#1504 Context toolbar not appearing for selected canvas (#1505)

elyra-ai · Jun 22, 2023 · f868ce0 · f868ce0
1 parent c0b72e1
commit f868ce0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/canvas_modules/harness/src/client/App.js b/canvas_modules/harness/src/client/App.js
@@ -1388,7 +1388,8 @@ class App extends React.Component {
 		let defMenu = defaultMenu;
 		// Add custom menu items at proper positions: open, preview & execute
 		if (source.type === "node" &&
-				(source.selectedObjectIds.length === 1 || this.canvasController.isContextMenuForNonSelectedObj())) {
+				(source.selectedObjectIds.length === 1 ||
+					this.canvasController.isContextMenuForNonSelectedObj(source))) {
 			defMenu.unshift({ action: "editNode", label: this.getLabel("node_editNode", "CMI: Open") });
 			defMenu.splice(2, 0, { action: "previewNode", label: this.getLabel("node_previewNode", "CMI: Preview") });
 			defMenu.splice(8, 0, { action: "executeNode", label: this.getLabel("node_executeNode", "CMI: Execute") });

diff --git a/canvas_modules/harness/src/client/components/custom-canvases/flows/flows-canvas.jsx b/canvas_modules/harness/src/client/components/custom-canvases/flows/flows-canvas.jsx
@@ -51,6 +51,7 @@ export default class FlowsCanvas extends React.Component {
 			enableLinkReplaceOnNewConnection: true,
 			paletteInitialState: true,
 			enableDropZoneOnExternalDrag: true,
+			enableContextToolbar: true,
 			enableHighlightNodeOnNewLinkDrag: true,
 			tipConfig: {
 				palette: true,

diff --git a/...arness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx b/...arness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx
@@ -93,6 +93,7 @@ export default class DetachedCanvas extends React.Component {
 			enableAutoLinkOnlyFromSelNodes: true,
 			enableSingleOutputPortDisplay: true,
 			enableMarkdownInComments: true,
+			enableContextToolbar: true,
 			enableResizableNodes: true,
 			enableNarrowPalette: false,
 			paletteInitialState: true,
@@ -242,11 +243,6 @@ export default class DetachedCanvas extends React.Component {
 			);
 		}
 
-		if (source.selectedObjectIds.length === 1) {
-			return newMenu.concat([
-				{ divider: true }, { action: "addPort", label: "Add port" }
-			]);
-		}
 		return newMenu;
 	}
 

diff --git a/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx b/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx
@@ -67,6 +67,7 @@ export default class DetachedCanvas extends React.Component {
 			enableAutoLinkOnlyFromSelNodes: true,
 			enableSingleOutputPortDisplay: true,
 			enableMarkdownInComments: true,
+			enableContextToolbar: true,
 			enableResizableNodes: true,
 			enableNarrowPalette: false,
 			paletteInitialState: true,
@@ -200,11 +201,6 @@ export default class DetachedCanvas extends React.Component {
 			);
 		}
 
-		if (source.type === "node" && source.selectedObjectIds.length === 1) {
-			newMenu.push(
-				{ divider: true }, { action: "addPort", label: "Add port" }
-			);
-		}
 		return newMenu;
 	}