[skip ci] newStudyFromTemplateClicked

Author: odeimaiz

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

@@ -32,7 +32,7 @@ qx.Class.define("osparc.dashboard.NewPlusButton", {
       allowGrowX: false,
     });
 
-    osparc.utils.Utils.setIdToWidget(this, "newStudyButton");
+    osparc.utils.Utils.setIdToWidget(this, "newStudyBtn");
 
     this.setMenu(new osparc.dashboard.NewPlusMenu());
   },

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

@@ -26,29 +26,98 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
     this.set({
       position: "bottom-left",
       padding: 10,
+      allowGrowX: true,
     });
 
     this.__addItems();
   },
 
+  events: {
+    "newStudyFromTemplateClicked": "qx.event.type.Data",
+  },
+
+  statics: {
+    createMenuButton: function(label, icon) {
+      const menuButton = new qx.ui.menu.Button().set({
+        label,
+        icon: icon || null,
+        font: "text-14",
+        padding: 4,
+      });
+      menuButton.getChildControl("label").set({
+        rich: true,
+      });
+      return menuButton;
+    },
+  },
+
   members: {
     _createChildControlImpl: function(id) {
       let control;
       switch (id) {
         case "new-folder":
-          control = new qx.ui.menu.Button().set({
-            label: this.tr("New Folder"),
-            icon: osparc.dashboard.CardBase.NEW_ICON + "14",
-            font: "text-14",
-          });
+          control = this.self().createMenuButton(this.tr("New Folder"), osparc.dashboard.CardBase.NEW_ICON + "14");
+          osparc.utils.Utils.setIdToWidget(control, "newFolderButton");
+          this.add(control);
+          break;
+        case "more-entry":
+          control = this.self().createMenuButton(this.tr("More"));
           this.add(control);
           break;
       }
       return control || this.base(arguments, id);
     },
 
-    __addItems: function() {
+    __addItems: async function() {
       this.getChildControl("new-folder");
+      this.addSeparator();
+      await this.__fetchReferencedTemplates();
+      const permissions = osparc.data.Permissions.getInstance();
+      if (permissions.canDo("dashboard.templates.read") || permissions.canDo("dashboard.services.read")) {
+        this.addSeparator();
+        const moreMenu = new qx.ui.menu.Menu();
+        const moreEntry = this.getChildControl("more-entry");
+        moreEntry.setMenu(moreMenu);
+        if (permissions.canDo("dashboard.templates.read")) {
+          moreMenu.add(this.self().createMenuButton(this.tr("Templates")));
+        }
+        if (permissions.canDo("dashboard.services.read")) {
+          moreMenu.add(this.self().createMenuButton(this.tr("Services")));
+        }
+      }
+    },
+
+    __fetchReferencedTemplates: async function() {
+      await osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
+        .then(newStudiesData => {
+          const product = osparc.product.Utils.getProductName()
+          if (product in newStudiesData) {
+            osparc.data.Resources.get("templates")
+              .then(templates => {
+                if (templates) {
+                  const referencedTemplates = newStudiesData[product];
+                  if (referencedTemplates["linkedResource"] === "templates") {
+                    this.__addReferencedTemplateButtons(referencedTemplates, templates);
+                  }
+                }
+              });
+          }
+        });
+    },
+
+    __addReferencedTemplateButtons: function(referencedTemplates, templates) {
+      const displayTemplates = referencedTemplates["resources"].filter(referencedTemplate => {
+        if (referencedTemplate.showDisabled) {
+          return true;
+        }
+        return templates.find(t => t.name === referencedTemplate.expectedTemplateLabel);
+      });
+      displayTemplates.forEach(displayTemplate => {
+        const menuButton = this.self().createMenuButton(displayTemplate.title);
+        osparc.utils.Utils.setIdToWidget(menuButton, displayTemplate.idToWidget);
+        menuButton.addListener("tap", () => this.fireDataEvent("newStudyFromTemplateClicked", displayTemplate));
+        this.add(menuButton);
+      });
     }
   },
 });

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

@@ -884,6 +884,14 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     __addNewPlusButton: function() {
       const newPlusButton = new osparc.dashboard.NewPlusButton();
+      newPlusButton.getMenu().addListener("newStudyFromTemplateClicked", e => {
+        const templateInfo = e.getData();
+        const templates = osparc.store.Store.getInstance().getTemplates();
+        const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
+        if (templateData) {
+          this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
+        }
+      })
       this._leftFilters.add(newPlusButton);
     },