Merge branch 'master' into pr-osparc-security-strip-user-and-password

GitHK · web-flow · commit f2370b9deb9d · 2024-09-25T07:30:41.000+02:00
diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/pydantic_extension.py b/packages/pytest-simcore/src/pytest_simcore/helpers/pydantic_extension.py
@@ -0,0 +1,34 @@
+from pydantic import SecretStr
+
+
+def _mask(value):
+    """
+    Mask the password, showing only the first and last characters
+    or *** if very short passwords
+    """
+    if len(value) > 2:
+        masked_value = value[0] + "*" * (len(value) - 2) + value[-1]
+    else:
+        # In case of very short passwords
+        masked_value = "*" * len(value)
+    return masked_value
+
+
+def _hash(value):
+    """Uses hash number to mask the password"""
+    return f"hash:{hash(value)}"
+
+
+class Secret4TestsStr(SecretStr):
+    """Prints a hint of the secret
+    TIP: Can be handy for testing
+    """
+
+    def _display(self) -> str | bytes:
+        # SEE overrides _SecretBase._display
+        value = self.get_secret_value()
+        return _mask(value) if value else ""
+
+
+assert str(Secret4TestsStr("123456890")) == "1*******0"
+assert "1*******0" in repr(Secret4TestsStr("123456890"))
diff --git a/services/static-webserver/client/source/class/osparc/CookiePolicy.js b/services/static-webserver/client/source/class/osparc/CookiePolicy.js
@@ -66,7 +66,7 @@ qx.Class.define("osparc.CookiePolicy", {
       return link;
     },
 
-    getZMTEULALink: function(linkText = "end users license agreement (EULA)") {
+    getZMTEULALink: function(linkText = "end-users license agreement (EULA)") {
       const color = qx.theme.manager.Color.getInstance().resolve("text");
       const link = `<a href='https://zurichmedtech.github.io/s4l-manual/#/docs/licensing/copyright_Sim4Life?id=zurich-medtech-ag-zmt' style='color: ${color}' target='_blank''>${linkText}</a>`;
       return link;
diff --git a/services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js b/services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js
@@ -129,14 +129,21 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
           rich: true
         });
         country.add(cItem);
-      })
+      });
+      // preselect
       fetch("https://ipapi.co/json")
         .then(res => res.json())
         .then(data => {
           const countryFound = country.getSelectables().find(c => c.getModel().toUpperCase() === data.country_code.toUpperCase());
           if (countryFound) {
             country.setSelection([countryFound])
           }
+        })
+        .catch(err => {
+          console.error(err);
+          const emptyItem = new qx.ui.form.ListItem("", null, "");
+          country.add(emptyItem);
+          country.setSelection([emptyItem]);
         });
       this._form.add(country, this.tr("Country"), null, "country");
 
