Get rid of context-menu-hoc

No issue #

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx
index da627533c8736d8e0649aa32587bc442eeb4ccbb..cc2fcb31b71a8b3e7416ef8e2f952df0a3b9bddc 100644 (file)
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -5,7 +5,7 @@
 import { connect } from "react-redux";
 import { RootState } from "../../store/store";
 import { contextMenuActions } from "../../store/context-menu/context-menu-actions";
-import { ContextMenu, ContextMenuProps, ContextMenuItem } from "../../components/context-menu/context-menu";
+import { ContextMenu as ContextMenuComponent, ContextMenuProps, ContextMenuItem } from "../../components/context-menu/context-menu";
 import { createAnchorAt } from "../../components/popover/helpers";
 import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer";
 import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set";
@@ -42,7 +42,7 @@ const mergeProps = ({ resource, ...dataProps }: DataProps, actionProps: ActionPr
     }
 });
 
-export const ContextMenuHOC = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenu);
+export const ContextMenu = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ContextMenuComponent);
 
 const menuActionSets = new Map<string, ContextMenuActionSet>();
 

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 934fe531724a2d31e9f296830c09387710c5b9b8..a62b713a52aeb7b4149e49248dc1ac4a7fe7fea1 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -31,7 +31,7 @@ import { contextMenuActions } from "../../store/context-menu/context-menu-action
 import { SidePanelIdentifiers } from '../../store/side-panel/side-panel-reducer';
 import { ProjectResource } from '../../models/project';
 import { ResourceKind } from '../../models/resource';
-import { ContextMenuHOC, ContextMenuKind } from "../../views-components/context-menu/context-menu";
+import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
 
 const drawerWidth = 240;
 const appBarHeight = 100;
@@ -195,7 +195,7 @@ export const Workbench = withStyles(styles)(
                             </div>
                             { user && <DetailsPanel /> }
                         </main>
-                        <ContextMenuHOC />
+                        <ContextMenu />
                         <CreateProjectDialog />
                     </div>
                 );