remove edge

Author: odeimaiz

services/static-webserver/client/source/class/osparc/data/model/Node.js

@@ -200,6 +200,7 @@ qx.Class.define("osparc.data.model.Node", {
     "keyChanged": "qx.event.type.Event",
     "changePosition": "qx.event.type.Data",
     "createEdge": "qx.event.type.Data",
+    "removeEdge": "qx.event.type.Data",
     "fileRequested": "qx.event.type.Data",
     "parameterRequested": "qx.event.type.Data",
     "filePickerRequested": "qx.event.type.Data",
@@ -926,8 +927,9 @@ qx.Class.define("osparc.data.model.Node", {
       }
     },
 
-    __removeInputNodeByIndex: function(index) {
-      // make sue index is valid
+    removeInputNode: function(inputNodeId) {
+      const index = this.__inputNodes.indexOf(inputNodeId);
+      // make sure index is valid
       if (index < 0 || index >= this.__inputNodes.length) {
         return false;
       }
@@ -937,11 +939,6 @@ qx.Class.define("osparc.data.model.Node", {
       return true;
     },
 
-    removeInputNode: function(inputNodeId) {
-      const index = this.__inputNodes.indexOf(inputNodeId);
-      this.__removeInputNodeByIndex(index);
-    },
-
     isInputNode: function(inputNodeId) {
       const index = this.__inputNodes.indexOf(inputNodeId);
       return (index > -1);
@@ -1466,7 +1463,13 @@ qx.Class.define("osparc.data.model.Node", {
             } else if (op === "remove") {
               // we don't have more information about the input node, so we just remove it by index
               const index = path.split("/")[4];
-              this.__removeInputNodeByIndex(index);
+              // make sure index is valid
+              if (index > -1 || index < this.__inputNodes.length) {
+                this.fireDataEvent("removeEdge", {
+                  nodeId1: this.__inputNodes[index],
+                  nodeId2: this.getNodeId(),
+                });
+              }
             }
             break;
           case "inputsRequired":

services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js

@@ -668,6 +668,11 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         const { nodeId1, nodeId2 } = data;
         this._createEdgeBetweenNodes(nodeId1, nodeId2, false);
       });
+      node.addListener("removeEdge", e => {
+        const data = e.getData();
+        const { nodeId1, nodeId2 } = data;
+        this.__removeEdgeBetweenNodes(nodeId1, nodeId2);
+      });
       nodeUI.populateNodeLayout(this.__svgLayer);
       nodeUI.addListener("renameNode", e => this.__openNodeRenamer(e.getData()), this);
       nodeUI.addListener("markerClicked", e => this.__openMarkerEditor(e.getData()), this);
@@ -873,6 +878,25 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       this.__svgLayer.addListener("mouseout", () => hint.exclude(), this);
     },
 
+    __getEdgeUIBetweenNodes: function(node1Id, node2Id) {
+      const foundEdgeUI = this.__edgesUI.find(edgeUi => {
+        const edgeObj = edgeUi.getEdge();
+        const inputNode = edgeObj.getInputNode();
+        const outputNode = edgeObj.getOutputNode();
+        if (inputNode.getNodeId() === node1Id && outputNode.getNodeId() === node2Id) {
+          return true;
+        }
+      });
+      return foundEdgeUI;
+    },
+
+    __removeEdgeBetweenNodes: function(node1Id, node2Id) {
+      const edgeUI = this.__getEdgeUIBetweenNodes(node1Id, node2Id);
+      if (edgeUI) {
+        this.__removeEdge(edgeUI);
+      }
+    },
+
     __updateAllEdges: function() {
       this.__nodesUI.forEach(nodeUI => {
         this.__updateNodeUIPos(nodeUI);