currentNodeId more progress

Author: odeimaiz

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

@@ -108,6 +108,13 @@ qx.Class.define("osparc.data.model.IframeHandler", {
       const loadingPage = new osparc.ui.message.Loading().set({
         header: this.__getLoadingPageHeader()
       });
+      if (osparc.product.Utils.isProduct("s4llite")) {
+        loadingPage.setShowToolbar(false);
+      } else {
+        this.getStudy().getUi().bind("mode", loadingPage, "showToolbar", {
+          converter: mode => mode !== "standalone"
+        });
+      }
 
       const node = this.getNode();
       const thumbnail = node.getMetaData()["thumbnail"];

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

@@ -716,7 +716,12 @@ qx.Class.define("osparc.desktop.StudyEditor", {
           this.__viewsStack.setSelection([this.__workbenchView]);
           const currentNodeId = this.getStudy().getUi().getCurrentNodeId();
           if (currentNodeId) {
-            this.__workbenchView.nodeSelected(currentNodeId);
+            const node = this.getStudy().getWorkbench().getNode(currentNodeId);
+            if (node && node.isDynamic()) {
+              this.__workbenchView.fullscreenNode(currentNodeId);
+            } else {
+              this.__workbenchView.nodeSelected(currentNodeId);
+            }
           } else {
             this.__workbenchView.openFirstNode();
           }

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

@@ -503,6 +503,8 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         this.__evalIframe();
         this.__openWorkbenchTab();
         this.__loggerView.setCurrentNodeId(null);
+
+        this.getStudy().getUi().setCurrentNodeId(this.getStudy().getUuid());
       });
       nodesTree.addListener("changeSelectedNode", e => {
         studyTreeItem.resetSelection();
@@ -516,6 +518,8 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         this.__loggerView.setCurrentNodeId(nodeId);
         this.__workbenchUI.nodeSelected(nodeId);
         this.fireDataEvent("changeSelectedNode", nodeId);
+
+        this.getStudy().getUi().setCurrentNodeId(nodeId);
       });
 
       if (this.__workbenchUIConnected === null) {
@@ -531,9 +535,13 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
             this.__evalIframe(node);
             this.__loggerView.setCurrentNodeId(nodeId);
             this.fireDataEvent("changeSelectedNode", nodeId);
+
+            this.getStudy().getUi().setCurrentNodeId(nodeId);
           } else {
             // empty selection
             this.__studyTreeItem.selectStudyItem();
+
+            this.getStudy().getUi().setCurrentNodeId(this.getStudy().getUuid());
           }
         });
         workbenchUI.addListener("nodeSelected", e => {
@@ -547,6 +555,8 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
             this.__populateSecondaryColumn(node);
             this.__openIframeTab(node);
             this.__loggerView.setCurrentNodeId(nodeId);
+
+            this.getStudy().getUi().setCurrentNodeId(nodeId);
           }
         }, this);
       }
@@ -564,6 +574,8 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
           }
           this.__loggerView.setCurrentNodeId(nodeId);
           this.__workbenchUI.nodeSelected(nodeId);
+
+          this.getStudy().getUi().setCurrentNodeId(nodeId);
         }
       }, this);
       nodesTree.addListener("removeNode", e => {
@@ -1184,19 +1196,25 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       this.__nodesTree.nodeSelected(this.__currentNodeId);
     },
 
+    fullscreenNode: function(nodeId) {
+      const node = this.getStudy().getWorkbench().getNode(nodeId);
+      if (node.isDynamic()) {
+        qx.event.Timer.once(() => {
+          this.__openIframeTab(node);
+          node.getIFrame().maximizeIFrame(true);
+        }, this, 10);
+      }
+    },
+
     openFirstNode: function() {
       const validNodes = this.getStudy().getNonFrontendNodes();
       if (validNodes.length === 1 && validNodes[0].isDynamic()) {
         const dynamicNode = validNodes[0];
-        this.nodeSelected(dynamicNode.getNodeId());
-        qx.event.Timer.once(() => {
-          this.__openIframeTab(dynamicNode);
-          dynamicNode.getIFrame().maximizeIFrame(true);
-        }, this, 10);
-        return;
+        this.fullscreenNode(dynamicNode.getNodeId());
+      } else {
+        this.setMaximized(false);
+        this.nodeSelected(this.getStudy().getUuid());
       }
-      this.setMaximized(false);
-      this.nodeSelected(this.getStudy().getUuid());
     }
   }
 });

services/static-webserver/client/source/class/osparc/ui/message/Loading.js

@@ -67,6 +67,15 @@ qx.Class.define("osparc.ui.message.Loading", {
       nullable: true,
       apply: "__applyMessages"
     },
+
+    /**
+     * Show Restart-Maximize Toolbar
+     */
+    showToolbar: {
+      check: "Boolean",
+      init: false,
+      event: "changeShowToolbar",
+    }
   },
 
   events: {
@@ -206,11 +215,14 @@ qx.Class.define("osparc.ui.message.Loading", {
       osparc.utils.Utils.setIdToWidget(maxButton, osparc.widget.PersistentIframe.getMaximizeWidgetId(maximize));
       maxButton.addListener("execute", () => this.maximizeIFrame(!this.hasState("maximized")), this);
 
-      const maximizeLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({
+      const toolbarLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({
         alignX: "right",
       }));
-      maximizeLayout.add(maxButton);
-      return maximizeLayout;
+      this.bind("showToolbar", toolbarLayout, "visibility", {
+        converter: showToolbar => showToolbar ? "visible" : "hidden"
+      });
+      toolbarLayout.add(maxButton);
+      return toolbarLayout;
     },
 
     __applyLogo: function(newLogo) {