defaultViewIcon?: IconType;
defaultViewMessages?: string[];
working?: boolean;
- currentRefresh?: string;
currentRoute?: string;
hideColumnSelector?: boolean;
paperProps?: PaperProps;
elementPath?: string;
isMSToolbarVisible: boolean;
checkedList: TCheckedList;
+ isNotFound: boolean;
}
interface DataExplorerActionProps<T> {
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
state = {
- showLoading: false,
- prevRefresh: "",
- prevRoute: "",
- msToolbarInDetailsCard: false,
+ msToolbarInDetailsCard: true,
};
multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
-
- componentDidUpdate(prevProps: DataExplorerProps<T>) {
- const currentRefresh = this.props.currentRefresh || "";
- const currentRoute = this.props.currentRoute || "";
-
- if (currentRoute !== this.state.prevRoute) {
- // Component already mounted, but the user comes from a route change,
- // like browsing through a project hierarchy.
- this.setState({
- showLoading: this.props.working,
- prevRoute: currentRoute,
- });
- }
-
- if (currentRefresh !== this.state.prevRefresh) {
- // Component already mounted, but the user just clicked the
- // refresh button.
- this.setState({
- showLoading: this.props.working,
- prevRefresh: currentRefresh,
- });
- }
- if (this.state.showLoading && !this.props.working) {
- this.setState({
- showLoading: false,
- });
- }
- if (this.props.selectedResourceUuid !== prevProps.selectedResourceUuid || this.props.currentRouteUuid !== prevProps.currentRouteUuid) {
- this.setState({
- msToolbarInDetailsCard: this.props.selectedResourceUuid === this.props.currentRouteUuid,
- });
- }
- }
componentDidMount() {
if (this.props.onSetColumns) {
this.props.onSetColumns(this.props.columns);
}
- // Component just mounted, so we need to show the loading indicator.
- this.setState({
- showLoading: this.props.working,
- prevRefresh: this.props.currentRefresh || "",
- prevRoute: this.props.currentRoute || "",
- });
+ }
+
+ componentDidUpdate( prevProps: Readonly<DataExplorerProps<T>>, prevState: Readonly<{}>, snapshot?: any ): void {
+ const { selectedResourceUuid, currentRouteUuid } = this.props;
+ if(selectedResourceUuid !== prevProps.selectedResourceUuid || currentRouteUuid !== prevProps.currentRouteUuid) {
+ this.setState({
+ msToolbarInDetailsCard: selectedResourceUuid === this.props.currentRouteUuid,
+ })
+ }
}
render() {
toggleMSToolbar,
setCheckedListOnStore,
checkedList,
+ working,
} = this.props;
return (
<Paper
onFiltersChange={onFiltersChange}
onSortToggle={onSortToggle}
extractKey={extractKey}
- working={this.state.showLoading}
defaultViewIcon={defaultViewIcon}
defaultViewMessages={defaultViewMessages}
currentRoute={paperKey}
selectedResourceUuid={selectedResourceUuid}
setSelectedUuid={this.props.setSelectedUuid}
currentRouteUuid={this.props.currentRouteUuid}
+ working={working}
+ isNotFound={this.props.isNotFound}
/>
</Grid>
<Grid