Merge branch '21660-inode-test-race'

[arvados.git] / services / workbench2 / src / views-components / multiselect-toolbar / ms-process-action-set.ts

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 586424caefca042017ba86bf8d66e1f7f3c4a416..0637fcc468acff64726a15879644759b5ca5bab3 100644 (file)
--- 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
@@ -2,12 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { MoveToIcon, RemoveIcon, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon } from "components/icon/icon";
-import { openMoveProcessDialog } from "store/processes/process-move-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
+import { DeleteForever, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon } 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";
-import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
 import { openProcessUpdateDialog } from "store/processes/process-update-actions";
 import { msNavigateToOutput } from "store/multiselect/multiselect-actions";
 import { cancelRunningWorkflow } from "store/processes/processes-actions";
@@ -26,7 +25,7 @@ const msCopyAndRerunProcess: MultiSelectMenuAction = {
 
 const msRemoveProcess: MultiSelectMenuAction = {
     name: ContextMenuActionNames.REMOVE,
-    icon: RemoveIcon,
+    icon: DeleteForever,
     hasAlts: false,
     isForMulti: true,
     execute: (dispatch, resources) => {
@@ -34,15 +33,16 @@ const msRemoveProcess: MultiSelectMenuAction = {
     },
 }
 
-const msMoveTo: MultiSelectMenuAction = {
-    name: ContextMenuActionNames.MOVE_TO,
-    icon: MoveToIcon,
-    hasAlts: false,
-    isForMulti: true,
-    execute: (dispatch, resources) => {
-        dispatch<any>(openMoveProcessDialog(resources[0]));
-    },
-}
+// removed until auto-move children is implemented
+// const msMoveTo: MultiSelectMenuAction = {
+//     name: ContextMenuActionNames.MOVE_TO,
+//     icon: MoveToIcon,
+//     hasAlts: false,
+//     isForMulti: true,
+//     execute: (dispatch, resources) => {
+//         dispatch<any>(openMoveProcessDialog(resources[0]));
+//     },
+// }
 
 const msViewOutputs: MultiSelectMenuAction = {
     name: ContextMenuActionNames.OUTPUTS,
@@ -81,18 +81,18 @@ export const msProcessActionSet: MultiSelectMenuActionSet = [
         ...msCommonActionSet,
         msCopyAndRerunProcess,
         msRemoveProcess,
-        msMoveTo,
+        // msMoveTo,
         msViewOutputs,
         msEditProcess,
         msCancelProcess
     ]
 ];
 
-const { MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS, CANCEL } = ContextMenuActionNames
+const {REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS, CANCEL } = ContextMenuActionNames
 
-export const msCommonProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS ]);
-export const msRunningProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS, CANCEL ]);
+export const msCommonProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS ]);
+export const msRunningProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS, CANCEL ]);
 
 export const msReadOnlyProcessActionFilter = new Set([COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, OUTPUTS ]);
-export const msAdminProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS ]);
+export const msAdminProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS ]);