User Menu buttons per product

Author: odeimaiz

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -37,6 +37,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
           break;
         case "theme-switcher":
           control = new osparc.ui.switch.ThemeSwitcherMenuBtn();
+          osparc.utils.Utils.setIdToWidget(control, "userMenuThemeSwitcherBtn");
           this.add(control);
           break;
         case "log-in":
@@ -46,6 +47,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
           break;
         case "user-center":
           control = new qx.ui.menu.Button(this.tr("My Account"));
+          osparc.utils.Utils.setIdToWidget(control, "userMenuMyAccountBtn");
           control.addListener("execute", () => osparc.desktop.account.MyAccountWindow.openWindow(), this);
           this.add(control);
           break;
@@ -80,6 +82,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
           control = new qx.ui.menu.Button(this.tr("Organizations")).set({
             visibility: osparc.data.Permissions.getInstance().canDo("user.organizations.create") ? "visible" :"excluded"
           });
+          osparc.utils.Utils.setIdToWidget(control, "userMenuOrganizationsBtn");
           control.addListener("execute", () => osparc.desktop.organizations.OrganizationsWindow.openWindow(), this);
           this.add(control);
           break;
@@ -97,12 +100,13 @@ qx.Class.define("osparc.navigation.UserMenu", {
           break;
         case "about":
           control = new qx.ui.menu.Button(this.tr("About oSPARC"));
-          control.addListener("execute", () => osparc.About.getInstance().open());
           osparc.utils.Utils.setIdToWidget(control, "userMenuAboutBtn");
+          control.addListener("execute", () => osparc.About.getInstance().open());
           this.add(control);
           break;
         case "about-product": {
           control = new qx.ui.menu.Button(this.tr("About Product"));
+          osparc.utils.Utils.setIdToWidget(control, "userMenuAboutProductBtn");
           const displayName = osparc.store.StaticInfo.getInstance().getDisplayName();
           control.getChildControl("label").setRich(true);
           control.setLabel(this.tr("About ") + displayName);

tests/e2e-frontend/tests/userMenu/userMenu.js

@@ -7,24 +7,89 @@ import { LoginPage } from '../fixtures/loginPage';
 import products from '../products.json';
 import users from '../users.json';
 
-const userMenuButtonsPerRole = {
+const userMenuButtons = {
+  "osparc": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": false,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": false,
+    "userMenuLogoutBtn": true,
+  },
+  "s4l": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": true,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": false,
+    "userMenuLogoutBtn": true,
+  },
+  "s4lacad": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": true,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": false,
+    "userMenuLogoutBtn": true,
+  },
+  "s4llite": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": true,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": false,
+    "userMenuLogoutBtn": true,
+  },
+  "tis": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": true,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": false,
+    "userMenuLogoutBtn": true,
+  },
+  "tiplite": {
+    "userMenuMyAccountBtn": true,
+    "userMenuBillingCenterBtn": true,
+    "userMenuPreferencesBtn": true,
+    "userMenuOrganizationsBtn": true,
+    "userMenuThemeSwitcherBtn": true,
+    "userMenuAboutBtn": true,
+    "userMenuAboutProductBtn": true,
+    "userMenuAccessTIPBtn": true,
+    "userMenuLogoutBtn": true,
+  },
+};
+
+const dedicatedCentersPerRole = {
   "USER": {
-    "My Account": true,
     "PO Center": false,
     "Admin Center": false,
   },
   "TESTER": {
-    "My Account": true,
     "PO Center": false,
     "Admin Center": false,
   },
   "PRODUCT_OWNER": {
-    "My Account": true,
     "PO Center": true,
     "Admin Center": false,
   },
   "ADMIN": {
-    "My Account": true,
     "PO Center": true,
     "Admin Center": true,
   },
@@ -60,13 +125,35 @@ for (const product in products) {
           await browser.close();
         });
 
-        test(`Options per Role in User Menu ${role}`, async () => {
-          expect(userMenuButtonsPerRole[role]).toBeDefined();
+        test(`User Menu buttons per ${product}`, async () => {
+          expect(userMenuButtons[product]).toBeDefined();
+
+          // open user menu
+          await page.getByTestId("userMenuBtn").click();
+
+          const buttons = userMenuButtons[product];
+          for (const buttonId in buttons) {
+            const menuButton = page.getByTestId(buttonId);
+            const isVisible = buttons[buttonId];
+            if (isVisible) {
+              await expect(menuButton).toBeVisible();
+            } else {
+              await expect(menuButton).toHaveCount(0);
+            }
+          }
+
+          // close user menu
+          await page.getByTestId("userMenuBtn").click();
+        });
+        userMenuButtons
+
+        test(`Dedicated Centers per Role in User Menu ${role}`, async () => {
+          expect(dedicatedCentersPerRole[role]).toBeDefined();
 
           // open user menu
           await page.getByTestId("userMenuBtn").click();
 
-          const buttons = userMenuButtonsPerRole[role];
+          const buttons = dedicatedCentersPerRole[role];
           for (const buttonText in buttons) {
             const expected = buttons[buttonText];
             const isVisible = await page.getByText(buttonText).isVisible();