✨ [Frontend] New product: TIP lite 🚨 (#6346)

Author: odeimaiz

services/catalog/src/simcore_service_catalog/services/services_api.py

@@ -97,18 +97,19 @@ async def list_services_paginated(
         product_name=product_name, user_id=user_id, limit=limit, offset=offset
     )
 
-    # injects access-rights
-    access_rights: dict[
-        tuple[str, str], list[ServiceAccessRightsAtDB]
-    ] = await repo.list_services_access_rights(
-        ((s.key, s.version) for s in services), product_name=product_name
-    )
-    if not access_rights:
-        raise CatalogForbiddenError(
-            name="any service",
-            user_id=user_id,
-            product_name=product_name,
+    if services:
+        # injects access-rights
+        access_rights: dict[
+            tuple[str, str], list[ServiceAccessRightsAtDB]
+        ] = await repo.list_services_access_rights(
+            ((s.key, s.version) for s in services), product_name=product_name
         )
+        if not access_rights:
+            raise CatalogForbiddenError(
+                name="any service",
+                user_id=user_id,
+                product_name=product_name,
+            )
 
     # get manifest of those with access rights
     got = await manifest.get_batch_services(

services/docker-compose.yml

@@ -528,7 +528,7 @@ services:
         - traefik.http.services.${SWARM_STACK_NAME}_static_webserver.loadbalancer.healthcheck.interval=2000ms
         - traefik.http.services.${SWARM_STACK_NAME}_static_webserver.loadbalancer.healthcheck.timeout=1000ms
         - traefik.http.middlewares.${SWARM_STACK_NAME}_static_webserver_retry.retry.attempts=2
-        - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.rule=(Path(`/osparc`) || Path(`/s4l`) || Path(`/s4llite`) || Path(`/s4lacad`) || Path(`/s4lengine`) || Path(`/s4ldesktop`) || Path(`/s4ldesktopacad`) || Path(`/tis`) || Path(`/transpiled`) || Path(`/resource`) || PathPrefix(`/osparc/`) || PathPrefix(`/s4l/`) || PathPrefix(`/s4llite/`) || PathPrefix(`/s4lacad/`) || PathPrefix(`/s4lengine/`) || PathPrefix(`/s4ldesktop/`) || PathPrefix(`/s4ldesktopacad/`) || PathPrefix(`/tis/`) || PathPrefix(`/transpiled/`) || PathPrefix(`/resource/`))
+        - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.rule=(Path(`/osparc`) || Path(`/s4l`) || Path(`/s4llite`) || Path(`/s4lacad`) || Path(`/s4lengine`) || Path(`/s4ldesktop`) || Path(`/s4ldesktopacad`) || Path(`/tis`) || Path(`/tiplite`) || Path(`/transpiled`) || Path(`/resource`) || PathPrefix(`/osparc/`) || PathPrefix(`/s4l/`) || PathPrefix(`/s4llite/`) || PathPrefix(`/s4lacad/`) || PathPrefix(`/s4lengine/`) || PathPrefix(`/s4ldesktop/`) || PathPrefix(`/s4ldesktopacad/`) || PathPrefix(`/tis/`) || PathPrefix(`/tiplite/`) || PathPrefix(`/transpiled/`) || PathPrefix(`/resource/`))
         - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.service=${SWARM_STACK_NAME}_static_webserver
         - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.entrypoints=http
         - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.priority=2

services/static-webserver/README.md

@@ -6,5 +6,5 @@ Used for static content serving.
 
 In the future will fully serve all static content. Currently the `webserver` is still serving the following routes:
 
-- `/` resolves to one of the three index.html pages inside the 4 products (osparc, tis, s4l, s4llite, s4lacad, s4lengine, s4ldesktop, s4ldesktopacad)
+- `/` resolves to one of the many index.html pages inside the products (osparc, tis, s4l...)
 - `/static-frontend-data.json` contains information required by the fronted

services/static-webserver/client/compile.json

@@ -147,6 +147,22 @@
       },
       "addTimestampsToUrls": true,
       "bootPath": "source/boot"
+    },
+    {
+      "class": "osparc.Application",
+      "theme": "osparc.theme.products.tis.ThemeDark",
+      "name": "tiplite",
+      "title": "TI Plan lite - IT'IS",
+      "include": [
+        "iconfont.material.Load",
+        "iconfont.fontawesome5.Load",
+        "osparc.theme.products.tis.ThemeLight"
+      ],
+      "environment": {
+        "product.name": "tiplite"
+      },
+      "addTimestampsToUrls": true,
+      "bootPath": "source/boot"
     }
   ],
   "eslintConfig": {

services/static-webserver/client/scripts/apps_metadata.json

@@ -56,6 +56,13 @@
                 "replace_me_og_description": "A tool powered by o²S²PARC technology that reduces optimization of targeted neurostimulation protocols.",
                 "replace_me_og_image": "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/master/services/static-webserver/client/source/resource/osparc/tip_splitimage.png"
             }
