[arvados-workbench2] updated: 2.6.0-75-gcb8dda3b

git repository hosting git at public.arvados.org
Thu Aug 31 17:56:42 UTC 2023


Summary of changes:
 .../multiselectToolbar/MultiselectToolbar.tsx      |  4 ++--
 .../ms-toolbar-action-filters.ts                   | 27 +++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

       via  cb8dda3b04dc65e5b9a87593ae3d985d008b6f0b (commit)
      from  7f5aa7c58dde29568ecb7b6bfb16f6b762c0ac1c (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 cb8dda3b04dc65e5b9a87593ae3d985d008b6f0b
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Thu Aug 31 13:56:37 2023 -0400

    15768: changed collection copy to clipboard copy Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index 85e6dd3a..b072652f 100644
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -15,7 +15,7 @@ import { getResource } from "store/resources/resources";
 import { ResourcesState } from "store/resources/resources";
 import { ContextMenuAction, ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
 import { RestoreFromTrashIcon, TrashIcon } from "components/icon/icon";
-import { multiselectActionsFilters, TMultiselectActionsFilters } from "./ms-toolbar-action-filters";
+import { multiselectActionsFilters, TMultiselectActionsFilters, contextMenuActionConsts } from "./ms-toolbar-action-filters";
 import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator";
 import { toggleTrashAction } from "views-components/context-menu/action-sets/project-action-set";
 
@@ -176,7 +176,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
     return {
         executeMulti: (selectedAction: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState): void => {
             const kindGroups = groupByKind(checkedList, resources);
-            if (selectedAction.name === "Move to") {
+            if (selectedAction.name === contextMenuActionConsts.MOVE_TO) {
                 const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as Resource;
 
                 const actionSet = kindToActionSet[firstResource.kind];
diff --git a/src/components/multiselectToolbar/ms-toolbar-action-filters.ts b/src/components/multiselectToolbar/ms-toolbar-action-filters.ts
index a56b7455..fafb8a4b 100644
--- a/src/components/multiselectToolbar/ms-toolbar-action-filters.ts
+++ b/src/components/multiselectToolbar/ms-toolbar-action-filters.ts
@@ -2,27 +2,26 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { ResourceKind } from 'models/resource';
-import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
-import { collectionActionSet } from 'views-components/context-menu/action-sets/collection-action-set';
-import { projectActionSet } from 'views-components/context-menu/action-sets/project-action-set';
-import { processResourceActionSet } from 'views-components/context-menu/action-sets/process-resource-action-set';
+import { ResourceKind } from "models/resource";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
+import { collectionActionSet } from "views-components/context-menu/action-sets/collection-action-set";
+import { projectActionSet } from "views-components/context-menu/action-sets/project-action-set";
+import { processResourceActionSet } from "views-components/context-menu/action-sets/process-resource-action-set";
 
 export type TMultiselectActionsFilters = Record<string, [ContextMenuActionSet, Set<string>]>;
 
 export const contextMenuActionConsts = {
-    MAKE_A_COPY: 'Make a copy',
-    MOVE_TO: 'Move to',
-    TOGGLE_TRASH_ACTION: 'ToggleTrashAction',
-    COPY_TO_CLIPBOARD: 'Copy to clipboard',
-    COPY_AND_RERUN_PROCESS: 'Copy and re-run process',
-    REMOVE: 'Remove',
+    MAKE_A_COPY: "Make a copy",
+    MOVE_TO: "Move to",
+    TOGGLE_TRASH_ACTION: "ToggleTrashAction",
+    COPY_TO_CLIPBOARD: "Copy to clipboard",
+    COPY_AND_RERUN_PROCESS: "Copy and re-run process",
+    REMOVE: "Remove",
 } as const;
 
-const { MAKE_A_COPY, MOVE_TO, TOGGLE_TRASH_ACTION, COPY_TO_CLIPBOARD, COPY_AND_RERUN_PROCESS, REMOVE } =
-    contextMenuActionConsts;
+const { MOVE_TO, TOGGLE_TRASH_ACTION, COPY_TO_CLIPBOARD, COPY_AND_RERUN_PROCESS, REMOVE } = contextMenuActionConsts;
 
-const collectionMSActionsFilter = new Set([MAKE_A_COPY, MOVE_TO, TOGGLE_TRASH_ACTION]);
+const collectionMSActionsFilter = new Set([COPY_TO_CLIPBOARD, MOVE_TO, TOGGLE_TRASH_ACTION]);
 const projectMSActionsFilter = new Set([COPY_TO_CLIPBOARD, MOVE_TO, TOGGLE_TRASH_ACTION]);
 const processResourceMSActionsFilter = new Set([COPY_AND_RERUN_PROCESS, MOVE_TO, REMOVE]);
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list