Skip to content

Commit 4b3d523

Browse files
committed
getLicensedItems
1 parent 8e0f469 commit 4b3d523

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ qx.Class.define("osparc.desktop.credits.RentalsTableModel", {
110110
// Returns a request promise with given offset and limit
111111
const getFetchPromise = (offset, limit=this.self().SERVER_MAX_LIMIT) => {
112112
return Promise.all([
113-
osparc.data.Resources.getInstance().getAllPages("licensedItems"),
113+
osparc.data.LicensedItems.getInstance().getLicensedItems(),
114114
osparc.data.Resources.fetch("wallets", "purchases", {
115115
url: {
116116
walletId: this.getWalletId(),

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ qx.Class.define("osparc.store.LicensedItems", {
2222
construct: function() {
2323
this.base(arguments);
2424

25+
this.__licensedItems = [];
2526
this.__modelsCache = {};
2627
},
2728

@@ -60,8 +61,21 @@ qx.Class.define("osparc.store.LicensedItems", {
6061
},
6162

6263
members: {
64+
__licensedItems: null,
6365
__modelsCache: null,
6466

67+
getLicensedItems: function() {
68+
if (this.__licensedItems) {
69+
return new Promise(resolve => resolve(this.__licensedItems));
70+
}
71+
72+
return osparc.data.Resources.getInstance().getAllPages("licensedItems")
73+
.then(licensedItems => {
74+
this.__licensedItems = licensedItems;
75+
return this.__licensedItems;
76+
})
77+
},
78+
6579
__fetchVipModels: async function(vipSubset) {
6680
if (!(vipSubset in this.self().VIP_MODELS)) {
6781
return [];
@@ -94,7 +108,7 @@ qx.Class.define("osparc.store.LicensedItems", {
94108
});
95109
},
96110

97-
fetchVipModels: async function(vipSubset) {
111+
getVipModels: async function(vipSubset) {
98112
const vipModels = this.self().VIP_MODELS;
99113
if (vipSubset && vipSubset in vipModels) {
100114
return await this.__fetchVipModels(vipSubset);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ qx.Class.define("osparc.vipMarket.Market", {
2727
});
2828
this.addWidgetOnTopOfTheTabs(miniWallet);
2929

30-
osparc.data.Resources.getInstance().getAllPages("licensedItems")
30+
osparc.data.LicensedItems.getInstance().getLicensedItems()
3131
.then(() => {
3232
[{
3333
category: "human",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
193193
},
194194

195195
__fetchModels: function(vipSubset) {
196-
osparc.store.LicensedItems.getInstance().fetchVipModels(vipSubset)
196+
osparc.store.LicensedItems.getInstance().getVipModels(vipSubset)
197197
.then(allAnatomicalModels => {
198198
const store = osparc.store.Store.getInstance();
199199
const contextWallet = store.getContextWallet();
@@ -207,7 +207,7 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
207207
}
208208
};
209209
Promise.all([
210-
osparc.data.Resources.get("licensedItems"),
210+
osparc.data.LicensedItems.getInstance().getLicensedItems(),
211211
osparc.data.Resources.fetch("wallets", "purchases", purchasesParams),
212212
])
213213
.then(values => {

0 commit comments

Comments
 (0)