@@ -321,7 +328,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
 
       // Eula link
       if (osparc.product.Utils.getProductName() !== "osparc") {
-        const eulaLink = osparc.CookiePolicy.getZMTEULALink("end users license agreement (EULA)");
+        const eulaLink = osparc.CookiePolicy.getZMTEULALink("end-users license agreement (EULA)");
         const eulaText = "I accept the " + eulaLink + " and I will use the product in accordance with it";
         const eula = new qx.ui.form.CheckBox().set({
           required: true,
diff --git a/services/static-webserver/client/source/class/osparc/node/slideshow/BaseNodeView.js b/services/static-webserver/client/source/class/osparc/node/slideshow/BaseNodeView.js
@@ -235,20 +235,20 @@ qx.Class.define("osparc.node.slideshow.BaseNodeView", {
       }
       const desc = this.getNode().getSlideshowInstructions();
       if (desc) {
-        const descView = new osparc.ui.markdown.Markdown().set({
+        const markdownInstructions = new osparc.ui.markdown.Markdown().set({
           value: desc,
           padding: 3,
           font: "text-14"
         });
-        const scrollContainer = new qx.ui.container.Scroll();
-        scrollContainer.add(descView);
         const title = this.tr("Instructions") + " - " + this.getNode().getLabel();
-        const width = 500;
-        const height = 500;
-        const win = this.__instructionsWindow = osparc.ui.window.Window.popUpInWindow(scrollContainer, title, width, height).set({
+        const width = 600;
+        const minHeight = 200;
+        const win = this.__instructionsWindow = osparc.ui.window.Window.popUpInWindow(markdownInstructions, title, width, minHeight).set({
           modal: false,
           clickAwayClose: false
         });
+        markdownInstructions.addListener("resized", () => win.center());
+
         win.getContentElement().setStyles({
           "border-color": qx.theme.manager.Color.getInstance().resolve("strong-main")
         });
diff --git a/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js b/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js
@@ -35,6 +35,11 @@ qx.Class.define("osparc.product.TIPTeaser", {
     });
 
     this.getChildControl("teaser-text");
+
+    osparc.utils.Utils.setIdToWidget(this, "tipTeaserWindow");
+
+    const closeBtn = this.getChildControl("close-button");
+    osparc.utils.Utils.setIdToWidget(closeBtn, "tipTeaserWindowCloseBtn");
   },
 
   statics: {
diff --git a/services/static-webserver/client/source/class/osparc/product/quickStart/tis/Slides.js b/services/static-webserver/client/source/class/osparc/product/quickStart/tis/Slides.js
@@ -26,7 +26,7 @@ qx.Class.define("osparc.product.quickStart.tis.Slides", {
     footerLinks: function() {
       const footerLinks = [];
 
-      const videoText = osparc.utils.Utils.createHTMLLink("TIP video", "https://youtu.be/-ZE6yOJ3ipw");
+      const videoText = osparc.utils.Utils.createHTMLLink("TIP videos", "https://www.youtube.com/playlist?list=PLcJQYcVCSqDu5gXnJj-_vS_spGhZOe-jF");
       const videoLabel = new qx.ui.basic.Label(videoText).set({
         textAlign: "center",
         rich : true
diff --git a/services/static-webserver/client/source/class/osparc/ui/markdown/Markdown.js b/services/static-webserver/client/source/class/osparc/ui/markdown/Markdown.js
@@ -71,6 +71,10 @@ qx.Class.define("osparc.ui.markdown.Markdown", {
     }
   },
 
+  events: {
+    "resized": "qx.event.type.Event",
+  },
+
   members: {
     __loadMarked: null,
     /**
@@ -138,7 +142,26 @@ qx.Class.define("osparc.ui.markdown.Markdown", {
         } else {
           this.setMinHeight(elemHeight);
         }
+
+        const elemMaxWidth = this.__getChildrenElementMaxWidth(domElement.children);
+        if (this.getMaxWidth() && elemMaxWidth > this.getMaxWidth()) {
+          this.setWidth(elemMaxWidth);
+        } else {
+          this.setMinWidth(elemMaxWidth);
+        }
       }
+      this.fireEvent("resized");
+    },
+
+    __getDomElement: function() {
+      if (!this.getContentElement || this.getContentElement() === null) {
+        return null;
+      }
+      const domElement = this.getContentElement().getDomElement();
+      if (domElement) {
+        return domElement;
+      }
+      return null;
     },
 
     __getChildrenElementHeight: function(children) {
@@ -155,23 +178,37 @@ qx.Class.define("osparc.ui.markdown.Markdown", {
       if (this.getNoMargin()) {
         element.style.marginTop = 0;
         element.style.marginBottom = 0;
-        const size = qx.bom.element.Dimension.getSize(element);
+        const size = this.__getElementSize(element);
         return size.height;
       }
-      const size = qx.bom.element.Dimension.getSize(element);
+      const size = this.__getElementSize(element);
       // add padding
-      return size.height + 15;
+      return size.height + 20;
     },
 
-    __getDomElement: function() {
-      if (!this.getContentElement || this.getContentElement() === null) {
-        return null;
+    __getChildrenElementMaxWidth: function(children) {
+      let maxWidth = 0;
+      for (let i=0; i < children.length; i++) {
+        maxWidth = Math.max(this.__getElementWidth(children[i]), maxWidth);
       }
-      const domElement = this.getContentElement().getDomElement();
-      if (domElement) {
-        return domElement;
+      return maxWidth;
+    },
+
+    __getElementWidth: function(element) {
+      const size = this.__getElementSize(element);
+      return size.width;
+    },
+
+    __getElementSize: function(element) {
+      if (
+        element &&
+        element.children &&
+        element.children.length &&
+        element.children[0].localName === "img"
+      ) {
+        return qx.bom.element.Dimension.getSize(element.children[0]);
       }
-      return null;
-    }
+      return qx.bom.element.Dimension.getSize(element);
+    },
   }
 });
diff --git a/tests/e2e-playwright/.gitignore b/tests/e2e-playwright/.gitignore
@@ -1,5 +1,5 @@
-test-results
+.e2e-playwright-*.txt
 assets
 report.html
-.e2e-playwright-*.txt
 report.xml
+test-results
diff --git a/tests/e2e-playwright/Makefile b/tests/e2e-playwright/Makefile
@@ -117,13 +117,17 @@ CLASSIC_TIP_INPUT_FILE := .e2e-playwright-classictip-env.txt
 $(SLEEPERS_INPUT_FILE) $(JUPYTER_LAB_INPUT_FILE) $(CLASSIC_TIP_INPUT_FILE) $(S4L_INPUT_FILE):
 	@read -p "Enter your product URL: " PRODUCT_URL; \
 	read -p "Is the product billable [y/n]: " BILLABLE; \
+	read -p "Is the product lite [y/n]: " IS_LITE; \
 	read -p "Is the test running in autoscaled deployment [y/n]: " AUTOSCALED; \
 	read -p "Enter your username: " USER_NAME; \
 	read -s -p "Enter your password: " PASSWORD; echo ""; \
 	echo "--product-url=$$PRODUCT_URL --user-name=$$USER_NAME --password=$$PASSWORD" > $@; \
 	if [ "$$BILLABLE" = "y" ]; then \
 		echo "--product-billable" >> $@; \
 	fi; \
+	if [ "$$IS_LITE" = "y" ]; then \
+		echo "--product-lite" >> $@; \
+	fi; \
 	if [ "$$AUTOSCALED" = "y" ]; then \
 		echo "--autoscaled" >> $@; \
 	fi; \
@@ -183,4 +187,4 @@ define run_test_on_chrome
 endef
 
 clean:
-	@rm -rf $(SLEEPERS_INPUT_FILE) $(JUPYTER_LAB_INPUT_FILE) $(CLASSIC_TIP_INPUT_FILE)
+	-@rm -rf $(SLEEPERS_INPUT_FILE) $(JUPYTER_LAB_INPUT_FILE) $(CLASSIC_TIP_INPUT_FILE)
diff --git a/tests/e2e-playwright/README.md b/tests/e2e-playwright/README.md
@@ -1,22 +1,36 @@
+
+
+## Usage
+
 ### Auto generate new test
-`playwright codegen sim4life.io`
+```
+playwright codegen sim4life.io
+```
 
 ### Run test locally with headed mode
 ```
 pytest -s tests/sim4life.py --headed --browser chromium --product-billable  --product-url https://sim4life.io/ --user-name YOUR_USERNAME --password YOUR_PASSWORD --service-key sim4life-8-0-0-dy
 ```
 
 ### Check test results output
-`playwright show-trace test-results/tests-sim4life-py-test-billable-sim4life-chromium/trace.zip`
+```
+playwright show-trace test-results/tests-sim4life-py-test-billable-sim4life-chromium/trace.zip
+```
 
 ### Run debug mode
-`PWDEBUG=1 pytest -s tests/sim4life.py`
+```
+PWDEBUG=1 pytest -s tests/sim4life.py
+```
 
 ### Run test in different browsers
-`pytest -s tests/sim4life.py --tracing on --html=report.html --browser chromium --browser firefox`
+```
+pytest -s tests/sim4life.py --tracing on --html=report.html --browser chromium --browser firefox
+```
 
-### or in chrome/msedge
-`pytest -s tests/sim4life.py --tracing on --html=report.html --browser-channel chrome`
+### or in chrome/ms-edge
+```
+pytest -s tests/sim4life.py --tracing on --html=report.html --browser-channel chrome
+```
 
-### Runs in CI
+## e2e CI
   - https://git.speag.com/oSparc/e2e-backend
diff --git a/tests/e2e-playwright/tests/conftest.py b/tests/e2e-playwright/tests/conftest.py
diff --git a/tests/e2e-playwright/tests/sim4life/test_sim4life.py b/tests/e2e-playwright/tests/sim4life/test_sim4life.py
diff --git a/tests/e2e-playwright/tests/sim4life/test_template.py b/tests/e2e-playwright/tests/sim4life/test_template.py
diff --git a/tests/e2e-playwright/tests/tip/test_ti_plan.py b/tests/e2e-playwright/tests/tip/test_ti_plan.py
