minors

Author: odeimaiz

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

@@ -52,7 +52,7 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
     orderBy: {
       check: "Object",
       init: {
-        field: "purchased_at",
+        field: "startAt",
         direction: "desc"
       }
     }
@@ -61,7 +61,7 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
   statics: {
     SERVER_MAX_LIMIT: 49,
     COLUMN_ID_TO_DB_COLUMN_MAP: {
-      0: "purchased_at",
+      0: "startAt",
     },
   },
 
@@ -83,15 +83,15 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
         limit: 1,
         filters: this.getFilters() ?
           JSON.stringify({
-            "started_at": this.getFilters()
+            "startAt": this.getFilters()
           }) :
           null,
         orderBy: JSON.stringify(this.getOrderBy()),
       };
       const options = {
         resolveWResponse: true
       };
-      osparc.store.LicensedItems.getInstance().getPurchasedLicensedItems(walletId, urlParams, options)
+      osparc.store.LicensedItems.getInstance().getCheckedOutLicensedItems(walletId, urlParams, options)
         .then(resp => {
           this._onRowCountLoaded(resp["_meta"].total)
         })
@@ -120,7 +120,7 @@ qx.Class.define("osparc.desktop.credits.CheckoutsTableModel", {
         };
         const licensedItemsStore = osparc.store.LicensedItems.getInstance();
         return Promise.all([
-          licensedItemsStore.getLicensedItems(),
+          licensedItemsStore.getCheckedOutLicensedItems(),
           licensedItemsStore.getPurchasedLicensedItems(walletId, urlParams),
           licensedItemsStore.getVipModels(),
         ])

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

@@ -52,7 +52,7 @@ qx.Class.define("osparc.desktop.credits.PurchasesTableModel", {
     orderBy: {
       check: "Object",
       init: {
-        field: "purchased_at",
+        field: "startAt",
         direction: "desc"
       }
     }
@@ -61,7 +61,7 @@ qx.Class.define("osparc.desktop.credits.PurchasesTableModel", {
   statics: {
     SERVER_MAX_LIMIT: 49,
     COLUMN_ID_TO_DB_COLUMN_MAP: {
-      0: "purchased_at",
+      0: "startAt",
     },
   },
 
@@ -83,7 +83,7 @@ qx.Class.define("osparc.desktop.credits.PurchasesTableModel", {
         limit: 1,
         filters: this.getFilters() ?
           JSON.stringify({
-            "started_at": this.getFilters()
+            "startAt": this.getFilters()
           }) :
           null,
         orderBy: JSON.stringify(this.getOrderBy()),

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

@@ -105,6 +105,20 @@ qx.Class.define("osparc.store.LicensedItems", {
       return osparc.data.Resources.fetch("licensedItems", "purchase", params);
     },
 
+    getCheckedOutLicensedItems: function(walletId, urlParams, options = {}) {
+      let purchasesParams = {
+        url: {
+          walletId,
+          offset: 0,
+          limit: 49,
+        }
+      };
+      if (urlParams) {
+        purchasesParams.url = Object.assign(purchasesParams.url, urlParams);
+      }
+      return osparc.data.Resources.fetch("licensedItems", "checkouts", purchasesParams, options);
+    },
+
     __fetchVipModels: async function(vipSubset) {
       if (!(vipSubset in this.self().VIP_MODELS)) {
         return [];