addNode working

Author: odeimaiz

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

@@ -54,6 +54,7 @@ qx.Class.define("osparc.data.model.Workbench", {
     "projectDocumentChanged": "qx.event.type.Data",
     "restartAutoSaveTimer": "qx.event.type.Event",
     "pipelineChanged": "qx.event.type.Event",
+    "nodeAdded": "qx.event.type.Data",
     "nodeRemoved": "qx.event.type.Data",
     "reloadModel": "qx.event.type.Event",
     "retrieveInputs": "qx.event.type.Data",
@@ -873,12 +874,6 @@ qx.Class.define("osparc.data.model.Workbench", {
     },
 
     __addNodesFromPatches: function(nodesAdded, workbenchPatchesByNode) {
-      console.log("Adding nodes from patches:", nodesAdded, workbenchPatchesByNode);
-
-      // not solved yet, log the user out to avoid issues
-      qx.core.Init.getApplication().logout(qx.locale.Manager.tr("Potentially conflicting updates coming from a collaborator"));
-      return;
-
       nodesAdded.forEach(nodeId => {
         const addNodePatch = workbenchPatchesByNode[nodeId].find(workbenchPatch => {
           const pathParts = workbenchPatch.path.split("/");
@@ -891,9 +886,11 @@ qx.Class.define("osparc.data.model.Workbench", {
           workbenchPatchesByNode[nodeId].splice(index, 1);
         }
         const node = this.__createNode(nodeData["key"], nodeData["version"], nodeId);
-        node.fetchMetadataAndPopulate(nodeData, null);
-        // OM here: then maybe
-        node.checkState();
+        node.fetchMetadataAndPopulate(nodeData, null)
+          .then(() => {
+            this.fireDataEvent("nodeAdded", node);
+            node.checkState();
+          });
       });
     },
 

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -246,9 +246,13 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         this.__connectEvents();
 
         study.getWorkbench().addListener("pipelineChanged", () => this.__evalSlidesButtons());
+        study.getWorkbench().addListener("nodeAdded", e => {
+          const node = e.getData();
+          this.__nodeAdded(node);
+        });
         study.getWorkbench().addListener("nodeRemoved", e => {
           const {nodeId, connectedEdgeIds} = e.getData();
-          this.nodeRemoved(nodeId, connectedEdgeIds);
+          this.__nodeRemoved(nodeId, connectedEdgeIds);
         });
         study.getUi().getSlideshow().addListener("changeSlideshow", () => this.__evalSlidesButtons());
         study.getUi().addListener("changeMode", () => this.__evalSlidesButtons());
@@ -1133,6 +1137,10 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       this.addListener("disappear", () => qx.event.message.Bus.getInstance().unsubscribe("maximizeIframe", maximizeIframeCb, this), this);
     },
 
+    __nodeAdded: function(node) {
+      this.__workbenchUI.addNode(node);
+    },
+
     __removeNode: function(nodeId) {
       const workbench = this.getStudy().getWorkbench();
       const node = workbench.getNode(nodeId);
@@ -1188,7 +1196,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       }
     },
 
-    nodeRemoved: function(nodeId, connectedEdgeIds) {
+    __nodeRemoved: function(nodeId, connectedEdgeIds) {
       // remove first the connected edges
       connectedEdgeIds.forEach(edgeId => {
         this.__workbenchUI.clearEdge(edgeId);

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

@@ -351,10 +351,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       let nodeUI = null;
       try {
         const node = await this.__getWorkbench().createNode(service.getKey(), service.getVersion());
-        nodeUI = this._createNodeUI(node.getNodeId());
-        this._addNodeUIToWorkbench(nodeUI, pos);
-        qx.ui.core.queue.Layout.flush();
-        this.__createDragDropMechanism(nodeUI);
+        nodeUI = this.addNode(node, pos);
       } catch (err) {
         console.error(err);
       } finally {
@@ -364,6 +361,20 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       return nodeUI;
     },
 
+    addNode: function(node, pos) {
+      if (pos === undefined) {
+        pos = {
+          x: 0,
+          y: 0,
+        };
+      }
+      const nodeUI = this._createNodeUI(node.getNodeId());
+      this._addNodeUIToWorkbench(nodeUI, pos);
+      qx.ui.core.queue.Layout.flush();
+      this.__createDragDropMechanism(nodeUI);
+      return nodeUI;
+    },
+
     __getNodesBounds: function() {
       if (this.__nodesUI.length === 0) {
         return null;