Skip to content

Commit b304017

Browse files
committed
minor
1 parent 5bc94bc commit b304017

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,14 @@ qx.Class.define("osparc.data.model.Node", {
483483
return Object.keys(this.getOutputs()).length;
484484
},
485485

486-
populateMetadata: function(metadata) {
486+
fetchAndPopulateWithMetadata: function() {
487+
this.getService(this.getKey(), this.getVersion())
488+
.then(serviceMetadata => {
489+
this.populateWithMetadata(serviceMetadata);
490+
});
491+
},
492+
493+
populateWithMetadata: function(metadata) {
487494
this.__metaData = metadata;
488495
if (metadata) {
489496
if (metadata.name) {
@@ -514,7 +521,7 @@ qx.Class.define("osparc.data.model.Node", {
514521
if (nodeData.label) {
515522
this.setLabel(nodeData.label);
516523
}
517-
this.populateInputOutputData(nodeData);
524+
this.__populateInputOutputData(nodeData);
518525
this.populateStates(nodeData);
519526
if (nodeData.bootOptions) {
520527
this.setBootOptions(nodeData.bootOptions);
@@ -540,7 +547,7 @@ qx.Class.define("osparc.data.model.Node", {
540547
}
541548
},
542549

543-
populateInputOutputData: function(nodeData) {
550+
__populateInputOutputData: function(nodeData) {
544551
this.__setInputData(nodeData.inputs);
545552
this.__setInputUnits(nodeData.inputsUnits);
546553
if (this.getPropsForm()) {
@@ -1277,7 +1284,7 @@ qx.Class.define("osparc.data.model.Node", {
12771284
key: newMetadata["key"],
12781285
version: newMetadata["version"],
12791286
});
1280-
this.populateMetadata(newMetadata);
1287+
this.populateWithMetadata(newMetadata);
12811288
this.populateNodeData();
12821289
this.setLabel(label);
12831290
osparc.node.ParameterEditor.setParameterOutputValue(this, value);
@@ -1297,7 +1304,7 @@ qx.Class.define("osparc.data.model.Node", {
12971304
key: newMetadata["key"],
12981305
version: newMetadata["version"],
12991306
});
1300-
this.populateMetadata(newMetadata);
1307+
this.populateWithMetadata(newMetadata);
13011308
this.populateNodeData();
13021309
this.setLabel(label);
13031310
this.__setInputData({

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ qx.Class.define("osparc.data.model.Workbench", {
273273
nodeRight.setInputConnected(true);
274274
},
275275

276-
__createNode: function(study, metadata, nodeId) {
277-
const node = new osparc.data.model.Node(study, metadata["key"], metadata["version"], nodeId);
278-
node.populateMetadata(metadata);
276+
__createNode: function(metadata, nodeId) {
277+
const node = new osparc.data.model.Node(this.getStudy(), metadata["key"], metadata["version"], nodeId);
278+
node.populateWithMetadata(metadata);
279279
if (osparc.utils.Utils.eventDrivenPatch()) {
280280
node.listenToChanges();
281281
node.addListener("projectDocumentChanged", e => this.fireDataEvent("projectDocumentChanged", e.getData()), this);
@@ -292,6 +292,10 @@ qx.Class.define("osparc.data.model.Workbench", {
292292
return node;
293293
},
294294

295+
deserializeNode: function() {
296+
// OM here
297+
},
298+
295299
createUnknownNode: function(nodeId) {
296300
if (nodeId === undefined) {
297301
nodeId = osparc.utils.Utils.uuidV4();
@@ -331,7 +335,7 @@ qx.Class.define("osparc.data.model.Workbench", {
331335
const nodeId = resp["node_id"];
332336

333337
this.fireEvent("restartAutoSaveTimer");
334-
const node = this.__createNode(this.getStudy(), metadata, nodeId);
338+
const node = this.__createNode(metadata, nodeId);
335339
node.populateNodeData();
336340
this.__giveUniqueNameToNode(node, node.getLabel());
337341
node.checkState();
@@ -747,7 +751,7 @@ qx.Class.define("osparc.data.model.Workbench", {
747751
for (let i=0; i<nodeIds.length; i++) {
748752
const metadata = values[i];
749753
const nodeId = nodeIds[i];
750-
this.__createNode(this.getStudy(), metadata, nodeId);
754+
this.__createNode(metadata, nodeId);
751755
}
752756

753757
// Then populate them (this will avoid issues of connecting nodes that might not be created yet)

0 commit comments

Comments
 (0)