Merge branch 'master' into 7348-add-dummy-functions-api

Author: bisgaard-itis

.github/workflows/ci-testing-deploy.yml

@@ -514,7 +514,7 @@ jobs:
   unit-test-storage:
     needs: changes
     if: ${{ needs.changes.outputs.storage == 'true' || github.event_name == 'push' }}
-    timeout-minutes: 18 # if this timeout gets too small, then split the tests
+    timeout-minutes: 25 # if this timeout gets too small, then split the tests
     name: "[unit] storage"
     runs-on: ${{ matrix.os }}
     strategy:

packages/pytest-simcore/src/pytest_simcore/docker_compose.py

@@ -2,10 +2,10 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-""" Fixtures to create docker-compose.yaml configuration files (as in Makefile)
+"""Fixtures to create docker-compose.yaml configuration files (as in Makefile)
 
-    - Basically runs `docker compose config
-    - Services in stack can be selected using 'core_services_selection', 'ops_services_selection' fixtures
+- Basically runs `docker compose config
+- Services in stack can be selected using 'core_services_selection', 'ops_services_selection' fixtures
 
 """
 
@@ -391,6 +391,10 @@ def _filter_services_and_dump(
         if "environment" in service:
             service["environment"] = _minio_fix(service["environment"])
 
+        if name == "postgres":
+            # NOTE: # -c fsync=off is not recommended for production as this disable writing to disk https://pythonspeed.com/articles/faster-db-tests/
+            service["command"] += ["-c", "fsync=off"]
+
     # updates current docker-compose (also versioned ... do not change by hand)
     with docker_compose_path.open("wt") as fh:
         yaml.dump(content, fh, default_flow_style=False)

packages/service-library/src/servicelib/rabbitmq/_client_rpc.py

@@ -32,15 +32,18 @@ async def create(
         cls, *, client_name: str, settings: RabbitSettings, **kwargs
     ) -> "RabbitMQRPCClient":
         client = cls(client_name=client_name, settings=settings, **kwargs)
-        await client._rpc_initialize()  # noqa: SLF001
+        await client._rpc_initialize()
         return client
 
     async def _rpc_initialize(self) -> None:
+        # NOTE: to show the connection name in the rabbitMQ UI see there
+        # https://www.bountysource.com/issues/89342433-setting-custom-connection-name-via-client_properties-doesn-t-work-when-connecting-using-an-amqp-url
+        #
+        connection_name = f"{get_rabbitmq_client_unique_name(self.client_name)}.rpc"
+        url = f"{self.settings.dsn}?name={connection_name}"
         self._connection = await aio_pika.connect_robust(
-            self.settings.dsn,
-            client_properties={
-                "connection_name": f"{get_rabbitmq_client_unique_name(self.client_name)}.rpc"
-            },
+            url,
+            client_properties={"connection_name": connection_name},
         )
         self._channel = await self._connection.channel()
 

packages/settings-library/src/settings_library/redis.py

@@ -42,6 +42,6 @@ def build_redis_dsn(self, db_index: RedisDatabase) -> str:
                 ),
                 host=self.REDIS_HOST,
                 port=self.REDIS_PORT,
-                path=f"/{db_index}",
+                path=f"{db_index}",
             )
         )

services/static-webserver/client/.gitignore

@@ -14,6 +14,3 @@ source/resource/iconfont/material
 # generator outputs
 /api/
 /test/
-
-# translations for the moment ignored
-*.po

services/static-webserver/client/Makefile

@@ -88,6 +88,17 @@ serve: compile ## serves site compiled in image in 127.0.0.1:8080
 	docker run --rm -p 8080:8080  $(docker_image) $(qx_serve) --target=build
 
 
+# qx translate --------------------------
+
+define qx_translate_extract =
+			qx compile --update-po-files
+endef
+
+.PHONY: translate-extract
+translate-extract: translate-extract ## the generated .po files goes to source/translation https://qooxdoo.org/documentation/v7.8/#/development/howto/internationalization?id=translation
+	# qx compile --update-po-files
+	$(docker_compose) run $(if $(detached),--detach --name=$(detached),--rm) qooxdoo-kit $(qx_translate_extract)
+
 
 # misc --------------------------
 .PHONY: shell

services/static-webserver/client/source/class/osparc/Application.js

@@ -74,7 +74,7 @@ qx.Class.define("osparc.Application", {
       const webSocket = osparc.wrapper.WebSocket.getInstance();
       webSocket.addListener("connect", () => osparc.WatchDog.getInstance().setOnline(true));
       webSocket.addListener("disconnect", () => osparc.WatchDog.getInstance().setOnline(false));
-      webSocket.addListener("logout", () => this.logout(qx.locale.Manager.tr("You were logged out")));
+      webSocket.addListener("logout", () => this.logout(qx.locale.Manager.tr("You have been logged out")));
       // alert the users that they are about to navigate away
       // from osparc. unfortunately it is not possible
       // to provide our own message here
@@ -371,7 +371,7 @@ qx.Class.define("osparc.Application", {
     __checkNewRelease: function() {
       if (osparc.NewRelease.firstTimeISeeThisFrontend()) {
         const newRelease = new osparc.NewRelease();
-        const title = this.tr("New Release");
+        const title = this.tr("New Version Released");
         const win = osparc.ui.window.Window.popUpInWindow(newRelease, title, 350, 135).set({
           clickAwayClose: false,
           resizable: false,
@@ -563,7 +563,7 @@ qx.Class.define("osparc.Application", {
       if (forcedReason) {
         osparc.FlashMessenger.logAs(forcedReason, "WARNING", 0);
       } else {
-        osparc.FlashMessenger.logAs(this.tr("You are logged out"), "INFO");
+        osparc.FlashMessenger.logAs(this.tr("You have been logged out"), "INFO");
       }
       this.__closeAllAndToLoginPage();
     },

services/static-webserver/client/source/class/osparc/CookieExpirationTracker.js

@@ -112,7 +112,7 @@ qx.Class.define("osparc.CookieExpirationTracker", {
     // /FLASH MESSAGE //
 
     __logoutUser: function() {
-      const reason = qx.locale.Manager.tr("Session expired");
+      const reason = qx.locale.Manager.tr("Your session has expired");
       qx.core.Init.getApplication().logout(reason);
     }
   }

services/static-webserver/client/source/class/osparc/MaintenanceTracker.js

@@ -166,7 +166,7 @@ qx.Class.define("osparc.MaintenanceTracker", {
         end: null,
         reason: null
       });
-      const reason = qx.locale.Manager.tr("We are under maintenance. Please check back later");
+      const reason = qx.locale.Manager.tr("The service is under maintenance. Please check back later");
       qx.core.Init.getApplication().logout(reason);
     },
 

services/static-webserver/client/source/class/osparc/TooSmallDialog.js

@@ -19,7 +19,7 @@ qx.Class.define("osparc.TooSmallDialog", {
   extend: osparc.ui.window.SingletonWindow,
 
   construct: function() {
-    this.base(arguments, "too-small-logout", this.tr("Window too small"));
+    this.base(arguments, "too-small-logout", this.tr("Window size too small"));
 
     this.set({
       layout: new qx.ui.layout.VBox(10),