[arvados-workbench2] updated: 2.7.1-2-g1229eaa4

[git repository hosting]

Summary of changes:
 src/views-components/main-app-bar/account-menu.tsx       | 7 ++++++-
 src/views-components/main-app-bar/admin-menu.tsx         | 8 ++++++--
 src/views-components/side-panel/side-panel-collapsed.tsx | 5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

       via  1229eaa4ed3692fa198b4b4ceb6da529f46f7ba9 (commit)
      from  8f78a47abe35f8fe96ef952a617c85613a1acc88 (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 1229eaa4ed3692fa198b4b4ceb6da529f46f7ba9
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Dec 13 11:31:24 2023 -0500

    21200: added sidepanel highlight for shell access select from account & admin menus Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index 68afef22..37c2c7a5 100644
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -22,6 +22,8 @@ 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;
@@ -51,7 +53,10 @@ const styles: StyleRulesCallback<CssRules> = () => ({
 export const AccountMenuComponent =
     ({ user, dispatch, currentRoute, workbenchURL, apiToken, localCluster, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) => {
         let accountMenuItems = <>
-            <MenuItem onClick={() => dispatch(openUserVirtualMachines())}>Shell Access</MenuItem>
+            <MenuItem onClick={() => {
+                dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({id: SidePanelTreeCategory.SHELL_ACCESS, pickerId: SIDE_PANEL_TREE} ))
+                dispatch(openUserVirtualMachines())
+            }}>Shell Access</MenuItem>
             <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
             <MenuItem onClick={() => {
                 dispatch<any>(getNewExtraToken(true));
diff --git a/src/views-components/main-app-bar/admin-menu.tsx b/src/views-components/main-app-bar/admin-menu.tsx
index ea93fdbb..ffe03b92 100644
--- a/src/views-components/main-app-bar/admin-menu.tsx
+++ b/src/views-components/main-app-bar/admin-menu.tsx
@@ -13,7 +13,8 @@ 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;
@@ -33,7 +34,10 @@ export const AdminMenu = connect(mapStateToProps)(
                 title="Admin Panel"
                 key={currentRoute}>
                 <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
-                <MenuItem onClick={() => dispatch(openAdminVirtualMachines())}>Shell Access</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(NavigationAction.navigateToSshKeysAdmin)}>Ssh Keys</MenuItem>
                 <MenuItem onClick={() => dispatch(NavigationAction.navigateToApiClientAuthorizations)}>Api Tokens</MenuItem>
                 <MenuItem onClick={() => dispatch(openUserPanel())}>Users</MenuItem>
diff --git a/src/views-components/side-panel/side-panel-collapsed.tsx b/src/views-components/side-panel/side-panel-collapsed.tsx
index 800aec2c..d884fc38 100644
--- a/src/views-components/side-panel/side-panel-collapsed.tsx
+++ b/src/views-components/side-panel/side-panel-collapsed.tsx
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import React, { ReactElement, useEffect } from 'react'
+import React, { ReactElement } from 'react'
 import { connect } from 'react-redux'
 import { ProjectsIcon, ProcessIcon, FavoriteIcon, ShareMeIcon, TrashIcon, PublicFavoriteIcon, GroupsIcon } from 'components/icon/icon'
 import { TerminalIcon } from 'components/icon/icon'
@@ -23,6 +23,7 @@ import {
 import { navigateToUserVirtualMachines } from 'store/navigation/navigation-action'
 import { RouterAction } from 'react-router-redux'
 import { User } from 'models/user'
+import { SidePanelTreeCategory } from 'store/side-panel-tree/side-panel-tree-actions'
 
 type CssRules = 'button' | 'unselected' | 'selected'
 
@@ -113,7 +114,7 @@ const mapStateToProps = ({auth, properties }: RootState) => {
         return {
             user: auth.user,
             selectedPath: properties.breadcrumbs
-                ? properties.breadcrumbs[0].label !== 'Shell Access'
+                ? properties.breadcrumbs[0].label !== SidePanelTreeCategory.SHELL_ACCESS
                 ? properties.breadcrumbs[0].label
                 : SidePanelCollapsedCategory.SHELL_ACCESS
                 : SidePanelCollapsedCategory.PROJECTS,

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


hooks/post-receive
--