[skip ci] refactor

Author: odeimaiz

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

@@ -114,25 +114,56 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
       ]).then(values => {
         const newStudiesData = values[0];
         const templates = values[1];
+        if (newStudiesData["categories"]) {
+          // this.__addCategories(newStudiesData["categories"]);
+        }
         if (newStudiesData["linkedResource"] === "templates") {
-          this.__addFromTemplateButtons(newStudiesData, templates);
+          newStudiesData["resources"].forEach(templateData => {
+            this.__addFromTemplateButton(templateData, templates);
+          });
         }
       });
     },
 
-    __addFromTemplateButtons: function(referencedTemplates, templates) {
-      const displayTemplates = referencedTemplates["resources"].filter(referencedTemplate => {
-        if (referencedTemplate.showDisabled) {
-          return true;
-        }
-        return templates.find(t => t.name === referencedTemplate.expectedTemplateLabel);
+    __addCategories: function(categories) {
+      categories.forEach(category => {
+        const categoryHeader = new qx.ui.basic.Label().set({
+          value: category["label"],
+          font: "text-14",
+          rich: true,
+          wrap: true,
+        });
+        categoryHeader.id = category["id"];
+        this.add(categoryHeader);
       });
-      displayTemplates.forEach(displayTemplate => {
-        const menuButton = this.self().createMenuButton(displayTemplate.title);
-        osparc.utils.Utils.setIdToWidget(menuButton, displayTemplate.idToWidget);
-        menuButton.addListener("tap", () => this.fireDataEvent("newStudyFromTemplateClicked", displayTemplate));
+    },
+
+    __addFromTemplateButton: function(templateData, templates) {
+      if (templateData.showDisabled) {
+        const menuButton = this.self().createMenuButton(templateData.title);
+        osparc.utils.Utils.setIdToWidget(menuButton, templateData.idToWidget);
+        if (templateData.showDisabled) {
+          menuButton.set({
+            enabled: false,
+            blockToolTip: templateData.description,
+          });
+        }
         this.add(menuButton);
-      });
+        return;
+      }
+
+      const templateFound = templates.find(t => t.name === templateData.expectedTemplateLabel);
+      if (templateFound) {
+        const menuButton = this.self().createMenuButton(templateData.title);
+        osparc.utils.Utils.setIdToWidget(menuButton, templateData.idToWidget);
+        menuButton.addListener("tap", () => {
+          this.fireDataEvent("newStudyFromTemplateClicked", {
+            templateData: templateFound,
+            newStudyLabel: templateData.newStudyLabel,
+          });
+        });
+        this.add(menuButton);
+      }
     },
 
     __createNewFolder: function() {

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

@@ -897,11 +897,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       }, this);
 
       newPlusButtonMenu.addListener("newStudyFromTemplateClicked", e => {
-        const templateInfo = e.getData();
-        const templates = osparc.store.Store.getInstance().getTemplates();
-        const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
+        const {
+          templateData,
+          newStudyLabel,
+        } = e.getData();
         if (templateData) {
-          this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
+          this.__newPlanBtnClicked(templateData, newStudyLabel);
         }
       }, this);