refactor

Author: odeimaiz

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

@@ -37,7 +37,7 @@ qx.Class.define("osparc.store.Services", {
             const servicesObj = osparc.service.Utils.convertArrayToObject(servicesArray);
             this.__addHits(servicesObj);
             this.__addTSRInfos(servicesObj);
-            this.__addExtraTypeInfos(servicesObj);
+            this.__addXTypeInfos(servicesObj);
 
             Object.values(servicesObj).forEach(serviceKey => {
               Object.values(serviceKey).forEach(service => this.__addServiceToCache(service));
@@ -128,9 +128,6 @@ qx.Class.define("osparc.store.Services", {
         };
         this.__servicesPromisesCached[key][version] = osparc.data.Resources.fetch("services", "getOne", params)
           .then(service => {
-            this.__addHit(service);
-            this.__addTSRInfo(service);
-            this.__addExtraTypeInfo(service);
             this.__addServiceToCache(service);
             // Resolve the promise locally before deleting it
             resolve(service);
@@ -368,6 +365,10 @@ qx.Class.define("osparc.store.Services", {
     },
 
     __addServiceToCache: function(service) {
+      this.__addHit(service);
+      this.__addTSRInfo(service);
+      this.__addXTypeInfo(service);
+
       const key = service.key;
       const version = service.version;
       service["resourceType"] = "service";
@@ -414,7 +415,7 @@ qx.Class.define("osparc.store.Services", {
       });
     },
 
-    __addExtraTypeInfo: function(service) {
+    __addXTypeInfo: function(service) {
       service["xType"] = service["type"];
       if (["backend", "frontend"].includes(service["xType"])) {
         if (osparc.data.model.Node.isFilePicker(service)) {
@@ -429,10 +430,10 @@ qx.Class.define("osparc.store.Services", {
       }
     },
 
-    __addExtraTypeInfos: function(servicesObj) {
+    __addXTypeInfos: function(servicesObj) {
       Object.values(servicesObj).forEach(serviceWVersion => {
         Object.values(serviceWVersion).forEach(service => {
-          this.__addExtraTypeInfo(service);
+          this.__addXTypeInfo(service);
         });
       });
     },