support "pipeline"

Author: odeimaiz

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

@@ -481,7 +481,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       if (
         osparc.utils.Resources.isService(resourceData) ||
         !osparc.product.Utils.showStudyPreview() ||
-        !(osparc.study.Utils.getUiMode(resourceData) === "workbench")
+        ["app", "guided", "standalone"].includes(osparc.study.Utils.getUiMode(resourceData))
       ) {
         // there is no pipelining or don't show it
         return null;

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

@@ -1811,7 +1811,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       confirmationWin.getChildControl("buttons-layout").addAt(copyOptionButton, 0);
       confirmationWin.addListener("close", () => {
         if (confirmationWin.getConfirmed()) {
-          this.__updateUIMode(studyData, "workbench")
+          this.__updateUIMode(studyData, "pipeline")
             .then(() => osparc.FlashMessenger.logAs(this.tr("Project converted to pipeline"), "INFO"))
             .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while converting to pipeline")));
         }
@@ -1822,8 +1822,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           .then(task => {
             task.addListener("resultReceived", e => {
               const copiedStudy = e.getData();
-              osparc.store.Study.patchStudyData(copiedStudy, "name", copiedStudy["name"] + " (pipeline)");
-              this.__updateUIMode(copiedStudy, "workbench")
+              this.__updateUIMode(copiedStudy, "pipeline")
                 .then(() => osparc.FlashMessenger.logAs(this.tr("Project's copy converted to pipeline"), "INFO"))
                 .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while converting the copy to pipeline")));
             }, this);

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.getStudy().getUi().setMode("workbench"), this);
+    slideshowToolbar.addListener("slidesStop", () => this.getStudy().getUi().setMode("pipeline"), this);
     this._add(slideshowToolbar);
 
     const mainView = this.__mainView = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({

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

@@ -707,14 +707,19 @@ qx.Class.define("osparc.desktop.StudyEditor", {
           this.__viewsStack.setSelection([this.__slideshowView]);
           this.__slideshowView.startSlides();
           break;
-        case "standalone": {
+        case "standalone":
           this.__viewsStack.setSelection([this.__workbenchView]);
           this.__workbenchView.openFirstNode();
           break;
-        }
+        case "pipeline":
+          this.__viewsStack.setSelection([this.__workbenchView]);
+          this.__workbenchView.setMaximized(false);
+          this.__workbenchView.showPipeline();
+          break;
         case "workbench":
         default: {
           this.__viewsStack.setSelection([this.__workbenchView]);
+          // OM: Is this needed?
           if (oldUIMode === "standalone") {
             // in this transition, show workbenchUI
             this.__workbenchView.setMaximized(false);

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

@@ -81,16 +81,7 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
             icon: null,
           });
           control.addListener("execute", () => {
-            this.getStudy().getUi().setMode("workbench");
-          });
-          break;
-        case "study-menu-convert-to-standalone":
-          control = new qx.ui.menu.Button().set({
-            label: this.tr("Convert to Standalone"),
-            icon: null,
-          });
-          control.addListener("execute", () => {
-            this.getStudy().getUi().setMode("standalone");
+            this.getStudy().getUi().setMode("pipeline");
           });
           break;
         case "study-menu-restore":
@@ -115,7 +106,6 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
           optionsMenu.add(this.getChildControl("study-menu-info"));
           optionsMenu.add(this.getChildControl("study-menu-reload"));
           optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
-          optionsMenu.add(this.getChildControl("study-menu-convert-to-standalone"));
           optionsMenu.add(this.getChildControl("study-menu-restore"));
           optionsMenu.add(this.getChildControl("study-menu-open-logger"));
           control = new qx.ui.form.MenuButton().set({

services/static-webserver/client/source/class/osparc/study/StudyPreview.js

@@ -37,7 +37,7 @@ qx.Class.define("osparc.study.StudyPreview", {
     __buildPreview: function() {
       const study = this.__study;
       const uiMode = study.getUi().getMode();
-      if (uiMode === "workbench" && !study.isPipelineEmpty()) {
+      if (["workbench", "pipeline"].includes(uiMode) && !study.isPipelineEmpty()) {
         const workbenchUIPreview = new osparc.workbench.WorkbenchUIPreview();
         workbenchUIPreview.setStudy(study);
         workbenchUIPreview.loadModel(study.getWorkbench());

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

@@ -340,30 +340,37 @@ qx.Class.define("osparc.study.Utils", {
     },
 
     guessIcon: function(studyData) {
-      if (osparc.product.Utils.isProduct("tis") || osparc.product.Utils.isProduct("tiplite")) {
+      if (
+        (osparc.product.Utils.isProduct("tis") || osparc.product.Utils.isProduct("tiplite")) &&
+        ["app", "guided"].includes(studyData["ui"]["mode"])
+      ) {
         return new Promise(resolve => resolve(this.__guessTIPIcon(studyData)));
       }
       return this.__guessIcon(studyData);
     },
 
     __guessIcon: function(studyData) {
-      const defaultIcon = osparc.dashboard.CardBase.PRODUCT_ICON;
       return new Promise(resolve => {
-        // the was to guess the TI type is to check the boot mode of the ti-postpro in the pipeline
-        const wbServices = this.self().getNonFrontendNodes(studyData);
-        if (wbServices.length === 1) {
-          const wbService = wbServices[0];
-          osparc.store.Services.getService(wbService.key, wbService.version)
-            .then(serviceMetadata => {
-              if (serviceMetadata && serviceMetadata["icon"]) {
-                resolve(serviceMetadata["icon"]);
-              }
-              resolve(defaultIcon);
-            });
-        } else if (wbServices.length > 1) {
+        if (studyData["ui"]["mode"] === "pipeline") {
           resolve("osparc/icons/diagram.png");
         } else {
-          resolve(defaultIcon);
+          const defaultIcon = osparc.dashboard.CardBase.PRODUCT_ICON;
+          // the was to guess the TI type is to check the boot mode of the ti-postpro in the pipeline
+          const wbServices = this.self().getNonFrontendNodes(studyData);
+          if (wbServices.length === 1) {
+            const wbService = wbServices[0];
+            osparc.store.Services.getService(wbService.key, wbService.version)
+              .then(serviceMetadata => {
+                if (serviceMetadata && serviceMetadata["icon"]) {
+                  resolve(serviceMetadata["icon"]);
+                }
+                resolve(defaultIcon);
+              });
+          } else if (wbServices.length > 1) {
+            resolve("osparc/icons/diagram.png");
+          } else {
+            resolve(defaultIcon);
+          }
         }
       });
     },