update tests

Author: odeimaiz

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

@@ -250,6 +250,8 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
       // disable it until found in services store
       menuButton.setEnabled(false);
 
+      // OM: direct access to service metadata
+
       const key = newStudyData.expectedKey;
       // Include deprecated versions, they should all be updatable to a non deprecated version
       const versions = osparc.service.Utils.getVersions(key, false);

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

@@ -956,31 +956,31 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         firstUpperCase: true
       })
       const desc = this.tr("Start with an empty study");
-      const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title, desc) : new osparc.dashboard.ListButtonNew(title, desc);
-      newStudyBtn.setCardKey("new-study");
-      newStudyBtn.subscribeToFilterGroup("searchBarFilter");
-      osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
-      newStudyBtn.addListener("tap", () => this.__newStudyBtnClicked(newStudyBtn));
-      this._resourcesContainer.addNonResourceCard(newStudyBtn);
+      const newEmptyStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title, desc) : new osparc.dashboard.ListButtonNew(title, desc);
+      newEmptyStudyBtn.setCardKey("new-study");
+      newEmptyStudyBtn.subscribeToFilterGroup("searchBarFilter");
+      osparc.utils.Utils.setIdToWidget(newEmptyStudyBtn, "emptyStudyBtn");
+      newEmptyStudyBtn.addListener("tap", () => this.__newEmptyStudyBtnClicked());
+      this._resourcesContainer.addNonResourceCard(newEmptyStudyBtn);
     },
 
     __addTIPPlusButton: function() {
       const mode = this._resourcesContainer.getMode();
       const title = this.tr("New Plan");
-      const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
-      newStudyBtn.setCardKey("new-study");
-      newStudyBtn.subscribeToFilterGroup("searchBarFilter");
-      osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
-      this._resourcesContainer.addNonResourceCard(newStudyBtn);
-      newStudyBtn.setEnabled(false);
+      const newPlansBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
+      newPlansBtn.setCardKey("new-study");
+      newPlansBtn.subscribeToFilterGroup("searchBarFilter");
+      osparc.utils.Utils.setIdToWidget(newPlansBtn, "newPlansBtn");
+      this._resourcesContainer.addNonResourceCard(newPlansBtn);
+      newPlansBtn.setEnabled(false);
 
       osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
         .then(newStudiesData => {
           const product = osparc.product.Utils.getProductName()
           if (product in newStudiesData) {
-            newStudyBtn.setEnabled(true);
+            newPlansBtn.setEnabled(true);
 
-            newStudyBtn.addListener("tap", () => {
+            newPlansBtn.addListener("tap", () => {
               osparc.data.Resources.get("templates")
                 .then(templates => {
                   if (templates) {
@@ -1506,7 +1506,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       }
     },
 
-    __newStudyBtnClicked: function(button) {
+    __newEmptyStudyBtnClicked: function() {
       const minStudyData = osparc.data.model.Study.createMinStudyObject();
       const existingNames = this._resourcesList.map(study => study["name"]);
       const title = osparc.utils.Utils.getUniqueName(minStudyData.name, existingNames);

services/static-webserver/client/source/class/osparc/product/Utils.js

@@ -301,8 +301,8 @@ qx.Class.define("osparc.product.Utils", {
         "s4l",
         "s4lacad",
         "s4llite",
-        "tis",
-        "tiplite",
+        // "tis",
+        // "tiplite",
       ].includes(osparc.product.Utils.getProductName());
     },
   }

services/static-webserver/client/source/resource/osparc/new_studies.json

@@ -116,43 +116,77 @@
     }]
   },
   "s4l": {
+    "categories": [{
+      "id": "apps",
+      "title": "Apps"
+    }, {
+      "id": "osparc",
+      "title": "oSPARC"
+    }],
     "resources": [{
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-ui",
       "title": "Sim4Life",
       "newStudyLabel": "New S4L project",
       "idToWidget": "startS4LButton"
     }, {
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/iseg-web",
       "title": "iSEG",
       "newStudyLabel": "New iSEG project"
     }, {
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-jupyter",
       "title": "Jupyter Lab",
       "icon": "https://upload.wikimedia.org/wikipedia/commons/3/38/Jupyter_logo.svg",
       "newStudyLabel": "New S4L Jupyter Lab"
+    }, {
+      "category": "osparc",
+      "resourceType": "study",
+      "icon": "@FontAwesome5Solid/file/18",
+      "title": "Workbench",
+      "newStudyLabel": "New Study",
+      "idToWidget": "emptyStudyBtn"
     }]
   },
   "s4lacad": {
+    "categories": [{
+      "id": "apps",
+      "title": "Apps"
+    }, {
+      "id": "osparc",
+      "title": "oSPARC"
+    }],
     "resources": [{
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-ui",
       "title": "Sim4Life",
       "newStudyLabel": "New S4L project",
       "idToWidget": "startS4LButton"
     }, {
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/iseg-web",
       "title": "iSEG",
       "newStudyLabel": "New iSEG project"
     }, {
+      "category": "apps",
       "resourceType": "service",
       "expectedKey": "simcore/services/dynamic/s4l-jupyter",
       "icon": "https://upload.wikimedia.org/wikipedia/commons/3/38/Jupyter_logo.svg",
       "title": "Jupyter Lab",
       "newStudyLabel": "New S4L Jupyter Lab"
+    }, {
+      "category": "osparc",
+      "resourceType": "study",
+      "icon": "@FontAwesome5Solid/file/18",
+      "title": "Workbench",
+      "newStudyLabel": "New Study",
+      "idToWidget": "emptyStudyBtn"
     }]
   },
   "s4llite": {
@@ -170,7 +204,7 @@
       "icon": "@FontAwesome5Solid/file/18",
       "title": "Empty Study",
       "newStudyLabel": "New Study",
-      "idToWidget": "newStudyBtn"
+      "idToWidget": "emptyStudyBtn"
     }]
   }
 }

tests/e2e-frontend/tests/studyBrowser/mainView.spec.js

@@ -9,33 +9,51 @@ import users from '../users.json';
 
 const expectedElements = {
   "osparc": {
+    "newButton": {
+      "id": "newPlusBtn"
+    },
     "plusButton": {
-      "id": "newStudyBtn",
+      "id": "emptyStudyBtn",
     },
   },
   "s4l": {
+    "newButton": {
+      "id": "newPlusBtn"
+    },
     "plusButton": {
       "id": "startS4LButton",
     },
   },
   "s4lacad": {
+    "newButton": {
+      "id": "newPlusBtn"
+    },
     "plusButton": {
       "id": "startS4LButton",
     },
   },
   "s4llite": {
+    "newButton": {
+      "id": "newPlusBtn"
+    },
     "plusButton": {
       "id": "startS4LButton",
     },
   },
   "tis": {
+    "newButton": {
+      "id": "newPlansBtn"
+    },
     "plusButton": {
-      "id": "newStudyBtn",
+      "id": "newTIPlanButton",
     },
   },
   "tiplite": {
+    "newButton": {
+      "id": "newPlansBtn"
+    },
     "plusButton": {
-      "id": "newStudyBtn",
+      "id": "newTIPlanButton",
     },
   },
 };
@@ -66,9 +84,14 @@ for (const product in products) {
           await browser.close();
         });
 
-        test(`Plus button`, async () => {
+        test(`Plus button after New button`, async () => {
           expect(expectedElements[product]["plusButton"]).toBeDefined();
 
+          if (expectedElements[product]["newPlusButton"]) {
+            const newPlusButton = page.getByTestId("newPlusBtn");
+            await newPlusButton.click();
+          }
+
           const plusButtonId = expectedElements[product]["plusButton"]["id"];
           const plusButton = page.getByTestId(plusButtonId);
           await expect(plusButton).toBeVisible({

tests/e2e-playwright/tests/tip/conftest.py

@@ -17,8 +17,7 @@ def _(
         plan_name_test_id: str,
     ) -> None:
         with log_context(logging.INFO, f"Finding {plan_name_test_id=} in dashboard"):
-            page.get_by_test_id("studiesTabBtn").click()
-            page.get_by_test_id("newStudyBtn").click()
+            page.get_by_test_id("newPlansBtn").click()
             page.get_by_test_id(plan_name_test_id).click()
 
     return _

tests/e2e/tests/tags.tes.js

@@ -48,7 +48,8 @@ describe('tags testing', () => {
     await page.goto(url);
     await auto.register(page, user, pass);
     // Create new study
-    await waitAndClick(page, '[osparc-test-id="newStudyBtn"]');
+    await waitAndClick(page, '[osparc-test-id="newPlusBtn"]');
+    await waitAndClick(page, '[osparc-test-id="emptyStudyBtn"]');
     // Wait until project is created and Dashboard button is enabled
     await utils.sleep(4000);
     await auto.toDashboard(page);

tests/e2e/utils/auto.js

@@ -113,7 +113,7 @@ async function dashboardNewTIPlan(page) {
   console.log("Creating New Plan");
 
   await dashboardStudiesBrowser(page);
-  await utils.waitAndClick(page, '[osparc-test-id="newStudyBtn"]');
+  await utils.waitAndClick(page, '[osparc-test-id="newPlansBtn"]');
   await utils.waitAndClick(page, '[osparc-test-id="newTIPlanButton"]');
 }