X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8b6f5c68fa40ad59092e1290dfd4261f0dfe643f..d8a3b5fdd6f606800e9b321acb3fca10c5183cb9:/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 99a595e0..55b0abd8 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -9,7 +9,7 @@ import { ContextMenu as ContextMenuComponent, ContextMenuProps, ContextMenuItem import { createAnchorAt } from "~/components/popover/helpers"; import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set"; import { Dispatch } from "redux"; - +import { memoize } from 'lodash'; type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { const { open, position, resource } = state.contextMenu; @@ -34,14 +34,20 @@ const mapDispatchToProps = (dispatch: Dispatch): ActionProps => ({ } }); +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 ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenuComponent); const menuActionSets = new Map(); @@ -50,24 +56,31 @@ export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => menuActionSets.set(name, itemSet); }; +const emptyActionSet: ContextMenuActionSet = []; const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet => { - return resource ? menuActionSets.get(resource.menuKind) || [] : []; + return resource ? menuActionSets.get(resource.menuKind) || emptyActionSet : emptyActionSet; }; export enum ContextMenuKind { API_CLIENT_AUTHORIZATION = "ApiClientAuthorization", ROOT_PROJECT = "RootProject", PROJECT = "Project", + PROJECT_ADMIN = "ProjectAdmin", RESOURCE = "Resource", FAVORITE = "Favorite", TRASH = "Trash", COLLECTION_FILES = "CollectionFiles", + READONLY_COLLECTION_FILES = "ReadOnlyCollectionFiles", COLLECTION_FILES_ITEM = "CollectionFilesItem", + READONLY_COLLECTION_FILES_ITEM = "ReadOnlyCollectionFilesItem", COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected", COLLECTION = 'Collection', + COLLECTION_ADMIN = 'CollectionAdmin', COLLECTION_RESOURCE = 'CollectionResource', + READONLY_COLLECTION = 'ReadOnlyCollection', TRASHED_COLLECTION = 'TrashedCollection', PROCESS = "Process", + PROCESS_ADMIN = 'ProcessAdmin', PROCESS_RESOURCE = 'ProcessResource', PROCESS_LOGS = "ProcessLogs", REPOSITORY = "Repository", @@ -76,5 +89,7 @@ export enum ContextMenuKind { KEEP_SERVICE = "KeepService", USER = "User", NODE = "Node", - GROUPS = "Group" + GROUPS = "Group", + GROUP_MEMBER = "GroupMember", + LINK = "Link", }