refactor page contexts

Author: odeimaiz

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

@@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.SlideshowView", {
       const nodeId = e.getData();
       this.__hideNode(nodeId);
     }, this);
-    slideshowToolbar.addListener("slidesStop", () => this.fireEvent("slidesStop"), this);
+    slideshowToolbar.addListener("slidesStop", () => this.getStudy().getUi().setMode("workbench"), this);
     this._add(slideshowToolbar);
 
     const mainView = this.__mainView = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({
@@ -109,7 +109,6 @@ qx.Class.define("osparc.desktop.SlideshowView", {
   },
 
   events: {
-    "slidesStop": "qx.event.type.Event",
     "startPartialPipeline": "qx.event.type.Data",
     "stopPipeline": "qx.event.type.Event",
     "backToDashboardPressed": "qx.event.type.Event",

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

@@ -37,8 +37,6 @@ qx.Class.define("osparc.desktop.StudyEditor", {
     });
 
     workbenchView.addListener("slidesEdit", () => this.__editSlides(), this);
-    workbenchView.addListener("slidesAppStart", () => this.setPageContext(this.self().PAGE_CONTEXT[2]), this); // "app"
-    slideshowView.addListener("slidesStop", () => this.setPageContext(this.self().PAGE_CONTEXT[1]), this); // "workbench"
 
     workbenchView.addListener("takeSnapshot", () => this.__takeSnapshot(), this);
     workbenchView.addListener("takeSnapshot", () => this.__takeSnapshot(), this);
@@ -72,7 +70,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
     const startStopButtons = workbenchView.getStartStopButtons();
     startStopButtons.addListener("startPipeline", () => this.__startPipeline([]), this);
     startStopButtons.addListener("startPartialPipeline", () => {
-      const partialPipeline = this.getPageContext() === "workbench" ? this.__workbenchView.getSelectedNodeIDs() : this.__slideshowView.getSelectedNodeIDs();
+      const partialPipeline = this.getStudy().getUi().getMode() === "app" ? this.__slideshowView.getSelectedNodeIDs() : this.__workbenchView.getSelectedNodeIDs();
       this.__startPipeline(partialPipeline);
     }, this);
     startStopButtons.addListener("stopPipeline", () => this.__stopPipeline(), this);
@@ -103,26 +101,11 @@ qx.Class.define("osparc.desktop.StudyEditor", {
       apply: "__applyStudy",
       event: "changeStudy"
     },
-
-    pageContext: {
-      check: ["workbench", "guided", "app", "standalone"], // "guided" is no longer used
-      init: null,
-      nullable: false,
-      event: "changePageContext",
-      apply: "__applyPageContext" // OM
-    }
   },
 
   statics: {
     AUTO_SAVE_INTERVAL: 3000,
     READ_ONLY_TEXT: qx.locale.Manager.tr("You do not have writing permissions.<br>Your changes will not be saved."),
-
-    PAGE_CONTEXT: {
-      0: "dashboard",
-      1: "workbench",
-      2: "app",
-      3: "standalone",
-    },
   },
 
   members: {
@@ -186,6 +169,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
               }
             }, this);
           }
+
+          study.getUi().addListener("changeMode", e => this.__uiModeChanged(e.getData()));
         })
         .catch(err => {
           console.error(err);
@@ -258,23 +243,9 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         osparc.FlashMessenger.getInstance().logAs(msg, "WARNING");
       }
 
-      const pageContext = study.getUi().getMode();
-      switch (pageContext) {
-        case "guided":
-        case "app":
-          this.__slideshowView.startSlides();
-          break;
-        case "workbench":
-        case "standalone":
-        default:
-          this.__workbenchView.openFirstNode();
-          break;
-      }
-      this.addListener("changePageContext", e => {
-        const pageCxt = e.getData();
-        study.getUi().setMode(pageCxt);
-      });
-      this.setPageContext(pageContext);
+
+      const uiMode = study.getUi().getMode();
+      this.__uiModeChanged(uiMode);
 
       const workbench = study.getWorkbench();
       workbench.addListener("retrieveInputs", e => {
@@ -565,8 +536,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
     },
 
     __editSlides: function() {
-      if (this.getPageContext() !== osparc.navigation.NavigationBar.PAGE_CONTEXT[1]) { // "workbench"
-        // if the user it not in "workbench" mode, return
+      if (this.getStudy().getUi().getMode() !== "workbench") {
+        // if the user is not in "workbench" mode, return
         return;
       }
 
@@ -729,23 +700,25 @@ qx.Class.define("osparc.desktop.StudyEditor", {
       return this.__workbenchView.getLogger();
     },
 
-    __applyPageContext: function(newCtxt) {
-      switch (newCtxt) {
+    __uiModeChanged: function(newUIMode) {
+      switch (newUIMode) {
         case "guided":
         case "app":
           this.__viewsStack.setSelection([this.__slideshowView]);
-          if (this.getStudy() && this.getStudy().getUi()) {
-            this.__slideshowView.startSlides();
-          }
+          this.__slideshowView.startSlides();
           break;
-        case "workbench":
         case "standalone":
-        default:
+        case "workbench":
+        default: {
           this.__viewsStack.setSelection([this.__workbenchView]);
-          if (this.getStudy() && this.getStudy().getUi()) {
-            this.__workbenchView.nodeSelected(this.getStudy().getUi().getCurrentNodeId());
+          const currentNodeId = this.getStudy().getUi().getCurrentNodeId();
+          if (currentNodeId) {
+            this.__workbenchView.nodeSelected();
+          } else {
+            this.__workbenchView.openFirstNode();
           }
           break;
+        }
       }
     },
 

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

@@ -70,7 +70,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
     "expandNavBar": "qx.event.type.Event",
     "backToDashboardPressed": "qx.event.type.Event",
     "slidesEdit": "qx.event.type.Event",
-    "slidesAppStart": "qx.event.type.Event",
     "annotationRectStart": "qx.event.type.Event",
     "takeSnapshot": "qx.event.type.Event",
     "showSnapshots": "qx.event.type.Event",
@@ -448,7 +447,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         marginTop: 7,
         ...osparc.navigation.NavigationBar.BUTTON_OPTIONS
       });
-      startAppButtonTB.addListener("execute", () => this.fireEvent("slidesAppStart"));
+      startAppButtonTB.addListener("execute", () => study.getUi().setMode("app"));
       topBar.add(startAppButtonTB);
 
       const collapseWithUserMenu = this.__collapseWithUserMenu = new osparc.desktop.CollapseWithUserMenu();
@@ -843,7 +842,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         toolTipText: this.tr("Start App Mode"),
         height: buttonsHeight
       });
-      startAppBtn.addListener("execute", () => this.fireEvent("slidesAppStart"), this);
+      startAppBtn.addListener("execute", () => this.getStudy().getUi().setMode("app"), this);
       slideshowButtons.add(startAppBtn);
 
       this.__evalSlidesButtons();

services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js

@@ -80,9 +80,7 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
             label: this.tr("Convert to Pipeline"),
             icon: null,
           });
-          control.addListener("execute", () => {
-            console.log("Convert to Pipeline");
-          });
+          control.addListener("execute", () => this.getStudy().getUi().setMode("workbench"));
           break;
         case "study-menu-download-logs":
           control = new qx.ui.menu.Button().set({