X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0019db357afed7f52da38e9c398f3e39ce4eb162..6477e004fb67681b8b64bcdbca187dbc32c6cd60:/services/workbench2/src/components/data-explorer/data-explorer.tsx diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx index 1b3e7f31d4..ba710bc783 100644 --- a/services/workbench2/src/components/data-explorer/data-explorer.tsx +++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx @@ -84,7 +84,6 @@ interface DataExplorerDataProps { defaultViewIcon?: IconType; defaultViewMessages?: string[]; working?: boolean; - currentRefresh?: string; currentRoute?: string; hideColumnSelector?: boolean; paperProps?: PaperProps; @@ -97,7 +96,7 @@ interface DataExplorerDataProps { elementPath?: string; isMSToolbarVisible: boolean; checkedList: TCheckedList; - isNotFound?: boolean; + isNotFound: boolean; } interface DataExplorerActionProps { @@ -119,50 +118,15 @@ interface DataExplorerActionProps { type DataExplorerProps = DataExplorerDataProps & DataExplorerActionProps & WithStyles & MPVPanelProps; -type DataExplorerState = { - prevRefresh: string; - prevRoute: string; -}; - export const DataExplorer = withStyles(styles)( class DataExplorerGeneric extends React.Component> { - state: DataExplorerState = { - prevRefresh: "", - prevRoute: "", - }; multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar; - componentDidUpdate(prevProps: DataExplorerProps) { - 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({ - prevRoute: currentRoute, - }); - } - - if (currentRefresh !== this.state.prevRefresh) { - // Component already mounted, but the user just clicked the - // refresh button. - this.setState({ - prevRefresh: currentRefresh, - }); - } - } - componentDidMount() { if (this.props.onSetColumns) { this.props.onSetColumns(this.props.columns); } - // Component just mounted, so we need to show the loading indicator. - this.setState({ - prevRefresh: this.props.currentRefresh || "", - prevRoute: this.props.currentRoute || "", - }); } render() {