From 5e5d32ab61b3a6e063ca43fbedb0483257affa22 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Fri, 29 Mar 2024 10:26:14 -0400 Subject: [PATCH] 21448: removed share from process menu Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../action-sets/process-resource-action-set.ts | 7 ------- .../ms-collection-action-set.ts | 17 +++++++++++++++-- .../multiselect-toolbar/ms-menu-actions.ts | 16 ++-------------- .../ms-project-action-set.ts | 15 ++++++++++++++- .../ms-workflow-action-set.ts | 16 ++++++++++++++-- 5 files changed, 45 insertions(+), 26 deletions(-) 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 40d16e9c8e..33d44ebf60 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 @@ -93,13 +93,6 @@ export const processResourceActionSet: ContextMenuActionSet = [ dispatch(openProcessUpdateDialog(resources[0])); }, }, - { - icon: ShareIcon, - name: ContextMenuActionNames.SHARE, - execute: (dispatch, resources) => { - dispatch(openSharingDialog(resources[0].uuid)); - }, - }, { icon: MoveToIcon, name: ContextMenuActionNames.MOVE_TO, 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 3933e7ddb3..d2e7b51e1d 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 } from "components/icon/icon"; +import { MoveToIcon, CopyIcon, RenameIcon, ShareIcon } 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"; @@ -13,6 +13,8 @@ import { TrashIcon, Link, FolderSharedIcon } from "components/icon/icon"; import { openCollectionUpdateDialog } from "store/collections/collection-update-actions"; import { copyToClipboardAction } from "store/open-in-new-tab/open-in-new-tab.actions"; import { openWebDavS3InfoDialog } from "store/collections/collection-info-actions"; +import { openSharingDialog } from "store/sharing-dialog/sharing-dialog-actions"; + const { MAKE_A_COPY, MOVE_TO, MOVE_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, SHARE} = ContextMenuActionNames; @@ -77,6 +79,16 @@ const msOpenWith3rdPartyClientAction: MultiSelectMenuAction = { }, }; +const msShareAction: MultiSelectMenuAction = { + name: SHARE, + icon: ShareIcon, + hasAlts: false, + isForMulti: false, + execute: (dispatch, resources) => { + dispatch(openSharingDialog(resources[0].uuid)); + }, +}; + export const msCollectionActionSet: MultiSelectMenuActionSet = [ [ ...msCommonActionSet, @@ -85,7 +97,8 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [ msToggleTrashAction, msEditCollection, msCopyToClipboardMenuAction, - msOpenWith3rdPartyClientAction + msOpenWith3rdPartyClientAction, + msShareAction, ], ]; diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-menu-actions.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-menu-actions.ts index ae36348308..12840cdea2 100644 --- a/services/workbench2/src/views-components/multiselect-toolbar/ms-menu-actions.ts +++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-menu-actions.ts @@ -7,14 +7,13 @@ import { IconType } from 'components/icon/icon'; import { ResourcesState } from 'store/resources/resources'; import { FavoritesState } from 'store/favorites/favorites-reducer'; import { ContextMenuResource } from 'store/context-menu/context-menu-actions'; -import { AddFavoriteIcon, AdvancedIcon, DetailsIcon, OpenIcon, PublicFavoriteIcon, RemoveFavoriteIcon, ShareIcon } from 'components/icon/icon'; +import { AddFavoriteIcon, AdvancedIcon, DetailsIcon, OpenIcon, PublicFavoriteIcon, RemoveFavoriteIcon } from 'components/icon/icon'; import { checkFavorite } from 'store/favorites/favorites-reducer'; import { toggleFavorite } from 'store/favorites/favorites-actions'; import { favoritePanelActions } from 'store/favorite-panel/favorite-panel-action'; import { openInNewTabAction } from 'store/open-in-new-tab/open-in-new-tab.actions'; import { toggleDetailsPanel } from 'store/details-panel/details-panel-action'; import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab'; -import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions'; import { togglePublicFavorite } from "store/public-favorites/public-favorites-actions"; import { publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action"; import { PublicFavoritesState } from 'store/public-favorites/public-favorites-reducer'; @@ -34,7 +33,7 @@ export type MultiSelectMenuAction = { export type MultiSelectMenuActionSet = MultiSelectMenuAction[][]; -const { ADD_TO_FAVORITES, ADD_TO_PUBLIC_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE } = ContextMenuActionNames; +const { ADD_TO_FAVORITES, ADD_TO_PUBLIC_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS } = ContextMenuActionNames; const msToggleFavoriteAction: MultiSelectMenuAction = { name: ADD_TO_FAVORITES, @@ -83,16 +82,6 @@ const msAdvancedAction: MultiSelectMenuAction = { }, }; -const msShareAction: MultiSelectMenuAction = { - name: SHARE, - icon: ShareIcon, - hasAlts: false, - isForMulti: false, - execute: (dispatch, resources) => { - dispatch(openSharingDialog(resources[0].uuid)); - }, -}; - const msTogglePublicFavoriteAction: MultiSelectMenuAction = { name: ADD_TO_PUBLIC_FAVORITES, icon: PublicFavoriteIcon, @@ -115,6 +104,5 @@ export const msCommonActionSet = [ msOpenInNewTabMenuAction, msViewDetailsAction, msAdvancedAction, - msShareAction, msTogglePublicFavoriteAction ]; 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 be072003c9..849dedd36d 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 @@ -12,6 +12,7 @@ import { NewProjectIcon, RenameIcon, UnfreezeIcon, + ShareIcon, } from 'components/icon/icon'; import { RestoreFromTrashIcon, TrashIcon, FolderSharedIcon, Link } from 'components/icon/icon'; import { getResource } from 'store/resources/resources'; @@ -20,6 +21,7 @@ import { openProjectUpdateDialog } from 'store/projects/project-update-actions'; import { freezeProject, unfreezeProject } from 'store/projects/project-lock-actions'; import { openWebDavS3InfoDialog } from 'store/collections/collection-info-actions'; import { copyToClipboardAction } from 'store/open-in-new-tab/open-in-new-tab.actions'; +import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions'; const { ADD_TO_FAVORITES, @@ -123,6 +125,16 @@ const msNewProjectAction: MultiSelectMenuAction = { }, }; +const msShareAction: MultiSelectMenuAction = { + name: SHARE, + icon: ShareIcon, + hasAlts: false, + isForMulti: false, + execute: (dispatch, resources) => { + dispatch(openSharingDialog(resources[0].uuid)); + }, +}; + export const msProjectActionSet: MultiSelectMenuActionSet = [ [ ...msCommonActionSet, @@ -132,7 +144,8 @@ export const msProjectActionSet: MultiSelectMenuActionSet = [ msNewProjectAction, msFreezeProjectAction, msOpenWith3rdPartyClientAction, - msCopyToClipboardMenuAction + msCopyToClipboardMenuAction, + msShareAction, ], ]; 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 fd54081681..25b015b47a 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 @@ -7,8 +7,10 @@ import { StartIcon, TrashIcon, Link } 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 } from 'store/open-in-new-tab/open-in-new-tab.actions'; +import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions'; +import { ShareIcon } from 'components/icon/icon'; -const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW } = ContextMenuActionNames; +const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW, SHARE } = ContextMenuActionNames; const msRunWorkflow: MultiSelectMenuAction = { name: RUN_WORKFLOW, @@ -40,7 +42,17 @@ const msCopyToClipboardMenuAction: MultiSelectMenuAction = { }, }; -export const msWorkflowActionSet: MultiSelectMenuActionSet = [[...msCommonActionSet, msRunWorkflow, msDeleteWorkflow, msCopyToClipboardMenuAction]]; +const msShareAction: MultiSelectMenuAction = { + name: SHARE, + icon: ShareIcon, + hasAlts: false, + isForMulti: false, + execute: (dispatch, resources) => { + dispatch(openSharingDialog(resources[0].uuid)); + }, +}; + +export const msWorkflowActionSet: MultiSelectMenuActionSet = [[...msCommonActionSet, msRunWorkflow, msDeleteWorkflow, msCopyToClipboardMenuAction, msShareAction]]; export const msReadOnlyWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW ]); export const msWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW]); -- 2.30.2