+++ /dev/null
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import { ContextMenuAction } from '../views-components/context-menu/context-menu-action-set';
-import { ContextMenuActionNames } from 'views-components/context-menu/context-menu-action-set';
-
-const {
- ACCOUNT_SETTINGS,
- ACTIVATE_USER,
- ADD_TO_FAVORITES,
- ADD_TO_PUBLIC_FAVORITES,
- ATTRIBUTES,
- API_DETAILS,
- CANCEL,
- COPY_AND_RERUN_PROCESS,
- COPY_ITEM_INTO_EXISTING_COLLECTION,
- COPY_ITEM_INTO_NEW_COLLECTION,
- COPY_SELECTED_INTO_EXISTING_COLLECTION,
- COPY_SELECTED_INTO_SEPARATE_COLLECTIONS,
- COPY_SELECTED_INTO_NEW_COLLECTION,
- COPY_TO_CLIPBOARD,
- DEACTIVATE_USER,
- DELETE_WORKFLOW,
- DOWNLOAD,
- EDIT_COLLECTION,
- EDIT_PROCESS,
- EDIT_PROJECT,
- FREEZE_PROJECT,
- HOME_PROJECT,
- LOGIN_AS_USER,
- MAKE_A_COPY,
- MANAGE,
- MOVE_ITEM_INTO_EXISTING_COLLECTION,
- MOVE_ITEM_INTO_NEW_COLLECTION,
- MOVE_SELECTED_INTO_EXISTING_COLLECTION,
- MOVE_SELECTED_INTO_NEW_COLLECTION,
- MOVE_SELECTED_INTO_SEPARATE_COLLECTIONS,
- MOVE_TO,
- MOVE_TO_TRASH,
- NEW_COLLECTION,
- NEW_PROJECT,
- OPEN_IN_NEW_TAB,
- OPEN_WITH_3RD_PARTY_CLIENT,
- OUTPUTS,
- PROVENANCE_GRAPH,
- READ,
- REMOVE,
- REMOVE_SELECTED,
- RENAME,
- RESTORE,
- RESTORE_VERSION,
- RUN_WORKFLOW,
- SELECT_ALL,
- SETUP_USER,
- SHARE,
- UNSELECT_ALL,
- VIEW_DETAILS,
- WRITE,
-} = ContextMenuActionNames;
-
-const processOrder = [VIEW_DETAILS, OPEN_IN_NEW_TAB, OUTPUTS, API_DETAILS, EDIT_PROCESS, COPY_AND_RERUN_PROCESS, MOVE_TO, REMOVE, ADD_TO_FAVORITES, ADD_TO_PUBLIC_FAVORITES];
-
-const kindToOrder: Record<string, ContextMenuActionNames[]> = {
- "ProcessResource": processOrder,
-};
-
-export const sortMenuItems = (menuKind:string, menuItems: ContextMenuAction[]) => {
- const order = kindToOrder[menuKind] || [];
- const bucketMap = new Map();
- order.forEach((name) => bucketMap.set(name, null));
- menuItems.forEach((item) => {if (bucketMap.has(item.name)) bucketMap.set(item.name, item)});
- console.log(Array.from(bucketMap.values()));
-};
\ No newline at end of file
import { PublicFavoritesState } from "store/public-favorites/public-favorites-reducer";
import { isExactlyOneSelected } from "store/multiselect/multiselect-actions";
import { IntersectionObserverWrapper } from "./ms-toolbar-overflow-wrapper";
-import { ContextMenuKind } from "views-components/context-menu/context-menu";
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
const WIDTH_TRANSITION = 150
import { msProcessActionSet, msCommonProcessActionFilter, msAdminProcessActionFilter, msRunningProcessActionFilter } from 'views-components/multiselect-toolbar/ms-process-action-set';
import { msWorkflowActionSet, msWorkflowActionFilter, msReadOnlyWorkflowActionFilter } from 'views-components/multiselect-toolbar/ms-workflow-action-set';
import { ResourceKind } from 'models/resource';
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
const {
COLLECTION,
import { CustomTheme } from "common/custom-theme";
import { fetchConfig } from "common/config";
import servicesProvider from "common/service-provider";
-import { addMenuActionSet, ContextMenuKind } from "views-components/context-menu/context-menu";
+import { addMenuActionSet } from "views-components/context-menu/context-menu";
+import { ContextMenuKind } from "views-components/context-menu/menu-item-sort";
import { rootProjectActionSet } from "views-components/context-menu/action-sets/root-project-action-set";
import {
filterGroupActionSet,
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { resourceUuidToContextMenuKind } from './context-menu-actions';
import configureStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import { unionize, ofType, UnionOf } from "common/unionize";
import { ContextMenuPosition } from "./context-menu-reducer";
-import { ContextMenuKind } from "views-components/context-menu/context-menu";
+import { ContextMenuKind } from "views-components/context-menu/menu-item-sort";
import { Dispatch } from "redux";
import { RootState } from "store/store";
import { getResource, getResourceWithEditableStatus } from "../resources/resources";
import { RootState } from "store/store";
import { Dispatch } from "redux";
import { collectionPanelFilesAction } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
-import { ContextMenuKind } from "../context-menu/context-menu";
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { openContextMenu, openCollectionFilesContextMenu } from 'store/context-menu/context-menu-actions';
import { openUploadCollectionFilesDialog } from 'store/collections/collection-upload-actions';
import { ResourceKind } from "models/resource";
import { connect } from "react-redux";
import { RootState } from "../../../store/store";
import { getNodeValue } from "models/tree";
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { CopyToClipboardAction } from "./copy-to-clipboard-action";
const mapStateToProps = (state: RootState) => {
import configureMockStore from 'redux-mock-store'
import { Provider } from 'react-redux';
import { CollectionFileViewerAction } from './collection-file-viewer-action';
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from '../menu-item-sort';
import { createTree, initTreeNode, setNode, getNodeValue } from "models/tree";
import { getInlineFileUrl, sanitizeToken } from "./helpers";
import { RootState } from "../../../store/store";
import { FileViewerAction } from 'views-components/context-menu/actions/file-viewer-action';
import { getNodeValue } from "models/tree";
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { getInlineFileUrl, sanitizeToken, isInlineFileUrlSafe } from "./helpers";
const mapStateToProps = (state: RootState) => {
import { RootState } from "../../../store/store";
import { DownloadAction } from "./download-action";
import { getNodeValue } from "../../../models/tree";
-import { ContextMenuKind } from '../context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { filterCollectionFilesBySelection } from "store/collection-panel/collection-panel-files/collection-panel-files-state";
import { sanitizeToken } from "./helpers";
import { Dispatch } from "redux";
import { memoize } from "lodash";
import { sortByProperty } from "common/array-utils";
-import { sortMenuItems } from "common/menu-item-sort";
+import { sortMenuItems, ContextMenuKind } from "./menu-item-sort";
type DataProps = Pick<ContextMenuProps, "anchorEl" | "items" | "open"> & { resource?: ContextMenuResource };
const menuActionSets = new Map<string, ContextMenuActionSet>();
-export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => {
- const sorted = itemSet.map(items => items.sort(sortByProperty("name")));
+export const addMenuActionSet = (name: ContextMenuKind, itemSet: ContextMenuActionSet) => {
+ const sorted = itemSet.map(items => sortMenuItems(name, items));
menuActionSets.set(name, sorted);
};
const emptyActionSet: ContextMenuActionSet = [];
const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet =>
resource ? menuActionSets.get(resource.menuKind) || emptyActionSet : emptyActionSet;
-
-export enum ContextMenuKind {
- API_CLIENT_AUTHORIZATION = "ApiClientAuthorization",
- ROOT_PROJECT = "RootProject",
- PROJECT = "Project",
- FILTER_GROUP = "FilterGroup",
- READONLY_PROJECT = "ReadOnlyProject",
- FROZEN_PROJECT = "FrozenProject",
- FROZEN_PROJECT_ADMIN = "FrozenProjectAdmin",
- PROJECT_ADMIN = "ProjectAdmin",
- FILTER_GROUP_ADMIN = "FilterGroupAdmin",
- RESOURCE = "Resource",
- FAVORITE = "Favorite",
- TRASH = "Trash",
- COLLECTION_FILES = "CollectionFiles",
- COLLECTION_FILES_MULTIPLE = "CollectionFilesMultiple",
- READONLY_COLLECTION_FILES = "ReadOnlyCollectionFiles",
- READONLY_COLLECTION_FILES_MULTIPLE = "ReadOnlyCollectionFilesMultiple",
- COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected",
- COLLECTION_FILE_ITEM = "CollectionFileItem",
- COLLECTION_DIRECTORY_ITEM = "CollectionDirectoryItem",
- READONLY_COLLECTION_FILE_ITEM = "ReadOnlyCollectionFileItem",
- READONLY_COLLECTION_DIRECTORY_ITEM = "ReadOnlyCollectionDirectoryItem",
- COLLECTION = "Collection",
- COLLECTION_ADMIN = "CollectionAdmin",
- READONLY_COLLECTION = "ReadOnlyCollection",
- OLD_VERSION_COLLECTION = "OldVersionCollection",
- TRASHED_COLLECTION = "TrashedCollection",
- PROCESS = "Process",
- RUNNING_PROCESS_ADMIN = "RunningProcessAdmin",
- PROCESS_ADMIN = "ProcessAdmin",
- RUNNING_PROCESS_RESOURCE = "RunningProcessResource",
- PROCESS_RESOURCE = "ProcessResource",
- READONLY_PROCESS_RESOURCE = "ReadOnlyProcessResource",
- PROCESS_LOGS = "ProcessLogs",
- REPOSITORY = "Repository",
- SSH_KEY = "SshKey",
- VIRTUAL_MACHINE = "VirtualMachine",
- KEEP_SERVICE = "KeepService",
- USER = "User",
- GROUPS = "Group",
- GROUP_MEMBER = "GroupMember",
- PERMISSION_EDIT = "PermissionEdit",
- LINK = "Link",
- WORKFLOW = "Workflow",
- READONLY_WORKFLOW = "ReadOnlyWorkflow",
- SEARCH_RESULTS = "SearchResults",
-}
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { ContextMenuAction } from './context-menu-action-set';
+import { ContextMenuActionNames } from 'views-components/context-menu/context-menu-action-set';
+import { sortByProperty } from 'common/array-utils';
+
+export enum ContextMenuKind {
+ API_CLIENT_AUTHORIZATION = "ApiClientAuthorization",
+ ROOT_PROJECT = "RootProject",
+ PROJECT = "Project",
+ FILTER_GROUP = "FilterGroup",
+ READONLY_PROJECT = "ReadOnlyProject",
+ FROZEN_PROJECT = "FrozenProject",
+ FROZEN_PROJECT_ADMIN = "FrozenProjectAdmin",
+ PROJECT_ADMIN = "ProjectAdmin",
+ FILTER_GROUP_ADMIN = "FilterGroupAdmin",
+ RESOURCE = "Resource",
+ FAVORITE = "Favorite",
+ TRASH = "Trash",
+ COLLECTION_FILES = "CollectionFiles",
+ COLLECTION_FILES_MULTIPLE = "CollectionFilesMultiple",
+ READONLY_COLLECTION_FILES = "ReadOnlyCollectionFiles",
+ READONLY_COLLECTION_FILES_MULTIPLE = "ReadOnlyCollectionFilesMultiple",
+ COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected",
+ COLLECTION_FILE_ITEM = "CollectionFileItem",
+ COLLECTION_DIRECTORY_ITEM = "CollectionDirectoryItem",
+ READONLY_COLLECTION_FILE_ITEM = "ReadOnlyCollectionFileItem",
+ READONLY_COLLECTION_DIRECTORY_ITEM = "ReadOnlyCollectionDirectoryItem",
+ COLLECTION = "Collection",
+ COLLECTION_ADMIN = "CollectionAdmin",
+ READONLY_COLLECTION = "ReadOnlyCollection",
+ OLD_VERSION_COLLECTION = "OldVersionCollection",
+ TRASHED_COLLECTION = "TrashedCollection",
+ PROCESS = "Process",
+ RUNNING_PROCESS_ADMIN = "RunningProcessAdmin",
+ PROCESS_ADMIN = "ProcessAdmin",
+ RUNNING_PROCESS_RESOURCE = "RunningProcessResource",
+ PROCESS_RESOURCE = "ProcessResource",
+ READONLY_PROCESS_RESOURCE = "ReadOnlyProcessResource",
+ PROCESS_LOGS = "ProcessLogs",
+ REPOSITORY = "Repository",
+ SSH_KEY = "SshKey",
+ VIRTUAL_MACHINE = "VirtualMachine",
+ KEEP_SERVICE = "KeepService",
+ USER = "User",
+ GROUPS = "Group",
+ GROUP_MEMBER = "GroupMember",
+ PERMISSION_EDIT = "PermissionEdit",
+ LINK = "Link",
+ WORKFLOW = "Workflow",
+ READONLY_WORKFLOW = "ReadOnlyWorkflow",
+ SEARCH_RESULTS = "SearchResults",
+}
+
+const processOrder = [
+ ContextMenuActionNames.VIEW_DETAILS,
+ ContextMenuActionNames.OPEN_IN_NEW_TAB,
+ ContextMenuActionNames.OUTPUTS,
+ ContextMenuActionNames.API_DETAILS,
+ ContextMenuActionNames.EDIT_PROCESS,
+ ContextMenuActionNames.COPY_AND_RERUN_PROCESS,
+ ContextMenuActionNames.MOVE_TO,
+ ContextMenuActionNames.REMOVE,
+ ContextMenuActionNames.ADD_TO_FAVORITES,
+ ContextMenuActionNames.ADD_TO_PUBLIC_FAVORITES,
+];
+
+const kindToOrder: Record<string, ContextMenuActionNames[]> = {
+ [ContextMenuKind.PROCESS_RESOURCE]: processOrder,
+};
+
+export const sortMenuItems = (menuKind: ContextMenuKind, menuItems: ContextMenuAction[]) => {
+ const order = kindToOrder[menuKind];
+ //if no specified order, sort by name
+ if (!order) return menuItems.sort(sortByProperty("name"));
+
+ const bucketMap = new Map();
+ const leftovers: ContextMenuAction[] = [];
+
+ order.forEach((name) => bucketMap.set(name, null));
+ menuItems.forEach((item) => {
+ if (bucketMap.has(item.name)) bucketMap.set(item.name, item);
+ else leftovers.push(item);
+ });
+
+ return Array.from(bucketMap.values()).concat(leftovers).filter((item) => item !== null);
+};
import { createTree } from 'models/tree';
import { GROUPS_PANEL_ID, openCreateGroupDialog } from 'store/groups-panel/groups-panel-actions';
import { noop } from 'lodash/fp';
-import { ContextMenuKind } from 'views-components/context-menu/context-menu';
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { getResource, ResourcesState } from 'store/resources/resources';
import { GroupResource } from 'models/group';
import { RootState } from 'store/store';
} from "components/collection-panel-files/collection-panel-files";
import { Dispatch } from "redux";
import { collectionPanelFilesAction } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
-import { ContextMenuKind } from "views-components/context-menu/context-menu";
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { openContextMenu, openCollectionFilesContextMenu } from 'store/context-menu/context-menu-actions';
import { openUploadCollectionFilesDialog } from 'store/collections/collection-upload-actions';
import { ResourceKind } from "models/resource";
import { navigateTo } from "store/navigation/navigation-action";
import { loadDetailsPanel } from "store/details-panel/details-panel-action";
import { toggleTrashed } from "store/trash/trash-actions";
-import { ContextMenuKind } from "views-components/context-menu/context-menu";
+import { ContextMenuKind } from 'views-components/context-menu/menu-item-sort';
import { Dispatch } from "redux";
import { createTree } from 'models/tree';
import {
projects / arvados.git / commitdiff