Skip to content

Commit ca4c86d

Browse files
committed
[skip ci] populateVersionsSelectBox
1 parent 6c9f264 commit ca4c86d

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

services/static-webserver/client/source/class/osparc/dashboard/ResourceDetails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
282282
hBox.add(versionsBox);
283283

284284

285-
osparc.store.Services.versionsToSelectBox(this.__resourceData["key"], versionsBox)
285+
osparc.store.Services.populateVersionsSelectBox(this.__resourceData["key"], versionsBox)
286286
.then(() => {
287287
let selectedItem = null;
288288

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,6 @@ qx.Class.define("osparc.store.Services", {
157157
return [];
158158
},
159159

160-
versionsToSelectBox: function(key, selectBox) {
161-
const metadata = this.getLatest(key);
162-
return this.getVersions(key, metadata["version"])
163-
.then(versions => {
164-
versions.forEach(vrsn => {
165-
const versionDisplay = this.getVersionDisplay(key, vrsn);
166-
const listItem = new qx.ui.form.ListItem(versionDisplay);
167-
osparc.utils.Utils.setIdToWidget(listItem, "serviceVersionItem_" + versionDisplay);
168-
listItem.version = vrsn;
169-
selectBox.add(listItem);
170-
});
171-
});
172-
},
173-
174160
getVersions: function(key, version, filterDeprecated = true) {
175161
return new Promise(resolve => {
176162
const versionsFromCache = () => {
@@ -188,6 +174,20 @@ qx.Class.define("osparc.store.Services", {
188174
});
189175
},
190176

177+
populateVersionsSelectBox: function(key, selectBox) {
178+
const latest = this.getLatest(key);
179+
return this.getService(key, latest["version"])
180+
.then(latestMetadata => {
181+
latestMetadata["history"].forEach(entry => {
182+
const versionDisplay = osparc.service.Utils.extractVersionDisplay(entry);
183+
const listItem = new qx.ui.form.ListItem(versionDisplay);
184+
osparc.utils.Utils.setIdToWidget(listItem, "serviceVersionItem_" + versionDisplay);
185+
listItem.version = entry["version"];
186+
selectBox.add(listItem);
187+
});
188+
});
189+
},
190+
191191
getServicesLatestList: function(excludeFrontend = true, excludeDeprecated = true) {
192192
return new Promise(resolve => {
193193
const servicesList = [];

services/static-webserver/client/source/class/osparc/workbench/ServiceCatalog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
247247
const latest = new qx.ui.form.ListItem(this.self().LATEST);
248248
latest.version = this.self().LATEST;
249249
selectBox.add(latest);
250-
osparc.store.Services.versionsToSelectBox(key, selectBox)
250+
osparc.store.Services.populateVersionsSelectBox(key, selectBox)
251251
.then(() => {
252252
osparc.utils.Utils.growSelectBox(selectBox, 200);
253253
selectBox.setSelection([latest]);

0 commit comments

Comments
 (0)