refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/node/TierSelectionView.js

@@ -59,16 +59,10 @@ qx.Class.define("osparc.node.TierSelectionView", {
             });
             const studyId = node.getStudy().getUuid();
             const nodeId = node.getNodeId();
-            const unitParams = {
-              url: {
-                studyId,
-                nodeId
-              }
-            };
-            osparc.data.Resources.fetch("studies", "getPricingUnit", unitParams)
-              .then(preselectedPricingUnit => {
-                if (preselectedPricingUnit && preselectedPricingUnit["pricingUnitId"]) {
-                  const tierFound = tierBox.getSelectables().find(t => t.getModel() === preselectedPricingUnit["pricingUnitId"]);
+            osparc.store.Study.getSelectedPricingUnit(studyId, nodeId)
+              .then(selectedPricingUnit => {
+                if (selectedPricingUnit && selectedPricingUnit["pricingUnitId"]) {
+                  const tierFound = tierBox.getSelectables().find(t => t.getModel() === selectedPricingUnit["pricingUnitId"]);
                   if (tierFound) {
                     tierBox.setSelection([tierFound]);
                   } else {

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

@@ -198,5 +198,26 @@ qx.Class.define("osparc.store.Study", {
           this.__nodeResources[studyId][nodeId] = updatedResources;
         });
     },
+
+    getSelectedPricingUnit: function(studyId, nodeId) {
+      const params = {
+        url: {
+          studyId,
+          nodeId
+        }
+      };
+      return osparc.data.Resources.fetch("studies", "getPricingUnits", params)
+        .then(pricingUnits => {
+          if (pricingUnits && pricingUnits["pricingUnits"]) {
+            return pricingUnits["pricingUnits"];
+          } else {
+            throw new Error("No pricing units found");
+          }
+        })
+        .catch(err => {
+          console.error("Failed to fetch pricing units:", err);
+          throw err;
+        });
+    }
   }
 });

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

@@ -103,20 +103,14 @@ qx.Class.define("osparc.study.NodePricingUnits", {
         osparc.store.Services.getPricingPlan(nodeKey, nodeVersion)
           .then(pricingPlanData => {
             if (pricingPlanData) {
-              const unitParams = {
-                url: {
-                  studyId,
-                  nodeId
-                }
-              };
               this.set({
                 pricingPlanId: pricingPlanData["pricingPlanId"]
               });
-              osparc.data.Resources.fetch("studies", "getPricingUnit", unitParams)
-                .then(preselectedPricingUnit => {
+              osparc.store.Study.getSelectedPricingUnit(studyId, nodeId)
+                .then(selectedPricingUnit => {
                   if (pricingPlanData && "pricingUnits" in pricingPlanData && pricingPlanData["pricingUnits"].length) {
                     const pricingUnitsData = pricingPlanData["pricingUnits"];
-                    const pricingUnitTiers = this.__pricingUnits = new osparc.study.PricingUnitTiers(pricingUnitsData, preselectedPricingUnit);
+                    const pricingUnitTiers = this.__pricingUnits = new osparc.study.PricingUnitTiers(pricingUnitsData, selectedPricingUnit);
                     if (inGroupBox) {
                       const pricingUnitsLayout = osparc.study.StudyOptions.createGroupBox(nodeLabel);
                       pricingUnitsLayout.add(pricingUnitTiers);