21225: Add styles to wrap mutually exclusive tabs and data explorer in same paper

[arvados.git] / services / workbench2 / src / views-components / data-explorer / data-explorer.tsx

diff --git a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
index 3de19481794cdf328c1cfda00f7108f41f403219..bcf8683e89ff724cd0b731b358d6ff80d59fc842 100644 (file)
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@ -11,9 +11,8 @@ 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, setSelectedUuid, isExactlyOneSelected } from "store/multiselect/multiselect-actions";
-import { DetailsPanelState } from "store/details-panel/details-panel-reducer";
+import { toggleMSToolbar, setCheckedListOnStore } from "store/multiselect/multiselect-actions";
+import { setSelectedResourceUuid } from "store/selected-resource/selected-resource-actions";
 
 interface Props {
     id: string;
@@ -21,46 +20,24 @@ interface Props {
     onContextMenu?: (event: React.MouseEvent<HTMLElement>, item: any, isAdmin?: boolean) => void;
     onRowDoubleClick: (item: any) => void;
     extractKey?: (item: any) => React.Key;
+    working?: boolean;
 }
 
-const getCurrentItemUuid = (
-    currentRoute: string,
-    workflowPanelDetailsUuid: string,
-    isDetailsResourceChecked: boolean,
-    isOnlyOneSelected: boolean,
-    detailsPanel: DetailsPanelState,
-    multiselectSelectedUuid: string
-) => {
-    if(currentRoute === '/workflows') {
-        return workflowPanelDetailsUuid;
-    }
-    if(isDetailsResourceChecked && isOnlyOneSelected) {
-        return detailsPanel.resourceUuid;
-    }
-    if(!detailsPanel.isOpened){
-        return multiselectSelectedUuid;
-    }
-    return detailsPanel.resourceUuid;
-};
-
-const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, detailsPanel, properties}: RootState, { id }: Props) => {
-    const progress = progressIndicator.find(p => p.id === id);
+const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, selectedResourceUuid, properties, searchBar}: RootState, { id }: Props) => {
+    const working = !!progressIndicator.some(p => p.working);
     const dataExplorerState = getDataExplorer(dataExplorer, id);
     const currentRoute = router.location ? router.location.pathname : "";
-    const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || "";
-    const isDetailsResourceChecked = multiselect.checkedList[detailsPanel.resourceUuid]
-    const isOnlyOneSelected = Object.values(multiselect.checkedList).filter(x => x === true).length === 1;
-    const currentItemUuid = getCurrentItemUuid(currentRoute, properties.workflowPanelDetailsUuid, isDetailsResourceChecked, isOnlyOneSelected, detailsPanel, multiselect.selectedUuid);
     const isMSToolbarVisible = multiselect.isVisible;
     return {
         ...dataExplorerState,
-        working: !!progress?.working,
-        currentRefresh: currentRefresh,
         currentRoute: currentRoute,
         paperKey: currentRoute,
-        currentItemUuid,
+        currentRouteUuid: properties.currentRouteUuid,
         isMSToolbarVisible,
+        selectedResourceUuid,
         checkedList: multiselect.checkedList,
+        working,
+        searchBarValue: searchBar.searchValue,
     };
 };
 
@@ -106,10 +83,9 @@ const mapDispatchToProps = () => {
             dispatch<any>(setCheckedListOnStore(checkedList));
         },
 
-        setSelectedUuid: (checkedList: TCheckedList) => {
-            dispatch<any>(setSelectedUuid(isExactlyOneSelected(checkedList)))
+        setSelectedUuid: (uuid: string | null) => {
+            dispatch<any>(setSelectedResourceUuid(uuid));
         },
-        
 
         onRowClick,