Skip to content

Commit 324b36a

Browse files
committed
refactor
1 parent b3b02c3 commit 324b36a

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
139139
this.__serviceList.addListener("changeSelected", e => {
140140
if (e.getData() && e.getData().getService()) {
141141
const selectedService = e.getData().getService();
142-
this.__changedSelection(selectedService.getKey(), selectedService.getVersion());
142+
this.__changedSelection(selectedService.getKey());
143143
} else {
144144
this.__changedSelection(null);
145145
}
@@ -225,21 +225,18 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
225225
});
226226

227227
osparc.service.Utils.sortObjectsBasedOn(filteredServices, this.__sortBy);
228-
const filteredServicesObj = this.__filteredServicesObj = osparc.service.Utils.convertArrayToObject(filteredServices);
229-
230-
const groupedServicesList = [];
231-
for (const key in filteredServicesObj) {
232-
const serviceMetadata = osparc.store.Services.getLatest(key);
233-
if (serviceMetadata) {
234-
const service = new osparc.data.model.Service(serviceMetadata);
235-
groupedServicesList.push(service);
236-
}
237-
}
228+
this.__filteredServicesObj = osparc.service.Utils.convertArrayToObject(filteredServices);
229+
230+
const servicesModels = [];
231+
filteredServices.forEach(filteredService => {
232+
const service = new osparc.data.model.Service(filteredService);
233+
servicesModels.push(service);
234+
});
238235

239-
this.__serviceList.setModel(new qx.data.Array(groupedServicesList));
236+
this.__serviceList.setModel(new qx.data.Array(servicesModels));
240237
},
241238

242-
__changedSelection: function(key, version) {
239+
__changedSelection: function(key) {
243240
if (this.__versionsBox) {
244241
const selectBox = this.__versionsBox;
245242
selectBox.removeAll();

0 commit comments

Comments
 (0)