@elyra/canvas 12.43.0 → 12.44.0

package/src/common-canvas/svg-canvas-renderer.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3384,135 +3384,202 @@ export default class SVGCanvasRenderer {
 	}
 
 	setPortPositionsForNode(node) {
-		if (this.canvasLayout.linkDirection === LINK_DIR_TOP_BOTTOM) {
-			this.setPortPositionsVertical(node, node.inputs, node.inputPortsWidth, node.layout.inputPortTopPosX, node.layout.inputPortTopPosY);
-			this.setPortPositionsVertical(node, node.outputs, node.outputPortsWidth, node.layout.outputPortBottomPosX, this.getOutputPortBottomPosY(node));
-		} else if (this.canvasLayout.linkDirection === LINK_DIR_BOTTOM_TOP) {
-			this.setPortPositionsVertical(node, node.inputs, node.inputPortsWidth, node.layout.inputPortBottomPosX, this.getInputPortBottomPosY(node));
-			this.setPortPositionsVertical(node, node.outputs, node.outputPortsWidth, node.layout.outputPortTopPosX, node.layout.outputPortTopPosY);
+		if (this.canvasLayout.linkDirection === LINK_DIR_TOP_BOTTOM ||
+				this.canvasLayout.linkDirection === LINK_DIR_BOTTOM_TOP) {
+			this.setPortPositionsVertical(
+				node, node.inputs, node.inputPortsWidth,
+				node.layout.inputPortPositions,
+				node.layout.inputPortAutoPosition);
+			this.setPortPositionsVertical(
+				node, node.outputs, node.outputPortsWidth,
+				node.layout.outputPortPositions,
+				node.layout.outputPortAutoPosition,
+				this.config.enableSingleOutputPortDisplay);
+
 		} else {
-			this.setPortPositionsLeftRight(node, node.inputs, node.inputPortsHeight, node.layout.inputPortLeftPosX, node.layout.inputPortLeftPosY);
-			this.setPortPositionsLeftRight(node, node.outputs, node.outputPortsHeight,
-				this.nodeUtils.getNodeOutputPortRightPosX(node),
-				this.nodeUtils.getNodeOutputPortRightPosY(node),
+			this.setPortPositionsHoriz(
+				node, node.inputs, node.inputPortsHeight,
+				node.layout.inputPortPositions,
+				node.layout.inputPortAutoPosition);
+			this.setPortPositionsHoriz(
+				node, node.outputs, node.outputPortsHeight,
+				node.layout.outputPortPositions,
+				node.layout.outputPortAutoPosition,
 				this.config.enableSingleOutputPortDisplay);
 		}
 	}
 
-	getOutputPortBottomPosY(node) {
-		return node.height + node.layout.outputPortBottomPosY;
-	}
-
-	getInputPortBottomPosY(node) {
-		return node.height + node.layout.inputPortBottomPosY;
-	}
-
-	setPortPositionsVertical(data, ports, portsWidth, xPos, yPos) {
+	setPortPositionsVertical(node, ports, portsWidth, portPositions, autoPosition, displaySinglePort = false) {
 		if (ports && ports.length > 0) {
-			if (data.width <= data.layout.defaultNodeWidth &&
+			const xPos = this.nodeUtils.getNodePortPosX(portPositions[0], node);
+			const yPos = this.nodeUtils.getNodePortPosY(portPositions[0], node);
+
+			if (node.width <= node.layout.defaultNodeWidth &&
 					ports.length === 1) {
 				ports[0].cx = xPos;
 				ports[0].cy = yPos;
 			} else {
-				let xPosition = 0;
+				// If we are only going to display a single port, we set all the
+				// port positions to be the same as if there is only one port.
+				if (displaySinglePort) {
+					this.setPortPositionsVerticalDisplaySingle(node, ports, xPos, yPos);
 
-				if (CanvasUtils.isExpandedSupernode(data)) {
-					const widthSvgArea = data.width - (2 * this.canvasLayout.supernodeSVGAreaPadding);
-					const remainingSpace = widthSvgArea - portsWidth;
-					xPosition = (2 * this.canvasLayout.supernodeSVGAreaPadding) + (remainingSpace / 2);
+				} else if (autoPosition || CanvasUtils.isExpandedSupernode(node)) {
+					this.setPortPositionsVerticalAuto(node, ports, portsWidth, yPos);
 
-				} else if (portsWidth < data.width) {
-					xPosition = (data.width - portsWidth) / 2;
+				} else {
+					this.setPortPositionsCustom(ports, portPositions, node, xPos, yPos);
 				}
+			}
+		}
+	}
 
-				xPosition += data.layout.portArcOffset;
+	// If only a single port is to be displayed, this methods sets the x and y
+	// coordinates of all the ports to the same values appropriately for either
+	// regular nodes or expanded supernodes.
+	setPortPositionsVerticalDisplaySingle(node, ports, xPos, yPos) {
+		let xPosition = 0;
+		if (CanvasUtils.isExpandedSupernode(node)) {
+			const widthSvgArea = node.width - (2 * this.canvasLayout.supernodeSVGAreaPadding);
+			xPosition = widthSvgArea / 2;
 
-				// Sub-flow binding node ports need to be spaced by the inverse of the
-				// zoom amount so that, after zoomToFit on the in-place sub-flow the
-				// binding node ports line up with those on the supernode. This is only
-				// necessary with binding nodes with mutiple ports.
-				let multiplier = 1;
-				if (CanvasUtils.isSuperBindingNode(data)) {
-					multiplier = 1 / this.zoomUtils.getZoomScale();
-				}
+		} else {
+			xPosition = xPos;
+		}
 
-				ports.forEach((p) => {
-					xPosition += (data.layout.portArcRadius * multiplier);
-					p.cx = xPosition;
-					p.cy = yPos;
-					xPosition += ((data.layout.portArcRadius + data.layout.portArcSpacing) * multiplier);
-				});
-			}
+		ports.forEach((p) => {
+			p.cx = xPosition;
+			p.cy = yPos;
+		});
+	}
+
+	// Sets the ports x and y coordinates for regular and expanded supernodes
+	// when all ports are displayed in a normal manner (as opposed to when a
+	// single port is displayed).
+	setPortPositionsVerticalAuto(node, ports, portsWidth, yPos) {
+		let xPosition = 0;
+
+		if (CanvasUtils.isExpandedSupernode(node)) {
+			const widthSvgArea = node.width - (2 * this.canvasLayout.supernodeSVGAreaPadding);
+			const remainingSpace = widthSvgArea - portsWidth;
+			xPosition = this.canvasLayout.supernodeSVGAreaPadding + (remainingSpace / 2);
+
+		} else if (portsWidth < node.width) {
+			xPosition = (node.width - portsWidth) / 2;
 		}
+
+		xPosition += node.layout.portArcOffset;
+
+		// Sub-flow binding node ports need to be spaced by the inverse of the
+		// zoom amount so that, after zoomToFit on the in-place sub-flow the
+		// binding node ports line up with those on the supernode. This is only
+		// necessary with binding nodes with mutiple ports.
+		let multiplier = 1;
+		if (CanvasUtils.isSuperBindingNode(node)) {
+			multiplier = 1 / this.zoomUtils.getZoomScale();
+		}
+		ports.forEach((p) => {
+			xPosition += (node.layout.portArcRadius * multiplier);
+			p.cx = xPosition;
+			p.cy = yPos;
+			xPosition += ((node.layout.portArcRadius + node.layout.portArcSpacing) * multiplier);
+		});
 	}
 
-	setPortPositionsLeftRight(data, ports, portsHeight, xPos, yPos, displaySinglePort = false) {
+	setPortPositionsHoriz(node, ports, portsHeight, portPositions, autoPosition, displaySinglePort = false) {
 		if (ports && ports.length > 0) {
-			if (data.height <= data.layout.defaultNodeHeight &&
+			const xPos = this.nodeUtils.getNodePortPosX(portPositions[0], node);
+			const yPos = this.nodeUtils.getNodePortPosY(portPositions[0], node);
+
+			if (node.height <= node.layout.defaultNodeHeight &&
 					ports.length === 1) {
 				ports[0].cx = xPos;
 				ports[0].cy = yPos;
+
 			} else {
-				// If we are only going to display a single port, we can set all the
+				// If we are only going to display a single port, we set all the
 				// port positions to be the same as if there is only one port.
 				if (displaySinglePort) {
-					this.setPortPositionsLeftRightSinglePort(data, ports, xPos, yPos);
+					this.setPortPositionsHorizDisplaySingle(node, ports, xPos, yPos);
+
+				} else if (autoPosition || CanvasUtils.isExpandedSupernode(node)) {
+					this.setPortPositionsHorizAuto(node, ports, portsHeight, xPos);
+
 				} else {
-					this.setPortPositionsLeftRightAllPorts(data, ports, portsHeight, xPos, yPos);
+					this.setPortPositionsCustom(ports, portPositions, node, xPos, yPos);
 				}
 			}
 		}
 	}
 
+	// If only a single port is to be displayed, this methods sets the x and y
+	// coordinates of all the ports to the same values appropriately for either
+	// regular nodes or expanded supernodes.
+	setPortPositionsHorizDisplaySingle(node, ports, xPos, yPos) {
+		let yPosition = 0;
+		if (CanvasUtils.isExpandedSupernode(node)) {
+			const heightSvgArea = node.height - this.canvasLayout.supernodeTopAreaHeight - this.canvasLayout.supernodeSVGAreaPadding;
+			yPosition = this.canvasLayout.supernodeTopAreaHeight + (heightSvgArea / 2);
+
+		} else {
+			yPosition = yPos;
+		}
+
+		ports.forEach((p) => {
+			p.cx = xPos;
+			p.cy = yPosition;
+		});
+	}
+
 	// Sets the ports x and y coordinates for regular and expanded supernodes
 	// when all ports are displayed in a normal manner (as opposed to when a
 	// single port is displayed).
-	setPortPositionsLeftRightAllPorts(data, ports, portsHeight, xPos, yPos) {
+	setPortPositionsHorizAuto(node, ports, portsHeight, xPos) {
 		let yPosition = 0;
 
-		if (CanvasUtils.isExpandedSupernode(data)) {
-			const heightSvgArea = data.height - this.canvasLayout.supernodeTopAreaHeight - this.canvasLayout.supernodeSVGAreaPadding;
+		if (CanvasUtils.isExpandedSupernode(node)) {
+			const heightSvgArea = node.height - this.canvasLayout.supernodeTopAreaHeight - this.canvasLayout.supernodeSVGAreaPadding;
 			const remainingSpace = heightSvgArea - portsHeight;
-			yPosition = this.canvasLayout.supernodeTopAreaHeight + this.canvasLayout.supernodeSVGAreaPadding + (remainingSpace / 2);
+			yPosition = this.canvasLayout.supernodeTopAreaHeight + (remainingSpace / 2);
 
-		} else if (portsHeight < data.height) {
-			yPosition = (data.height - portsHeight) / 2;
+		} else if (portsHeight < node.height) {
+			yPosition = (node.height - portsHeight) / 2;
 		}
 
-		yPosition += data.layout.portArcOffset;
+		yPosition += node.layout.portArcOffset;
 
 		// Sub-flow binding node ports need to be spaced by the inverse of the
 		// zoom amount so that, after zoomToFit on the in-place sub-flow the
 		// binding node ports line up with those on the supernode. This is only
 		// necessary with binding nodes with mutiple ports.
 		let multiplier = 1;
-		if (CanvasUtils.isSuperBindingNode(data)) {
+		if (CanvasUtils.isSuperBindingNode(node)) {
 			multiplier = 1 / this.zoomUtils.getZoomScale();
 		}
 		ports.forEach((p) => {
-			yPosition += (data.layout.portArcRadius * multiplier);
+			yPosition += (node.layout.portArcRadius * multiplier);
 			p.cx = xPos;
 			p.cy = yPosition;
-			yPosition += ((data.layout.portArcRadius + data.layout.portArcSpacing) * multiplier);
+			yPosition += ((node.layout.portArcRadius + node.layout.portArcSpacing) * multiplier);
 		});
 	}
 
-	// If only a single port is to be displayed, this methods sets the x and y
-	// coordinates of all the ports to the same values appropriately for either
-	// regular nodes or expanded supernodes.
-	setPortPositionsLeftRightSinglePort(data, ports, xPos, yPos) {
-		let yPosition = 0;
-		if (CanvasUtils.isExpandedSupernode(data)) {
-			const heightSvgArea = data.height - this.canvasLayout.supernodeTopAreaHeight - this.canvasLayout.supernodeSVGAreaPadding;
-			yPosition = this.canvasLayout.supernodeTopAreaHeight + (heightSvgArea / 2);
+	// Sets the node's port positions based on the custom positions provided
+	// by the application in the portPositions array.
+	setPortPositionsCustom(ports, portPositions, node, zerothX, zerothY) {
+		let xPos = zerothX;
+		let yPos = zerothY;
 
-		} else {
-			yPosition = yPos;
-		}
-
-		ports.forEach((p) => {
+		ports.forEach((p, i) => {
+			// No need to recalculate the zeroth position AND if there are more
+			// ports than portPositions just use the last port position for all
+			// subsequent ports.
+			if (i > 0 && i < portPositions.length) {
+				xPos = this.nodeUtils.getNodePortPosX(portPositions[i], node);
+				yPos = this.nodeUtils.getNodePortPosY(portPositions[i], node);
+			}
 			p.cx = xPos;
-			p.cy = yPosition;
+			p.cy = yPos;
 		});
 	}
 

package/src/common-canvas/svg-canvas-utils-external.js

@@ -69,7 +69,7 @@ export default class SvgCanvasExternal {
 				out.cy = outputPos.cy / k;
 			});
 		}
-		this.ren.displayLinks();
+		this.ren.displayMovedLinks();
 	}
 
 	setNodesProperties(newProps) {

package/src/common-canvas/svg-canvas-utils-links.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -245,34 +245,29 @@ export default class SvgCanvasLinks {
 	}
 
 	getNodeLinkCoordsForPorts(srcNode, srcPortId, trgNode, trgPortId) {
-		let srcX = srcNode.width + srcNode.layout.outputPortRightPosX;
-		let srcY = srcNode.layout.outputPortRightPosY;
-		let trgX = trgNode.layout.inputPortLeftPosX;
-		let trgY = trgNode.layout.inputPortLeftPosY;
-
-		if (this.canvasLayout.linkDirection === LINK_DIR_TOP_BOTTOM) {
-			srcX = srcNode.layout.outputPortBottomPosX;
-			srcY = srcNode.height + srcNode.layout.outputPortBottomPosY;
-			trgX = trgNode.layout.inputPortTopPosX;
-			trgY = trgNode.layout.inputPortTopPosY;
-
-		} else if (this.canvasLayout.linkDirection === LINK_DIR_BOTTOM_TOP) {
-			srcX = srcNode.layout.outputPortBottomPosX;
-			srcY = srcNode.layout.outputPortBottomPosY;
-			trgX = trgNode.layout.inputPortTopPosX;
-			trgY = trgNode.height + trgNode.layout.inputPortTopPosY;
-		}
+		let srcX;
+		let srcY;
+		let trgX;
+		let trgY;
 
 		if (srcNode.outputs && srcNode.outputs.length > 0) {
 			const port = srcNode.outputs.find((srcPort) => srcPort.id === srcPortId);
 			srcX = port ? port.cx : srcX;
 			srcY = port ? port.cy : srcY;
+
+		} else {
+			srcX = this.nodeUtils.getNodePortPosX(srcNode.layout.outputPortPositions[0], srcNode);
+			srcY = this.nodeUtils.getNodePortPosY(srcNode.layout.outputPortPositions[0], srcNode);
 		}
 
 		if (trgNode.inputs && trgNode.inputs.length > 0) {
 			const port = trgNode.inputs.find((trgPort) => trgPort.id === trgPortId);
 			trgX = port ? port.cx : trgX;
 			trgY = port ? port.cy : trgY;
+
+		} else {
+			trgX = this.nodeUtils.getNodePortPosX(trgNode.layout.inputPortPositions[0], trgNode);
+			trgY = this.nodeUtils.getNodePortPosY(trgNode.layout.inputPortPositions[0], trgNode);
 		}
 
 		return {
@@ -284,31 +279,32 @@ export default class SvgCanvasLinks {
 	}
 
 	getAssociationCurveLinkCoords(srcNode, trgNode, assocLinkVariation) {
-		let x1 = 0;
-		let x2 = 0;
+		let srcX = 0;
+		let trgX = 0;
 
 		if (assocLinkVariation === ASSOC_VAR_CURVE_RIGHT) {
-			x1 = srcNode.x_pos + srcNode.width;
-			x2 = trgNode.x_pos;
+			srcX = srcNode.width;
+			trgX = 0;
 
 		} else if (assocLinkVariation === ASSOC_VAR_CURVE_LEFT) {
-			x1 = srcNode.x_pos;
-			x2 = trgNode.x_pos + trgNode.width;
+			srcX = 0;
+			trgX = trgNode.width;
 
 		} else if (assocLinkVariation === ASSOC_VAR_DOUBLE_BACK_LEFT) {
-			x1 = srcNode.x_pos;
-			x2 = trgNode.x_pos;
+			srcX = 0;
+			trgX = 0;
 
 		} else {
-			x1 = srcNode.x_pos + srcNode.width;
-			x2 = trgNode.x_pos + trgNode.width;
+			srcX = srcNode.width;
+			trgX = trgNode.width;
 		}
 
 		return {
-			x1: x1,
-			y1: srcNode.y_pos + srcNode.layout.outputPortRightPosY,
-			x2: x2,
-			y2: trgNode.y_pos + trgNode.layout.inputPortLeftPosY };
+			x1: srcNode.x_pos + srcX,
+			y1: srcNode.y_pos + this.nodeUtils.getNodePortPosY(srcNode.layout.outputPortPositions[0], srcNode),
+			x2: trgNode.x_pos + trgX,
+			y2: trgNode.y_pos + this.nodeUtils.getNodePortPosY(trgNode.layout.inputPortPositions[0], trgNode)
+		};
 	}
 
 	getCommentLinkCoords(srcComment, trgNode) {

package/src/common-canvas/svg-canvas-utils-nodes.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -339,20 +339,12 @@ export default class SvgCanvasNodes {
 		return node.layout.errorHeight;
 	}
 
-	getNodeInputPortLeftPosX(node) {
-		return this.getElementPosX(node.width, node.layout.inputPortLeftPosX, node.layout.inputPortLeftPosition);
+	getNodePortPosX(posInfo, node) {
+		return this.getElementPosX(node.width, posInfo.x_pos, posInfo.pos);
 	}
 
-	getNodeInputPortLeftPosY(node) {
-		return this.getElementPosY(node.height, node.layout.inputPortLeftPosY, node.layout.inputPortLeftPosition);
-	}
-
-	getNodeOutputPortRightPosX(node) {
-		return this.getElementPosX(node.width, node.layout.outputPortRightPosX, node.layout.outputPortRightPosition);
-	}
-
-	getNodeOutputPortRightPosY(node) {
-		return this.getElementPosY(node.height, node.layout.outputPortRightPosY, node.layout.outputPortRightPosition);
+	getNodePortPosY(posInfo, node) {
+		return this.getElementPosY(node.height, posInfo.y_pos, posInfo.pos);
 	}
 
 	getElementPosX(width, xOffset = 0, position = "topLeft") {

package/src/icons/icon.scss

@@ -51,5 +51,5 @@ svg.canvas-state-icon-info {
 }
 
 svg.canvas-state-icon-information-hollow {
-	fill: $icon-01;
+	fill: $icon-02;
 }

package/src/object-model/config-utils.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import { isMatch, isMatchWith, omit } from "lodash";
 import LayoutDimensions from "./layout-dimensions.js";
 import { ASSOC_STRAIGHT, LINK_SELECTION_NONE } from "../common-canvas/constants/canvas-constants";
 
-export default class CanvasUtils {
+export default class ConfigUtils {
 
 	// Returns a config object which is the result of merging config into
 	// startConfig.