From 850fcf7cb1dab07f0b8ce05bbf14716b79fb21cd Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Fri, 22 Dec 2023 13:37:18 -0500 Subject: [PATCH] 21200: fixed shell access label and icon Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../src/store/breadcrumbs/breadcrumbs-actions.ts | 10 +++++----- .../src/store/workbench/workbench-actions.ts | 1 - .../src/views-components/data-explorer/renderers.tsx | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts index 2ba2201bac..a751a0582b 100644 --- a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts +++ b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts @@ -20,7 +20,7 @@ import { ProcessResource } from 'models/process'; import { OrderBuilder } from 'services/api/order-builder'; import { Breadcrumb } from 'components/breadcrumbs/breadcrumbs'; import { ContainerRequestResource, containerRequestFieldsNoMounts } from 'models/container-request'; -import { AdminMenuIcon, CollectionIcon, IconType, ProcessIcon, ProjectIcon, ResourceIcon, WorkflowIcon } from 'components/icon/icon'; +import { AdminMenuIcon, CollectionIcon, IconType, ProcessIcon, ProjectIcon, ResourceIcon, TerminalIcon, WorkflowIcon } from 'components/icon/icon'; import { CollectionResource } from 'models/collection'; import { getSidePanelIcon } from 'views-components/side-panel-tree/side-panel-tree'; import { WorkflowResource } from 'models/workflow'; @@ -301,21 +301,21 @@ export const setInstanceTypesBreadcrumbs = () => ])); }; -export const VIRTUAL_MACHINES_USER_PANEL_LABEL = 'Virtual Machines'; +export const VIRTUAL_MACHINES_USER_PANEL_LABEL = 'Shell Access'; export const setVirtualMachinesBreadcrumbs = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(setBreadcrumbs([ - { label: VIRTUAL_MACHINES_USER_PANEL_LABEL, uuid: VIRTUAL_MACHINES_USER_PANEL_LABEL }, + { label: VIRTUAL_MACHINES_USER_PANEL_LABEL, uuid: VIRTUAL_MACHINES_USER_PANEL_LABEL, icon: TerminalIcon }, ])); }; -export const VIRTUAL_MACHINES_ADMIN_PANEL_LABEL = 'Virtual Machines Admin'; +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: AdminMenuIcon }, + { label: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, uuid: VIRTUAL_MACHINES_ADMIN_PANEL_LABEL, icon: TerminalIcon }, ])); }; diff --git a/services/workbench2/src/store/workbench/workbench-actions.ts b/services/workbench2/src/store/workbench/workbench-actions.ts index f5245b0e53..c6e7ff66d3 100644 --- a/services/workbench2/src/store/workbench/workbench-actions.ts +++ b/services/workbench2/src/store/workbench/workbench-actions.ts @@ -98,7 +98,6 @@ 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 { 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"; diff --git a/services/workbench2/src/views-components/data-explorer/renderers.tsx b/services/workbench2/src/views-components/data-explorer/renderers.tsx index 9e898b28e7..0ebe96ef3a 100644 --- a/services/workbench2/src/views-components/data-explorer/renderers.tsx +++ b/services/workbench2/src/views-components/data-explorer/renderers.tsx @@ -537,7 +537,6 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource ) => { export const ResourceLinkTail = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); const tailResource = getResource(resource?.tailUuid || "")(state.resources); - const userUuid = state.auth.user?.uuid return { item: tailResource || { uuid: resource?.tailUuid || "", kind: resource?.tailKind || ResourceKind.NONE }, -- 2.39.5