[arvados] updated: 2.7.0-5679-g9b81f1cb8c

[git repository hosting]

Summary of changes:
 services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts | 9 +++++++--
 services/workbench2/src/store/workbench/workbench-actions.ts     | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

       via  9b81f1cb8c16ad2e164e83d8e2b123fd271cea89 (commit)
       via  bee33d91dc0284fab48048c21d59694a64958f9f (commit)
      from  f6fe5fa6e06b66e04aaa87fe655c3e27d54501d2 (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 9b81f1cb8c16ad2e164e83d8e2b123fd271cea89
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Dec 27 11:01:31 2023 -0500

    21200: set proper breadcrumbs when nav from all users Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
index 29dd77b776..dc34e91b69 100644
--- a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -269,11 +269,16 @@ export const setUserProfileBreadcrumbs = (userUuid: string) =>
         try {
             const user = getResource<UserResource>(userUuid)(getState().resources)
                 || await services.userService.get(userUuid, false);
-            const breadcrumbs: Breadcrumb[] = [
+                const currentCrumbs = getState().properties.breadcrumbs as Breadcrumb[]
+            const userProfileBreadcrumbs: Breadcrumb[] = [
                 { label: USERS_PANEL_LABEL, uuid: USERS_PANEL_LABEL },
                 { label: user ? `${user.firstName} ${user.lastName}` : userUuid, uuid: userUuid },
+            ];    
+            const breadcrumbsWithPreviousCrumbs: Breadcrumb[] = [
+                ...currentCrumbs,
+                { label: user ? `${user.firstName} ${user.lastName}` : userUuid, uuid: userUuid },
             ];
-            dispatch(setBreadcrumbs(breadcrumbs));
+            dispatch(setBreadcrumbs(currentCrumbs.some(crumb => crumb.label === SidePanelTreeCategory.GROUPS) ? breadcrumbsWithPreviousCrumbs : userProfileBreadcrumbs));
         } catch (e) {
             const breadcrumbs: Breadcrumb[] = [
                 { label: USERS_PANEL_LABEL, uuid: USERS_PANEL_LABEL },

commit bee33d91dc0284fab48048c21d59694a64958f9f
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Dec 27 10:06:12 2023 -0500

    21200: deactivate sidepanel node on admin/shell access Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/store/workbench/workbench-actions.ts b/services/workbench2/src/store/workbench/workbench-actions.ts
index 18aed3e668..1ac749cd9d 100644
--- a/services/workbench2/src/store/workbench/workbench-actions.ts
+++ b/services/workbench2/src/store/workbench/workbench-actions.ts
@@ -753,6 +753,7 @@ export const loadVirtualMachines = handleFirstTimeLoad(async (dispatch: Dispatch
 export const loadVirtualMachinesAdmin = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
     await dispatch(loadVirtualMachinesPanel());
     dispatch(setVirtualMachinesAdminBreadcrumbs());
+    dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({pickerId: SIDE_PANEL_TREE} ))
 });
 
 export const loadRepositories = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {

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


hooks/post-receive
--