createFolder

Author: odeimaiz

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

@@ -33,6 +33,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
   },
 
   events: {
+    "createFolder": "qx.event.type.Data",
     "newStudyFromTemplateClicked": "qx.event.type.Data",
   },
 
@@ -58,6 +59,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
         case "new-folder":
           control = this.self().createMenuButton(this.tr("New Folder"), osparc.dashboard.CardBase.NEW_ICON + "14");
           osparc.utils.Utils.setIdToWidget(control, "newFolderButton");
+          control.addListener("tap", () => this.__createNewFolder());
           this.add(control);
           break;
         case "more-entry":
@@ -118,6 +120,21 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
         menuButton.addListener("tap", () => this.fireDataEvent("newStudyFromTemplateClicked", displayTemplate));
         this.add(menuButton);
       });
-    }
+    },
+
+    __createNewFolder: function() {
+      const newFolder = true;
+      const folderEditor = new osparc.editor.FolderEditor(newFolder);
+      const title = this.tr("New Folder");
+      const win = osparc.ui.window.Window.popUpInWindow(folderEditor, title, 300, 120);
+      folderEditor.addListener("createFolder", () => {
+        const name = folderEditor.getLabel();
+        this.fireDataEvent("createFolder", {
+          name,
+        });
+        win.close();
+      });
+      folderEditor.addListener("cancel", () => win.close());
+    },
   },
 });

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

@@ -251,7 +251,10 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         })
         .catch(console.error)
         .finally(() => {
-          this.__addNewFolderButton();
+          // In favor of the NewPlusButton
+          if (!["tis", "tiplite"].includes(osparc.product.Utils.getProductName())) {
+            this.__addNewFolderButton();
+          }
           this.__loadingFolders = null;
         });
     },
@@ -884,15 +887,24 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     __addNewPlusButton: function() {
       const newPlusButton = new osparc.dashboard.NewPlusButton();
-      newPlusButton.getMenu().addListener("newStudyFromTemplateClicked", e => {
+      this._leftFilters.add(newPlusButton);
+
+      const newPlusButtonMenu = newPlusButton.getMenu();
+
+      newPlusButtonMenu.addListener("createFolder", e => {
+        const data = e.getData();
+        this.__createFolder(data);
+      }, 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);
         if (templateData) {
           this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
         }
-      })
-      this._leftFilters.add(newPlusButton);
+      }, this);
+
     },
 
     __addNewStudyButtons: function() {
@@ -914,7 +926,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           break;
         case "tis":
         case "tiplite":
-          this.__addTIPPlusButton();
+          // In favor of the NewPlusButton
+          // this.__addTIPPlusButton();
           break;
         case "s4l":
         case "s4lacad":