Merge branch 'master' into extract-celery-code

Author: giancarloromeo

services/docker-compose.yml

@@ -1385,10 +1385,12 @@ services:
       - "--metrics.prometheus.entryPoint=metrics"
       - "--entryPoints.http.address=:80"
       - "--entryPoints.http.forwardedHeaders.insecure"
-      - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805      - "--entryPoints.simcore_api.address=:10081"
+      - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file uploads
+      - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file downloads
       - "--entryPoints.simcore_api.address=:10081"
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
-      - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
+      - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file uploads
+      - "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file downloads
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
       - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
@@ -1401,6 +1403,14 @@ services:
       - "--tracing.addinternals"
       - "--tracing.otlp=true"
       - "--tracing.otlp.http=true"
+    healthcheck:
+      # NOTE: this healthcheck to check if traefik is up and running must be run on the ping entrypoint defined in command!
+      test: traefik healthcheck --ping --ping.entryPoint=ping --entryPoints.ping.address=:9082
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+      start_interval: 1s
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock

services/static-webserver/client/source/class/osparc/editor/HtmlEditor.js

@@ -26,8 +26,7 @@ qx.Class.define("osparc.editor.HtmlEditor", {
 
     this.getChildControl("preview-html");
     this.getChildControl("subtitle").set({
-      value: this.tr("Supports HTML"),
-      url: "https://en.wikipedia.org/wiki/HTML",
+      value: this.tr("Supports HTML")
     });
   },
 

services/static-webserver/client/source/class/osparc/editor/MarkdownEditor.js

@@ -31,8 +31,7 @@ qx.Class.define("osparc.editor.MarkdownEditor", {
 
     this.getChildControl("preview-markdown");
     this.getChildControl("subtitle").set({
-      value: this.tr("Markdown supported"),
-      url: "https://en.wikipedia.org/wiki/Markdown",
+      value: this.tr("Markdown supported")
     });
   },
 

services/static-webserver/client/source/class/osparc/editor/TextEditor.js

@@ -81,13 +81,15 @@ qx.Class.define("osparc.editor.TextEditor", {
           writePage.add(control, {
             flex: 1
           });
-          const subtitle = this.getChildControl("subtitle");
+          const subtitle = this.getChildControl("subtitle").set({
+            value: this.tr("Supports HTML")
+          });
           writePage.add(subtitle);
           tabs.add(writePage);
           break;
         }
         case "subtitle":
-          control = new osparc.ui.basic.LinkLabel().set({
+          control = new qx.ui.basic.Label().set({
             font: "text-12"
           });
           this._add(control);

services/static-webserver/client/source/class/osparc/info/CommentUI.js

@@ -113,8 +113,10 @@ qx.Class.define("osparc.info.CommentUI", {
 
     __buildLayout: function() {
       const thumbnail = this.getChildControl("thumbnail");
+      thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail("", "", 32));
 
       const userName = this.getChildControl("user-name");
+      userName.setValue("Unknown");
 
       const date = new Date(this.__comment["modified"]);
       const date2 = osparc.utils.Utils.formatDateAndTime(date);
@@ -129,14 +131,7 @@ qx.Class.define("osparc.info.CommentUI", {
           if (user) {
             thumbnail.setSource(user.getThumbnail());
             userName.setValue(user.getLabel());
-          } else {
-            thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
-            userName.setValue("Unknown user");
           }
-        })
-        .catch(() => {
-            thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
-            userName.setValue("Unknown user");
         });
 
       this.getChildControl("spacer");

services/static-webserver/client/source/class/osparc/utils/Avatar.js

@@ -34,7 +34,12 @@ qx.Class.define("osparc.utils.Avatar", {
   type: "static",
 
   statics: {
-    emailToThumbnail: function(email = "", username = "??", size = 32) {
+    emailToThumbnail: function(email, username) {
+      return this.__getUrl(email, username, 32);
+    },
+
+    __getUrl: function(email, username, size = 100) {
+      email = email || "";
       // MD5 (Message-Digest Algorithm) by WebToolkit
       const MD5 = function(s) {
         function L(k, d) {

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

@@ -156,11 +156,6 @@
         "title": "${replace_me_product_name}",
         "newStudyLabel": "New Project",
         "idToWidget": "startS4LButton"
-      }, {
-        "resourceType": "service",
-        "expectedKey": "simcore/services/dynamic/s4l-ui-framework",
-        "title": "Sim4Life.framework",
-        "newStudyLabel": "Sim4Life.framework"
       }]
     }
   },