From 1204d70c4e323a580b1e667db494422e2ef3897d Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Fri, 18 Oct 2024 15:43:08 -0400 Subject: [PATCH] 22207: changed all copy icons to "CopyContent" icon Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- services/workbench2/src/components/icon/icon.tsx | 4 +++- .../context-menu/action-sets/collection-action-set.ts | 5 +++-- .../context-menu/action-sets/process-resource-action-set.ts | 4 ++-- .../context-menu/action-sets/project-action-set.ts | 4 ++-- .../context-menu/action-sets/workflow-action-set.ts | 4 ++-- .../multiselect-toolbar/ms-collection-action-set.ts | 6 +++--- .../multiselect-toolbar/ms-process-action-set.ts | 4 ++-- .../multiselect-toolbar/ms-project-action-set.ts | 3 ++- .../multiselect-toolbar/ms-workflow-action-set.ts | 4 ++-- 9 files changed, 21 insertions(+), 17 deletions(-) diff --git a/services/workbench2/src/components/icon/icon.tsx b/services/workbench2/src/components/icon/icon.tsx index 4953645c46..4b278e2cae 100644 --- a/services/workbench2/src/components/icon/icon.tsx +++ b/services/workbench2/src/components/icon/icon.tsx @@ -17,7 +17,8 @@ import Create from "@mui/icons-material/Create"; import ImportContacts from "@mui/icons-material/ImportContacts"; import ChevronRight from "@mui/icons-material/ChevronRight"; import Close from "@mui/icons-material/Close"; -import ContentCopy from "@mui/icons-material/FileCopyOutlined"; +import ContentCopy from "@mui/icons-material/ContentCopy"; +import FileCopyOutlined from "@mui/icons-material/FileCopyOutlined"; import CreateNewFolder from "@mui/icons-material/CreateNewFolder"; import Delete from "@mui/icons-material/Delete"; import DeviceHub from "@mui/icons-material/DeviceHub"; @@ -205,6 +206,7 @@ export const CustomizeTableIcon: IconType = props => ; export const CommandIcon: IconType = props => ; export const CopyIcon: IconType = props => ; export const FileCopyIcon: IconType = props => ; +export const FileCopyOutlinedIcon: IconType = props => ; export const CollectionIcon: IconType = props => ; export const CloseIcon: IconType = props => ; export const CloudUploadIcon: IconType = props => ; diff --git a/services/workbench2/src/views-components/context-menu/action-sets/collection-action-set.ts b/services/workbench2/src/views-components/context-menu/action-sets/collection-action-set.ts index 1bf0bbafcc..5037eb9741 100644 --- a/services/workbench2/src/views-components/context-menu/action-sets/collection-action-set.ts +++ b/services/workbench2/src/views-components/context-menu/action-sets/collection-action-set.ts @@ -16,6 +16,7 @@ import { Link, RestoreVersionIcon, FolderSharedIcon, + FileCopyOutlinedIcon, } from "components/icon/icon"; import { openCollectionUpdateDialog } from "store/collections/collection-update-actions"; import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action"; @@ -62,14 +63,14 @@ const commonActionSet: ContextMenuActionSet = [ }, }, { - icon: Link, + icon: CopyIcon, name: ContextMenuActionNames.COPY_UUID, execute: (dispatch, resources) => { dispatch(copyStringToClipboardAction(resources[0].uuid)); }, }, { - icon: CopyIcon, + icon: FileCopyOutlinedIcon, name: ContextMenuActionNames.MAKE_A_COPY, execute: (dispatch, resources) => { if (resources[0].fromContextMenu || resources.length === 1) dispatch(openCollectionCopyDialog(resources[0])); diff --git a/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts index c06fdf8aab..0d138e6201 100644 --- a/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts +++ b/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts @@ -14,7 +14,7 @@ import { AdvancedIcon, OpenIcon, StopIcon, - Link, + CopyIcon, } from "components/icon/icon"; import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action"; import { openProcessUpdateDialog } from "store/processes/process-update-actions"; @@ -79,7 +79,7 @@ export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [ }, }, { - icon: Link, + icon: CopyIcon, name: ContextMenuActionNames.COPY_UUID, execute: (dispatch, resources) => { dispatch(copyStringToClipboardAction(resources[0].uuid)); diff --git a/services/workbench2/src/views-components/context-menu/action-sets/project-action-set.ts b/services/workbench2/src/views-components/context-menu/action-sets/project-action-set.ts index a6f715d5c5..f02eda9255 100644 --- a/services/workbench2/src/views-components/context-menu/action-sets/project-action-set.ts +++ b/services/workbench2/src/views-components/context-menu/action-sets/project-action-set.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import { ContextMenuActionSet, ContextMenuActionNames } from "../context-menu-action-set"; -import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, FolderSharedIcon } from "components/icon/icon"; +import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, FolderSharedIcon, CopyIcon } from "components/icon/icon"; import { ToggleFavoriteAction } from "../actions/favorite-action"; import { toggleFavorite } from "store/favorites/favorites-actions"; import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action"; @@ -48,7 +48,7 @@ export const copyToClipboardMenuAction = { }; export const copyUuidAction = { - icon: Link, + icon: CopyIcon, name: ContextMenuActionNames.COPY_UUID, execute: (dispatch, resources) => { dispatch(copyStringToClipboardAction(resources[0].uuid)); diff --git a/services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts b/services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts index 3cd222a2de..49203075ca 100644 --- a/services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts +++ b/services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts @@ -4,7 +4,7 @@ import { ContextMenuActionSet, ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set"; import { openRunProcess, openRemoveWorkflowDialog } from "store/workflow-panel/workflow-panel-actions"; -import { DetailsIcon, AdvancedIcon, OpenIcon, Link, StartIcon, DeleteForever } from "components/icon/icon"; +import { DetailsIcon, AdvancedIcon, OpenIcon, Link, StartIcon, DeleteForever, CopyIcon } from "components/icon/icon"; import { copyToClipboardAction, openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions"; import { openDetailsPanel } from "store/details-panel/details-panel-action"; import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab"; @@ -61,7 +61,7 @@ export const workflowActionSet: ContextMenuActionSet = [ }, }, { - icon: Link, + icon: CopyIcon, name: ContextMenuActionNames.COPY_UUID, execute: (dispatch, resources) => { dispatch(copyStringToClipboardAction(resources[0].uuid)); diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-collection-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-collection-action-set.ts index 4ae68ed3fe..6cf1e8fdd2 100644 --- a/services/workbench2/src/views-components/multiselect-toolbar/ms-collection-action-set.ts +++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-collection-action-set.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { MoveToIcon, CopyIcon, RenameIcon, ShareIcon } from "components/icon/icon"; +import { MoveToIcon, CopyIcon, RenameIcon, ShareIcon, FileCopyOutlinedIcon } from "components/icon/icon"; import { openMoveCollectionDialog } from "store/collections/collection-move-actions"; import { openCollectionCopyDialog, openMultiCollectionCopyDialog } from "store/collections/collection-copy-actions"; import { toggleCollectionTrashed } from "store/trash/trash-actions"; @@ -20,7 +20,7 @@ const { MAKE_A_COPY, MOVE_TO, MOVE_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, O const msCopyCollection: MultiSelectMenuAction = { name: MAKE_A_COPY, - icon: CopyIcon, + icon: FileCopyOutlinedIcon, hasAlts: false, isForMulti: true, execute: (dispatch, [...resources]) => { @@ -71,7 +71,7 @@ const msCopyToClipboardMenuAction: MultiSelectMenuAction = { const msCopyUuid: MultiSelectMenuAction = { name: COPY_UUID, - icon: Link, + icon: CopyIcon, hasAlts: false, isForMulti: false, execute: (dispatch, resources) => { diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts index c4e043885b..5fb98d6de2 100644 --- a/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts +++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set"; -import { DeleteForever, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon, Link } from "components/icon/icon"; +import { DeleteForever, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon, CopyIcon } from "components/icon/icon"; import { openCopyProcessDialog } from "store/processes/process-copy-actions"; import { openRemoveProcessDialog } from "store/processes/processes-actions"; import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from "./ms-menu-actions"; @@ -38,7 +38,7 @@ const msRemoveProcess: MultiSelectMenuAction = { const msCopyUuid: MultiSelectMenuAction = { name: COPY_UUID, - icon: Link, + icon: CopyIcon, hasAlts: false, isForMulti: false, execute: (dispatch, resources) => { diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-project-action-set.ts index 33df81b0b8..e687280174 100644 --- a/services/workbench2/src/views-components/multiselect-toolbar/ms-project-action-set.ts +++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-project-action-set.ts @@ -13,6 +13,7 @@ import { RenameIcon, UnfreezeIcon, ShareIcon, + CopyIcon, } from 'components/icon/icon'; import { RestoreFromTrashIcon, TrashIcon, FolderSharedIcon, Link } from 'components/icon/icon'; import { getResource } from 'store/resources/resources'; @@ -52,7 +53,7 @@ const msCopyToClipboardMenuAction: MultiSelectMenuAction = { const msCopyUuid: MultiSelectMenuAction = { name: COPY_UUID, - icon: Link, + icon: CopyIcon, hasAlts: false, isForMulti: false, execute: (dispatch, resources) => { diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts index bbbf44c4b9..a3d77719c8 100644 --- a/services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts +++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import { openRunProcess, openRemoveWorkflowDialog } from 'store/workflow-panel/workflow-panel-actions'; -import { StartIcon, DeleteForever, Link } from 'components/icon/icon'; +import { StartIcon, DeleteForever, Link, CopyIcon } from 'components/icon/icon'; import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from './ms-menu-actions'; import { ContextMenuActionNames } from 'views-components/context-menu/context-menu-action-set'; import { copyToClipboardAction, copyStringToClipboardAction } from 'store/open-in-new-tab/open-in-new-tab.actions'; @@ -46,7 +46,7 @@ const msCopyToClipboardMenuAction: MultiSelectMenuAction = { const msCopyUuid: MultiSelectMenuAction = { name: COPY_UUID, - icon: Link, + icon: CopyIcon, hasAlts: false, isForMulti: false, execute: (dispatch, resources) => { -- 2.30.2