#1238 SetCanvas canvas-controller API should support styles for nodes…

…, comments and links (#1239)
elyra-ai · Nov 7, 2022 · 4dc9102 · 4dc9102
1 parent 5677ba6
commit 4dc9102
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/canvas_modules/common-canvas/src/object-model/canvas-in-handler.js b/canvas_modules/common-canvas/src/object-model/canvas-in-handler.js
@@ -61,7 +61,8 @@ export default class CanvasInHandler {
 				y_pos: typeof canvasNode.y_pos !== "undefined" ? canvasNode.y_pos : canvasNode.yPos, // Handle old field name yPos
 				class_name: canvasNode.className,
 				label: canvasNode.objectData.label,
-				type: nodeType
+				type: nodeType,
+				style: canvasNode.style
 			};
 			if (canvasNode.objectData && canvasNode.objectData.description) {
 				newNode.description = canvasNode.objectData.description;
@@ -178,7 +179,8 @@ export default class CanvasInHandler {
 				x_pos: typeof canvasComment.x_pos !== "undefined" ? canvasComment.x_pos : canvasComment.xPos, // Handle old field name xPos
 				y_pos: typeof canvasComment.y_pos !== "undefined" ? canvasComment.y_pos : canvasComment.yPos, // Handle old field name yPos
 				height: canvasComment.height,
-				width: canvasComment.width
+				width: canvasComment.width,
+				style: canvasComment.style
 			})
 		);
 	}
@@ -192,7 +194,8 @@ export default class CanvasInHandler {
 					class_name: canvasLink.className,
 					srcNodeId: canvasLink.source,
 					trgNodeId: canvasLink.target,
-					type: this.getLinkType(canvasLink)
+					type: this.getLinkType(canvasLink),
+					style: canvasLink.style
 				};
 				if (canvasLink.sourcePort) {
 					newLink.srcNodePortId = canvasLink.sourcePort;

diff --git a/canvas_modules/harness/test_resources/diagrams/commentColorCanvas.json b/canvas_modules/harness/test_resources/diagrams/commentColorCanvas.json
@@ -291,7 +291,12 @@
                   "node_ref": "id2PZSCTRPRIJ",
                   "class_name": "canvas-comment-link"
                 }
-              ]
+              ],
+              "style": {
+                "body": {
+                  "default": "fill: #FFFF99"
+                }
+              }
             },
             {
               "id": "id2MHTH4XNJ32",

diff --git a/canvas_modules/harness/test_resources/diagrams/v1-commentColorCanvas.json b/canvas_modules/harness/test_resources/diagrams/v1-commentColorCanvas.json
@@ -273,7 +273,12 @@
                   "node_ref": "id2PZSCTRPRIJ",
                   "class_name": "canvas-comment-link"
                 }
-              ]
+              ],
+              "style": {
+                "body": {
+                  "default": "fill: #FFFF99"
+                }
+              }
             },
             {
               "id": "id2MHTH4XNJ32",

diff --git a/canvas_modules/harness/test_resources/diagrams/v2-commentColorCanvas.json b/canvas_modules/harness/test_resources/diagrams/v2-commentColorCanvas.json
@@ -285,7 +285,12 @@
                   "node_ref": "id2PZSCTRPRIJ",
                   "class_name": "canvas-comment-link"
                 }
-              ]
+              ],
+              "style": {
+                "body": {
+                  "default": "fill: #FFFF99"
+                }
+              }
             },
             {
               "id": "id2MHTH4XNJ32",

diff --git a/canvas_modules/harness/test_resources/diagrams/x-commentColorCanvas.json b/canvas_modules/harness/test_resources/diagrams/x-commentColorCanvas.json
@@ -212,7 +212,12 @@
             "id2PZSCTRPRIJ"
           ]
         },
-        "isCut": false
+        "isCut": false,
+        "style": {
+          "body": {
+            "default": "fill: #FFFF99"
+          }
+        }
       },
       {
         "id": "id2MHTH4XNJ32",