VipMarket

Author: odeimaiz

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

@@ -121,7 +121,8 @@ qx.Class.define("osparc.vipMarket.Market", {
       licensedItemsStore.getLicensedItems()
         .then(async licensedItems => {
           this.__freeItems = [];
-          for (const licensedItem of licensedItems) {
+          const licensedItemsArr = Object.values(licensedItems);
+          for (const licensedItem of licensedItemsArr) {
             const pricingUnits = await osparc.store.Pricing.getInstance().fetchPricingUnits(licensedItem.getPricingPlanId());
             if (pricingUnits.length === 1 && pricingUnits[0].getCost() === 0) {
               this.__freeItems.push(licensedItem);

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

@@ -174,7 +174,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
         const selection = e.getData();
         if (selection.length) {
           const licensedItemId = selection[0].getLicensedItemId();
-          const licensedItemBundle = this.__anatomicalBundles.find(anatomicalBundle => anatomicalBundle["licensedItemId"] === licensedItemId);
+          const licensedItemBundle = this.__anatomicalBundles.find(anatomicalBundle => anatomicalBundle.getLicensedItemId() === licensedItemId);
           if (licensedItemBundle) {
             anatomicModelDetails.setAnatomicalModelsData(licensedItemBundle);
             return;
@@ -191,21 +191,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
         return;
       }
 
-      this.__anatomicalBundles = [];
-      licensedBundles.forEach(licensedBundle => {
-        licensedBundle["thumbnail"] = "";
-        licensedBundle["date"] = null;
-        if (licensedBundle["licensedResources"] && licensedBundle["licensedResources"].length) {
-          const firstItem = licensedBundle["licensedResources"][0]["source"];
-          if (firstItem["thumbnail"]) {
-            licensedBundle["thumbnail"] = firstItem["thumbnail"];
-          }
-          if (firstItem["features"] && firstItem["features"]["date"]) {
-            licensedBundle["date"] = new Date(firstItem["features"]["date"]);
-          }
-        }
-        this.__anatomicalBundles.push(licensedBundle);
-      });
+      this.__anatomicalBundles = licensedBundles;
 
       this.__populateModels();
 
@@ -238,8 +224,8 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
       const sortModel = sortBy => {
         models.sort((a, b) => {
           // first criteria
-          const nASeats = osparc.store.LicensedItems.seatsToNSeats(a["seats"]);
-          const nBSeats = osparc.store.LicensedItems.seatsToNSeats(b["seats"]);
+          const nASeats = osparc.store.LicensedItems.seatsToNSeats(a.getSeats());
+          const nBSeats = osparc.store.LicensedItems.seatsToNSeats(b.getSeats());
           if (nBSeats !== nASeats) {
             // nSeats first
             return nBSeats - nASeats;
@@ -249,20 +235,20 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
             if (sortBy["sort"] === "name") {
               if (sortBy["order"] === "down") {
                 // A -> Z
-                return a["displayName"].localeCompare(b["displayName"]);
+                return a.getDisplayName().localeCompare(b.getDisplayName());
               }
-              return b["displayName"].localeCompare(a["displayName"]);
+              return b.getDisplayName().localeCompare(a.getDisplayName());
             } else if (sortBy["sort"] === "date") {
               if (sortBy["order"] === "down") {
                 // Now -> Yesterday
-                return b["date"] - a["date"];
+                return b.getDate() - a.getDate();
               }
-              return a["date"] - b["date"];
+              return a.getDate() - b.getDate();
             }
           }
           // default criteria
           // A -> Z
-          return a["displayName"].localeCompare(b["displayName"]);
+          return a.getDisplayName().localeCompare(b.getDisplayName());
         });
       };
       sortModel();
@@ -309,9 +295,9 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
           msg += " rented until " + osparc.utils.Utils.formatDate(new Date(purchaseData["expireAt"]));
           osparc.FlashMessenger.getInstance().logAs(msg, "INFO");
 
-          const found = this.__anatomicalBundles.find(model => model["licensedItemId"] === licensedItemId);
+          const found = this.__anatomicalBundles.find(model => model.getLicensedItemId() === licensedItemId);
           if (found) {
-            found["seats"].push({
+            found.getSeats().push({
               licensedItemId: purchaseData["licensedItemId"],
               licensedItemPurchaseId: purchaseData["licensedItemPurchaseId"],
               numOfSeats: purchaseData["numOfSeats"],