Merge branch 'master' into pr-osparc-extend-rclone-options

Author: GitHK

packages/service-library/src/servicelib/redis.py

@@ -17,6 +17,7 @@
 from redis.backoff import ExponentialBackoff
 from settings_library.redis import RedisDatabase, RedisSettings
 from tenacity import retry
+from yarl import URL
 
 from .background_task import periodic_task
 from .logging_utils import log_catch, log_context
@@ -94,7 +95,8 @@ def __post_init__(self):
     async def setup(self) -> None:
         if not await self.ping():
             await self.shutdown()
-            raise CouldNotConnectToRedisError(dsn=self.redis_dsn)
+            url_safe: URL = URL(self.redis_dsn).with_password("???")
+            raise CouldNotConnectToRedisError(dsn=f"{url_safe}")
 
         self._health_check_task = asyncio.create_task(
             self._check_health(),

services/dynamic-sidecar/Dockerfile

@@ -187,7 +187,7 @@ RUN chmod +x services/dynamic-sidecar/docker/*.sh
 HEALTHCHECK \
   --interval=10s \
   --timeout=5s \
-  --start-period=30s \
+  --start-period=180s \
   --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/dynamic-sidecar/docker/healthcheck.py", "http://localhost:8000/health"]

services/dynamic-sidecar/docker/entrypoint.sh

@@ -93,12 +93,12 @@ fi
 # Change ownership of volumes mount directory
 # directories are empty at this point
 # each individual subdirectory is a unique volume
-chown --verbose --recursive "$SC_USER_NAME":"$GROUPNAME" "${DYNAMIC_SIDECAR_DY_VOLUMES_MOUNT_DIR}"
+chown --recursive "$SC_USER_NAME":"$GROUPNAME" "${DYNAMIC_SIDECAR_DY_VOLUMES_MOUNT_DIR}"
 # Allow owner and group to edit write and execute
 # files from all the subdirectories
 # When the service access files downloaded by the dynamic-sidecar
 # it uses group permissions
-chmod --verbose --recursive 774 "${DYNAMIC_SIDECAR_DY_VOLUMES_MOUNT_DIR}"
+chmod --recursive 774 "${DYNAMIC_SIDECAR_DY_VOLUMES_MOUNT_DIR}"
 
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"

services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js

@@ -27,27 +27,7 @@ qx.Class.define("osparc.widget.PersistentIframe", {
   construct: function(source, el) {
     this.base(arguments, source);
 
-    this.themeSwitchHandler = msg => {
-      this.postThemeSwitch(msg.getData());
-    };
-
-    this.postThemeSwitch = theme => {
-      const iframe = this._getIframeElement();
-      if (this._getIframeElement()) {
-        const iframeDomEl = iframe.getDomElement();
-        const iframeSource = iframe.getSource();
-        if (iframeDomEl && iframeSource) {
-          const msg = "osparc;theme=" + theme;
-          try {
-            iframeDomEl.contentWindow.postMessage(msg, iframeSource);
-          } catch (err) {
-            console.log(`Failed posting message ${msg} to iframe ${iframeSource}\n${err.message}`);
-          }
-        }
-      }
-    };
-
-    qx.event.message.Bus.getInstance().subscribe("themeSwitch", this.themeSwitchHandler);
+    this.__attachInterframeMessageHandlers();
   },
 
   statics: {
@@ -265,6 +245,69 @@ qx.Class.define("osparc.widget.PersistentIframe", {
       this.__iframe.setSource(newValue);
     },
 
+    __attachInterframeMessageHandlers: function() {
+      this.__attachTriggerers();
+      this.__attachListeners();
+    },
+
+    __attachTriggerers: function() {
+      this.postThemeSwitch = theme => {
+        const iframe = this._getIframeElement();
+        if (iframe) {
+          const iframeDomEl = iframe.getDomElement();
+          const iframeSource = iframe.getSource();
+          if (iframeDomEl && iframeSource) {
+            const msg = "osparc;theme=" + theme;
+            try {
+              iframeDomEl.contentWindow.postMessage(msg, iframeSource);
+            } catch (err) {
+              console.log(`Failed posting message ${msg} to iframe ${iframeSource}\n${err.message}`);
+            }
+          }
+        }
+      };
+
+      this.themeSwitchHandler = msg => {
+        this.postThemeSwitch(msg.getData());
+      };
+      qx.event.message.Bus.getInstance().subscribe("themeSwitch", this.themeSwitchHandler);
+    },
+
+    __attachListeners: function() {
+      this.__iframe.addListener("load", () => {
+        const iframe = this._getIframeElement();
+        if (iframe) {
+          const iframeDomEl = iframe.getDomElement();
+          if (iframeDomEl) {
+            window.addEventListener("message", message => {
+              const data = message.data;
+              if (data) {
+                this.__handleIframeMessage(data);
+              }
+            });
+          }
+        }
+      }, this);
+    },
+
+    __handleIframeMessage: function(data) {
+      if (data["type"] && data["message"]) {
+        if (data["type"] === "theme") {
+          // switch theme driven by the iframe
+          const message = data["message"];
+          if (message.includes("osparc;theme=")) {
+            const themeName = message.replace("osparc;theme=", "");
+            const validThemes = osparc.ui.switch.ThemeSwitcher.getValidThemes();
+            const themeFound = validThemes.find(theme => theme.basename === themeName);
+            const themeManager = qx.theme.manager.Meta.getInstance();
+            if (themeFound !== themeManager.getTheme()) {
+              themeManager.setTheme(themeFound);
+            }
+          }
+        }
+      }
+    },
+
     // override
     _getIframeElement: function() {
       return this.__iframe._getIframeElement(); // eslint-disable-line no-underscore-dangle