X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3dd4b3bc31fea7f614290131d0ade5c0e0ffc595..2a7fd99c212c33a1ec9911f8529fa5afc59a7bb2:/src/views-components/data-explorer/data-explorer.tsx

diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index 8db551e8b4..871389d416 100644
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -2,15 +2,17 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { connect } from "react-redux";
-import { RootState } from "store/store";
-import { DataExplorer as DataExplorerComponent } from "components/data-explorer/data-explorer";
-import { getDataExplorer } from "store/data-explorer/data-explorer-reducer";
-import { Dispatch } from "redux";
-import { dataExplorerActions } from "store/data-explorer/data-explorer-action";
-import { DataColumn } from "components/data-table/data-column";
-import { DataColumns } from "components/data-table/data-table";
+import { connect } from 'react-redux';
+import { RootState } from 'store/store';
+import { DataExplorer as DataExplorerComponent } from 'components/data-explorer/data-explorer';
+import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
+import { Dispatch } from 'redux';
+import { dataExplorerActions } from 'store/data-explorer/data-explorer-action';
+import { DataColumn } from 'components/data-table/data-column';
+import { DataColumns, TCheckedList } from 'components/data-table/data-table';
 import { DataTableFilters } from 'components/data-table-filters/data-table-filters-tree';
+import { LAST_REFRESH_TIMESTAMP } from 'components/refresh-button/refresh-button';
+import { toggleMSToolbar, setCheckedListOnStore } from 'store/multiselect/multiselect-actions';
 
 interface Props {
     id: string;
@@ -18,40 +20,29 @@ interface Props {
     onContextMenu?: (event: React.MouseEvent<HTMLElement>, item: any, isAdmin?: boolean) => void;
     onRowDoubleClick: (item: any) => void;
     extractKey?: (item: any) => React.Key;
-    working?: boolean;
 }
 
-let prevRoute = '';
-let routeChanged = false;
-let isWorking = false;
-
 const mapStateToProps = (state: RootState, { id }: Props) => {
-    const progress = state.progressIndicator.find(p => p.id === id);
+    const progress = state.progressIndicator.find((p) => p.id === id);
     const dataExplorerState = getDataExplorer(state.dataExplorer, id);
     const currentRoute = state.router.location ? state.router.location.pathname : '';
+    const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || '';
     const currentItemUuid = currentRoute === '/workflows' ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid;
-
-    if (currentRoute !== prevRoute) {
-        routeChanged = true;
-        prevRoute = currentRoute;
-    }
-    if (progress?.working) {
-        isWorking = true;
-    }
-
-    const working = routeChanged && isWorking;
-
-    if (working && !progress?.working) {
-        routeChanged = false;
-        isWorking = false;
-    }
-
-    return { ...dataExplorerState, working, paperKey: currentRoute, currentItemUuid };
+    const isMSToolbarVisible = state.multiselect.isVisible;
+    return {
+        ...dataExplorerState,
+        working: !!progress?.working,
+        currentRefresh: currentRefresh,
+        currentRoute: currentRoute,
+        paperKey: currentRoute,
+        currentItemUuid,
+        isMSToolbarVisible,
+    };
 };
 
-const mapDispatchToProps = () => {
+const mapDispatchToProps = (dispatchFn) => {
     return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
-        onSetColumns: (columns: DataColumns<any>) => {
+        onSetColumns: (columns: DataColumns<any, any>) => {
             dispatch(dataExplorerActions.SET_COLUMNS({ id, columns }));
         },
 
@@ -59,15 +50,15 @@ const mapDispatchToProps = () => {
             dispatch(dataExplorerActions.SET_EXPLORER_SEARCH_VALUE({ id, searchValue }));
         },
 
-        onColumnToggle: (column: DataColumn<any>) => {
+        onColumnToggle: (column: DataColumn<any, any>) => {
             dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name }));
         },
 
-        onSortToggle: (column: DataColumn<any>) => {
+        onSortToggle: (column: DataColumn<any, any>) => {
             dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
         },
 
-        onFiltersChange: (filters: DataTableFilters, column: DataColumn<any>) => {
+        onFiltersChange: (filters: DataTableFilters, column: DataColumn<any, any>) => {
             dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
         },
 
@@ -83,6 +74,14 @@ const mapDispatchToProps = () => {
             dispatch(dataExplorerActions.SET_PAGE({ id, page }));
         },
 
+        toggleMSToolbar: (isVisible: boolean) => {
+            dispatchFn(toggleMSToolbar(isVisible));
+        },
+
+        setCheckedListOnStore: (checkedList: TCheckedList) => {
+            dispatchFn(setCheckedListOnStore(checkedList));
+        },
+
         onRowClick,
 
         onRowDoubleClick,
@@ -92,4 +91,3 @@ const mapDispatchToProps = () => {
 };
 
 export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);
-