X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a781af5eae4f4e7f6e07a2b205ad4e54e9e8ec7a..refs/heads/14433_properties_inside_projects:/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 93cb644a..b6d2b91b 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -2,21 +2,21 @@ // // 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 { ContextMenuItemSet } from "./context-menu-item-set"; -import { emptyItemSet } from "./empty-item-set"; - -type DataProps = Pick & { resource?: ContextMenuResource }; +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 { Dispatch } from "redux"; + +type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { - const { position, resource } = state.contextMenu; + const { open, position, resource } = state.contextMenu; return { anchorEl: resource ? createAnchorAt(position) : undefined, - items: getMenuItemSet(resource).getItems(), + items: getMenuActionSet(resource), + open, resource }; }; @@ -24,12 +24,12 @@ 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: (item: ContextMenuItem, resource?: ContextMenuResource) => { - dispatch(actions.CLOSE_CONTEXT_MENU()); + onItemClick: (action: ContextMenuAction, resource?: ContextMenuResource) => { + dispatch(contextMenuActions.CLOSE_CONTEXT_MENU()); if (resource) { - getMenuItemSet(resource).handleItem(dispatch, item, resource); + action.execute(dispatch, resource); } } }); @@ -42,15 +42,31 @@ const mergeProps = ({ resource, ...dataProps }: DataProps, actionProps: ActionPr } }); -export const ContextMenuHOC = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenu); +export const ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenuComponent); -const menuItemSets = new Map(); +const menuActionSets = new Map(); -export const addMenuItemsSet = (name: string, itemSet: ContextMenuItemSet) => { - menuItemSets.set(name, itemSet); +export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => { + menuActionSets.set(name, itemSet); }; -const getMenuItemSet = (resource?: ContextMenuResource): ContextMenuItemSet => { - return resource ? menuItemSets.get(resource.kind) || emptyItemSet : emptyItemSet; +const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet => { + return resource ? menuActionSets.get(resource.menuKind) || [] : []; }; +export enum ContextMenuKind { + ROOT_PROJECT = "RootProject", + PROJECT = "Project", + RESOURCE = "Resource", + FAVORITE = "Favorite", + TRASH = "Trash", + COLLECTION_FILES = "CollectionFiles", + COLLECTION_FILES_ITEM = "CollectionFilesItem", + COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected", + COLLECTION = 'Collection', + COLLECTION_RESOURCE = 'CollectionResource', + TRASHED_COLLECTION = 'TrashedCollection', + PROCESS = "Process", + PROCESS_RESOURCE = 'ProcessResource', + PROCESS_LOGS = "ProcessLogs" +}