all moved to Services

Author: odeimaiz

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

@@ -1205,7 +1205,7 @@ qx.Class.define("osparc.data.model.Node", {
       if (!["int"].includes(type)) {
         return;
       }
-      const newMetadata = osparc.service.Utils.getParameterMetadata("integer");
+      const newMetadata = osparc.store.Services.getParameterMetadata("integer");
       if (newMetadata) {
         const value = this.__getInputData()["linspace_start"];
         const label = this.getLabel();

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

@@ -426,7 +426,7 @@ qx.Class.define("osparc.data.model.Workbench", {
     },
 
     __filePickerNodeRequested: async function(nodeId, portId, file) {
-      const filePickerMetadata = osparc.service.Utils.getFilePicker();
+      const filePickerMetadata = osparc.store.Services.getFilePicker();
       const filePicker = await this.createNode(filePickerMetadata["key"], filePickerMetadata["version"]);
       if (filePicker === null) {
         return;
@@ -469,7 +469,7 @@ qx.Class.define("osparc.data.model.Workbench", {
 
       // create a new ParameterNode
       const type = osparc.utils.Ports.getPortType(requesterNode.getMetaData()["inputs"], portId);
-      const parameterMetadata = osparc.service.Utils.getParameterMetadata(type);
+      const parameterMetadata = osparc.store.Services.getParameterMetadata(type);
       if (parameterMetadata) {
         const parameterNode = await this.createNode(parameterMetadata["key"], parameterMetadata["version"]);
         if (parameterNode === null) {
@@ -499,7 +499,7 @@ qx.Class.define("osparc.data.model.Workbench", {
       // create a new ProbeNode
       const requesterPortMD = requesterNode.getMetaData()["outputs"][portId];
       const type = osparc.utils.Ports.getPortType(requesterNode.getMetaData()["outputs"], portId);
-      const probeMetadata = osparc.service.Utils.getProbeMetadata(type);
+      const probeMetadata = osparc.store.Services.getProbeMetadata(type);
       if (probeMetadata) {
         const probeNode = await this.createNode(probeMetadata["key"], probeMetadata["version"]);
         if (probeNode === null) {

services/static-webserver/client/source/class/osparc/form/renderer/PropForm.js

@@ -84,7 +84,7 @@ qx.Class.define("osparc.form.renderer.PropForm", {
 
     isFieldParametrizable: function(field) {
       const supportedTypes = [];
-      const paramsMD = osparc.service.Utils.getParametersMetadata();
+      const paramsMD = osparc.store.Services.getParametersMetadata();
       paramsMD.forEach(paramMD => {
         supportedTypes.push(osparc.node.ParameterEditor.getParameterOutputTypeFromMD(paramMD));
       });

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

@@ -189,32 +189,6 @@ qx.Class.define("osparc.service.Utils", {
       return qx.locale.Manager.tr("It will be Retired: ") + osparc.utils.Utils.formatDate(deprecationTime);
     },
 
-    getFilePicker: function() {
-      return this.self().getLatest("simcore/services/frontend/file-picker");
-    },
-
-    getParametersMetadata: function() {
-      const parametersMetadata = [];
-      const services = osparc.store.Services.servicesCached;
-      for (const key in services) {
-        if (key.includes("simcore/services/frontend/parameter/")) {
-          const latest = this.self().getLatest(key);
-          if (latest) {
-            parametersMetadata.push(latest);
-          }
-        }
-      }
-      return parametersMetadata;
-    },
-
-    getParameterMetadata: function(type) {
-      return this.self().getLatest("simcore/services/frontend/parameter/"+type);
-    },
-
-    getProbeMetadata: function(type) {
-      return this.self().getLatest("simcore/services/frontend/iterator-consumer/probe/"+type);
-    },
-
     removeFileToKeyMap: function(service) {
       [
         "inputs",

services/static-webserver/client/source/class/osparc/store/Services.js

@@ -285,6 +285,32 @@ qx.Class.define("osparc.store.Services", {
       return msg;
     },
 
+    getFilePicker: function() {
+      return this.getLatest("simcore/services/frontend/file-picker");
+    },
+
+    getParametersMetadata: function() {
+      const parametersMetadata = [];
+      const services = this.__servicesCached;
+      for (const key in services) {
+        if (key.includes("simcore/services/frontend/parameter/")) {
+          const latest = this.getLatest(key);
+          if (latest) {
+            parametersMetadata.push(latest);
+          }
+        }
+      }
+      return parametersMetadata;
+    },
+
+    getParameterMetadata: function(type) {
+      return this.getLatest("simcore/services/frontend/parameter/"+type);
+    },
+
+    getProbeMetadata: function(type) {
+      return this.getLatest("simcore/services/frontend/iterator-consumer/probe/"+type);
+    },
+
     __addToCache: function(service) {
       const key = service.key;
       const version = service.version;

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

@@ -2005,7 +2005,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
               x: e.offsetX,
               y: e.offsetY
             };
-            const service = qx.data.marshal.Json.createModel(osparc.service.Utils.getFilePicker());
+            const service = qx.data.marshal.Json.createModel(osparc.store.Services.getFilePicker());
             const nodeUI = await this.__addNode(service, pos);
             if (nodeUI) {
               const filePicker = new osparc.file.FilePicker(nodeUI.getNode(), "workbench");
@@ -2028,7 +2028,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         const data = this.__isDraggingLink["dragData"];
         this.__isDraggingLink = null;
         const pos = this.__pointerEventToWorkbenchPos(e, false);
-        const service = qx.data.marshal.Json.createModel(osparc.service.Utils.getFilePicker());
+        const service = qx.data.marshal.Json.createModel(osparc.store.Services.getFilePicker());
         const nodeUI = await this.__addNode(service, pos);
         if (nodeUI) {
           const node = nodeUI.getNode();