From b10fe745ed1110342a89e272570ef7d91fb8559d Mon Sep 17 00:00:00 2001
From: Abhi <abhinandan13jan@gmail.com>
Date: Tue, 9 Nov 2021 15:03:27 +0530
Subject: [PATCH] migrate rhoas kafka and helm

---
 .../src/topology/components/helmComponentFactory.ts         | 3 +--
 .../src/topology/components/rhoasComponentFactory.ts        | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/packages/helm-plugin/src/topology/components/helmComponentFactory.ts b/frontend/packages/helm-plugin/src/topology/components/helmComponentFactory.ts
index d4464f2308b..9ee180fe0b0 100644
--- a/frontend/packages/helm-plugin/src/topology/components/helmComponentFactory.ts
+++ b/frontend/packages/helm-plugin/src/topology/components/helmComponentFactory.ts
@@ -9,7 +9,6 @@ import {
 import { contextMenuActions } from '@console/topology/src/actions/contextMenuActions';
 import {
   WorkloadNode,
-  noRegroupWorkloadContextMenu,
   createConnectorCallback,
   NodeComponentProps,
   nodeDragSourceSpec,
@@ -45,7 +44,7 @@ export const getHelmComponentFactory = (
           withEditReviewAccess('patch')(
             withDragNode(nodeDragSourceSpec(type, false))(
               withSelection({ controlled: true })(
-                withContextMenu(noRegroupWorkloadContextMenu)(WorkloadNode),
+                withContextMenu(contextMenuActions)(WorkloadNode),
               ),
             ),
           ),
diff --git a/frontend/packages/rhoas-plugin/src/topology/components/rhoasComponentFactory.ts b/frontend/packages/rhoas-plugin/src/topology/components/rhoasComponentFactory.ts
index 396ea116b25..4b8dcadea7e 100644
--- a/frontend/packages/rhoas-plugin/src/topology/components/rhoasComponentFactory.ts
+++ b/frontend/packages/rhoas-plugin/src/topology/components/rhoasComponentFactory.ts
@@ -5,12 +5,12 @@ import {
   withSelection,
   withCreateConnector,
 } from '@patternfly/react-topology';
+import { contextMenuActions } from '@console/topology/src/actions/contextMenuActions';
 import {
   createConnectorCallback,
   nodeDragSourceSpec,
   withContextMenu,
   CreateConnector,
-  noRegroupWorkloadContextMenu,
 } from '@console/topology/src/components/graph-view';
 import BindableNode from '@console/topology/src/components/graph-view/components/nodes/trapezoidNode/BindableNode';
 import { withEditReviewAccess } from '@console/topology/src/utils';
@@ -29,9 +29,7 @@ export const getRhoasComponentFactory = (
       )(
         withEditReviewAccess('patch')(
           withDragNode(nodeDragSourceSpec(type))(
-            withSelection({ controlled: true })(
-              withContextMenu(noRegroupWorkloadContextMenu)(BindableNode),
-            ),
+            withSelection({ controlled: true })(withContextMenu(contextMenuActions)(BindableNode)),
           ),
         ),
       );