refactor

Author: odeimaiz

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

@@ -67,6 +67,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     }
     preloadPromises.push(store.getAllClassifiers(true));
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
+    preloadPromises.push(osparc.store.Products.getInstance().fetchPlusButtonUiConfig());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();

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

@@ -24,25 +24,20 @@ qx.Class.define("osparc.store.Products", {
 
     fetchPlusButtonUiConfig: function() {
       return osparc.utils.Utils.fetchJSON("/resource/osparc/ui_config.json")
-        .then(newStudiesData => {
+        .then(uiConfig => {
           const product = osparc.product.Utils.getProductName()
-          if (product in newStudiesData) {
-            this.__plusButtonUiConfig = newStudiesData[product];
-            return this.__plusButtonUiConfig;
+          if (product in uiConfig && "plusButton" in uiConfig[product]) {
+            this.__plusButtonUiConfig = uiConfig[product]["plusButton"];
+          } else {
+            this.__plusButtonUiConfig = false;
           }
-          return {};
+          return this.__plusButtonUiConfig;
         })
         .catch(console.error);
     },
 
     getPlusButtonUiConfig: function() {
-      return new Promise(resolve => {
-        if (this.__plusButtonUiConfig) {
-          resolve(this.__plusButtonUiConfig);
-        } else {
-          resolve(this.fetchPlusButtonUiConfig())
-        }
-      });
+      return this.__plusButtonUiConfig;
     },
   }
 });

services/static-webserver/client/source/resource/osparc/ui_config.json

@@ -1,6 +1,6 @@
 {
   "tis": {
-    "NO_plus_button": {
+    "NO_plusButton": {
       "categories": [{
         "id": "precomputed",
         "title": "Precomputed"
@@ -55,7 +55,7 @@
     }
   },
   "tiplite": {
-    "NO_plus_button": {
+    "NO_plusButton": {
       "categories": [{
         "id": "precomputed",
         "title": "Precomputed"
@@ -120,7 +120,7 @@
     }
   },
   "s4l": {
-    "plus_button": {
+    "plusButton": {
       "resources": [{
         "resourceType": "service",
         "expectedKey": "simcore/services/dynamic/s4l-ui",
@@ -137,7 +137,7 @@
     }
   },
   "s4lacad": {
-    "plus_button": {
+    "plusButton": {
       "resources": [{
         "resourceType": "service",
         "expectedKey": "simcore/services/dynamic/s4l-ui",
@@ -154,7 +154,7 @@
     }
   },
   "s4llite": {
-    "plus_button": {
+    "plusButton": {
       "resources": [{
         "resourceType": "service",
         "expectedKey": "simcore/services/dynamic/s4l-ui-lite",
@@ -165,7 +165,7 @@
     }
   },
   "osparc": {
-    "plus_button": {
+    "plusButton": {
       "resources": [{
         "resourceType": "study",
         "icon": "@FontAwesome5Solid/file/18",