Skip to content

Commit 81bb386

Browse files
committed
remove unnecessary events
1 parent 7ba392b commit 81bb386

File tree

6 files changed

+6
-32
lines changed

6 files changed

+6
-32
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ qx.Class.define("osparc.data.model.Node", {
196196
},
197197

198198
events: {
199-
"updateStudyDocument": "qx.event.type.Event",
200199
"projectDocumentChanged": "qx.event.type.Data",
201200
"reloadModel": "qx.event.type.Event",
202201
"retrieveInputs": "qx.event.type.Data",

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

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

5252
events: {
53-
"updateStudyDocument": "qx.event.type.Event",
5453
"projectDocumentChanged": "qx.event.type.Data",
55-
"restartAutoSaveTimer": "qx.event.type.Event",
5654
"pipelineChanged": "qx.event.type.Event",
5755
"nodeAdded": "qx.event.type.Data",
5856
"nodeRemoved": "qx.event.type.Data",
@@ -352,7 +350,6 @@ qx.Class.define("osparc.data.model.Workbench", {
352350
return null;
353351
}
354352

355-
this.fireEvent("restartAutoSaveTimer");
356353
// create the node in the backend first
357354
const params = {
358355
url: {
@@ -368,7 +365,6 @@ qx.Class.define("osparc.data.model.Workbench", {
368365
const resp = await osparc.data.Resources.fetch("studies", "addNode", params);
369366
const nodeId = resp["node_id"];
370367

371-
this.fireEvent("restartAutoSaveTimer");
372368
const node = this.__createNode(key, version, nodeId);
373369
node.fetchMetadataAndPopulate()
374370
.then(() => {
@@ -394,15 +390,11 @@ qx.Class.define("osparc.data.model.Workbench", {
394390
},
395391

396392
__initNodeSignals: function(node) {
397-
if (osparc.utils.Utils.eventDrivenPatch()) {
398-
node.listenToChanges();
399-
node.addListener("projectDocumentChanged", e => this.fireDataEvent("projectDocumentChanged", e.getData()), this);
400-
}
393+
node.listenToChanges();
394+
node.addListener("projectDocumentChanged", e => this.fireDataEvent("projectDocumentChanged", e.getData()), this);
401395
node.addListener("keyChanged", () => this.fireEvent("reloadModel"), this);
402396
node.addListener("changeInputNodes", () => this.fireDataEvent("pipelineChanged"), this);
403397
node.addListener("reloadModel", () => this.fireEvent("reloadModel"), this);
404-
node.addListener("updateStudyDocument", () => this.fireEvent("updateStudyDocument"), this);
405-
406398
node.addListener("showInLogger", e => this.fireDataEvent("showInLogger", e.getData()), this);
407399
node.addListener("retrieveInputs", e => this.fireDataEvent("retrieveInputs", e.getData()), this);
408400
node.addListener("fileRequested", e => this.fireDataEvent("fileRequested", e.getData()), this);
@@ -633,7 +625,6 @@ qx.Class.define("osparc.data.model.Workbench", {
633625
return;
634626
}
635627

636-
this.fireEvent("restartAutoSaveTimer");
637628
let node = this.getNode(nodeId);
638629
if (node) {
639630
// remove the node in the backend first
@@ -645,8 +636,6 @@ qx.Class.define("osparc.data.model.Workbench", {
645636
},
646637

647638
__nodeRemoved: function(nodeId) {
648-
this.fireEvent("restartAutoSaveTimer");
649-
650639
delete this.__nodes[nodeId];
651640

652641
// remove first the connected edges
@@ -1002,14 +991,11 @@ qx.Class.define("osparc.data.model.Workbench", {
1002991
__createNodeOld: function(metadata, nodeId) {
1003992
const node = new osparc.data.model.Node(this.getStudy(), metadata["key"], metadata["version"], nodeId);
1004993
node.setMetadata(metadata);
1005-
if (osparc.utils.Utils.eventDrivenPatch()) {
1006-
node.listenToChanges();
1007-
node.addListener("projectDocumentChanged", e => this.fireDataEvent("projectDocumentChanged", e.getData()), this);
1008-
}
994+
node.listenToChanges();
995+
node.addListener("projectDocumentChanged", e => this.fireDataEvent("projectDocumentChanged", e.getData()), this);
1009996
node.addListener("keyChanged", () => this.fireEvent("reloadModel"), this);
1010997
node.addListener("changeInputNodes", () => this.fireDataEvent("pipelineChanged"), this);
1011998
node.addListener("reloadModel", () => this.fireEvent("reloadModel"), this);
1012-
node.addListener("updateStudyDocument", () => this.fireEvent("updateStudyDocument"), this);
1013999
osparc.utils.Utils.localCache.serviceToFavs(metadata["key"]);
10141000

10151001
this.__initNodeSignals(node);

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
287287
this.nodeSelected(nodeId);
288288
}, this);
289289

290-
if (osparc.utils.Utils.eventDrivenPatch()) {
291-
study.listenToChanges(); // this includes the listener on the workbench and ui
292-
study.addListener("projectDocumentChanged", e => this.projectDocumentChanged(e.getData()), this);
293-
} else {
294-
workbench.addListener("updateStudyDocument", () => this.updateStudyDocument());
295-
workbench.addListener("restartAutoSaveTimer", () => this.__restartAutoSaveTimer());
296-
}
290+
study.listenToChanges(); // this includes the listener on the workbench and ui
291+
study.addListener("projectDocumentChanged", e => this.projectDocumentChanged(e.getData()), this);
297292

298293
if (osparc.utils.DisabledPlugins.isRTCEnabled()) {
299294
this.__listenToProjectDocument();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ qx.Class.define("osparc.node.BootOptionsView", {
5454
"boot_mode": newBootModeId
5555
};
5656
node.setBootOptions(data);
57-
node.fireEvent("updateStudyDocument");
5857
node.fireDataEvent("projectDocumentChanged", {
5958
"op": "replace",
6059
"path": `/workbench/${nodeId}/bootOptions`,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ qx.Class.define("osparc.node.LifeCycleView", {
119119
newData["version"] = latestCompatible["version"];
120120
}
121121
node.set(newData);
122-
node.fireEvent("updateStudyDocument");
123122
node.fireDataEvent("projectDocumentChanged", [{
124123
"op": "replace",
125124
"path": `/workbench/${nodeId}/key`,

services/static-webserver/client/source/class/osparc/utils/Utils.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,6 @@ qx.Class.define("osparc.utils.Utils", {
542542
return (["dev", "master"].includes(platformName));
543543
},
544544

545-
eventDrivenPatch: function() {
546-
return osparc.utils.DisabledPlugins.isRTCEnabled();
547-
},
548-
549545
getEditButton: function(isVisible = true) {
550546
return new qx.ui.form.Button(null, "@FontAwesome5Solid/pencil-alt/12").set({
551547
appearance: "form-button-outlined",

0 commit comments

Comments
 (0)