[arvados] updated: 2.7.0-6053-g5f7299e677

[git repository hosting]

Summary of changes:
 services/workbench2/src/components/data-explorer/data-explorer.tsx | 4 ++--
 services/workbench2/src/components/data-table/data-table.tsx       | 2 +-
 services/workbench2/src/views/main-panel/main-panel-root.tsx       | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

       via  5f7299e677a453c3fa9b278d29a132e74c9aca6d (commit)
      from  b321ea05ba350bb48e4b86c8fd73cea924d4b61d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5f7299e677a453c3fa9b278d29a132e74c9aca6d
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Mar 20 12:02:36 2024 -0400

    21224: set toolbar to only display if the global selected uuid is populated Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 2d5a0b240e..b9816721f9 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -236,7 +236,7 @@ export const DataExplorer = withStyles(styles)(
                                 </Grid>
                             )}
                             {!!progressBar && progressBar}
-                            {this.multiSelectToolbarInTitle && <MultiselectToolbar />}
+                            {this.multiSelectToolbarInTitle && !!selectedResourceUuid && <MultiselectToolbar />}
                             {(!hideColumnSelector || !hideSearchInput || !!actions) && (
                                 <Grid
                                     className={classes.headerMenu}
@@ -302,7 +302,7 @@ export const DataExplorer = withStyles(styles)(
                                 </Grid>
                             )}
                         </div>
-                        {!this.multiSelectToolbarInTitle && <MultiselectToolbar />}
+                        {!this.multiSelectToolbarInTitle && !!selectedResourceUuid && <MultiselectToolbar />}
                         <Grid
                             item
                             xs="auto"
diff --git a/services/workbench2/src/components/data-table/data-table.tsx b/services/workbench2/src/components/data-table/data-table.tsx
index 6808447df3..1335bdf398 100644
--- a/services/workbench2/src/components/data-table/data-table.tsx
+++ b/services/workbench2/src/components/data-table/data-table.tsx
@@ -178,7 +178,7 @@ export const DataTable = withStyles(styles)(
             if (singleSelected && singleSelected !== isExactlyOneSelected(prevProps.checkedList)) {
                 this.props.setSelectedUuid(singleSelected);
             }
-            if (!singleSelected) {
+            if (!singleSelected && !!currentRouteUuid) {
                 this.props.setSelectedUuid(currentRouteUuid);
             }
         }
diff --git a/services/workbench2/src/views/main-panel/main-panel-root.tsx b/services/workbench2/src/views/main-panel/main-panel-root.tsx
index 99fd93db69..da0a298a72 100644
--- a/services/workbench2/src/views/main-panel/main-panel-root.tsx
+++ b/services/workbench2/src/views/main-panel/main-panel-root.tsx
@@ -11,6 +11,7 @@ import { LoginPanel } from 'views/login-panel/login-panel';
 import { InactivePanel } from 'views/inactive-panel/inactive-panel';
 import { WorkbenchLoadingScreen } from 'views/workbench/workbench-loading-screen';
 import { MainAppBar } from 'views-components/main-app-bar/main-app-bar';
+import { Routes } from 'routes/routes';
 
 type CssRules = 'root';
 
@@ -53,7 +54,9 @@ export const MainPanelRoot = withStyles(styles)(
             useEffect(() => {
                 const splitRoute = currentRoute.split('/');
                 const uuid = splitRoute[splitRoute.length - 1];
-                setCurrentRouteUuid(uuid);
+                if(Object.values(Routes).includes(`/${uuid}`) === false) {
+                    setCurrentRouteUuid(uuid);
+                }
                 // eslint-disable-next-line react-hooks/exhaustive-deps
             }, [currentRoute]);
 

-----------------------------------------------------------------------


hooks/post-receive
--