Merge branch 'master' into 13764-icons-colors-unification-refactoring

[arvados-workbench2.git] / 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 eb965044c7cf49bb6f967d73981116691ad1609a..cc103c49edb810341469b25658866e66d07e4396 100644 (file)
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -9,14 +9,13 @@ import ContextMenu, { ContextMenuProps, ContextMenuItem } from "../../components
 import { createAnchorAt } from "../../components/popover/helpers";
 import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer";
 import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set";
-import { emptyActionSet } from "./action-sets/empty-action-set";
 
 type DataProps = Pick<ContextMenuProps, "anchorEl" | "items"> & { resource?: ContextMenuResource };
 const mapStateToProps = (state: RootState): DataProps => {
     const { position, resource } = state.contextMenu;
     return {
         anchorEl: resource ? createAnchorAt(position) : undefined,
-        items: getMenuItemSet(resource),
+        items: getMenuActionSet(resource),
         resource
     };
 };
@@ -44,13 +43,13 @@ const mergeProps = ({ resource, ...dataProps }: DataProps, actionProps: ActionPr
 
 export const ContextMenuHOC = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenu);
 
-const menuItemSets = new Map<string, ContextMenuActionSet>();
+const menuActionSets = new Map<string, ContextMenuActionSet>();
 
-export const addMenuItemsSet = (name: string, itemSet: ContextMenuActionSet) => {
-    menuItemSets.set(name, itemSet);
+export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => {
+    menuActionSets.set(name, itemSet);
 };
 
-const getMenuItemSet = (resource?: ContextMenuResource): ContextMenuActionSet => {
-    return resource ? menuItemSets.get(resource.kind) || emptyActionSet : emptyActionSet;
+const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet => {
+    return resource ? menuActionSets.get(resource.kind) || [] : [];
 };