🎨 [Frontend] Show Hypertools if there are any (#7871)

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/NewStudies.js renamed to services/static-webserver/client/source/class/osparc/dashboard/NewPlans.js

@@ -15,7 +15,7 @@
 
 ************************************************************************ */
 
-qx.Class.define("osparc.dashboard.NewStudies", {
+qx.Class.define("osparc.dashboard.NewPlans", {
   extend: qx.ui.core.Widget,
 
   construct: function(newStudiesData) {
@@ -38,7 +38,8 @@ qx.Class.define("osparc.dashboard.NewStudies", {
 
     osparc.store.Templates.getHypertools()
       .then(hypertools => {
-        this.__newStudies = newButtonsInfo.filter(newButtonInfo => {
+        // TIP and TIP lite templates are template_type: "hypertool"
+        this.__newPlans = newButtonsInfo.filter(newButtonInfo => {
           if (newButtonInfo.showDisabled) {
             return true;
           }
@@ -59,15 +60,15 @@ qx.Class.define("osparc.dashboard.NewStudies", {
   },
 
   events: {
-    "newStudyClicked": "qx.event.type.Data",
+    "newPlanClicked": "qx.event.type.Data",
   },
 
   statics: {
     WIDTH: 600
   },
 
   members: {
-    __newStudies: null,
+    __newPlans: null,
     __groups: null,
     __flatList: null,
     __groupedContainers: null,
@@ -103,7 +104,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
       }
 
       const newCards = [];
-      this.__newStudies.forEach(resourceData => {
+      this.__newPlans.forEach(resourceData => {
         const cards = this.__resourceToCards(resourceData);
         cards.forEach(newCard => {
           if (resourceData.showDisabled) {
@@ -175,7 +176,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
     },
 
     __createCard: function(templateInfo) {
-      const newStudyClicked = () => this.fireDataEvent("newStudyClicked", templateInfo);
+      const newPlanClicked = () => this.fireDataEvent("newPlanClicked", templateInfo);
 
       const title = templateInfo.title;
       const desc = templateInfo.description;
@@ -184,7 +185,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
         newPlanButton.setCardKey(templateInfo["idToWidget"]);
         osparc.utils.Utils.setIdToWidget(newPlanButton, templateInfo["idToWidget"]);
       }
-      newPlanButton.addListener("tap", () => newStudyClicked());
+      newPlanButton.addListener("tap", () => newPlanClicked());
       return newPlanButton;
     },
 

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

@@ -168,9 +168,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
 
     __addItems: function() {
       this.__addUIConfigItems();
-      if (osparc.product.Utils.isS4LProduct()) {
-        this.__addHypertools();
-      }
+      this.__addHypertools();
       this.__addMoreMenu();
       this.getChildControl("new-folder");
     },
@@ -196,18 +194,21 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
     },
 
     __addHypertools: function() {
+      const hypertoolsMenuButton = this.self().createMenuButton(null, this.tr("Hypertools"));
+      hypertoolsMenuButton.exclude();
+      this.addAt(hypertoolsMenuButton, this.__itemIdx);
+      this.__itemIdx++;
+      this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON);
+
       osparc.store.Templates.getHypertools()
         .then(hypertools => {
+          hypertoolsMenuButton.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+          // add entry for hypertools if there are any
           if (hypertools.length) {
-            const hypertoolsMenuButton = this.self().createMenuButton(null, this.tr("Hypertools"));
-            this.addAt(hypertoolsMenuButton, this.__itemIdx);
-            this.__itemIdx++;
-
             const hypertoolsMenu = new qx.ui.menu.Menu().set({
               appearance: "menu-wider",
             });
             hypertoolsMenuButton.setMenu(hypertoolsMenu);
-            this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON);
 
             hypertools.forEach(templateData => {
               const hypertoolButton = this.self().createMenuButton(null, templateData["name"]);

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

@@ -526,7 +526,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       });
       task.addListener("taskAborted", () => {
         finished();
-        const msg = this.tr("Study to Template cancelled");
+        const msg = this.tr("Project to Template cancelled");
         osparc.FlashMessenger.logAs(msg, "WARNING");
       });
       task.addListener("pollingError", e => {

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

@@ -421,6 +421,11 @@ qx.Class.define("osparc.dashboard.ResourceBrowserFilter", {
 
       // hypertools filter
       const button = new qx.ui.toolbar.RadioButton("Hypertools", null);
+      button.exclude();
+      osparc.store.Templates.getHypertools()
+        .then(hypertools => {
+          button.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+        });
       osparc.utils.Utils.replaceIconWithThumbnail(button, osparc.data.model.StudyUI.HYPERTOOL_ICON, 26);
       // align it with the rest of icons
       button.set({

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

@@ -278,6 +278,11 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
 
       // hypertools filter
       const hypertoolTypeButton = new qx.ui.menu.Button("Hypertools", null);
+      hypertoolTypeButton.exclude();
+      osparc.store.Templates.getHypertools()
+        .then(hypertools => {
+          hypertoolTypeButton.setVisibility(hypertools.length > 0 ? "visible" : "excluded");
+        });
       osparc.utils.Utils.replaceIconWithThumbnail(hypertoolTypeButton, osparc.data.model.StudyUI.HYPERTOOL_ICON, 18);
       serviceTypeMenu.add(hypertoolTypeButton);
       hypertoolTypeButton.addListener("execute", () => this.__addChip("app-type", "hypertool", "Hypertools"), this);

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

@@ -966,13 +966,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           osparc.store.Templates.getHypertools()
             .then(hypertools => {
               if (hypertools) {
-                const newStudies = new osparc.dashboard.NewStudies(newStudiesConfig);
+                const newPlans = new osparc.dashboard.NewPlans(newStudiesConfig);
                 const winTitle = this.tr("New Plan");
-                const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
+                const win = osparc.ui.window.Window.popUpInWindow(newPlans, winTitle, osparc.dashboard.NewPlans.WIDTH+40, 300).set({
                   clickAwayClose: false,
                   resizable: true
                 });
-                newStudies.addListener("newStudyClicked", e => {
+                newPlans.addListener("newPlanClicked", e => {
                   win.close();
                   const templateInfo = e.getData();
                   const templateData = hypertools.find(t => t.name === templateInfo.expectedTemplateLabel);

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

@@ -341,7 +341,7 @@ qx.Class.define("osparc.desktop.MainPage", {
           osparc.data.Resources.fetch("studies", "getOne", params2)
             .then(studyData => {
               if (!studyData) {
-                const msg = this.tr("Study not found");
+                const msg = this.tr("Project not found");
                 throw new Error(msg);
               }
               osparc.desktop.MainPageHandler.getInstance().loadStudy(studyData);

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

@@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.MainPageHandler", {
       osparc.data.Resources.fetch("studies", "getOne", params)
         .then(studyData => {
           if (!studyData) {
-            const msg = qx.locale.Manager.tr("Study not found");
+            const msg = qx.locale.Manager.tr("Project not found");
             throw new Error(msg);
           }
           this.loadStudy(studyData);

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

@@ -387,7 +387,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       });
       this.__addTopBarSpacer(topBar);
 
-      const studyOptionsPage = this.__studyOptionsPage = this.__createTabPage("@FontAwesome5Solid/book", this.tr("Study options"));
+      const studyOptionsPage = this.__studyOptionsPage = this.__createTabPage("@FontAwesome5Solid/book", this.tr("Project options"));
       studyOptionsPage.getLayout().set({
         separator: "separator-vertical",
         spacing: 10

services/static-webserver/client/source/class/osparc/info/StudyMedium.js

@@ -162,7 +162,7 @@ qx.Class.define("osparc.info.StudyMedium", {
 
     __openStudyDetails: function() {
       const studyDetails = new osparc.info.StudyLarge(this.getStudy());
-      const title = this.tr("Study Information");
+      const title = this.tr("Project Information");
       const width = osparc.info.CardLarge.WIDTH;
       const height = osparc.info.CardLarge.HEIGHT;
       osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height).set({