showing also nodesInStudy

Author: odeimaiz

services/web/client/source/class/osparc/component/node/BaseNodeView.js

@@ -180,7 +180,7 @@ qx.Class.define("osparc.component.node.BaseNodeView", {
     },
 
     __openServiceDetails: function() {
-      const serviceDetails = new osparc.servicecard.Large(this.getNode().getMetaData(), this.getNode().getNodeId());
+      const serviceDetails = new osparc.servicecard.Large(this.getNode().getMetaData(), this.getNode().getNodeId(), this.getStudy());
       const title = this.tr("Service information");
       const width = 600;
       const height = 700;

services/web/client/source/class/osparc/component/widget/NodesTree.js

@@ -244,7 +244,7 @@ qx.Class.define("osparc.component.widget.NodesTree", {
           osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height);
         } else {
           const node = study.getWorkbench().getNode(nodeId);
-          const serviceDetails = new osparc.servicecard.Large(node.getMetaData(), nodeId);
+          const serviceDetails = new osparc.servicecard.Large(node.getMetaData(), nodeId, study);
           const title = this.tr("Service information");
           const width = 600;
           const height = 700;

services/web/client/source/class/osparc/component/workbench/WorkbenchUI.js

@@ -1645,7 +1645,7 @@ qx.Class.define("osparc.component.workbench.WorkbenchUI", {
     __openNodeInfo: function(nodeId) {
       if (nodeId) {
         const node = this.getStudy().getWorkbench().getNode(nodeId);
-        const serviceDetails = new osparc.servicecard.Large(node.getMetaData(), nodeId);
+        const serviceDetails = new osparc.servicecard.Large(node.getMetaData(), nodeId, this.getStudy());
         const title = this.tr("Service information");
         const width = 600;
         const height = 700;

services/web/client/source/class/osparc/dashboard/ResourceMoreOptions.js

@@ -200,7 +200,7 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
       const title = this.tr("Information");
       const icon = "@FontAwesome5Solid/info";
       const resourceData = this.__resourceData;
-      const infoCard = osparc.utils.Resources.isService(resourceData) ? new osparc.servicecard.Large(resourceData, null, false) : new osparc.studycard.Large(resourceData, false);
+      const infoCard = osparc.utils.Resources.isService(resourceData) ? new osparc.servicecard.Large(resourceData, null, null, false) : new osparc.studycard.Large(resourceData, false);
       infoCard.addListener("openAccessRights", () => this.openAccessRights());
       infoCard.addListener("openClassifiers", () => this.openClassfiers());
       infoCard.addListener("openQuality", () => this.openQuality());

services/web/client/source/class/osparc/data/Resources.js

@@ -142,11 +142,6 @@ qx.Class.define("osparc.data.Resources", {
             method: "DELETE",
             url: statics.API + "/projects/{studyId}/nodes/{nodeId}"
           },
-          getNodeResources: {
-            useCache: false,
-            method: "GET",
-            url: statics.API + "/projects/{studyId}/nodes/{nodeId}/resources"
-          },
           addTag: {
             useCache: false,
             method: "PUT",
@@ -159,6 +154,20 @@ qx.Class.define("osparc.data.Resources", {
           }
         }
       },
+      /*
+       * NODES
+       */
+      "nodesInStudy": {
+        idField: "nodeId",
+        useCache: false,
+        endpoints: {
+          getResources: {
+            useCache: false,
+            method: "GET",
+            url: statics.API + "/projects/{studyId}/nodes/{nodeId}/resources"
+          }
+        }
+      },
       /*
        * SNAPSHOTS
        */

services/web/client/source/class/osparc/servicecard/Large.js

@@ -24,7 +24,7 @@ qx.Class.define("osparc.servicecard.Large", {
     * @param instanceUuid {String} uuid of the service instance
     * @param openOptions {Boolean} open edit options in new window or fire event
     */
-  construct: function(serviceData, instanceUuid = null, openOptions = true) {
+  construct: function(serviceData, instanceUuid = null, study = null, openOptions = true) {
     this.base(arguments);
 
     this.set({
@@ -39,6 +39,10 @@ qx.Class.define("osparc.servicecard.Large", {
       this.setInstanceUuid(instanceUuid);
     }
 
+    if (study) {
+      this.setStudy(study);
+    }
+
     if (openOptions !== undefined) {
       this.setOpenOptions(openOptions);
     }
@@ -72,6 +76,12 @@ qx.Class.define("osparc.servicecard.Large", {
       nullable: true
     },
 
+    study: {
+      check: "osparc.data.model.Study",
+      init: null,
+      nullable: true
+    },
+
     openOptions: {
       check: "Boolean",
       init: true,
@@ -296,7 +306,7 @@ qx.Class.define("osparc.servicecard.Large", {
             nodeId: this.getInstanceUuid()
           }
         };
-        promise = osparc.data.Resources.fetch("studies", "getNodeResources", params);
+        promise = osparc.data.Resources.fetch("nodesInStudy", "getResources", params);
       } else {
         const params = {
           url: osparc.data.Resources.getServiceUrl(

services/web/client/source/class/osparc/store/Store.js

@@ -62,6 +62,10 @@ qx.Class.define("osparc.store.Store", {
       check: "Array",
       init: []
     },
+    nodesInStudy: {
+      check: "Array",
+      init: []
+    },
     snapshots: {
       check: "Array",
       init: [],