working again

Author: odeimaiz

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

@@ -939,6 +939,20 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _openResourceDetails: function(resourceData) {
+      // OM: remove this
+      const hack = true;
+      if (hack) {
+        const functionData = {
+          "uuid": resourceData["uuid"],
+          "resourceType": "function",
+        };
+        const resourceDetails = new osparc.dashboard.ResourceDetails(functionData).set({
+          showOpenButton: false,
+        });
+        osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+        return;
+      }
+
       const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
       const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
       resourceDetails.addListener("updateStudy", e => this._updateStudyData(e.getData()));

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

@@ -37,6 +37,10 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         latestPromise = osparc.data.Resources.fetch("studies", "getOne", params);
         break;
       }
+      case "function": {
+        latestPromise = osparc.store.Templates.fetchTemplate(resourceData["uuid"]);
+        break;
+      }
       case "service": {
         latestPromise = osparc.store.Services.getService(resourceData["key"], resourceData["version"]);
         break;
@@ -57,6 +61,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
           case "template":
           case "tutorial":
           case "hypertool":
+          case "function":
             // when getting the latest study data, the debt information was lost
             if (osparc.study.Utils.isInDebt(this.__resourceData)) {
               const mainStore = osparc.store.Store.getInstance();
@@ -372,6 +377,16 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       // removeAll
       osparc.utils.Utils.removeAllChildren(tabsView);
 
+      if (this.__resourceData["resourceType"] === "function") {
+        // for now, we only want the preview page
+        const page = this.__getPreviewPage();
+        if (page) {
+          tabsView.add(page);
+        }
+        this.fireEvent("pagesAdded");
+        return;
+      }
+
       // add Open service button
       [
         this.__getInfoPage,

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

@@ -31,67 +31,33 @@ qx.Class.define("osparc.study.StudyPreview", {
     this.__buildPreview();
   },
 
-  statics: {
-    __popUpPreview: function(studyData) {
-      const cantReadServices = osparc.study.Utils.getCantReadServices(studyData["services"]);
-      if (cantReadServices && cantReadServices.length) {
-        osparc.FlashMessenger.logError("Function Data not available");
-        return;
-      }
-
-      const study = new osparc.data.model.Study(studyData);
-      // make sure it will be shown
-      study.getUi().setMode("pipeline");
-
-      const studyReady = () => {
-        const preview = new osparc.study.StudyPreview(study);
-        const title = qx.locale.Manager.tr("Function Preview");
-        const width = osparc.dashboard.ResourceDetails.WIDTH;
-        const height = osparc.dashboard.ResourceDetails.HEIGHT;
-        osparc.ui.window.Window.popUpInWindow(preview, title, width, height).set({
-          clickAwayClose: false,
-          resizable: true,
-          showClose: true,
-        });
-      }
-
-      if (study.getWorkbench().isDeserialized()) {
-        studyReady();
-      } else {
-        study.getWorkbench().addListener("changeDeserialized", e => {
-          if (e.getData()) {
-            studyReady();
-          }
-        }, this);
-      }
-    },
-
-    popUpPreview: function(studyData) {
-      if ("services" in studyData) {
-        this.__popUpPreview(studyData);
-      } else {
-        osparc.store.Services.getStudyServices(studyData["uuid"])
-          .then(resp => {
-            const services = resp["services"];
-            studyData["services"] = services;
-            this.__popUpPreview(studyData);
-          });
-      }
-    }
-  },
-
   members: {
     __study: null,
 
     __buildPreview: function() {
       const study = this.__study;
+
+      const studyReady = () => {
+        if (!study.isPipelineEmpty()) {
+          const workbenchUIPreview = new osparc.workbench.WorkbenchUIPreview();
+          workbenchUIPreview.setStudy(study);
+          workbenchUIPreview.loadModel(study.getWorkbench());
+          workbenchUIPreview.setMaxHeight(550);
+          this._add(workbenchUIPreview);
+        }
+      };
+
       const uiMode = study.getUi().getMode();
-      if (["workbench", "pipeline"].includes(uiMode) && !study.isPipelineEmpty()) {
-        const workbenchUIPreview = new osparc.workbench.WorkbenchUIPreview();
-        workbenchUIPreview.setStudy(study);
-        workbenchUIPreview.loadModel(study.getWorkbench());
-        workbenchUIPreview.setMaxHeight(550);
-        this._add(workbenchUIPreview);
+      if (["workbench", "pipeline"].includes(uiMode)) {
+        if (study.getWorkbench().isDeserialized()) {
+          studyReady();
+        } else {
+          study.getWorkbench().addListener("changeDeserialized", e => {
+            if (e.getData()) {
+              studyReady();
+            }
+          }, this);
+        }
       }
     }
   }

services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js

@@ -334,11 +334,14 @@ qx.Class.define("osparc.widget.PersistentIframe", {
             // this is the MetaModeling service trying to show function/template information
             if (data["message"] && data["message"]["functionId"]) {
               const templateId = data["message"]["functionId"];
-              osparc.store.Templates.fetchTemplate(templateId)
-                .then(templateData => {
-                  osparc.study.StudyPreview.popUpPreview(templateData);
-                })
-                .catch(() => osparc.FlashMessenger.logError(this.tr("Function not found")));
+              const functionData = {
+                "uuid": templateId,
+                "resourceType": "function",
+              };
+              const resourceDetails = new osparc.dashboard.ResourceDetails(functionData).set({
+                showOpenButton: false,
+              });
+              osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
             }
             break;
           }