template as property

Author: odeimaiz

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

@@ -75,14 +75,17 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
               });
             break;
           case "function": {
-            // use function's underlying template info to fetch services metadata
-            // osparc.store.Templates.fetchTemplate(resourceData["uuid"]);
-            osparc.store.Services.getStudyServicesMetadata(latestResourceData)
-              .finally(() => {
-                this.__resourceModel = new osparc.data.model.Function(latestResourceData);
-                this.__resourceModel["resourceType"] = resourceData["resourceType"];
-                this.__resourceData["services"] = resourceData["services"];
-                this.__addPages();
+            osparc.store.Templates.fetchTemplate(resourceData["templateId"])
+              .then(templateData => {
+                osparc.store.Services.getStudyServicesMetadata(templateData)
+                  .finally(() => {
+                    this.__resourceModel = new osparc.data.model.Function(latestResourceData);
+                    this.__resourceModel["resourceType"] = resourceData["resourceType"];
+                    const template = new osparc.data.model.Study(templateData);
+                    this.__resourceModel.setTemplate(template);
+                    this.__resourceData["services"] = resourceData["services"];
+                    this.__addPages();
+                  });
               });
             break;
           }

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

@@ -40,8 +40,6 @@ qx.Class.define("osparc.data.model.Function", {
       creationDate: functionData.creationDate ? new Date(functionData.creationDate) : this.getCreationDate(),
       lastChangeDate: functionData.lastChangeDate ? new Date(functionData.lastChangeDate) : this.getLastChangeDate(),
       thumbnail: functionData.thumbnail || this.getThumbnail(),
-      workbenchData: functionData.workbench || this.getWorkbenchData(),
-      functionUIData: functionData.ui || this.getFunctionUIData(),
     });
   },
 
@@ -123,16 +121,10 @@ qx.Class.define("osparc.data.model.Function", {
       init: null
     },
 
-    workbenchData: {
-      check: "Object",
-      nullable: false,
-      init: {},
-    },
-
-    functionUIData: {
-      check: "Object",
-      nullable: false,
-      init: {},
+    template: {
+      check: "osparc.data.model.Study",
+      nullable: true,
+      init: null,
     },
   },