all good

Author: odeimaiz

services/static-webserver/client/source/class/osparc/desktop/credits/CheckoutsTableModel.js

@@ -122,19 +122,16 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
         return Promise.all([
           licensedItemsStore.getLicensedItems(),
           licensedItemsStore.getCheckedOutLicensedItems(walletId, urlParams),
-          licensedItemsStore.getVipModels(),
         ])
           .then(values => {
             const licensedItems = values[0];
             const checkoutsItems = values[1];
-            const vipModels = values[2];
 
             const data = [];
             const checkoutsCols = osparc.desktop.credits.CheckoutsTable.COLS;
             checkoutsItems.forEach(checkoutsItem => {
               const licensedItemId = checkoutsItem["licensedItemId"];
               const licensedItem = licensedItems.find(licItem => licItem["licensedItemId"] === licensedItemId);
-              const vipModel = vipModels.find(vipMdl => licensedItem && (vipMdl["modelId"] == licensedItem["name"]));
               let start = "";
               let duration = "";
               if (checkoutsItem["startedAt"]) {
@@ -146,11 +143,11 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
               data.push({
                 [checkoutsCols.CHECKOUT_ID.id]: checkoutsItem["licensedItemCheckoutId"],
                 [checkoutsCols.ITEM_ID.id]: licensedItemId,
-                [checkoutsCols.ITEM_LABEL.id]: vipModel ? vipModel["name"] : "unknown model",
+                [checkoutsCols.ITEM_LABEL.id]: licensedItem ? licensedItem["displayName"] : "unknown model",
                 [checkoutsCols.START.id]: start,
                 [checkoutsCols.DURATION.id]: duration,
                 [checkoutsCols.SEATS.id]: checkoutsItem["numOfSeats"],
-                [checkoutsCols.USER.id]: checkoutsItem["userId"],
+                [checkoutsCols.USER.id]: checkoutsItem["userEmail"],
               });
             });
             return data;

services/static-webserver/client/source/class/osparc/desktop/credits/PurchasesTableModel.js

@@ -121,28 +121,25 @@ qx.Class.define("osparc.desktop.credits.PurchasesTableModel", {
         return Promise.all([
           licensedItemsStore.getLicensedItems(),
           licensedItemsStore.getPurchasedLicensedItems(walletId, urlParams),
-          licensedItemsStore.getVipModels(),
         ])
           .then(values => {
             const licensedItems = values[0];
-            const purchasesItems = values[1];
-            const vipModels = values[2];
+            const purchasesItems = values[1]["data"];
 
             const data = [];
             const purchasesCols = osparc.desktop.credits.PurchasesTable.COLS;
             purchasesItems.forEach(purchasesItem => {
               const licensedItemId = purchasesItem["licensedItemId"];
               const licensedItem = licensedItems.find(licItem => licItem["licensedItemId"] === licensedItemId);
-              const vipModel = vipModels.find(vipMdl => licensedItem && (vipMdl["modelId"] == licensedItem["name"]));
               data.push({
                 [purchasesCols.PURCHASE_ID.id]: purchasesItem["licensedItemPurchaseId"],
                 [purchasesCols.ITEM_ID.id]: licensedItemId,
-                [purchasesCols.ITEM_LABEL.id]: vipModel ? vipModel["name"] : "unknown model",
+                [purchasesCols.ITEM_LABEL.id]: licensedItem ? licensedItem["displayName"] : "unknown model",
                 [purchasesCols.START.id]: osparc.utils.Utils.formatDateAndTime(new Date(purchasesItem["startAt"])),
                 [purchasesCols.END.id]: osparc.utils.Utils.formatDateAndTime(new Date(purchasesItem["expireAt"])),
                 [purchasesCols.SEATS.id]: purchasesItem["numOfSeats"],
                 [purchasesCols.COST.id]: purchasesItem["pricingUnitCost"] ? ("-" + parseFloat(purchasesItem["pricingUnitCost"]).toFixed(2)) : "", // show it negative
-                [purchasesCols.USER.id]: purchasesItem["purchasedByUser"],
+                [purchasesCols.USER.id]: purchasesItem["userEmail"],
               });
             });
             return data;

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

@@ -92,9 +92,5 @@ qx.Class.define("osparc.store.LicensedItems", {
       }
       return osparc.data.Resources.fetch("licensedItems", "checkouts", purchasesParams, options);
     },
-
-    getVipModels: async function(vipSubset) {
-      console.log(this.getLicensedItems());
-    }
   }
 });