cr-change-props-names 14489-context-menus-dropdowns-persists-after-using-back-option
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 17 Dec 2018 13:05:28 +0000 (14:05 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 17 Dec 2018 13:05:28 +0000 (14:05 +0100)
Feature #14489

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

src/components/data-explorer/data-explorer.tsx
src/views-components/data-explorer/data-explorer.tsx

index 56958c807fb8f10a7527eb5441eacc5931506a2b..b6ca215d56463ec7f7ba3742ae06f5105ffa69ad 100644 (file)
@@ -49,7 +49,7 @@ interface DataExplorerDataProps<T> {
     paperProps?: PaperProps;
     actions?: React.ReactNode;
     hideSearchInput?: boolean;
-    currentRoute?: string;
+    paperKey?: string;
 }
 
 interface DataExplorerActionProps<T> {
@@ -81,9 +81,9 @@ export const DataExplorer = withStyles(styles)(
                 rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch,
                 items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
                 dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput,
-                currentRoute
+                paperKey
             } = this.props;
-            return <Paper className={classes.root} {...paperProps} key={currentRoute}>
+            return <Paper className={classes.root} {...paperProps} key={paperKey}>
                 <Toolbar className={classes.toolbar}>
                     <Grid container justify="space-between" wrap="nowrap" alignItems="center">
                         {!hideSearchInput && <div className={classes.searchBox}>
index 78b4079500938707ad8808e0bcea7d29178621f2..8cddf3ba1a5eea67880519a292a46d5146c58e5f 100644 (file)
@@ -24,7 +24,7 @@ const mapStateToProps = (state: RootState, { id }: Props) => {
     const progress = state.progressIndicator.find(p => p.id === id);
     const working = progress && progress.working;
     const currentRoute = state.router.location ? state.router.location.pathname : '';
-    return { ...getDataExplorer(state.dataExplorer, id), working, currentRoute };
+    return { ...getDataExplorer(state.dataExplorer, id), working, paperKey: currentRoute };
 };
 
 const mapDispatchToProps = () => {