update market

Author: odeimaiz

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

@@ -46,7 +46,7 @@ qx.Class.define("osparc.data.model.LicensedItem", {
       licensedItemId: licensedItemData.licensedItemId,
       categoryId: licensedItemData.categoryId,
       categoryDisplay: licensedItemData.categoryDisplay,
-      categoryIcon: licensedItemData.categoryIcon,
+      categoryIcon: licensedItemData.categoryIcon || `osparc/market/${licensedItemData.categoryId}.svg`,
       pricingPlanId: licensedItemData.pricingPlanId,
       key: licensedItemData.key,
       version: licensedItemData.version,
@@ -137,13 +137,37 @@ qx.Class.define("osparc.data.model.LicensedItem", {
     },
 
     seats: {
-      check: "Object",
+      check: "Array",
       nullable: true,
       init: null,
       event: "changeSeats",
     },
   },
 
+  statics: {
+    addSeatsFromPurchases: function(licensedItems, purchases) {
+      // reset seats
+      Object.values(licensedItems).forEach(licensedItem => licensedItem.setSeats([]));
+      // populate seats
+      purchases.forEach(purchase => {
+        const {
+          key,
+          version,
+        } = purchase;
+        Object.values(licensedItems).forEach(licensedItem => {
+          if (licensedItem.getKey() === key && licensedItem.getVersion() <= version) {
+            licensedItem.getSeats().push({
+              licensedItemId: purchase["licensedItemId"],
+              licensedItemPurchaseId: purchase["licensedItemPurchaseId"],
+              numOfSeats: purchase["numOfSeats"],
+              expireAt: new Date(purchase["expireAt"]),
+            });
+          }
+        });
+      })
+    },
+  },
+
   members: {
   }
 });

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

@@ -27,28 +27,6 @@ qx.Class.define("osparc.store.LicensedItems", {
   },
 
   statics: {
-    populateSeatsFromPurchases: function(licensedItems, purchases) {
-      // reset seats
-      licensedItems.forEach(licensedItem => licensedItem["seats"] = []);
-      // populate seats
-      purchases.forEach(purchase => {
-        const {
-          key,
-          version,
-        } = purchase;
-        licensedItems.forEach(licensedItem => {
-          if (licensedItem["key"] === key && licensedItem["version"] <= version) {
-            licensedItem["seats"].push({
-              licensedItemId: purchase["licensedItemId"],
-              licensedItemPurchaseId: purchase["licensedItemPurchaseId"],
-              numOfSeats: purchase["numOfSeats"],
-              expireAt: new Date(purchase["expireAt"]),
-            });
-          }
-        });
-      })
-    },
-
     getLowerLicensedItems: function(licensedItems, key, version) {
       const lowerLicensedItems = [];
       licensedItems.forEach(licensedItem => {
@@ -98,15 +76,14 @@ qx.Class.define("osparc.store.LicensedItems", {
     __cachedLicensedItems: null,
 
     getLicensedItems: function() {
-      if (this.__licensedItems) {
-        return new Promise(resolve => resolve(this.__licensedItems));
+      if (this.__cachedLicensedItems.length) {
+        return new Promise(resolve => resolve(this.__cachedLicensedItems));
       }
 
       return osparc.data.Resources.getInstance().getAllPages("licensedItems")
-        .then(licensedItems => {
-          licensedItems.forEach(licensedItemData => this.__addLicensedItemsToCache(licensedItemData));
-          this.__licensedItems = licensedItems;
-          return this.__licensedItems;
+        .then(licensedItemsData => {
+          licensedItemsData.forEach(licensedItemData => this.__addLicensedItemsToCache(licensedItemData));
+          return this.__cachedLicensedItems;
         });
     },
 

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

@@ -68,7 +68,7 @@ qx.Class.define("osparc.vipMarket.Market", {
         .then(values => {
           const licensedItems = values[0];
           const purchasedItems = values[1];
-          osparc.store.LicensedItems.populateSeatsFromPurchases(licensedItems, purchasedItems);
+          osparc.data.model.LicensedItem.addSeatsFromPurchases(licensedItems, purchasedItems);
           const categories = [];
           const availableCategory = {
             categoryId: "availableModels",
@@ -78,21 +78,21 @@ qx.Class.define("osparc.vipMarket.Market", {
           };
           categories.push(availableCategory);
           let openCategory = null;
-          licensedItems.forEach(licensedItem => {
-            if (licensedItem["seats"].length) {
+          Object.values(licensedItems).forEach(licensedItem => {
+            if (licensedItem.getSeats().length) {
               availableCategory["items"].push(licensedItem);
               if (!this.__reqOpenCategory) {
                 openCategory = availableCategory["categoryId"];
               }
             }
-            if (licensedItem && licensedItem["categoryId"]) {
-              const categoryId = licensedItem["categoryId"];
+            if (licensedItem && licensedItem.getCategoryId()) {
+              const categoryId = licensedItem.getCategoryId();
               let category = categories.find(cat => cat["categoryId"] === categoryId);
               if (!category) {
                 category = {
                   categoryId,
-                  label: licensedItem["categoryDisplay"] || "Category",
-                  icon: licensedItem["categoryIcon"] || `osparc/market/${categoryId}.svg`,
+                  label: licensedItem.getCategoryDisplay() || "Category",
+                  icon: licensedItem.getCategoryIcon(),
                   items: [],
                 };
                 if (!openCategory) {
@@ -122,7 +122,7 @@ qx.Class.define("osparc.vipMarket.Market", {
         .then(async licensedItems => {
           this.__freeItems = [];
           for (const licensedItem of licensedItems) {
-            const pricingUnits = await osparc.store.Pricing.getInstance().fetchPricingUnits(licensedItem["pricingPlanId"]);
+            const pricingUnits = await osparc.store.Pricing.getInstance().fetchPricingUnits(licensedItem.getPricingPlanId());
             if (pricingUnits.length === 1 && pricingUnits[0].getCost() === 0) {
               this.__freeItems.push(licensedItem);
             }
@@ -164,10 +164,10 @@ qx.Class.define("osparc.vipMarket.Market", {
         .then(values => {
           const licensedItems = values[0];
           const purchasedItems = values[1];
-          osparc.store.LicensedItems.populateSeatsFromPurchases(licensedItems, purchasedItems);
+          osparc.data.model.LicensedItem.addSeatsFromPurchases(licensedItems, purchasedItems);
           let items = [];
-          licensedItems.forEach(licensedItem => {
-            if (licensedItem["seats"].length) {
+          Object.values(licensedItems).forEach(licensedItem => {
+            if (licensedItem.getSeats().length) {
               items.push(licensedItem);
             }
           });