[arvados] updated: 2.7.0-6262-g9d8b1517ec
git repository hosting
git at public.arvados.org
Thu Mar 28 14:36:26 UTC 2024
Summary of changes:
.../multiselect-toolbar/MultiselectToolbar.tsx | 9 ++++---
.../src/store/favorites/favorites-actions.ts | 6 ++---
.../project-panel-middleware-service.ts | 4 ++--
.../src/store/projects/project-lock-actions.ts | 10 ++++----
.../public-favorites/public-favorites-actions.ts | 6 ++---
.../trash-panel/trash-panel-middleware-service.ts | 4 ++--
.../workbench2/src/store/trash/trash-actions.ts | 6 ++---
.../ms-collection-action-set.ts | 6 ++---
.../multiselect-toolbar/ms-menu-actions.ts | 28 ++--------------------
.../multiselect-toolbar/ms-process-action-set.ts | 16 ++++++-------
.../multiselect-toolbar/ms-project-action-set.ts | 4 ++--
.../multiselect-toolbar/ms-workflow-action-set.ts | 4 ++--
12 files changed, 39 insertions(+), 64 deletions(-)
via 9d8b1517ec34774e041eede98c050f6bdd184c22 (commit)
from 04c46ad79307ac28644adc5f25a05d8f0736c499 (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 9d8b1517ec34774e041eede98c050f6bdd184c22
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Thu Mar 28 10:36:21 2024 -0400
21448: combined contextmenunames and mstoolbaractionnames since they were mostly duplicated and serve the same purpose Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 6500593166..7b44d675a2 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -14,8 +14,7 @@ import { Resource, ResourceKind, extractUuidKind } from "models/resource";
import { getResource } from "store/resources/resources";
import { ResourcesState } from "store/resources/resources";
import { MultiSelectMenuAction, MultiSelectMenuActionSet } from "views-components/multiselect-toolbar/ms-menu-actions";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
-import { ContextMenuAction } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuAction, ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { multiselectActionsFilters, TMultiselectActionsFilters, msMenuResourceKind } from "./ms-toolbar-action-filters";
import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator";
import { msToggleTrashAction } from "views-components/multiselect-toolbar/ms-project-action-set";
@@ -338,13 +337,13 @@ function mapDispatchToProps(dispatch: Dispatch) {
executeMulti: (selectedAction: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState): void => {
const kindGroups = groupByKind(checkedList, resources);
switch (selectedAction.name) {
- case MultiSelectMenuActionNames.MOVE_TO:
- case MultiSelectMenuActionNames.REMOVE:
+ case ContextMenuActionNames.MOVE_TO:
+ case ContextMenuActionNames.REMOVE:
const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as ContainerRequestResource | Resource;
const action = findActionByName(selectedAction.name as string, kindToActionSet[firstResource.kind]);
if (action) action.execute(dispatch, kindGroups[firstResource.kind]);
break;
- case MultiSelectMenuActionNames.COPY_TO_CLIPBOARD:
+ case ContextMenuActionNames.COPY_TO_CLIPBOARD:
const selectedResources = selectedToArray(checkedList).map(uuid => getResource(uuid)(resources));
dispatch<any>(copyToClipboardAction(selectedResources));
break;
diff --git a/services/workbench2/src/store/favorites/favorites-actions.ts b/services/workbench2/src/store/favorites/favorites-actions.ts
index da454ed77d..3f4d7a802f 100644
--- a/services/workbench2/src/store/favorites/favorites-actions.ts
+++ b/services/workbench2/src/store/favorites/favorites-actions.ts
@@ -10,7 +10,7 @@ import { checkFavorite } from "./favorites-reducer";
import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
import { ServiceRepository } from "services/services";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
import { loadFavoritesTree} from "store/side-panel-tree/side-panel-tree-actions";
@@ -29,7 +29,7 @@ export const toggleFavorite = (resource: { uuid: string; name: string }) =>
return Promise.reject("No user");
}
dispatch(progressIndicatorActions.START_WORKING("toggleFavorite"));
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.ADD_TO_FAVORITES))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.ADD_TO_FAVORITES))
dispatch(favoritesActions.TOGGLE_FAVORITE({ resourceUuid: resource.uuid }));
const isFavorite = checkFavorite(resource.uuid, getState().favorites);
dispatch(snackbarActions.OPEN_SNACKBAR({
@@ -54,7 +54,7 @@ export const toggleFavorite = (resource: { uuid: string; name: string }) =>
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_FAVORITES))
+ dispatch<any>(removeDisabledButton(ContextMenuActionNames.ADD_TO_FAVORITES))
dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite"));
dispatch<any>(loadFavoritesTree())
})
diff --git a/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts b/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
index 89f0576d86..e8d03dfcd7 100644
--- a/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
+++ b/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
@@ -35,7 +35,7 @@ import { updatePublicFavorites } from "store/public-favorites/public-favorites-a
import { selectedFieldsOfGroup } from "models/group";
import { defaultCollectionSelectedFields } from "models/collection";
import { containerRequestFieldsNoMounts } from "models/container-request";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { removeDisabledButton } from "store/multiselect/multiselect-actions";
import { dataExplorerActions } from "store/data-explorer/data-explorer-action";
@@ -82,7 +82,7 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
} finally {
if (!background) {
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
- api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
+ api.dispatch<any>(removeDisabledButton(ContextMenuActionNames.MOVE_TO_TRASH))
}
}
}
diff --git a/services/workbench2/src/store/projects/project-lock-actions.ts b/services/workbench2/src/store/projects/project-lock-actions.ts
index 28e934d1f8..cd72e35196 100644
--- a/services/workbench2/src/store/projects/project-lock-actions.ts
+++ b/services/workbench2/src/store/projects/project-lock-actions.ts
@@ -7,11 +7,11 @@ import { ServiceRepository } from "services/services";
import { projectPanelActions } from "store/project-panel/project-panel-action-bind";
import { loadResource } from "store/resources/resources-actions";
import { RootState } from "store/store";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
export const freezeProject = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.FREEZE_PROJECT))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.FREEZE_PROJECT))
const userUUID = getState().auth.user!.uuid;
const updatedProject = await services.projectService.update(uuid, {
@@ -20,18 +20,18 @@ export const freezeProject = (uuid: string) => async (dispatch: Dispatch, getSta
dispatch(projectPanelActions.REQUEST_ITEMS());
dispatch<any>(loadResource(uuid, false));
- dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.FREEZE_PROJECT))
+ dispatch<any>(removeDisabledButton(ContextMenuActionNames.FREEZE_PROJECT))
return updatedProject;
};
export const unfreezeProject = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.FREEZE_PROJECT))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.FREEZE_PROJECT))
const updatedProject = await services.projectService.update(uuid, {
frozenByUuid: null,
});
dispatch(projectPanelActions.REQUEST_ITEMS());
dispatch<any>(loadResource(uuid, false));
- dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.FREEZE_PROJECT))
+ dispatch<any>(removeDisabledButton(ContextMenuActionNames.FREEZE_PROJECT))
return updatedProject;
};
diff --git a/services/workbench2/src/store/public-favorites/public-favorites-actions.ts b/services/workbench2/src/store/public-favorites/public-favorites-actions.ts
index 0f8ed6c261..b9915dbdf1 100644
--- a/services/workbench2/src/store/public-favorites/public-favorites-actions.ts
+++ b/services/workbench2/src/store/public-favorites/public-favorites-actions.ts
@@ -10,7 +10,7 @@ import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
import { ServiceRepository } from "services/services";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { loadPublicFavoritesTree } from "store/side-panel-tree/side-panel-tree-actions";
export const publicFavoritesActions = unionize({
@@ -24,7 +24,7 @@ export type PublicFavoritesAction = UnionOf<typeof publicFavoritesActions>;
export const togglePublicFavorite = (resource: { uuid: string; name: string }) =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
dispatch(progressIndicatorActions.START_WORKING("togglePublicFavorite"));
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
const uuidPrefix = getState().auth.config.uuidPrefix;
const uuid = `${uuidPrefix}-j7d0g-publicfavorites`;
dispatch(publicFavoritesActions.TOGGLE_PUBLIC_FAVORITE({ resourceUuid: resource.uuid }));
@@ -51,7 +51,7 @@ export const togglePublicFavorite = (resource: { uuid: string; name: string }) =
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
+ dispatch<any>(removeDisabledButton(ContextMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
dispatch<any>(loadPublicFavoritesTree())
})
diff --git a/services/workbench2/src/store/trash-panel/trash-panel-middleware-service.ts b/services/workbench2/src/store/trash-panel/trash-panel-middleware-service.ts
index c822cece87..b0fed19d0d 100644
--- a/services/workbench2/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/services/workbench2/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -27,7 +27,7 @@ import { serializeResourceTypeFilters } from 'store//resource-type-filters/resou
import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service';
import { joinFilters } from 'services/api/filter-builder';
import { CollectionResource } from "models/collection";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { removeDisabledButton } from "store/multiselect/multiselect-actions";
export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -85,7 +85,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
}));
api.dispatch(couldNotFetchTrashContents());
}
- api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
+ api.dispatch<any>(removeDisabledButton(ContextMenuActionNames.MOVE_TO_TRASH))
}
}
diff --git a/services/workbench2/src/store/trash/trash-actions.ts b/services/workbench2/src/store/trash/trash-actions.ts
index f4e3d3f0c4..b6740bf9ae 100644
--- a/services/workbench2/src/store/trash/trash-actions.ts
+++ b/services/workbench2/src/store/trash/trash-actions.ts
@@ -13,7 +13,7 @@ import { sharedWithMePanelActions } from "store/shared-with-me-panel/shared-with
import { ResourceKind } from "models/resource";
import { navigateTo, navigateToTrash } from "store/navigation/navigation-action";
import { matchCollectionRoute, matchSharedWithMeRoute } from "routes/routes";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { addDisabledButton } from "store/multiselect/multiselect-actions";
export const toggleProjectTrashed =
@@ -22,7 +22,7 @@ export const toggleProjectTrashed =
let errorMessage = "";
let successMessage = "";
let untrashedResource;
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.MOVE_TO_TRASH))
try {
if (isTrashed) {
errorMessage = "Could not restore project from trash";
@@ -77,7 +77,7 @@ export const toggleCollectionTrashed =
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
let errorMessage = "";
let successMessage = "";
- dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
+ dispatch<any>(addDisabledButton(ContextMenuActionNames.MOVE_TO_TRASH))
try {
if (isTrashed) {
const { location } = getState().router;
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 760260892c..3933e7ddb3 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
@@ -8,13 +8,13 @@ import { openCollectionCopyDialog, openMultiCollectionCopyDialog } from "store/c
import { toggleCollectionTrashed } from "store/trash/trash-actions";
import { ContextMenuResource } from "store/context-menu/context-menu-actions";
import { msCommonActionSet, MultiSelectMenuActionSet, MultiSelectMenuAction } from "./ms-menu-actions";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
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";
-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} = MultiSelectMenuActionNames;
+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;
const msCopyCollection: MultiSelectMenuAction = {
name: MAKE_A_COPY,
@@ -48,7 +48,7 @@ const msToggleTrashAction: MultiSelectMenuAction = {
}
const msEditCollection: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.EDIT_COLLECTION,
+ name: ContextMenuActionNames.EDIT_COLLECTION,
icon: RenameIcon,
hasAlts: false,
isForMulti: false,
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 2facdcd4ce..ae36348308 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
@@ -18,31 +18,7 @@ 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';
-
-export enum MultiSelectMenuActionNames {
- ADD_TO_FAVORITES = 'Add to Favorites',
- MOVE_TO_TRASH = 'Move to trash',
- ADD_TO_PUBLIC_FAVORITES = 'Add to public favorites',
- API_DETAILS = 'API Details',
- CANCEL = 'CANCEL',
- COPY_AND_RERUN_PROCESS = 'Copy and re-run process',
- COPY_TO_CLIPBOARD = 'Copy to clipboard',
- DELETE_WORKFLOW = 'Delete Workflow',
- EDIT_COLLECTION = 'Edit collection',
- EDIT_PROJECT = 'Edit project',
- EDIT_PROCESS = 'Edit process',
- FREEZE_PROJECT = 'Freeze Project',
- MAKE_A_COPY = 'Make a copy',
- MOVE_TO = 'Move to',
- NEW_PROJECT = 'New project',
- OPEN_IN_NEW_TAB = 'Open in new tab',
- OPEN_WITH_3RD_PARTY_CLIENT = 'Open with 3rd party client',
- OUTPUTS = 'Outputs',
- REMOVE = 'Remove',
- RUN_WORKFLOW = 'Run Workflow',
- SHARE = 'Share',
- VIEW_DETAILS = 'View details',
-};
+import { ContextMenuActionNames } from 'views-components/context-menu/context-menu-action-set';
export type MultiSelectMenuAction = {
name: string;
@@ -58,7 +34,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 } = MultiSelectMenuActionNames;
+const { ADD_TO_FAVORITES, ADD_TO_PUBLIC_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE } = ContextMenuActionNames;
const msToggleFavoriteAction: MultiSelectMenuAction = {
name: ADD_TO_FAVORITES,
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 7802ad81f1..586424caef 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
@@ -7,13 +7,13 @@ import { openMoveProcessDialog } from "store/processes/process-move-actions";
import { openCopyProcessDialog } from "store/processes/process-copy-actions";
import { openRemoveProcessDialog } from "store/processes/processes-actions";
import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from "./ms-menu-actions";
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/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";
const msCopyAndRerunProcess: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.COPY_AND_RERUN_PROCESS,
+ name: ContextMenuActionNames.COPY_AND_RERUN_PROCESS,
icon: ReRunProcessIcon,
hasAlts: false,
isForMulti: false,
@@ -25,7 +25,7 @@ const msCopyAndRerunProcess: MultiSelectMenuAction = {
}
const msRemoveProcess: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.REMOVE,
+ name: ContextMenuActionNames.REMOVE,
icon: RemoveIcon,
hasAlts: false,
isForMulti: true,
@@ -35,7 +35,7 @@ const msRemoveProcess: MultiSelectMenuAction = {
}
const msMoveTo: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.MOVE_TO,
+ name: ContextMenuActionNames.MOVE_TO,
icon: MoveToIcon,
hasAlts: false,
isForMulti: true,
@@ -45,7 +45,7 @@ const msMoveTo: MultiSelectMenuAction = {
}
const msViewOutputs: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.OUTPUTS,
+ name: ContextMenuActionNames.OUTPUTS,
icon: OutputIcon,
hasAlts: false,
isForMulti: false,
@@ -57,7 +57,7 @@ const msViewOutputs: MultiSelectMenuAction = {
}
const msEditProcess: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.EDIT_PROCESS,
+ name: ContextMenuActionNames.EDIT_PROCESS,
icon: RenameIcon,
hasAlts: false,
isForMulti: false,
@@ -67,7 +67,7 @@ const msEditProcess: MultiSelectMenuAction = {
}
const msCancelProcess: MultiSelectMenuAction = {
- name: MultiSelectMenuActionNames.CANCEL,
+ name: ContextMenuActionNames.CANCEL,
icon: StopIcon,
hasAlts: false,
isForMulti: false,
@@ -88,7 +88,7 @@ export const msProcessActionSet: MultiSelectMenuActionSet = [
]
];
-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 } = MultiSelectMenuActionNames
+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
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 ]);
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 c7a47aba5a..be072003c9 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
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from 'views-components/multiselect-toolbar/ms-menu-actions';
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { openMoveProjectDialog } from 'store/projects/project-move-actions';
import { toggleProjectTrashed } from 'store/trash/trash-actions';
import {
@@ -35,7 +35,7 @@ const {
MOVE_TO_TRASH,
FREEZE_PROJECT,
NEW_PROJECT,
-} = MultiSelectMenuActionNames;
+} = ContextMenuActionNames;
const msCopyToClipboardMenuAction: MultiSelectMenuAction = {
name: COPY_TO_CLIPBOARD,
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 ab819df225..fd54081681 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
@@ -5,10 +5,10 @@
import { openRunProcess, deleteWorkflow } from 'store/workflow-panel/workflow-panel-actions';
import { StartIcon, TrashIcon, Link } from 'components/icon/icon';
import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from './ms-menu-actions';
-import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/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';
-const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW } = MultiSelectMenuActionNames;
+const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW } = ContextMenuActionNames;
const msRunWorkflow: MultiSelectMenuAction = {
name: RUN_WORKFLOW,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list