X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/92a91b827484223bcb3d1a7693b37c573de54538..0b569ee693ece680309ac9c114e975c9cb3e7f64:/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 2e316f6859..3de1948179 100644
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@ -12,7 +12,8 @@ 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";
+import { toggleMSToolbar, setCheckedListOnStore, setSelectedUuid, isExactlyOneSelected } from "store/multiselect/multiselect-actions";
+import { DetailsPanelState } from "store/details-panel/details-panel-reducer";
 
 interface Props {
     id: string;
@@ -22,13 +23,34 @@ interface Props {
     extractKey?: (item: any) => React.Key;
 }
 
+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 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 currentItemUuid = currentRoute === "/workflows" ? properties.workflowPanelDetailsUuid : isDetailsResourceChecked ? detailsPanel.resourceUuid : multiselect.selectedUuid;
+    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,
@@ -84,6 +106,11 @@ const mapDispatchToProps = () => {
             dispatch<any>(setCheckedListOnStore(checkedList));
         },
 
+        setSelectedUuid: (checkedList: TCheckedList) => {
+            dispatch<any>(setSelectedUuid(isExactlyOneSelected(checkedList)))
+        },
+        
+
         onRowClick,
 
         onRowDoubleClick,