refactor versionsToSelectBox

Author: odeimaiz

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

@@ -282,18 +282,15 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       hBox.add(versionsBox);
 
 
-      osparc.store.Services.getVersions(this.__resourceData["key"], this.__resourceData["version"])
-        .then(versions => {
+      osparc.store.Services.versionsToSelectBox(this.__resourceData["key"], versionsBox)
+        .then(() => {
           let selectedItem = null;
 
           // first setSelection
-          versions.forEach(version => {
-            selectedItem = osparc.service.Utils.versionToListItem(this.__resourceData, version);
-            versionsBox.add(selectedItem);
-            if (this.__resourceData["version"] === version) {
-              versionsBox.setSelection([selectedItem]);
-            }
-          });
+          const versionFound = versionsBox.getSelectables().find(selectable => selectable.version === this.__resourceData["version"]);
+          if (versionFound) {
+            versionsBox.setSelection([selectedItem]);
+          }
           osparc.utils.Utils.growSelectBox(versionsBox, 200);
 
           // then listen to changes

services/static-webserver/client/source/class/osparc/service/Utils.js

@@ -137,14 +137,6 @@ qx.Class.define("osparc.service.Utils", {
       return "";
     },
 
-    versionToListItem: function(key, version) {
-      const versionDisplay = osparc.store.Services.getVersionDisplay(key, version);
-      const listItem = new qx.ui.form.ListItem(versionDisplay);
-      osparc.utils.Utils.setIdToWidget(listItem, "serviceVersionItem_" + versionDisplay);
-      listItem.version = version;
-      return listItem;
-    },
-
     canIWrite: function(serviceAccessRights) {
       const groupsStore = osparc.store.Groups.getInstance();
       const orgIDs = groupsStore.getOrganizationIds();

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

@@ -157,6 +157,20 @@ qx.Class.define("osparc.store.Services", {
       return [];
     },
 
+    versionsToSelectBox: function(key, selectBox) {
+      const metadata = this.getLatest(key);
+      return this.getVersions(key, metadata["version"])
+        .then(versions => {
+          versions.forEach(vrsn => {
+            const versionDisplay = this.getVersionDisplay(key, vrsn);
+            const listItem = new qx.ui.form.ListItem(versionDisplay);
+            osparc.utils.Utils.setIdToWidget(listItem, "serviceVersionItem_" + versionDisplay);
+            listItem.version = vrsn;
+            selectBox.add(listItem);
+          });
+        });
+    },
+
     getVersions: function(key, version, filterDeprecated = true) {
       return new Promise(resolve => {
         const versionsFromCache = () => {

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

@@ -247,12 +247,8 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
           const latest = new qx.ui.form.ListItem(this.self().LATEST);
           latest.version = this.self().LATEST;
           selectBox.add(latest);
-          osparc.store.Services.getVersions(key, version)
-            .then(versions => {
-              versions.forEach(vrsn => {
-                const listItem = osparc.service.Utils.versionToListItem(key, vrsn);
-                selectBox.add(listItem);
-              });
+          osparc.store.Services.versionsToSelectBox(key, selectBox)
+            .then(() => {
               osparc.utils.Utils.growSelectBox(selectBox, 200);
               selectBox.setSelection([latest]);
             });