all models

Author: odeimaiz

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

@@ -125,13 +125,13 @@ qx.Class.define("osparc.study.NodePricingUnits", {
                     } else {
                       this._add(pricingUnitTiers);
                     }
-                    pricingUnitTiers.addListener("changeSelectedUnitId", e => {
+                    pricingUnitTiers.addListener("selectPricingUnitRequested", e => {
+                      const selectedPricingUnitId = e.getData();
                       if (this.isPatchNode()) {
                         pricingUnitTiers.setEnabled(false);
                         const pricingPlanId = this.getPricingPlanId();
-                        const selectedPricingUnitId = e.getData();
                         this.self().patchPricingUnitSelection(studyId, nodeId, pricingPlanId, selectedPricingUnitId)
-                          // .then(() => )
+                          .then(() => pricingUnitTiers.setSelectedUnitId(selectedPricingUnitId))
                           .catch(err => {
                             const msg = err.message || this.tr("Cannot change Tier");
                             osparc.FlashMessenger.getInstance().logAs(msg, "ERROR");

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

@@ -34,13 +34,20 @@ qx.Class.define("osparc.study.PricingUnitTiers", {
       check: "Number",
       init: null,
       nullable: false,
-      event: "changeSelectedUnitId"
+      event: "changeSelectedUnitId",
+      apply: "__applySelectedUnitId",
     }
   },
 
+  events: {
+    "selectPricingUnitRequested": "qx.event.type.Event",
+  },
+
   members: {
+    __pricingUnitTiers: null,
+
     __buildLayout: function(pricingUnitsData, preselectedPricingUnit, changeSelectionAllowed) {
-      const pricingUnitTiers = [];
+      const pricingUnitTiers = this.__pricingUnitTiers = [];
       pricingUnitsData.forEach(pricingUnitData => {
         const pricingUnit = new osparc.data.model.PricingUnit(pricingUnitData);
         const pricingUnitTier = new osparc.study.PricingUnitTier(pricingUnit).set({
@@ -67,14 +74,15 @@ qx.Class.define("osparc.study.PricingUnitTiers", {
       pricingUnitTiers.forEach(pricingUnitTier => {
         pricingUnitTier.addListener("selectPricingUnit", () => {
           if (changeSelectionAllowed) {
-            // select and unselect the rest
-            pricingUnitTiers.forEach(puTIer => puTIer.setSelected(puTIer === pricingUnitTier));
-            // and save selection
-            const selectedUnitId = pricingUnitTier.getUnitData().getPricingUnitId();
-            this.setSelectedUnitId(selectedUnitId);
+            this.fireDataEvent("selectPricingUnitRequested", pricingUnitTier.getUnitData().getPricingUnitId());
           }
         });
       });
-    }
+    },
+
+    __applySelectedUnitId: function(selectedUnitId) {
+      // select and unselect the rest
+      this.__pricingUnitTiers.forEach(puTIer => puTIer.setSelected(puTIer.getUnitData().getPricingUnitId() === selectedUnitId));
+    },
   }
 });

services/static-webserver/client/source/class/osparc/vipMarket/Market.js

@@ -29,18 +29,22 @@ qx.Class.define("osparc.vipMarket.Market", {
     [{
       category: "humanWhole",
       label: "Humans",
+      icon: "@FontAwesome5Solid/users/20",
       url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanWholeBody",
     }, {
       category: "humanRegion",
       label: "Humans (Region)",
+      icon: "@FontAwesome5Solid/users/20",
       url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanBodyRegion",
     }, {
       category: "animalWhole",
       label: "Animals",
+      icon: "@FontAwesome5Solid/users/20",
       url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/AnimalWholeBody",
     }, {
       category: "compPhantom",
       label: "Phantoms",
+      icon: "@FontAwesome5Solid/users/20",
       url: "https://speag.swiss/PD_DirectDownload/getDownloadableItems/ComputationalPhantom",
     }].forEach(marketInfo => {
       this.__buildViPMarketPage(marketInfo);
@@ -49,13 +53,11 @@ qx.Class.define("osparc.vipMarket.Market", {
 
   members: {
     __buildViPMarketPage: function(marketInfo) {
-      const title = marketInfo["label"];
-      const iconSrc = "@FontAwesome5Solid/users/20";
       const vipMarketView = new osparc.vipMarket.VipMarket();
       vipMarketView.set({
         metadataUrl: marketInfo["url"],
       });
-      const page = this.addTab(title, iconSrc, vipMarketView);
+      const page = this.addTab(marketInfo["label"], marketInfo["icon"], vipMarketView);
       page.category = marketInfo["category"];
       return page;
     },

services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js

@@ -105,6 +105,8 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
             alignY: "middle",
             allowGrowY: false,
             minWidth: 160,
+          });
+          control.getChildControl("textfield").set({
             backgroundColor: "transparent",
           });
           this.addListener("appear", () => control.getChildControl("textfield").focus());