[arvados-workbench2] updated: 2.7.0-194-g3612a36e
git repository hosting
git at public.arvados.org
Fri Nov 10 19:16:45 UTC 2023
Summary of changes:
.../multiselect-toolbar/MultiselectToolbar.tsx | 12 ++++++------
.../ms-kind-action-differentiator.ts | 6 +++---
.../ms-toolbar-action-filters.ts | 9 ++++-----
.../api-client-authorization-action-set.ts | 4 ++--
.../action-sets/collection-action-set.ts | 14 +++++++-------
.../action-sets/collection-files-action-set.ts | 22 +++++++++++-----------
.../collection-files-item-action-set.ts | 12 ++++++------
.../collection-files-not-selected-action-set.ts | 4 ++--
.../action-sets/favorite-action-set.ts | 4 ++--
.../context-menu/action-sets/group-action-set.ts | 4 ++--
.../action-sets/group-member-action-set.ts | 4 ++--
.../action-sets/keep-service-action-set.ts | 4 ++--
.../context-menu/action-sets/link-action-set.ts | 4 ++--
.../action-sets/permission-edit-action-set.ts | 4 ++--
.../action-sets/process-resource-action-set.ts | 12 ++++++------
.../context-menu/action-sets/project-action-set.ts | 10 +++++-----
.../action-sets/project-admin-action-set.ts | 8 ++++----
.../action-sets/repository-action-set.ts | 4 ++--
.../action-sets/resource-action-set.ts | 4 ++--
.../action-sets/root-project-action-set.ts | 4 ++--
.../action-sets/search-results-action-set.ts | 4 ++--
.../context-menu/action-sets/ssh-key-action-set.ts | 4 ++--
.../context-menu/action-sets/trash-action-set.ts | 4 ++--
.../action-sets/trashed-collection-action-set.ts | 4 ++--
.../context-menu/action-sets/user-action-set.ts | 4 ++--
.../action-sets/virtual-machine-action-set.ts | 4 ++--
.../action-sets/workflow-action-set.ts | 6 +++---
.../context-menu/context-menu-action-set.ts | 4 ++--
src/views-components/context-menu/context-menu.tsx | 12 ++++++------
.../ms-collection-action-set.ts | 4 ++--
.../multiselect-toolbar/ms-process-action-set.ts | 4 ++--
.../multiselect-toolbar/ms-project-action-set.ts | 17 ++---------------
32 files changed, 103 insertions(+), 117 deletions(-)
via 3612a36e473bf1599180a9b3b90b03ca0aaafb45 (commit)
from b831639582bf6ffc96566424dc5b5168a5c54a0f (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 3612a36e473bf1599180a9b3b90b03ca0aaafb45
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Fri Nov 10 14:05:13 2023 -0500
Revert "21128: renamed overloaded context menu types Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>"
This reverts commit b831639582bf6ffc96566424dc5b5168a5c54a0f.
refs#21128 Rename of overloaded types broke other components unexpectedly Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 7bc442fb..3d8ae0c3 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -13,7 +13,7 @@ import { ContextMenuResource } from "store/context-menu/context-menu-actions";
import { Resource, extractUuidKind } from "models/resource";
import { getResource } from "store/resources/resources";
import { ResourcesState } from "store/resources/resources";
-import { ContextMenuActionItem, ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuAction, ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { RestoreFromTrashIcon, TrashIcon } from "components/icon/icon";
import { multiselectActionsFilters, TMultiselectActionsFilters, contextMenuActionConsts } from "./ms-toolbar-action-filters";
import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator";
@@ -42,7 +42,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
export type MultiselectToolbarProps = {
checkedList: TCheckedList;
resources: ResourcesState;
- executeMulti: (action: ContextMenuActionItem, checkedList: TCheckedList, resources: ResourcesState) => void;
+ executeMulti: (action: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState) => void;
};
export const MultiselectToolbar = connect(
@@ -130,14 +130,14 @@ function groupByKind(checkedList: TCheckedList, resources: ResourcesState): Reco
return result;
}
-function filterActions(actionArray: ContextMenuActionItemSet, filters: Set<string>): Array<ContextMenuActionItem> {
+function filterActions(actionArray: ContextMenuActionSet, filters: Set<string>): Array<ContextMenuAction> {
return actionArray[0].filter(action => filters.has(action.name as string));
}
function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMultiselectActionsFilters) {
- const rawResult: Set<ContextMenuActionItem> = new Set();
+ const rawResult: Set<ContextMenuAction> = new Set();
const resultNames = new Set();
- const allFiltersArray: ContextMenuActionItem[][] = [];
+ const allFiltersArray: ContextMenuAction[][] = [];
currentResourceKinds.forEach(kind => {
if (filterSet[kind]) {
const actions = filterActions(...filterSet[kind]);
@@ -188,7 +188,7 @@ function mapStateToProps(state: RootState) {
function mapDispatchToProps(dispatch: Dispatch) {
return {
- executeMulti: (selectedAction: ContextMenuActionItem, checkedList: TCheckedList, resources: ResourcesState): void => {
+ executeMulti: (selectedAction: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState): void => {
const kindGroups = groupByKind(checkedList, resources);
switch (selectedAction.name) {
case contextMenuActionConsts.MOVE_TO:
diff --git a/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts b/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts
index 9c79f247..e2f643b6 100644
--- a/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts
+++ b/src/components/multiselect-toolbar/ms-kind-action-differentiator.ts
@@ -3,18 +3,18 @@
// SPDX-License-Identifier: AGPL-3.0
import { ResourceKind } from "models/resource";
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { msCollectionActionSet } from "views-components/multiselect-toolbar/ms-collection-action-set";
import { msProjectActionSet } from "views-components/multiselect-toolbar/ms-project-action-set";
import { msProcessActionSet } from "views-components/multiselect-toolbar/ms-process-action-set";
-export function findActionByName(name: string, actionSet: ContextMenuActionItemSet) {
+export function findActionByName(name: string, actionSet: ContextMenuActionSet) {
return actionSet[0].find(action => action.name === name);
}
const { COLLECTION, PROJECT, PROCESS } = ResourceKind;
-export const kindToActionSet: Record<string, ContextMenuActionItemSet> = {
+export const kindToActionSet: Record<string, ContextMenuActionSet> = {
[COLLECTION]: msCollectionActionSet,
[PROJECT]: msProjectActionSet,
[PROCESS]: msProcessActionSet,
diff --git a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
index e907bf58..9145a820 100644
--- a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
+++ b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
@@ -3,27 +3,26 @@
// SPDX-License-Identifier: AGPL-3.0
import { ResourceKind } from "models/resource";
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { msCollectionActionSet } from "views-components/multiselect-toolbar/ms-collection-action-set";
import { msProjectActionSet } from "views-components/multiselect-toolbar/ms-project-action-set";
import { msProcessActionSet } from "views-components/multiselect-toolbar/ms-process-action-set";
-export type TMultiselectActionsFilters = Record<string, [ContextMenuActionItemSet, Set<string>]>;
+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",
- TOGGLE_FAVORITES_ACTION: "ToggleFavoriteAction",
COPY_TO_CLIPBOARD: "Copy to clipboard",
COPY_AND_RERUN_PROCESS: "Copy and re-run process",
REMOVE: "Remove",
};
-const { MOVE_TO, TOGGLE_TRASH_ACTION, TOGGLE_FAVORITES_ACTION, REMOVE, MAKE_A_COPY } = contextMenuActionConsts;
+const { MOVE_TO, TOGGLE_TRASH_ACTION, REMOVE, MAKE_A_COPY } = contextMenuActionConsts;
//these sets govern what actions are on the ms toolbar for each resource kind
-const projectMSActionsFilter = new Set([MOVE_TO, TOGGLE_TRASH_ACTION, TOGGLE_FAVORITES_ACTION]);
+const projectMSActionsFilter = new Set([MOVE_TO, TOGGLE_TRASH_ACTION]);
const processResourceMSActionsFilter = new Set([MOVE_TO, REMOVE]);
const collectionMSActionsFilter = new Set([MAKE_A_COPY, MOVE_TO, TOGGLE_TRASH_ACTION]);
diff --git a/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts b/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
index ff3963fe..8e75d22f 100644
--- a/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
+++ b/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
@@ -7,10 +7,10 @@ import {
openApiClientAuthorizationRemoveDialog,
} from "store/api-client-authorizations/api-client-authorizations-actions";
import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab";
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { AdvancedIcon, RemoveIcon, AttributesIcon } from "components/icon/icon";
-export const apiClientAuthorizationActionSet: ContextMenuActionItemSet = [
+export const apiClientAuthorizationActionSet: ContextMenuActionSet = [
[
{
name: "Attributes",
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index 264ca5c0..95aec9c7 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItem, ContextMenuActionItemSet } from "../context-menu-action-set";
+import { ContextMenuAction, ContextMenuActionSet } from "../context-menu-action-set";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "store/favorites/favorites-actions";
import {
@@ -34,7 +34,7 @@ import { togglePublicFavorite } from "store/public-favorites/public-favorites-ac
import { publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action";
import { ContextMenuResource } from "store/context-menu/context-menu-actions";
-const toggleFavoriteAction: ContextMenuActionItem = {
+const toggleFavoriteAction: ContextMenuAction = {
component: ToggleFavoriteAction,
name: "ToggleFavoriteAction",
execute: (dispatch, resources) => {
@@ -45,7 +45,7 @@ const toggleFavoriteAction: ContextMenuActionItem = {
}
},
};
-const commonActionSet: ContextMenuActionItemSet = [
+const commonActionSet: ContextMenuActionSet = [
[
{
icon: OpenIcon,
@@ -86,7 +86,7 @@ const commonActionSet: ContextMenuActionItemSet = [
],
];
-export const readOnlyCollectionActionSet: ContextMenuActionItemSet = [
+export const readOnlyCollectionActionSet: ContextMenuActionSet = [
[
...commonActionSet.reduce((prev, next) => prev.concat(next), []),
toggleFavoriteAction,
@@ -100,7 +100,7 @@ export const readOnlyCollectionActionSet: ContextMenuActionItemSet = [
],
];
-export const collectionActionSet: ContextMenuActionItemSet = [
+export const collectionActionSet: ContextMenuActionSet = [
[
...readOnlyCollectionActionSet.reduce((prev, next) => prev.concat(next), []),
{
@@ -134,7 +134,7 @@ export const collectionActionSet: ContextMenuActionItemSet = [
],
];
-export const collectionAdminActionSet: ContextMenuActionItemSet = [
+export const collectionAdminActionSet: ContextMenuActionSet = [
[
...collectionActionSet.reduce((prev, next) => prev.concat(next), []),
{
@@ -151,7 +151,7 @@ export const collectionAdminActionSet: ContextMenuActionItemSet = [
],
];
-export const oldCollectionVersionActionSet: ContextMenuActionItemSet = [
+export const oldCollectionVersionActionSet: ContextMenuActionSet = [
[
...commonActionSet.reduce((prev, next) => prev.concat(next), []),
{
diff --git a/src/views-components/context-menu/action-sets/collection-files-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 48b8cd82..80deb37c 100644
--- a/src/views-components/context-menu/action-sets/collection-files-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItem, ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuAction, ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { collectionPanelFilesAction, openMultipleFilesRemoveDialog } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
import {
openCollectionPartialCopyMultipleToNewCollectionDialog,
@@ -12,7 +12,7 @@ import {
import { openCollectionPartialMoveMultipleToExistingCollectionDialog, openCollectionPartialMoveMultipleToNewCollectionDialog, openCollectionPartialMoveToSeparateCollectionsDialog } from "store/collections/collection-partial-move-actions";
import { FileCopyIcon, FileMoveIcon, RemoveIcon, SelectAllIcon, SelectNoneIcon } from "components/icon/icon";
-const copyActions: ContextMenuActionItem[] = [
+const copyActions: ContextMenuAction[] = [
{
name: "Copy selected into new collection",
icon: FileCopyIcon,
@@ -29,7 +29,7 @@ const copyActions: ContextMenuActionItem[] = [
},
];
-const copyActionsMultiple: ContextMenuActionItem[] = [
+const copyActionsMultiple: ContextMenuAction[] = [
...copyActions,
{
name: "Copy selected into separate collections",
@@ -40,7 +40,7 @@ const copyActionsMultiple: ContextMenuActionItem[] = [
}
];
-const moveActions: ContextMenuActionItem[] = [
+const moveActions: ContextMenuAction[] = [
{
name: "Move selected into new collection",
icon: FileMoveIcon,
@@ -57,7 +57,7 @@ const moveActions: ContextMenuActionItem[] = [
},
];
-const moveActionsMultiple: ContextMenuActionItem[] = [
+const moveActionsMultiple: ContextMenuAction[] = [
...moveActions,
{
name: "Move selected into separate collections",
@@ -68,7 +68,7 @@ const moveActionsMultiple: ContextMenuActionItem[] = [
}
];
-const selectActions: ContextMenuActionItem[] = [
+const selectActions: ContextMenuAction[] = [
{
name: "Select all",
icon: SelectAllIcon,
@@ -85,7 +85,7 @@ const selectActions: ContextMenuActionItem[] = [
},
];
-const removeAction: ContextMenuActionItem = {
+const removeAction: ContextMenuAction = {
name: "Remove selected",
icon: RemoveIcon,
execute: dispatch => {
@@ -94,22 +94,22 @@ const removeAction: ContextMenuActionItem = {
};
// These action sets are used on the multi-select actions button.
-export const readOnlyCollectionFilesActionSet: ContextMenuActionItemSet = [
+export const readOnlyCollectionFilesActionSet: ContextMenuActionSet = [
selectActions,
copyActions,
];
-export const readOnlyCollectionFilesMultipleActionSet: ContextMenuActionItemSet = [
+export const readOnlyCollectionFilesMultipleActionSet: ContextMenuActionSet = [
selectActions,
copyActionsMultiple,
];
-export const collectionFilesActionSet: ContextMenuActionItemSet = readOnlyCollectionFilesActionSet.concat([[
+export const collectionFilesActionSet: ContextMenuActionSet = readOnlyCollectionFilesActionSet.concat([[
removeAction,
...moveActions
]]);
-export const collectionFilesMultipleActionSet: ContextMenuActionItemSet = readOnlyCollectionFilesMultipleActionSet.concat([[
+export const collectionFilesMultipleActionSet: ContextMenuActionSet = readOnlyCollectionFilesMultipleActionSet.concat([[
removeAction,
...moveActionsMultiple
]]);
diff --git a/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
index 5f767b48..fb158a82 100644
--- a/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "../context-menu-action-set";
+import { ContextMenuActionSet } from "../context-menu-action-set";
import { FileCopyIcon, FileMoveIcon, RemoveIcon, RenameIcon } from "components/icon/icon";
import { DownloadCollectionFileAction } from "../actions/download-collection-file-action";
import { openFileRemoveDialog, openRenameFileDialog } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
@@ -17,7 +17,7 @@ import {
openCollectionPartialCopyToNewCollectionDialog,
} from "store/collections/collection-partial-copy-actions";
-export const readOnlyCollectionDirectoryItemActionSet: ContextMenuActionItemSet = [
+export const readOnlyCollectionDirectoryItemActionSet: ContextMenuActionSet = [
[
{
name: "Copy item into new collection",
@@ -48,7 +48,7 @@ export const readOnlyCollectionDirectoryItemActionSet: ContextMenuActionItemSet
],
];
-export const readOnlyCollectionFileItemActionSet: ContextMenuActionItemSet = [
+export const readOnlyCollectionFileItemActionSet: ContextMenuActionSet = [
[
{
component: DownloadCollectionFileAction,
@@ -60,7 +60,7 @@ export const readOnlyCollectionFileItemActionSet: ContextMenuActionItemSet = [
],
];
-const writableActionSet: ContextMenuActionItemSet = [
+const writableActionSet: ContextMenuActionSet = [
[
{
name: "Move item into new collection",
@@ -99,6 +99,6 @@ const writableActionSet: ContextMenuActionItemSet = [
],
];
-export const collectionDirectoryItemActionSet: ContextMenuActionItemSet = readOnlyCollectionDirectoryItemActionSet.concat(writableActionSet);
+export const collectionDirectoryItemActionSet: ContextMenuActionSet = readOnlyCollectionDirectoryItemActionSet.concat(writableActionSet);
-export const collectionFileItemActionSet: ContextMenuActionItemSet = readOnlyCollectionFileItemActionSet.concat(writableActionSet);
+export const collectionFileItemActionSet: ContextMenuActionSet = readOnlyCollectionFileItemActionSet.concat(writableActionSet);
diff --git a/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
index dee16602..1e31d11c 100644
--- a/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
@@ -2,11 +2,11 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { collectionPanelFilesAction } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
import { SelectAllIcon } from "components/icon/icon";
-export const collectionFilesNotSelectedActionSet: ContextMenuActionItemSet = [[{
+export const collectionFilesNotSelectedActionSet: ContextMenuActionSet = [[{
name: "Select all",
icon: SelectAllIcon,
execute: dispatch => {
diff --git a/src/views-components/context-menu/action-sets/favorite-action-set.ts b/src/views-components/context-menu/action-sets/favorite-action-set.ts
index c1126c85..bdc4b07a 100644
--- a/src/views-components/context-menu/action-sets/favorite-action-set.ts
+++ b/src/views-components/context-menu/action-sets/favorite-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { ToggleFavoriteAction } from '../actions/favorite-action';
import { toggleFavorite } from 'store/favorites/favorites-actions';
import { favoritePanelActions } from 'store/favorite-panel/favorite-panel-action';
-export const favoriteActionSet: ContextMenuActionItemSet = [
+export const favoriteActionSet: ContextMenuActionSet = [
[
{
component: ToggleFavoriteAction,
diff --git a/src/views-components/context-menu/action-sets/group-action-set.ts b/src/views-components/context-menu/action-sets/group-action-set.ts
index f5f9d665..816583fa 100644
--- a/src/views-components/context-menu/action-sets/group-action-set.ts
+++ b/src/views-components/context-menu/action-sets/group-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { RenameIcon, AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { openGroupAttributes, openRemoveGroupDialog, openGroupUpdateDialog } from 'store/groups-panel/groups-panel-actions';
-export const groupActionSet: ContextMenuActionItemSet = [
+export const groupActionSet: ContextMenuActionSet = [
[
{
name: 'Rename',
diff --git a/src/views-components/context-menu/action-sets/group-member-action-set.ts b/src/views-components/context-menu/action-sets/group-member-action-set.ts
index 34d71d03..ad1ce97c 100644
--- a/src/views-components/context-menu/action-sets/group-member-action-set.ts
+++ b/src/views-components/context-menu/action-sets/group-member-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { openGroupMemberAttributes, openRemoveGroupMemberDialog } from 'store/group-details-panel/group-details-panel-actions';
-export const groupMemberActionSet: ContextMenuActionItemSet = [
+export const groupMemberActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/keep-service-action-set.ts b/src/views-components/context-menu/action-sets/keep-service-action-set.ts
index 9959ab36..2957f008 100644
--- a/src/views-components/context-menu/action-sets/keep-service-action-set.ts
+++ b/src/views-components/context-menu/action-sets/keep-service-action-set.ts
@@ -4,10 +4,10 @@
import { openKeepServiceAttributesDialog, openKeepServiceRemoveDialog } from 'store/keep-services/keep-services-actions';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
-export const keepServiceActionSet: ContextMenuActionItemSet = [
+export const keepServiceActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/link-action-set.ts b/src/views-components/context-menu/action-sets/link-action-set.ts
index 63bcf62b..86458423 100644
--- a/src/views-components/context-menu/action-sets/link-action-set.ts
+++ b/src/views-components/context-menu/action-sets/link-action-set.ts
@@ -4,10 +4,10 @@
import { openLinkAttributesDialog, openLinkRemoveDialog } from 'store/link-panel/link-panel-actions';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
-export const linkActionSet: ContextMenuActionItemSet = [
+export const linkActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/permission-edit-action-set.ts b/src/views-components/context-menu/action-sets/permission-edit-action-set.ts
index eb29a412..4b6950ee 100644
--- a/src/views-components/context-menu/action-sets/permission-edit-action-set.ts
+++ b/src/views-components/context-menu/action-sets/permission-edit-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { CanReadIcon, CanManageIcon, CanWriteIcon } from 'components/icon/icon';
import { editPermissionLevel } from 'store/group-details-panel/group-details-panel-actions';
import { PermissionLevel } from 'models/permission';
-export const permissionEditActionSet: ContextMenuActionItemSet = [
+export const permissionEditActionSet: ContextMenuActionSet = [
[
{
name: 'Read',
diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index db1c7507..64b90ff4 100644
--- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "../context-menu-action-set";
+import { ContextMenuActionSet } from "../context-menu-action-set";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "store/favorites/favorites-actions";
import {
@@ -32,7 +32,7 @@ import { publicFavoritePanelActions } from "store/public-favorites-panel/public-
import { openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
import { cancelRunningWorkflow } from "store/processes/processes-actions";
-export const readOnlyProcessResourceActionSet: ContextMenuActionItemSet = [
+export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [
[
{
component: ToggleFavoriteAction,
@@ -82,7 +82,7 @@ export const readOnlyProcessResourceActionSet: ContextMenuActionItemSet = [
],
];
-export const processResourceActionSet: ContextMenuActionItemSet = [
+export const processResourceActionSet: ContextMenuActionSet = [
[
...readOnlyProcessResourceActionSet.reduce((prev, next) => prev.concat(next), []),
{
@@ -116,7 +116,7 @@ export const processResourceActionSet: ContextMenuActionItemSet = [
],
];
-const runningProcessOnlyActionSet: ContextMenuActionItemSet = [
+const runningProcessOnlyActionSet: ContextMenuActionSet = [
[
{
name: "CANCEL",
@@ -128,7 +128,7 @@ const runningProcessOnlyActionSet: ContextMenuActionItemSet = [
]
];
-export const processResourceAdminActionSet: ContextMenuActionItemSet = [
+export const processResourceAdminActionSet: ContextMenuActionSet = [
[
...processResourceActionSet.reduce((prev, next) => prev.concat(next), []),
{
@@ -150,7 +150,7 @@ export const runningProcessResourceActionSet = [
],
];
-export const runningProcessResourceAdminActionSet: ContextMenuActionItemSet = [
+export const runningProcessResourceAdminActionSet: ContextMenuActionSet = [
[
...processResourceAdminActionSet.reduce((prev, next) => prev.concat(next), []),
...runningProcessOnlyActionSet.reduce((prev, next) => prev.concat(next), []),
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index b48c72f3..27063151 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "../context-menu-action-set";
+import { ContextMenuActionSet } from "../context-menu-action-set";
import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, FolderSharedIcon } from "components/icon/icon";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "store/favorites/favorites-actions";
@@ -123,11 +123,11 @@ export const newProjectAction: any = {
},
};
-export const readOnlyProjectActionSet: ContextMenuActionItemSet = [
+export const readOnlyProjectActionSet: ContextMenuActionSet = [
[toggleFavoriteAction, openInNewTabMenuAction, copyToClipboardMenuAction, viewDetailsAction, advancedAction, openWith3rdPartyClientAction],
];
-export const filterGroupActionSet: ContextMenuActionItemSet = [
+export const filterGroupActionSet: ContextMenuActionSet = [
[
toggleFavoriteAction,
openInNewTabMenuAction,
@@ -142,7 +142,7 @@ export const filterGroupActionSet: ContextMenuActionItemSet = [
],
];
-export const frozenActionSet: ContextMenuActionItemSet = [
+export const frozenActionSet: ContextMenuActionSet = [
[
shareAction,
toggleFavoriteAction,
@@ -155,7 +155,7 @@ export const frozenActionSet: ContextMenuActionItemSet = [
],
];
-export const projectActionSet: ContextMenuActionItemSet = [
+export const projectActionSet: ContextMenuActionSet = [
[
toggleFavoriteAction,
openInNewTabMenuAction,
diff --git a/src/views-components/context-menu/action-sets/project-admin-action-set.ts b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
index fd7b18f2..490bf3e3 100644
--- a/src/views-components/context-menu/action-sets/project-admin-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "../context-menu-action-set";
+import { ContextMenuActionSet } from "../context-menu-action-set";
import { TogglePublicFavoriteAction } from "views-components/context-menu/actions/public-favorite-action";
import { togglePublicFavorite } from "store/public-favorites/public-favorites-actions";
import { publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action";
@@ -32,7 +32,7 @@ export const togglePublicFavoriteAction = {
},
};
-export const projectAdminActionSet: ContextMenuActionItemSet = [
+export const projectAdminActionSet: ContextMenuActionSet = [
[
toggleFavoriteAction,
openInNewTabMenuAction,
@@ -50,7 +50,7 @@ export const projectAdminActionSet: ContextMenuActionItemSet = [
],
];
-export const filterGroupAdminActionSet: ContextMenuActionItemSet = [
+export const filterGroupAdminActionSet: ContextMenuActionSet = [
[
toggleFavoriteAction,
openInNewTabMenuAction,
@@ -66,7 +66,7 @@ export const filterGroupAdminActionSet: ContextMenuActionItemSet = [
],
];
-export const frozenAdminActionSet: ContextMenuActionItemSet = [
+export const frozenAdminActionSet: ContextMenuActionSet = [
[
shareAction,
togglePublicFavoriteAction,
diff --git a/src/views-components/context-menu/action-sets/repository-action-set.ts b/src/views-components/context-menu/action-sets/repository-action-set.ts
index f92a1daf..cbdcd004 100644
--- a/src/views-components/context-menu/action-sets/repository-action-set.ts
+++ b/src/views-components/context-menu/action-sets/repository-action-set.ts
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, ShareIcon, AttributesIcon } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { openRepositoryAttributes, openRemoveRepositoryDialog } from 'store/repositories/repositories-actions';
import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
-export const repositoryActionSet: ContextMenuActionItemSet = [
+export const repositoryActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/resource-action-set.ts b/src/views-components/context-menu/action-sets/resource-action-set.ts
index 1d3a511c..401e9634 100644
--- a/src/views-components/context-menu/action-sets/resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/resource-action-set.ts
@@ -2,11 +2,11 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { ToggleFavoriteAction } from '../actions/favorite-action';
import { toggleFavorite } from 'store/favorites/favorites-actions';
-export const resourceActionSet: ContextMenuActionItemSet = [
+export const resourceActionSet: ContextMenuActionSet = [
[
{
component: ToggleFavoriteAction,
diff --git a/src/views-components/context-menu/action-sets/root-project-action-set.ts b/src/views-components/context-menu/action-sets/root-project-action-set.ts
index 7e47bd95..a779d1eb 100644
--- a/src/views-components/context-menu/action-sets/root-project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/root-project-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { openCollectionCreateDialog } from 'store/collections/collection-create-actions';
import { NewProjectIcon, CollectionIcon } from 'components/icon/icon';
import { openProjectCreateDialog } from 'store/projects/project-create-actions';
-export const rootProjectActionSet: ContextMenuActionItemSet = [
+export const rootProjectActionSet: ContextMenuActionSet = [
[
{
icon: NewProjectIcon,
diff --git a/src/views-components/context-menu/action-sets/search-results-action-set.ts b/src/views-components/context-menu/action-sets/search-results-action-set.ts
index ca93fd3e..dcc9eae2 100644
--- a/src/views-components/context-menu/action-sets/search-results-action-set.ts
+++ b/src/views-components/context-menu/action-sets/search-results-action-set.ts
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { DetailsIcon, AdvancedIcon, OpenIcon, Link } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { toggleDetailsPanel } from 'store/details-panel/details-panel-action';
import { copyToClipboardAction, openInNewTabAction } from 'store/open-in-new-tab/open-in-new-tab.actions';
-export const searchResultsActionSet: ContextMenuActionItemSet = [
+export const searchResultsActionSet: ContextMenuActionSet = [
[
{
icon: OpenIcon,
diff --git a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
index 64bc7bc7..c31e1681 100644
--- a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
+++ b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
import { openSshKeyRemoveDialog, openSshKeyAttributesDialog } from 'store/auth/auth-action-ssh';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-export const sshKeyActionSet: ContextMenuActionItemSet = [
+export const sshKeyActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/trash-action-set.ts b/src/views-components/context-menu/action-sets/trash-action-set.ts
index acfca61c..82e00df6 100644
--- a/src/views-components/context-menu/action-sets/trash-action-set.ts
+++ b/src/views-components/context-menu/action-sets/trash-action-set.ts
@@ -2,11 +2,11 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { ToggleTrashAction } from 'views-components/context-menu/actions/trash-action';
import { toggleTrashed } from 'store/trash/trash-actions';
-export const trashActionSet: ContextMenuActionItemSet = [
+export const trashActionSet: ContextMenuActionSet = [
[
{
component: ToggleTrashAction,
diff --git a/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts b/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
index a8e4f124..3e8f0cb6 100644
--- a/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from '../context-menu-action-set';
+import { ContextMenuActionSet } from '../context-menu-action-set';
import { DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RestoreFromTrashIcon } from 'components/icon/icon';
import { toggleCollectionTrashed } from 'store/trash/trash-actions';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { toggleDetailsPanel } from 'store/details-panel/details-panel-action';
-export const trashedCollectionActionSet: ContextMenuActionItemSet = [
+export const trashedCollectionActionSet: ContextMenuActionSet = [
[
{
icon: DetailsIcon,
diff --git a/src/views-components/context-menu/action-sets/user-action-set.ts b/src/views-components/context-menu/action-sets/user-action-set.ts
index 104aa91f..0108ff7e 100644
--- a/src/views-components/context-menu/action-sets/user-action-set.ts
+++ b/src/views-components/context-menu/action-sets/user-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import {
AdvancedIcon,
ProjectIcon,
@@ -26,7 +26,7 @@ import {
isOtherUser,
} from 'store/context-menu/context-menu-filters';
-export const userActionSet: ContextMenuActionItemSet = [
+export const userActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
index 82abeba9..a26cbe13 100644
--- a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
+++ b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from 'views-components/context-menu/context-menu-action-set';
+import { ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
import { AdvancedIcon, RemoveIcon, AttributesIcon } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
import { openVirtualMachineAttributes, openRemoveVirtualMachineDialog } from 'store/virtual-machines/virtual-machines-actions';
-export const virtualMachineActionSet: ContextMenuActionItemSet = [
+export const virtualMachineActionSet: ContextMenuActionSet = [
[
{
name: 'Attributes',
diff --git a/src/views-components/context-menu/action-sets/workflow-action-set.ts b/src/views-components/context-menu/action-sets/workflow-action-set.ts
index 68f920e3..4a1460bf 100644
--- a/src/views-components/context-menu/action-sets/workflow-action-set.ts
+++ b/src/views-components/context-menu/action-sets/workflow-action-set.ts
@@ -2,14 +2,14 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { openRunProcess, deleteWorkflow } from "store/workflow-panel/workflow-panel-actions";
import { DetailsIcon, AdvancedIcon, OpenIcon, Link, StartIcon, TrashIcon } from "components/icon/icon";
import { copyToClipboardAction, 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";
-export const readOnlyWorkflowActionSet: ContextMenuActionItemSet = [
+export const readOnlyWorkflowActionSet: ContextMenuActionSet = [
[
{
icon: OpenIcon,
@@ -49,7 +49,7 @@ export const readOnlyWorkflowActionSet: ContextMenuActionItemSet = [
],
];
-export const workflowActionSet: ContextMenuActionItemSet = [
+export const workflowActionSet: ContextMenuActionSet = [
[
...readOnlyWorkflowActionSet[0],
{
diff --git a/src/views-components/context-menu/context-menu-action-set.ts b/src/views-components/context-menu/context-menu-action-set.ts
index 8ff28aeb..a953500b 100644
--- a/src/views-components/context-menu/context-menu-action-set.ts
+++ b/src/views-components/context-menu/context-menu-action-set.ts
@@ -6,8 +6,8 @@ import { Dispatch } from "redux";
import { ContextMenuItem } from "components/context-menu/context-menu";
import { ContextMenuResource } from "store/context-menu/context-menu-actions";
-export interface ContextMenuActionItem extends ContextMenuItem {
+export interface ContextMenuAction extends ContextMenuItem {
execute(dispatch: Dispatch, resources: ContextMenuResource[], state?: any): void;
}
-export type ContextMenuActionItemSet = Array<Array<ContextMenuActionItem>>;
+export type ContextMenuActionSet = Array<Array<ContextMenuAction>>;
diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx
index 94dae520..2a5cccc0 100644
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -7,7 +7,7 @@ import { RootState } from "store/store";
import { contextMenuActions, ContextMenuResource } from "store/context-menu/context-menu-actions";
import { ContextMenu as ContextMenuComponent, ContextMenuProps, ContextMenuItem } from "components/context-menu/context-menu";
import { createAnchorAt } from "components/popover/helpers";
-import { ContextMenuActionItemSet, ContextMenuActionItem } from "./context-menu-action-set";
+import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set";
import { Dispatch } from "redux";
import { memoize } from "lodash";
import { sortByProperty } from "common/array-utils";
@@ -41,7 +41,7 @@ const mapDispatchToProps = (dispatch: Dispatch): ActionProps => ({
onClose: () => {
dispatch(contextMenuActions.CLOSE_CONTEXT_MENU());
},
- onItemClick: (action: ContextMenuActionItem, resource?: ContextMenuResource) => {
+ onItemClick: (action: ContextMenuAction, resource?: ContextMenuResource) => {
dispatch(contextMenuActions.CLOSE_CONTEXT_MENU());
if (resource) {
action.execute(dispatch, [resource]);
@@ -64,15 +64,15 @@ const mergeProps = ({ resource, ...dataProps }: DataProps, actionProps: ActionPr
export const ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenuComponent);
-const menuActionSets = new Map<string, ContextMenuActionItemSet>();
+const menuActionSets = new Map<string, ContextMenuActionSet>();
-export const addMenuActionSet = (name: string, itemSet: ContextMenuActionItemSet) => {
+export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => {
const sorted = itemSet.map(items => items.sort(sortByProperty("name")));
menuActionSets.set(name, sorted);
};
-const emptyActionSet: ContextMenuActionItemSet = [];
-const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionItemSet =>
+const emptyActionSet: ContextMenuActionSet = [];
+const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet =>
resource ? menuActionSets.get(resource.menuKind) || emptyActionSet : emptyActionSet;
export enum ContextMenuKind {
diff --git a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
index 8787b228..b0a2a1b0 100644
--- a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { MoveToIcon, CopyIcon } from "components/icon/icon";
import { openMoveCollectionDialog } from "store/collections/collection-move-actions";
import { openCollectionCopyDialog, openMultiCollectionCopyDialog } from "store/collections/collection-copy-actions";
@@ -10,7 +10,7 @@ import { ToggleTrashAction } from "views-components/context-menu/actions/trash-a
import { toggleCollectionTrashed } from "store/trash/trash-actions";
import { ContextMenuResource } from "store/context-menu/context-menu-actions";
-export const msCollectionActionSet: ContextMenuActionItemSet = [
+export const msCollectionActionSet: ContextMenuActionSet = [
[
{
icon: CopyIcon,
diff --git a/src/views-components/multiselect-toolbar/ms-process-action-set.ts b/src/views-components/multiselect-toolbar/ms-process-action-set.ts
index 5fbd265f..820fc799 100644
--- a/src/views-components/multiselect-toolbar/ms-process-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-process-action-set.ts
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { MoveToIcon, RemoveIcon, ReRunProcessIcon } from "components/icon/icon";
import { openMoveProcessDialog } from "store/processes/process-move-actions";
import { openCopyProcessDialog } from "store/processes/process-copy-actions";
import { openRemoveProcessDialog } from "store/processes/processes-actions";
-export const msProcessActionSet: ContextMenuActionItemSet = [
+export const msProcessActionSet: ContextMenuActionSet = [
[
{
icon: ReRunProcessIcon,
diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
index b4d12951..2b5dfa22 100644
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -2,25 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionItemSet } from "views-components/context-menu/context-menu-action-set";
+import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { MoveToIcon, Link } from "components/icon/icon";
import { openMoveProjectDialog } from "store/projects/project-move-actions";
import { ToggleTrashAction } from "views-components/context-menu/actions/trash-action";
import { toggleProjectTrashed } from "store/trash/trash-actions";
import { copyToClipboardAction } from "store/open-in-new-tab/open-in-new-tab.actions";
-import { ToggleFavoriteAction } from "views-components/context-menu/actions/favorite-action";
-import { toggleFavorite } from "store/favorites/favorites-actions";
-import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action";
-
-export const msToggleFavoriteAction = {
- component: ToggleFavoriteAction,
- name: "ToggleFavoriteAction",
- execute: (dispatch, resources) => {
- dispatch(toggleFavorite(resources[0])).then(() => {
- dispatch(favoritePanelActions.REQUEST_ITEMS());
- });
- },
-};
export const msCopyToClipboardMenuAction = {
icon: Link,
@@ -48,4 +35,4 @@ export const msToggleTrashAction = {
},
};
-export const msProjectActionSet: ContextMenuActionItemSet = [[msToggleFavoriteAction, msCopyToClipboardMenuAction, msMoveToAction, msToggleTrashAction]]
+export const msProjectActionSet: ContextMenuActionSet = [[msCopyToClipboardMenuAction, msMoveToAction, msToggleTrashAction]];
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list