Skip to content

Commit dfc0794

Browse files
authored
Iterators and Probes: missing changes (ITISFoundation#2687)
1 parent b70f404 commit dfc0794

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

services/web/client/source/class/osparc/data/model/Node.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -460,22 +460,7 @@ qx.Class.define("osparc.data.model.Node", {
460460
this.getStatus().setProgress(progress);
461461
}
462462
if ("state" in nodeData) {
463-
const state = nodeData.state;
464-
if ("dependencies" in state) {
465-
this.getStatus().setDependencies(state.dependencies);
466-
}
467-
if ("currentStatus" in state && this.isComputational()) {
468-
// currentStatus is only applicable to computational services
469-
this.getStatus().setRunning(state.currentStatus);
470-
}
471-
if ("modified" in state) {
472-
if (this.getStatus().getHasOutputs()) {
473-
// File Picker can't have a modified output
474-
this.getStatus().setModified((state.modified || this.getStatus().hasDependencies()) && !this.isFilePicker());
475-
} else {
476-
this.getStatus().setModified(null);
477-
}
478-
}
463+
this.getStatus().setState(nodeData.state);
479464
}
480465
},
481466

services/web/client/source/class/osparc/desktop/WorkbenchView.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -613,23 +613,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
613613
}, this);
614614
}
615615

616-
// callback for node updates
617-
const slotName3 = "nodeUpdated";
618-
if (!socket.slotExists(slotName3)) {
619-
socket.on(slotName3, data => {
620-
const d = JSON.parse(data);
621-
const nodeId = d["node_id"];
622-
const nodeData = d["data"];
623-
const workbench = this.getStudy().getWorkbench();
624-
const node = workbench.getNode(nodeId);
625-
if (node && nodeData) {
626-
node.setOutputData(nodeData.outputs);
627-
node.populateStates(nodeData);
628-
} else if (osparc.data.Permissions.getInstance().isTester()) {
629-
console.log("Ignored ws 'nodeUpdated' msg", d);
630-
}
631-
}, this);
632-
}
616+
this.listenToNodeUpdated();
633617

634618
// callback for events
635619
const slotName4 = "event";

0 commit comments

Comments
 (0)