Skip to content

Commit 18d423a

Browse files
committed
updateStudyDocument with data and remove restartAutoSaveTimer
1 parent 7cbed89 commit 18d423a

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ qx.Class.define("osparc.data.model.Node", {
197197
},
198198

199199
events: {
200-
"updateStudyDocument": "qx.event.type.Event",
200+
"updateStudyDocument": "qx.event.type.Data",
201201
"reloadModel": "qx.event.type.Event",
202202
"retrieveInputs": "qx.event.type.Data",
203203
"keyChanged": "qx.event.type.Event",

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ qx.Class.define("osparc.data.model.Workbench", {
5050
},
5151

5252
events: {
53-
"updateStudyDocument": "qx.event.type.Event",
54-
"restartAutoSaveTimer": "qx.event.type.Event",
53+
"updateStudyDocument": "qx.event.type.Data",
5554
"pipelineChanged": "qx.event.type.Event",
5655
"reloadModel": "qx.event.type.Event",
5756
"retrieveInputs": "qx.event.type.Data",
@@ -276,7 +275,7 @@ qx.Class.define("osparc.data.model.Workbench", {
276275
node.addListener("keyChanged", () => this.fireEvent("reloadModel"), this);
277276
node.addListener("changeInputNodes", () => this.fireDataEvent("pipelineChanged"), this);
278277
node.addListener("reloadModel", () => this.fireEvent("reloadModel"), this);
279-
node.addListener("updateStudyDocument", () => this.fireEvent("updateStudyDocument"), this);
278+
node.addListener("updateStudyDocument", e => this.fireDataEvent("updateStudyDocument", e.getData()), this);
280279
osparc.utils.Utils.localCache.serviceToFavs(metadata.key);
281280
return node;
282281
},
@@ -292,7 +291,6 @@ qx.Class.define("osparc.data.model.Workbench", {
292291
return null;
293292
}
294293

295-
this.fireEvent("restartAutoSaveTimer");
296294
// create the node in the backend first
297295
const params = {
298296
url: {
@@ -309,7 +307,6 @@ qx.Class.define("osparc.data.model.Workbench", {
309307
const resp = await osparc.data.Resources.fetch("studies", "addNode", params);
310308
const nodeId = resp["node_id"];
311309

312-
this.fireEvent("restartAutoSaveTimer");
313310
const node = this.__createNode(this.getStudy(), metadata, nodeId);
314311
this.__initNodeSignals(node);
315312
this.__addNode(node);
@@ -543,12 +540,9 @@ qx.Class.define("osparc.data.model.Workbench", {
543540

544541
let node = this.getNode(nodeId);
545542
if (node) {
546-
this.fireEvent("restartAutoSaveTimer");
547543
// remove the node in the backend first
548544
const removed = await node.removeNode();
549545
if (removed) {
550-
this.fireEvent("restartAutoSaveTimer");
551-
552546
delete this.__nodes[nodeId];
553547

554548
// remove first the connected edges

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
239239
this.nodeSelected(nodeId);
240240
}, this);
241241

242-
workbench.addListener("updateStudyDocument", () => this.updateStudyDocument());
243-
workbench.addListener("restartAutoSaveTimer", () => this.__restartAutoSaveTimer());
242+
workbench.addListener("updateStudyDocument", e => this.updateStudyDocument(e.getData()), this);
244243
},
245244

246245
__setStudyDataInBackend: function(studyData) {

services/static-webserver/client/source/class/osparc/node/BootOptionsView.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ qx.Class.define("osparc.node.BootOptionsView", {
5353
node.setBootOptions({
5454
"boot_mode": newBootModeId
5555
});
56-
node.fireEvent("updateStudyDocument");
56+
node.fireDataEvent("updateStudyDocument", {
57+
"op": "replace",
58+
"path": `/workbench/${nodeId}/bootOptions/boot_mode`,
59+
"value": newBootModeId,
60+
});
5761
// add timeout to make sure the node is saved before starting it
5862
setTimeout(() => {
5963
buttonsLayout.setEnabled(true);

services/static-webserver/client/source/class/osparc/node/LifeCycleView.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,15 @@ qx.Class.define("osparc.node.LifeCycleView", {
117117
if (node.getVersion() !== latestCompatible["version"]) {
118118
node.setVersion(latestCompatible["version"]);
119119
}
120-
node.fireEvent("updateStudyDocument");
120+
node.fireDataEvent("updateStudyDocument", [{
121+
"op": "replace",
122+
"path": `/workbench/${nodeId}/key`,
123+
"value": latestCompatible["key"],
124+
}, {
125+
"op": "replace",
126+
"path": `/workbench/${nodeId}/version`,
127+
"value": latestCompatible["version"],
128+
}]);
121129
// add timeout to make sure the node is saved before starting it
122130
setTimeout(() => {
123131
updateButton.setFetching(false);

0 commit comments

Comments
 (0)