Feature/fb 09 05 (ITISFoundation#3317)

Author: odeimaiz

services/web/client/source/class/osparc/auth/ui/LoginSMSCodeView.js

@@ -83,7 +83,9 @@ qx.Class.define("osparc.auth.ui.LoginSMSCodeView", {
         flex: 1
       });
       resendCodeBtn.addListener("execute", () => {
-        osparc.auth.ui.VerifyPhoneNumberView.restartResendTimer(this.__resendCodeBtn, this.tr("Resend code"));
+        const msg = this.tr("Not yet implemented. Please, reload the page instead");
+        osparc.component.message.FlashMessenger.getInstance().logAs(msg, "WARNING");
+        // osparc.auth.ui.VerifyPhoneNumberView.restartResendTimer(this.__resendCodeBtn, this.tr("Resend code"));
       }, this);
       this.add(resendLayout);
     },

services/web/client/source/class/osparc/component/widget/PreparingInputs.js

@@ -21,6 +21,8 @@ qx.Class.define("osparc.component.widget.PreparingInputs", {
   construct: function(monitoredNodes = []) {
     this.base(arguments);
 
+    osparc.utils.Utils.setIdToWidget(this, "AppMode_PreparingInputsView");
+
     this._setLayout(new qx.ui.layout.VBox(10));
 
     const text = this.tr("In order to move to this step, we need to prepare some inputs for you.<br>This might take a while, so enjoy checking the logs down here:");

services/web/client/source/class/osparc/dashboard/ResourceBrowserBase.js

@@ -212,7 +212,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
             if (dontShow === "true") {
               return;
             }
-            if (templates === false && resources.length === 0 && this._resourcesContainer.nextRequest === null) {
+            if (templates === false && "_meta" in resp && resp["_meta"]["total"] === 0) {
               // there are no studies
               const tutorialWindow = new osparc.component.tutorial.ti.Slides();
               tutorialWindow.center();

services/web/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -369,21 +369,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __newStudyBtnClicked: function() {
       this.__newStudyBtn.setValue(false);
       const minStudyData = osparc.data.model.Study.createMyNewStudyObject();
-      let title = minStudyData.name;
-      const existingTitles = this.__studies.map(study => study.name);
-      if (existingTitles.includes(title)) {
-        let cont = 1;
-        while (existingTitles.includes(`${title} (${cont})`)) {
-          cont++;
-        }
-        title += ` (${cont})`;
-      }
+      const title = osparc.utils.Utils.getUniqueStudyName(minStudyData.name, this.__studies);
       minStudyData["name"] = title;
       minStudyData["description"] = "";
       this.__createStudy(minStudyData, null);
     },
 
     __newPlanBtnClicked: function(templateData) {
+      const title = osparc.utils.Utils.getUniqueStudyName(templateData.name, this.__studies);
+      templateData.name = title;
       this._showLoadingPage(this.tr("Creating ") + (templateData.name || this.tr("Study")));
       osparc.utils.Study.createStudyFromTemplate(templateData)
         .then(studyId => {

services/web/client/source/class/osparc/navigation/BreadcrumbsSlideshow.js

@@ -75,6 +75,7 @@ qx.Class.define("osparc.navigation.BreadcrumbsSlideshow", {
       const node = study.getWorkbench().getNode(nodeId);
       if (node && nodeId in slideshow) {
         const pos = slideshow[nodeId].position;
+        osparc.utils.Utils.setIdToWidget(btn, "AppMode_StepBtn_"+(pos+1));
         node.bind("label", btn, "label", {
           converter: val => `${pos+1}: ${val}`
         });

services/web/client/source/class/osparc/navigation/PrevNextButtons.js

@@ -80,13 +80,15 @@ qx.Class.define("osparc.navigation.PrevNextButtons", {
         icon: this.self().PREV_BUTTON,
         ...this.self().BUTTON_OPTIONS
       });
+      osparc.utils.Utils.setIdToWidget(prvsBtn, "AppMode_PreviousBtn");
       prvsBtn.addListener("execute", () => this.__prevPressed(), this);
 
       const nextBtn = this.__nextBtn = new qx.ui.form.Button().set({
         toolTipText: qx.locale.Manager.tr("Next"),
         icon: this.self().NEXT_BUTTON,
         ...this.self().BUTTON_OPTIONS
       });
+      osparc.utils.Utils.setIdToWidget(nextBtn, "AppMode_NextBtn");
       nextBtn.addListener("execute", () => this.__nextPressed(), this);
 
       const runBtn = this.__runBtn = new qx.ui.form.Button().set({

services/web/client/source/class/osparc/utils/Utils.js

@@ -77,6 +77,19 @@ qx.Class.define("osparc.utils.Utils", {
       }
     },
 
+    getUniqueStudyName: function(preferredName, list) {
+      let title = preferredName;
+      const existingTitles = list.map(study => study.name);
+      if (existingTitles.includes(title)) {
+        let cont = 1;
+        while (existingTitles.includes(`${title} (${cont})`)) {
+          cont++;
+        }
+        title += ` (${cont})`;
+      }
+      return title;
+    },
+
     checkIsOnScreen: function(elem) {
       const isInViewport = element => {
         if (element) {

tests/e2e/tutorials/jupyterlabs.js

@@ -38,15 +38,8 @@ async function runTutorial() {
       await tutorial.openNode(j);
       await tutorial.waitFor(35000);
 
-
       // Run the jlab nbook
-      const iframeHandles = await tutorial.getIframe();
-      let iframes2 = [];
-      for (let i = 0; i < iframeHandles.length; i++) {
-        const frame = await iframeHandles[i].contentFrame();
-        iframes2.push(frame);
-      }
-      const jLabIframe = iframes2.find(iframe => iframe._url.includes(workbenchData["nodeIds"][j]));
+      const jLabIframe = await tutorial.getIframe(workbenchData["nodeIds"][j]);
 
       await tutorial.takeScreenshot("before_nb_selection");
       const input2outputFileSelector = '[title~="jl_notebook.ipynb"]';

tests/e2e/tutorials/ti-plan.js

@@ -40,13 +40,36 @@ async function runTutorial() {
     // wait for the three services
     const workbenchData = utils.extractWorkbenchData(studyData["data"]);
     console.log(workbenchData);
-    // skipping the second one wchich is the optimizer
+
+    // wait for the three services, except the optimizer
     await tutorial.waitForServices(
       workbenchData["studyId"],
       [workbenchData["nodeIds"][0], workbenchData["nodeIds"][2], workbenchData["nodeIds"][3]],
       startTimeout,
       false
     );
+
+    // Make Electrode Selector selection
+    const electrodeSelectorIframe = await tutorial.getIframe(workbenchData["nodeIds"][0]);
+    await utils.waitAndClick(electrodeSelectorIframe, '[osparc-test-id="TargetStructure_Selector"]');
+    await utils.waitAndClick(electrodeSelectorIframe, '[osparc-test-id="TargetStructure_Target_Hypothalamus"]');
+    const selection = [
+      ["E1+", "FT9"],
+      ["E1-", "FT7"],
+      ["E2+", "T9"],
+      ["E2-", "T7"],
+    ];
+    for (let i = 0; i < selection.length; i++) {
+      const grp = selection[i];
+      await utils.waitAndClick(electrodeSelectorIframe, `[osparc-test-id="ElectrodeGroup_${grp[0]}_Start"]`);
+      await utils.waitAndClick(electrodeSelectorIframe, `[osparc-test-id="Electrode_${grp[1]}"]`);
+    }
+    await utils.waitAndClick(electrodeSelectorIframe, `[osparc-test-id="FinishSetUp"]`);
+
+    // Run optimizer
+    await tutorial.waitAndClick("AppMode_NextBtn");
+    await tutorial.waitFor(5000, "Running Optimizer");
+    await tutorial.waitForStudyDone(studyId, 120000);
   }
   catch (err) {
     tutorial.setTutorialFailed(true);

tests/e2e/tutorials/tutorialBase.js

@@ -297,6 +297,7 @@ class TutorialBase {
   }
 
   async waitForServices(studyId, nodeIds, timeout = 40000, waitForConnected = true) {
+    console.log("waitForServices timeout:", timeout);
     if (nodeIds.length < 1) {
       return;
     }
@@ -389,10 +390,26 @@ class TutorialBase {
     await this.takeScreenshot('openNode_' + nodePosInTree);
   }
 
-  async getIframe() {
+  async __getIframeHandles() {
     return await this.__page.$$("iframe");
   }
 
+  async __getIframes() {
+    const iframeHandles = await this.__getIframeHandles();
+    const iframes = [];
+    for (let i = 0; i < iframeHandles.length; i++) {
+      const frame = await iframeHandles[i].contentFrame();
+      iframes.push(frame);
+    }
+    return iframes;
+  }
+
+  async getIframe(nodeId) {
+    const iframes = await this.__getIframes();
+    const nodeIframe = iframes.find(iframe => iframe._url.includes(nodeId));
+    return nodeIframe;
+  }
+
   async openNodeFiles(nodePosInTree = 0) {
     const nodeId = await auto.openNode(this.__page, nodePosInTree);
     this.__responsesQueue.addResponseListener("storage/locations/0/files/metadata?uuid_filter=" + nodeId);
@@ -406,8 +423,12 @@ class TutorialBase {
     }
   }
 
+  async waitAndClick(osparcTestId) {
+    await utils.waitAndClick(this.__page, `[osparc-test-id=${osparcTestId}]`);
+  }
+
   async closeNodeFiles() {
-    await utils.waitAndClick(this.__page, '[osparc-test-id="nodeDataManagerCloseBtn"]');
+    await this.waitAndClick("nodeDataManagerCloseBtn");
   }
 
   async checkNodeOutputs(nodePos, fileNames, checkNFiles = true, checkFileNames = true) {