refactoring

Author: odeimaiz

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

@@ -142,11 +142,13 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
         if (newStudiesData["categories"]) {
           this.__addCategories(newStudiesData["categories"]);
         }
-        if (newStudiesData["linkedResource"] === "templates") {
-          newStudiesData["resources"].forEach(templateData => {
-            this.__addFromTemplateButton(templateData, templates);
-          });
-        }
+        newStudiesData["resources"].forEach(resourceData => {
+          if (resourceData["resourceType"] === "template") {
+            this.__addFromTemplateButton(resourceData, templates);
+          } else if (resourceData["resourceType"] === "service") {
+            this.__addFromServiceButton(resourceData);
+          }
+        });
       });
     },
 
@@ -169,10 +171,36 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
       });
     },
 
+    __createFromResourceButton: function(resourceData) {
+      const icon = "icon" in resourceData ? resourceData["icon"] : null;
+      const menuButton = this.self().createMenuButton(resourceData.title, icon);
+      osparc.utils.Utils.setIdToWidget(menuButton, resourceData.idToWidget);
+      return menuButton;
+    },
+
+    __addFromResourceButton: function(menuButton, resourceData) {
+      if (menuButton.getIcon()) {
+        menuButton.getChildControl("icon").set({
+          scale: true,
+          maxWidth: 22,
+          maxHeight: 22,
+        })
+      }
+
+      let idx = null;
+      if (resourceData.category) {
+        idx = this.__getLastIdxFromCategory(resourceData.category);
+      }
+      if (idx) {
+        menuButton["categoryId"] = resourceData.category;
+        this.addAt(menuButton, idx+1);
+      } else {
+        this.add(menuButton);
+      }
+    },
+
     __addFromTemplateButton: function(templateData, templates) {
-      const icon = "icon" in templateData ? templateData["icon"] : null;
-      const menuButton = this.self().createMenuButton(templateData.title, icon);
-      osparc.utils.Utils.setIdToWidget(menuButton, templateData.idToWidget);
+      const menuButton = this.__createFromResourceButton(templateData);
 
       if (templateData.showDisabled) {
         menuButton.set({
@@ -194,24 +222,13 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
         }
       }
 
-      if (menuButton.getIcon()) {
-        menuButton.getChildControl("icon").set({
-          scale: true,
-          maxWidth: 22,
-          maxHeight: 22,
-        })
-      }
+      this.__addFromResourceButton(menuButton, templateData);
+    },
 
-      let idx = null;
-      if (templateData.category) {
-        idx = this.__getLastIdxFromCategory(templateData.category);
-      }
-      if (idx) {
-        menuButton["categoryId"] = templateData.category;
-        this.addAt(menuButton, idx+1);
-      } else {
-        this.add(menuButton);
-      }
+    __addFromServiceButton: function(serviceData) {
+      const menuButton = this.__createFromResourceButton(serviceData);
+
+      this.__addFromResourceButton(menuButton, serviceData);
     },
 
     __createNewFolder: function() {

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

@@ -8,29 +8,32 @@
       "title": "Personalized",
       "description": "In the process, TIP will launch simulations on AWS.<br>The associated resource costs will be deduced from your Credits."
     }],
-    "linkedResource": "templates",
     "resources": [{
+      "resourceType": "template",
       "expectedTemplateLabel": "TI Planning Tool",
       "title": "Classic TI",
       "description": "",
       "newStudyLabel": "Classic TI",
       "category": "precomputed",
       "idToWidget": "newTIPlanButton"
     }, {
+      "resourceType": "template",
       "expectedTemplateLabel": "mcTI Planning Tool",
       "title": "Multichannel TI",
       "description": "",
       "newStudyLabel": "Multichannel TI",
       "category": "precomputed",
       "idToWidget": "newMTIPlanButton"
     }, {
+      "resourceType": "template",
       "expectedTemplateLabel": "pmTI Planning Tool",
       "title": "Phase-modulation TI",
       "description": "",
       "newStudyLabel": "Phase-modulation TI",
       "category": "precomputed",
       "idToWidget": "newPMTIPlanButton"
     }, {
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized TI Planning Tool",
       "title": "Personalized<br>Classic TI",
       "description": "",
@@ -39,6 +42,7 @@
       "idToWidget": "personalizationNewTIPlanButton",
       "billable": true
     }, {
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized mcTI Planning Tool",
       "title": "Personalized<br>Multichannel TI",
       "description": "",
@@ -47,6 +51,7 @@
       "idToWidget": "personalizationNewMTIPlanButton",
       "billable": true
     }, {
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized pmTI Planning Tool",
       "title": "Personalized<br>Phase-modulation TI",
       "description": "",
@@ -65,8 +70,8 @@
       "title": "Personalized",
       "description": "In the process, TIP will launch simulations on AWS.<br>The associated resource costs will be deduced from your Credits."
     }],
-    "linkedResource": "templates",
     "resources": [{
+      "resourceType": "template",
       "expectedTemplateLabel": "TI Planning Tool",
       "title": "Classic TI",
       "description": "",
@@ -75,6 +80,7 @@
       "idToWidget": "newTIPlanButton"
     }, {
       "showDisabled": true,
+      "resourceType": "template",
       "expectedTemplateLabel": "mcTI Planning Tool",
       "title": "Multichannel TI",
       "description": "Not available in ${replace_me_product_name}",
@@ -83,6 +89,7 @@
       "idToWidget": "newMTIPlanButton"
     }, {
       "showDisabled": true,
+      "resourceType": "template",
       "expectedTemplateLabel": "pmTI Planning Tool",
       "title": "Phase-modulation TI",
       "description": "Not available in ${replace_me_product_name}",
@@ -91,6 +98,7 @@
       "idToWidget": "newPMTIPlanButton"
     }, {
       "showDisabled": true,
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized TI Planning Tool",
       "title": "Personalized<br>Classic TI",
       "description": "Not available in ${replace_me_product_name}",
@@ -100,6 +108,7 @@
       "billable": true
     }, {
       "showDisabled": true,
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized mcTI Planning Tool",
       "title": "Personalized<br>Multichannel TI",
       "description": "Not available in ${replace_me_product_name}",
@@ -109,6 +118,7 @@
       "billable": true
     }, {
       "showDisabled": true,
+      "resourceType": "template",
       "expectedTemplateLabel": "personalized pmTI Planning Tool",
       "title": "Personalized<br>Phase-modulation TI",
       "description": "Not available in ${replace_me_product_name}",
@@ -119,8 +129,8 @@
     }]
   },
   "s4l": {
-    "linkedResource": "services",
     "resources": [{
+      "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-ui",
       "title": "Start Sim4Life",
       "description": "New Sim4Life project",
@@ -129,8 +139,8 @@
     }]
   },
   "s4lacad": {
-    "linkedResource": "services",
     "resources": [{
+      "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-ui",
       "title": "Start Sim4Life",
       "description": "New Sim4Life project",
@@ -139,8 +149,8 @@
     }]
   },
   "s4llite": {
-    "linkedResource": "services",
     "resources": [{
+      "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-ui-lite",
       "title": "Start ${replace_me_product_name}",
       "description": "New project",