[arvados] updated: 2.7.0-5675-g68dcbf1347

[git repository hosting]

Summary of changes:
 services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts   | 2 +-
 services/workbench2/src/store/workbench/workbench-actions.ts       | 3 +++
 .../workbench2/src/views-components/main-app-bar/account-menu.tsx  | 7 +------
 .../workbench2/src/views-components/main-app-bar/admin-menu.tsx    | 7 +------
 4 files changed, 6 insertions(+), 13 deletions(-)

       via  68dcbf13477b97edc0e5ce0b377f612232b3ac6b (commit)
      from  850fcf7cb1dab07f0b8ce05bbf14716b79fb21cd (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 68dcbf13477b97edc0e5ce0b377f612232b3ac6b
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri Dec 22 14:31:00 2023 -0500

    21200: moved activatesidepaneltreeitem to loadvirtualmachine function 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 a751a0582b..29dd77b776 100644
--- a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -315,7 +315,7 @@ export const VIRTUAL_MACHINES_ADMIN_PANEL_LABEL = 'Shell Access Admin';
 export const setVirtualMachinesAdminBreadcrumbs = () =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(setBreadcrumbs([
-            { label: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, uuid: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, icon: TerminalIcon },
+            { label: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, uuid: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, icon: AdminMenuIcon },
         ]));
     };
 
diff --git a/services/workbench2/src/store/workbench/workbench-actions.ts b/services/workbench2/src/store/workbench/workbench-actions.ts
index c6e7ff66d3..18aed3e668 100644
--- a/services/workbench2/src/store/workbench/workbench-actions.ts
+++ b/services/workbench2/src/store/workbench/workbench-actions.ts
@@ -15,6 +15,7 @@ import {
     initSidePanelTree,
     loadSidePanelTreeProjects,
     SidePanelTreeCategory,
+    SIDE_PANEL_TREE, 
 } from "store/side-panel-tree/side-panel-tree-actions";
 import { updateResources } from "store/resources/resources-actions";
 import { projectPanelColumns } from "views/project-panel/project-panel";
@@ -101,6 +102,7 @@ import { allProcessesPanelColumns } from "views/all-processes-panel/all-processe
 import { userProfileGroupsColumns } from "views/user-profile-panel/user-profile-panel-root";
 import { selectedToArray, selectedToKindSet } from "components/multiselect-toolbar/MultiselectToolbar";
 import { multiselectActions } from "store/multiselect/multiselect-actions";
+import { treePickerActions } from "store/tree-picker/tree-picker-actions";
 
 export const WORKBENCH_LOADING_SCREEN = "workbenchLoadingScreen";
 
@@ -745,6 +747,7 @@ export const loadLinks = handleFirstTimeLoad(async (dispatch: Dispatch<any>) =>
 export const loadVirtualMachines = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
     await dispatch(loadVirtualMachinesPanel());
     dispatch(setVirtualMachinesBreadcrumbs());
+    dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({id: SidePanelTreeCategory.SHELL_ACCESS, pickerId: SIDE_PANEL_TREE} ))
 });
 
 export const loadVirtualMachinesAdmin = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
diff --git a/services/workbench2/src/views-components/main-app-bar/account-menu.tsx b/services/workbench2/src/views-components/main-app-bar/account-menu.tsx
index 3ff3aaedeb..690b4033d3 100644
--- a/services/workbench2/src/views-components/main-app-bar/account-menu.tsx
+++ b/services/workbench2/src/views-components/main-app-bar/account-menu.tsx
@@ -22,8 +22,6 @@ import {
 import { openUserVirtualMachines } from "store/virtual-machines/virtual-machines-actions";
 import { pluginConfig } from 'plugins';
 import { ElementListReducer } from 'common/plugintypes';
-import { treePickerActions } from "store/tree-picker/tree-picker-actions";
-import { SIDE_PANEL_TREE, SidePanelTreeCategory } from "store/side-panel-tree/side-panel-tree-actions";
 
 interface AccountMenuProps {
     user?: User;
@@ -53,10 +51,7 @@ const styles: StyleRulesCallback<CssRules> = () => ({
 export const AccountMenuComponent =
     ({ user, dispatch, currentRoute, workbenchURL, apiToken, localCluster, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) => {
         let accountMenuItems = <>
-            <MenuItem onClick={() => {
-                dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({id: SidePanelTreeCategory.SHELL_ACCESS, pickerId: SIDE_PANEL_TREE} ))
-                dispatch(openUserVirtualMachines())
-            }}>Shell Access</MenuItem>
+            <MenuItem onClick={() => dispatch(openUserVirtualMachines())}>Shell Access</MenuItem>
             <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
             <MenuItem onClick={() => {
                 dispatch<any>(getNewExtraToken(true));
diff --git a/services/workbench2/src/views-components/main-app-bar/admin-menu.tsx b/services/workbench2/src/views-components/main-app-bar/admin-menu.tsx
index ffe03b9201..3059062960 100644
--- a/services/workbench2/src/views-components/main-app-bar/admin-menu.tsx
+++ b/services/workbench2/src/views-components/main-app-bar/admin-menu.tsx
@@ -13,8 +13,6 @@ import { openRepositoriesPanel } from "store/repositories/repositories-actions";
 import * as NavigationAction from 'store/navigation/navigation-action';
 import { openAdminVirtualMachines } from "store/virtual-machines/virtual-machines-actions";
 import { openUserPanel } from "store/users/users-actions";
-import { treePickerActions } from "store/tree-picker/tree-picker-actions";
-import { SIDE_PANEL_TREE, SidePanelTreeCategory } from "store/side-panel-tree/side-panel-tree-actions";
 interface AdminMenuProps {
     user?: User;
     currentRoute: string;
@@ -34,10 +32,7 @@ export const AdminMenu = connect(mapStateToProps)(
                 title="Admin Panel"
                 key={currentRoute}>
                 <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
-                <MenuItem onClick={() => {
-                    dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({id: SidePanelTreeCategory.SHELL_ACCESS, pickerId: SIDE_PANEL_TREE} ))
-                    dispatch(openAdminVirtualMachines())
-                }}>Shell Access</MenuItem>
+                <MenuItem onClick={() => dispatch(openAdminVirtualMachines())}>Shell Access</MenuItem>
                 <MenuItem onClick={() => dispatch(NavigationAction.navigateToSshKeysAdmin)}>Ssh Keys</MenuItem>
                 <MenuItem onClick={() => dispatch(NavigationAction.navigateToApiClientAuthorizations)}>Api Tokens</MenuItem>
                 <MenuItem onClick={() => dispatch(openUserPanel())}>Users</MenuItem>

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


hooks/post-receive
--