simpler signals

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -375,11 +375,10 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       newWorkspaceCard.subscribeToFilterGroup("searchBarFilter");
       [
         "workspaceCreated",
+        "workspaceDeleted",
         "workspaceUpdated",
       ].forEach(e => {
-        newWorkspaceCard.addListener(e, () => {
-          this.__reloadWorkspaces();
-        });
+        newWorkspaceCard.addListener(e, () => this.__reloadWorkspaces());
       });
       this._resourcesContainer.addNewWorkspaceCard(newWorkspaceCard);
     },

services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonNew.js

@@ -46,25 +46,27 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonNew", {
   },
 
   events: {
-    "workspaceCreated": "qx.event.type.Data",
-    "workspaceUpdated": "qx.event.type.Data"
+    "workspaceCreated": "qx.event.type.Event",
+    "workspaceDeleted": "qx.event.type.Event",
+    "workspaceUpdated": "qx.event.type.Event",
   },
 
   members: {
     __itemSelected: function(newVal) {
       if (newVal) {
         const workspaceEditor = new osparc.editor.WorkspaceEditor();
         const title = this.tr("New Workspace");
-        const win = osparc.ui.window.Window.popUpInWindow(workspaceEditor, title, 500, 500);
-        workspaceEditor.addListener("workspaceCreated", e => {
-          const newWorkspace = e.getData();
-          this.fireDataEvent("workspaceCreated", newWorkspace.getWorkspaceId(), this);
+        const win = osparc.ui.window.Window.popUpInWindow(workspaceEditor, title, 500, 500).set({
+          modal: true,
+          clickAwayClose: false,
         });
+        workspaceEditor.addListener("workspaceCreated", () => this.fireEvent("workspaceCreated"));
+        workspaceEditor.addListener("workspaceDeleted", () => this.fireEvent("workspaceDeleted"));
         workspaceEditor.addListener("workspaceUpdated", () => {
           win.close();
-          this.fireDataEvent("workspaceUpdated", workspaceEditor.getWorkspace());
+          this.fireEvent("workspaceUpdated");
         }, this);
-        workspaceEditor.addListener("updateAccessRights", () => this.fireDataEvent("workspaceUpdated", workspaceEditor.getWorkspace()), this);
+        workspaceEditor.addListener("updateAccessRights", () => this.fireEvent("workspaceUpdated"));
         win.getChildControl("close-button").addListener("tap", () => workspaceEditor.cancel());
         workspaceEditor.addListener("cancel", () => win.close());
       }

services/static-webserver/client/source/class/osparc/editor/WorkspaceEditor.js

@@ -45,7 +45,7 @@ qx.Class.define("osparc.editor.WorkspaceEditor", {
       this.__createWorkspace()
         .then(newWorkspace => {
           this.setWorkspace(newWorkspace);
-          this.fireDataEvent("workspaceCreated", newWorkspace);
+          this.fireDataEvent("workspaceCreated");
           this.getChildControl("sharing");
         });
     }
@@ -84,7 +84,8 @@ qx.Class.define("osparc.editor.WorkspaceEditor", {
   },
 
   events: {
-    "workspaceCreated": "qx.event.type.Data",
+    "workspaceCreated": "qx.event.type.Event",
+    "workspaceDeleted": "qx.event.type.Event",
     "workspaceUpdated": "qx.event.type.Event",
     "updateAccessRights": "qx.event.type.Event",
     "cancel": "qx.event.type.Event"
@@ -223,7 +224,12 @@ qx.Class.define("osparc.editor.WorkspaceEditor", {
 
     cancel: function() {
       if (this.__creatingWorkspace) {
-        osparc.store.Workspaces.getInstance().deleteWorkspace(this.getWorkspace().getWorkspaceId());
+        osparc.store.Workspaces.getInstance().deleteWorkspace(this.getWorkspace().getWorkspaceId())
+          .then(() => this.fireEvent("workspaceDeleted"))
+          .catch(err => {
+            console.error(err);
+            osparc.FlashMessenger.logAs(err.message, "ERROR");
+          });
       }
       this.fireEvent("cancel");
     },