X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0d71d490e24d2f1dae33360f194259bb597f2799..65ad44ac98393e9e7a7f3da8732b536fc051cf51:/src/views-components/context-menu/context-menu.tsx diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx index eb965044..244f61c4 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -2,21 +2,32 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { connect, Dispatch, DispatchProp } from "react-redux"; -import { RootState } from "../../store/store"; -import actions from "../../store/context-menu/context-menu-actions"; -import ContextMenu, { ContextMenuProps, ContextMenuItem } from "../../components/context-menu/context-menu"; -import { createAnchorAt } from "../../components/popover/helpers"; -import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer"; +import { connect } from "react-redux"; +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 { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set"; -import { emptyActionSet } from "./action-sets/empty-action-set"; - -type DataProps = Pick & { resource?: ContextMenuResource }; +import { Dispatch } from "redux"; +import { memoize } from 'lodash'; +import { sortByProperty } from "common/array-utils"; +type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { - const { position, resource } = state.contextMenu; + const { open, position, resource } = state.contextMenu; + + const filteredItems = getMenuActionSet(resource).map((group) => (group.filter((item) => { + if (resource && item.filters) { + // Execute all filters on this item, every returns true IFF all filters return true + return item.filters.every((filter) => filter(state, resource)); + } else { + return true; + } + }))); + return { anchorEl: resource ? createAnchorAt(position) : undefined, - items: getMenuItemSet(resource), + items: filteredItems, + open, resource }; }; @@ -24,33 +35,80 @@ const mapStateToProps = (state: RootState): DataProps => { type ActionProps = Pick & { onItemClick: (item: ContextMenuItem, resource?: ContextMenuResource) => void }; const mapDispatchToProps = (dispatch: Dispatch): ActionProps => ({ onClose: () => { - dispatch(actions.CLOSE_CONTEXT_MENU()); + dispatch(contextMenuActions.CLOSE_CONTEXT_MENU()); }, onItemClick: (action: ContextMenuAction, resource?: ContextMenuResource) => { - dispatch(actions.CLOSE_CONTEXT_MENU()); + dispatch(contextMenuActions.CLOSE_CONTEXT_MENU()); if (resource) { action.execute(dispatch, resource); } } }); +const handleItemClick = memoize( + (resource: DataProps['resource'], onItemClick: ActionProps['onItemClick']): ContextMenuProps['onItemClick'] => + item => { + onItemClick(item, resource); + } +); + const mergeProps = ({ resource, ...dataProps }: DataProps, actionProps: ActionProps): ContextMenuProps => ({ ...dataProps, ...actionProps, - onItemClick: item => { - actionProps.onItemClick(item, resource); - } + onItemClick: handleItemClick(resource, actionProps.onItemClick) }); -export const ContextMenuHOC = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenu); -const menuItemSets = new Map(); +export const ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenuComponent); -export const addMenuItemsSet = (name: string, itemSet: ContextMenuActionSet) => { - menuItemSets.set(name, itemSet); -}; +const menuActionSets = new Map(); -const getMenuItemSet = (resource?: ContextMenuResource): ContextMenuActionSet => { - return resource ? menuItemSets.get(resource.kind) || emptyActionSet : emptyActionSet; +export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => { + const sorted = itemSet.map(items => items.sort(sortByProperty('name'))); + 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', + PROJECT_ADMIN = "ProjectAdmin", + FILTER_GROUP_ADMIN = "FilterGroupAdmin", + RESOURCE = "Resource", + FAVORITE = "Favorite", + TRASH = "Trash", + COLLECTION_FILES = "CollectionFiles", + READONLY_COLLECTION_FILES = "ReadOnlyCollectionFiles", + COLLECTION_FILE_ITEM = "CollectionFileItem", + COLLECTION_DIRECTORY_ITEM = "CollectionDirectoryItem", + READONLY_COLLECTION_FILE_ITEM = "ReadOnlyCollectionFileItem", + READONLY_COLLECTION_DIRECTORY_ITEM = "ReadOnlyCollectionDirectoryItem", + COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected", + COLLECTION = 'Collection', + COLLECTION_ADMIN = 'CollectionAdmin', + READONLY_COLLECTION = 'ReadOnlyCollection', + OLD_VERSION_COLLECTION = 'OldVersionCollection', + TRASHED_COLLECTION = 'TrashedCollection', + PROCESS = "Process", + PROCESS_ADMIN = 'ProcessAdmin', + 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", +}