+        }, {
+            "application": "tiplite",
+            "replacements": {
+                "replace_me_og_title": "TI Plan lite - IT'IS",
+                "replace_me_og_description": "A tool powered by o²S²PARC technology that reduces optimization of targeted neurostimulation protocols.",
+                "replace_me_og_image": "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/master/services/static-webserver/client/source/resource/osparc/tip_splitimage.png"
+            }
         }
     ]
 }

services/static-webserver/client/source/class/osparc/Application.js

@@ -469,7 +469,7 @@ qx.Class.define("osparc.Application", {
         let title = this.tr("Privacy Policy");
         let height = 160;
         if (osparc.product.Utils.showLicenseExtra()) {
-          // "tis" and "s4llite" include the license terms
+          // "tis", "tiplite" and "s4llite" include the license terms
           title = this.tr("Privacy Policy and License Terms");
           height = 210;
         }
@@ -519,6 +519,7 @@ qx.Class.define("osparc.Application", {
           view = new osparc.auth.LoginPageS4L();
           break;
         case "tis":
+        case "tiplite":
           view = new osparc.auth.LoginPageTI();
           break;
         default: {

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

@@ -121,16 +121,21 @@ qx.Class.define("osparc.auth.ui.LoginView", {
 
       this.add(grp);
 
-      if (osparc.product.Utils.isProduct("tis")) {
-        const text = `
-        1) The TIP tool is designed for research purposes only and is not intended for clinical use.
-        </br>
-        </br>
-        2) Users are responsible for ensuring the anonymization and privacy protection of personal data.
-        </br>
-        </br>
-        3) The development, maintenance and usage of the TIP tool is fully sponsored by the IT’IS Foundation, with the exception of the 61 complex 3D electromagnetic simulations on the AWS cluster required for the personalized plans.
-        `;
+      if (osparc.product.Utils.isProduct("tis") || osparc.product.Utils.isProduct("tiplite")) {
+        let text = "";
+        if (osparc.product.Utils.isProduct("tiplite")) {
+          text = "The TIP tool is designed for research purposes only and is not intended for clinical use."
+        } else {
+          text = `
+            1) The TIP tool is designed for research purposes only and is not intended for clinical use.
+            </br>
+            </br>
+            2) Users are responsible for ensuring the anonymization and privacy protection of personal data.
+            </br>
+            </br>
+            3) The development, maintenance and usage of the TIP tool is fully sponsored by the IT’IS Foundation, with the exception of the 61 complex 3D electromagnetic simulations on the AWS cluster required for the personalized plans.
+          `;
+        }
         const disclaimer = osparc.announcement.AnnouncementUIFactory.createLoginAnnouncement(this.tr("Disclaimer"), text);
         this.add(disclaimer);
 

services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js

@@ -62,6 +62,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
         case "osparc":
           this._form.add(email, this.tr("Email"), qx.util.Validate.email(), "email");
           break;
+        case "tiplite":
         case "s4lacad":
         case "s4ldesktopacad":
           this._form.add(email, this.tr("University Email"), qx.util.Validate.email(), "email");
@@ -80,6 +81,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
           break;
         case "s4lacad":
         case "s4ldesktopacad":
+        case "tiplite":
           this._form.add(organization, this.tr("University"), null, "university");
           break;
         case "tis":
@@ -294,6 +296,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
       switch (osparc.product.Utils.getProductName()) {
         case "osparc":
         case "tis":
+        case "tiplite":
           ppLink = osparc.CookiePolicy.getITISPrivacyPolicyLink("our privacy policy");
           break;
         default:

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

@@ -18,11 +18,12 @@
 qx.Class.define("osparc.dashboard.NewStudies", {
   extend: qx.ui.core.Widget,
 
-  construct: function(newStudies, groups) {
+  construct: function(newStudiesData) {
     this.base(arguments);
 
-    this.__newStudies = newStudies;
-    this.__groups = groups || [];
+    const newButtonsInfo = newStudiesData.resources;
+    this.__groups = newStudiesData.categories || [];
+    this.__groupedContainers = [];
 
     this._setLayout(new qx.ui.layout.VBox(10));
 
@@ -35,7 +36,18 @@ qx.Class.define("osparc.dashboard.NewStudies", {
     });
     this._add(this.__flatList);
 
-    this.__groupedContainers = [];
+    osparc.data.Resources.get("templates")
+      .then(templates => {
+        const displayTemplates = newButtonsInfo.filter(newButtonInfo => {
+          if (newButtonInfo.showDisabled) {
+            return true;
+          }
+          return templates.find(t => t.name === newButtonInfo.expectedTemplateLabel);
+        });
+        this.__newStudies = displayTemplates;
+      })
+      .catch(console.error)
+      .finally(() => this.fireEvent("templatesLoaded"));
   },
 
   properties: {
@@ -48,7 +60,8 @@ qx.Class.define("osparc.dashboard.NewStudies", {
   },
 
   events: {
-    "newStudyClicked": "qx.event.type.Data"
+    "templatesLoaded": "qx.event.type.Event",
+    "newStudyClicked": "qx.event.type.Data",
   },
 
   statics: {
@@ -89,11 +102,15 @@ qx.Class.define("osparc.dashboard.NewStudies", {
         this._add(this.__flatList);
       }
 
-      let cards = [];
+      const newCards = [];
       this.__newStudies.forEach(resourceData => {
-        Array.prototype.push.apply(cards, this.__resourceToCards(resourceData));
+        const cards = this.__resourceToCards(resourceData);
+        cards.forEach(newCard => {
+          newCard.setEnabled(!(resourceData.showDisabled));
+          newCards.push(newCard);
+        });
       });
-      return cards;
+      return newCards;
     },
 
     __resourceToCards: function(resourceData) {

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

@@ -239,21 +239,21 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           this.__addStudiesToList(studies);
 
           // Show Quick Start if there are no studies in the root folder of the personal workspace
-          const quickStart = osparc.product.quickStart.Utils.getQuickStart();
-          if (quickStart) {
-            const dontShow = osparc.utils.Utils.localCache.getLocalStorageItem(quickStart.localStorageStr);
+          const quickStartInfo = osparc.product.quickStart.Utils.getQuickStart();
+          if (quickStartInfo) {
+            const dontShow = osparc.utils.Utils.localCache.getLocalStorageItem(quickStartInfo.localStorageStr);
             if (dontShow === "true") {
               return;
             }
             const nStudies = "_meta" in resp ? resp["_meta"]["total"] : 0;
             if (
               nStudies === 0 &&
-              this.getWorkspaceId() === null &&
+              this.getCurrentWorkspaceId() === null &&
               this.getCurrentFolderId() === null
             ) {
-              const tutorialWindow = quickStart.tutorial();
-              tutorialWindow.center();
-              tutorialWindow.open();
+              const quickStartWindow = quickStartInfo.tutorial();
+              quickStartWindow.center();
+              quickStartWindow.open();
             }
           }
         })
@@ -751,6 +751,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           this.__addEmptyStudyPlusButton();
           break;
         case "tis":
+        case "tiplite":
           this.__addTIPPlusButtons();
           break;
         case "s4l":
@@ -787,7 +788,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
               .then(newStudiesData => {
                 const product = osparc.product.Utils.getProductName()
                 if (product in newStudiesData) {
-                  const newButtonsInfo = newStudiesData[product].resources;
                   const mode = this._resourcesContainer.getMode();
                   const title = this.tr("New Plan");
                   const desc = this.tr("Choose Plan in pop-up");
@@ -803,24 +803,24 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
                   newStudyBtn.addListener("execute", () => {
                     newStudyBtn.setValue(false);
 
-                    const foundTemplates = newButtonsInfo.filter(newButtonInfo => templates.find(t => t.name === newButtonInfo.expectedTemplateLabel));
-                    const groups = newStudiesData[product].categories;
-                    const newStudies = new osparc.dashboard.NewStudies(foundTemplates, groups);
-                    newStudies.setGroupBy("category");
-                    const winTitle = this.tr("New Plan");
-                    const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
-                      clickAwayClose: false,
-                      resizable: true
+                    const newStudies = new osparc.dashboard.NewStudies(newStudiesData[product]);
+                    newStudies.addListener("templatesLoaded", () => {
+                      newStudies.setGroupBy("category");
+                      const winTitle = this.tr("New Plan");
+                      const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
+                        clickAwayClose: false,
+                        resizable: true
+                      });
+                      newStudies.addListener("newStudyClicked", e => {
+                        win.close();
+                        const templateInfo = e.getData();
+                        const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
+                        if (templateData) {
+                          this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
+                        }
+                      });
+                      osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
                     });
-                    newStudies.addListener("newStudyClicked", e => {
-                      win.close();
-                      const templateInfo = e.getData();
-                      const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
-                      if (templateData) {
-                        this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
-                      }
-                    });
-                    osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
                   });
                 }
               });