[arvados-workbench2] created: 2.7.1-1-g8f78a47a
git repository hosting
git at public.arvados.org
Wed Dec 13 14:34:44 UTC 2023
at 8f78a47abe35f8fe96ef952a617c85613a1acc88 (commit)
commit 8f78a47abe35f8fe96ef952a617c85613a1acc88
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Dec 13 09:34:29 2023 -0500
21200: changed virtual machines to shell access evrywhere Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index e89a95e0..62530352 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -95,7 +95,7 @@ import { subprocessPanelActions } from "store/subprocess-panel/subprocess-panel-
import { subprocessPanelColumns } from "views/subprocess-panel/subprocess-panel-root";
import { loadAllProcessesPanel, allProcessesPanelActions } from "../all-processes-panel/all-processes-panel-action";
import { allProcessesPanelColumns } from "views/all-processes-panel/all-processes-panel";
-import { AdminMenuIcon } from "components/icon/icon";
+import { TerminalIcon } from "components/icon/icon";
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";
@@ -742,12 +742,12 @@ export const loadLinks = handleFirstTimeLoad(async (dispatch: Dispatch<any>) =>
export const loadVirtualMachines = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
await dispatch(loadVirtualMachinesPanel());
- dispatch(setBreadcrumbs([{ label: "Virtual Machines" }]));
+ dispatch(setBreadcrumbs([{ label: "Shell Access", icon: TerminalIcon }]));
});
export const loadVirtualMachinesAdmin = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
await dispatch(loadVirtualMachinesPanel());
- dispatch(setBreadcrumbs([{ label: "Virtual Machines Admin", icon: AdminMenuIcon }]));
+ dispatch(setBreadcrumbs([{ label: "Shell Access Admin", icon: TerminalIcon }]));
});
export const loadRepositories = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index c2cc0e2a..68afef22 100644
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -51,7 +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(openUserVirtualMachines())}>Virtual Machines</MenuItem>
+ <MenuItem onClick={() => 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 198306b5..ea93fdbb 100644
--- a/src/views-components/main-app-bar/admin-menu.tsx
+++ b/src/views-components/main-app-bar/admin-menu.tsx
@@ -33,7 +33,7 @@ export const AdminMenu = connect(mapStateToProps)(
title="Admin Panel"
key={currentRoute}>
<MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
- <MenuItem onClick={() => dispatch(openAdminVirtualMachines())}>Virtual Machines</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>
diff --git a/src/views-components/side-panel/side-panel-collapsed.tsx b/src/views-components/side-panel/side-panel-collapsed.tsx
index d2f5cfec..800aec2c 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 } from 'react'
+import React, { ReactElement, useEffect } 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'
@@ -113,7 +113,7 @@ const mapStateToProps = ({auth, properties }: RootState) => {
return {
user: auth.user,
selectedPath: properties.breadcrumbs
- ? properties.breadcrumbs[0].label !== 'Virtual Machines'
+ ? properties.breadcrumbs[0].label !== 'Shell Access'
? properties.breadcrumbs[0].label
: SidePanelCollapsedCategory.SHELL_ACCESS
: SidePanelCollapsedCategory.PROJECTS,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list