elyra-ai#124 Update Layout info when setCanvasConfig is called with n…

…ew nodeLayout field
tomlyn · Jun 9, 2020 · 82855cf · 82855cf
1 parent f1e8a37
commit 82855cf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/canvas_modules/common-canvas/src/common-canvas/canvas-controller.js b/canvas_modules/common-canvas/src/common-canvas/canvas-controller.js
@@ -79,6 +79,7 @@ export default class CanvasController {
 			enableDisplayFullLabelOnHover: false,
 			enableDropZoneOnExternalDrag: false,
 			enableZoomIntoSubFlows: false,
+			enableZoomType: "Regular",
 			enableSaveZoom: "None",
 			enableSnapToGridType: "None",
 			enableSnapToGridX: null,
@@ -153,6 +154,7 @@ export default class CanvasController {
 	setCanvasConfig(config) {
 		this.canvasConfig = Object.assign(this.canvasConfig, config);
 		this.objectModel.setSchemaValidation(this.canvasConfig.schemaValidation);
+		this.objectModel.setLayoutType(config);
 	}
 
 	getCanvasConfig() {

diff --git a/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.js b/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.js
@@ -265,18 +265,7 @@ export default class SVGCanvasD3 {
 
 	// Initializes the dimensions for nodes, comments layout etc.
 	initializeLayoutInfo(config) {
-
-		if (config.enableConnectionType === "Halo") {
-			this.objectModel.setLayoutType("halo", config);
-
-		} else { // Ports connection type
-			if (config.enableNodeFormatType === "Horizontal") {
-				this.objectModel.setLayoutType("ports-horizontal", config);
-
-			} else { // Vertical
-				this.objectModel.setLayoutType("ports-vertical", config);
-			}
-		}
+		this.objectModel.setLayoutType(config);
 	}
 
 	paletteNodeDraggedOver(nodeTemplate, x, y) {

diff --git a/canvas_modules/common-canvas/src/object-model/layout-dimensions.js b/canvas_modules/common-canvas/src/object-model/layout-dimensions.js
@@ -1039,17 +1039,18 @@ const portsVerticalDefaultLayout = {
 
 
 export default class LayoutDimensions {
-	static getLayout(type, config) {
-		let defaultLayout;
-		if (type === "halo") {
-			defaultLayout = haloDefaultLayout;
-		} else if (type === "ports-vertical") {
-			defaultLayout = portsVerticalDefaultLayout;
-		} else {
-			defaultLayout = portsHorizontalDefaultLayout;
-		}
+	static getLayoutForConfig(config) {
+		let type;
+		if (config.enableConnectionType === "Halo") {
+			type = "halo";
 
-		let newLayout = Object.assign({}, defaultLayout);
+		} else if (config.enableNodeFormatType === "Horizontal") {
+			type = "ports-horizontal";
+
+		} else { // Vertical
+			type = "ports-vertical";
+		}
+		let newLayout = this.getLayout(type);
 		if (config) {
 			newLayout = this.overrideNodeLayout(newLayout, config); // Do this first because snap-to-grid depends on this.
 			newLayout = this.overrideCanvasLayout(newLayout, config);
@@ -1060,6 +1061,18 @@ export default class LayoutDimensions {
 		return newLayout;
 	}
 
+	static getLayout(type) {
+		let defaultLayout;
+		if (type === "halo") {
+			defaultLayout = haloDefaultLayout;
+		} else if (type === "ports-vertical") {
+			defaultLayout = portsVerticalDefaultLayout;
+		} else {
+			defaultLayout = portsHorizontalDefaultLayout;
+		}
+		return Object.assign({}, defaultLayout);
+	}
+
 	static overrideNodeLayout(layout, config) {
 		layout.nodeLayout = Object.assign({}, layout.nodeLayout, config.enableNodeLayout);
 

diff --git a/canvas_modules/common-canvas/src/object-model/object-model.js b/canvas_modules/common-canvas/src/object-model/object-model.js
@@ -884,8 +884,8 @@ export default class ObjectModel {
 	// Layout Info methods
 	// ---------------------------------------------------------------------------
 
-	setLayoutType(type, config) {
-		const layoutInfo = Object.assign({}, LayoutDimensions.getLayout(type, config));
+	setLayoutType(config) {
+		const layoutInfo = Object.assign({}, LayoutDimensions.getLayoutForConfig(config));
 		const newPipelines = this.prepareNodes(this.getCanvasInfo().pipelines, layoutInfo.nodeLayout, layoutInfo.canvasLayout);
 
 		this.store.dispatch({ type: "SET_LAYOUT_INFO",