last changes

Author: odeimaiz

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

@@ -930,7 +930,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           request = osparc.store.Templates.searchTemplatesPaginated(params, options);
           break;
         case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
-          // OM: implement this
           request = osparc.store.Functions.fetchFunctionsPaginated(params, options);
       }
       return request;
@@ -1179,6 +1178,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
               searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES;
               break;
             case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
+              // functions are not searchable yet
               searchContext = null;
               break;
             default:
@@ -1286,6 +1286,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           this._searchBarFilter.resetFilters();
           this._searchBarFilter.getChildControl("text-field").setPlaceholder("Search in Functions");
           this._searchBarFilter.setEnabled(false);
+          // functions can't be sorted yet
           this._toolbar.exclude();
           this._loadingResourcesBtn.setFetching(false);
           this.invalidateFunctions();
@@ -1651,7 +1652,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     _updateFunctionData: function(functionData) {
       functionData["resourceType"] = "function";
 
-      const index = this._resourcesList.findIndex(study => study["uuid"] === studyData["uuid"]);
+      const index = this._resourcesList.findIndex(func => func["uuid"] === functionData["uuid"]);
       if (index === -1) {
         // add it in first position, most likely it's a new study
         this._resourcesList.unshift(functionData);

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

@@ -312,7 +312,7 @@ qx.Class.define("osparc.data.Permissions", {
 
       // This needs to be provided by the backend
       if (action === "readFunctions") {
-        return true;
+        return osparc.utils.Utils.isDevelopmentPlatform();
       }
 
       if (

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

@@ -577,9 +577,6 @@ qx.Class.define("osparc.data.model.Node", {
      */
     __addSettings: function(inputs) {
       const form = this.__settingsForm = new osparc.form.Auto(inputs);
-      if (!this.getStudy()) {
-        return;
-      }
       const propsForm = new osparc.form.renderer.PropForm(form, this, this.getStudy());
       this.setPropsForm(propsForm);
       propsForm.addListener("linkFieldModified", e => {

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

@@ -68,13 +68,6 @@ qx.Class.define("osparc.data.model.Workbench", {
       event: "changeStudy"
     },
 
-    function: {
-      check: "osparc.data.model.Function",
-      init: null,
-      nullable: true,
-      event: "changeFunction"
-    },
-
     deserialized: {
       check: "Boolean",
       init: false,

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

@@ -26,12 +26,8 @@ qx.Class.define("osparc.study.StudyPreview", {
 
     this._setLayout(new qx.ui.layout.VBox(5));
 
-    if (study instanceof osparc.data.model.Study) {
-      const uiMode = study.getUi().getMode();
-      if (["workbench", "pipeline"].includes(uiMode)) {
-        this.__buildPreview(study);
-      }
-    } else if (study instanceof osparc.data.model.Function) {
+    const uiMode = study.getUi().getMode();
+    if (["workbench", "pipeline"].includes(uiMode)) {
       this.__buildPreview(study);
     }
   },
@@ -40,11 +36,7 @@ qx.Class.define("osparc.study.StudyPreview", {
     __buildPreview: function(study) {
       const workbenchReady = () => {
         const workbenchUIPreview = new osparc.workbench.WorkbenchUIPreview();
-        if (study instanceof osparc.data.model.Study) {
-          workbenchUIPreview.setStudy(study);
-        } else if (study instanceof osparc.data.model.Function) {
-          workbenchUIPreview.setFunction(study);
-        }
+        workbenchUIPreview.setStudy(study);
         workbenchUIPreview.loadModel(study.getWorkbench());
         workbenchUIPreview.setMaxHeight(550);
         this._add(workbenchUIPreview);

services/static-webserver/client/source/class/osparc/workbench/NodeUI.js

@@ -298,11 +298,9 @@ qx.Class.define("osparc.workbench.NodeUI", {
       node.addListener("changeMarker", () => updateMarker());
       updateMarker();
 
-      if (node.getStudy()) {
-        node.getStudy().bind("pipelineRunning", this._deleteBtn, "enabled", {
-          converter: running => !running
-        });
-      }
+      node.getStudy().bind("pipelineRunning", this._deleteBtn, "enabled", {
+        converter: running => !running
+      });
 
       const evaluateLifeCycleIcon = () => {
         const deprecatedIcon = this.getChildControl("deprecated-icon");