Merge remote-tracking branch 'upstream/master' into pr-osparc-refactor-simcore-sdk

Andrei Neagu · Andrei Neagu · commit d9af07cf7ee3 · 2025-06-05T10:29:48.000+02:00
diff --git a/services/docker-compose.yml b/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
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
@@ -700,7 +700,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
       }
 
       // Block card
-      const cantReadServices = osparc.study.Utils.getCantExecuteServices(services);
+      const cantReadServices = osparc.study.Utils.getCantReadServices(services);
       if (cantReadServices.length) {
         this.setBlocked("UNKNOWN_SERVICES");
         const image = "@FontAwesome5Solid/ban/";
@@ -985,8 +985,17 @@ qx.Class.define("osparc.dashboard.CardBase", {
       throw new Error("Abstract method called!");
     },
 
-    _applyMenu: function(value, old) {
-      throw new Error("Abstract method called!");
+    _applyMenu: function(menu) {
+      const menuButton = this.getChildControl("menu-button");
+      if (menu) {
+        menuButton.setMenu(menu).set({
+          appearance: "menu-wider",
+          position: "bottom-left",
+        });
+        osparc.utils.Utils.setIdToWidget(menu, "studyItemMenuMenu");
+        menu.addListener("appear", () => this.evaluateMenuButtons());
+      }
+      menuButton.setVisibility(menu ? "visible" : "excluded");
     },
 
     _setStudyPermissions: function(accessRights) {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js
@@ -281,19 +281,5 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
         }
       }
     },
-
-    // overridden
-    _applyMenu: function(menu, old) {
-      const menuButton = this.getChildControl("menu-button");
-      if (menu) {
-        menuButton.setMenu(menu).set({
-          appearance: "menu-wider",
-          position: "bottom-left",
-        });
-        osparc.utils.Utils.setIdToWidget(menu, "studyItemMenuMenu");
-        this.evaluateMenuButtons();
-      }
-      menuButton.setVisibility(menu ? "visible" : "excluded");
-    }
   }
 });
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js
@@ -295,18 +295,5 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
         });
       });
     },
-
-    _applyMenu: function(menu, old) {
-      const menuButton = this.getChildControl("menu-button");
-      if (menu) {
-        menuButton.setMenu(menu).set({
-          appearance: "menu-wider",
-          position: "bottom-left",
-        });
-        osparc.utils.Utils.setIdToWidget(menu, "studyItemMenuMenu");
-        this.evaluateMenuButtons();
-      }
-      menuButton.setVisibility(menu ? "visible" : "excluded");
-    }
   }
 });
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -1598,10 +1598,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const duplicateStudyButton = this.__getDuplicateMenuButton(studyData);
       menu.add(duplicateStudyButton);
 
-      const convertToPipelineButton = this.__getConvertToPipelineMenuButton(studyData);
-      menu.add(convertToPipelineButton);
+      if (writeAccess && osparc.product.Utils.showConvertToPipeline()) {
+        const convertToPipelineButton = this.__getConvertToPipelineMenuButton(studyData);
+        menu.add(convertToPipelineButton);
+      }
 
-      if (osparc.product.Utils.hasExportCMisEnabled()) {
+      if (osparc.product.Utils.showExportCMis()) {
         const exportStudyButton = this.__getExportCMisMenuButton(studyData);
         menu.add(exportStudyButton);
       }
diff --git a/services/static-webserver/client/source/class/osparc/editor/HtmlEditor.js b/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")
     });
   },
 
diff --git a/services/static-webserver/client/source/class/osparc/editor/MarkdownEditor.js b/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")
     });
   },
 
diff --git a/services/static-webserver/client/source/class/osparc/editor/TextEditor.js b/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);
diff --git a/services/static-webserver/client/source/class/osparc/info/CommentUI.js b/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");
diff --git a/services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js b/services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js
@@ -60,7 +60,7 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
       osparc.store.Services.getStudyServices(this._studyData["uuid"])
         .then(resp => {
           const services = resp["services"];
-          if (osparc.study.Utils.getCantExecuteServices(services).length) {
+          if (osparc.study.Utils.getCantReadServices(services).length) {
             msg += this.tr("Some services are inaccessible. Please contact the service owner:");
             msg += "<br><br>";
           }
diff --git a/services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js b/services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js
@@ -89,15 +89,6 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
           });
           control.addListener("execute", () => this.__convertToPipelineClicked(), this);
           break;
-        case "study-menu-restore":
-          control = new qx.ui.menu.Button().set({
-            label: this.tr("Restore"),
-            icon: osparc.theme.common.Image.URLS["window-restore"] + "/20",
-          });
-          control.addListener("execute", () => {
-            this.getStudy().getUi().setMode("workbench");
-          });
-          break;
         case "study-menu-open-logger":
           control = new qx.ui.menu.Button().set({
             label: this.tr("Platform Logs..."),
@@ -111,8 +102,9 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
           optionsMenu.add(this.getChildControl("study-menu-info"));
           optionsMenu.add(this.getChildControl("study-menu-reload"));
           optionsMenu.add(this.getChildControl("study-menu-conversations"));
-          optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
-          optionsMenu.add(this.getChildControl("study-menu-restore"));
+          if (osparc.product.Utils.showConvertToPipeline()) {
+            optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
+          }
           optionsMenu.add(this.getChildControl("study-menu-open-logger"));
           control = new qx.ui.form.MenuButton().set({
             appearance: "fab-button",
@@ -162,15 +154,12 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
           converter: mode => mode === "standalone" ? "visible" : "excluded"
         });
 
-        const convertToPipelineButton = this.getChildControl("study-menu-convert-to-pipeline");
-        study.getUi().bind("mode", convertToPipelineButton, "visibility", {
-          converter: mode => mode === "standalone" ? "visible" : "excluded"
-        });
-
-        const restoreButton = this.getChildControl("study-menu-restore");
-        study.getUi().bind("mode", restoreButton, "visibility", {
-          converter: mode => mode === "standalone" ? "visible" : "excluded"
-        });
+        if (osparc.product.Utils.showConvertToPipeline()) {
+          const convertToPipelineButton = this.getChildControl("study-menu-convert-to-pipeline");
+          study.getUi().bind("mode", convertToPipelineButton, "visibility", {
+            converter: mode => mode === "standalone" ? "visible" : "excluded"
+          });
+        }
 
         const loggerButton = this.getChildControl("study-menu-open-logger");
         study.getUi().bind("mode", loggerButton, "visibility", {
diff --git a/services/static-webserver/client/source/class/osparc/product/Utils.js b/services/static-webserver/client/source/class/osparc/product/Utils.js
@@ -230,7 +230,7 @@ qx.Class.define("osparc.product.Utils", {
     },
 
     // oSPARC only
-    hasExportCMisEnabled: function() {
+    showExportCMis: function() {
       const product = this.getProductName();
       return product === "osparc";
     },
@@ -307,17 +307,15 @@ qx.Class.define("osparc.product.Utils", {
     },
 
     showQuality: function() {
-      if (this.isProduct("osparc")) {
-        return true;
-      }
-      return false;
+      return this.isProduct("osparc");
     },
 
     showClassifiers: function() {
-      if (this.getProductName().includes("s4l")) {
-        return false;
-      }
-      return true;
+      return this.isProduct("osparc");
+    },
+
+    showConvertToPipeline: function() {
+      return this.isS4LProduct() || this.isProduct("osparc");
     },
 
     showS4LStore: function() {
diff --git a/services/static-webserver/client/source/class/osparc/store/Services.js b/services/static-webserver/client/source/class/osparc/store/Services.js
@@ -37,7 +37,7 @@ qx.Class.define("osparc.store.Services", {
             const servicesObj = osparc.service.Utils.convertArrayToObject(servicesArray);
             this.__addHits(servicesObj);
             this.__addTSRInfos(servicesObj);
-            this.__addExtraTypeInfos(servicesObj);
+            this.__addXTypeInfos(servicesObj);
 
             Object.values(servicesObj).forEach(serviceKey => {
               Object.values(serviceKey).forEach(service => this.__addServiceToCache(service));
@@ -128,9 +128,6 @@ qx.Class.define("osparc.store.Services", {
         };
         this.__servicesPromisesCached[key][version] = osparc.data.Resources.fetch("services", "getOne", params)
           .then(service => {
-            this.__addHit(service);
-            this.__addTSRInfo(service);
-            this.__addExtraTypeInfo(service);
             this.__addServiceToCache(service);
             // Resolve the promise locally before deleting it
             resolve(service);
@@ -168,6 +165,15 @@ qx.Class.define("osparc.store.Services", {
         }
       };
       this.__studyServicesPromisesCached[studyId] = osparc.data.Resources.fetch("studies", "getServices", params)
+        .then(resp => {
+          const services = resp["services"];
+          services.forEach(service => {
+            // this service information is not complete, keep it in cache anyway
+            service.version = service["release"]["version"];
+            this.__addServiceToCache(service);
+          });
+          return resp;
+        })
         .finally(() => {
           delete this.__studyServicesPromisesCached[studyId];
         });
@@ -368,13 +374,26 @@ qx.Class.define("osparc.store.Services", {
     },
 
     __addServiceToCache: function(service) {
+      this.__addHit(service);
+      this.__addTSRInfo(service);
+      this.__addXTypeInfo(service);
+
       const key = service.key;
       const version = service.version;
       service["resourceType"] = "service";
       this.__addToCache(key, version, service);
     },
 
     __addToCache: function(key, version, value) {
+      // some services that go to the cache are not complete, e.g. study services
+      // if the one in the cache is the complete one, do not overwrite it
+      if (
+        this.__isInCache(key, version) &&
+        "inputs" in this.__servicesCached[key][version]
+      ) {
+        return;
+      }
+
       if (!(key in this.__servicesCached)) {
         this.__servicesCached[key] = {};
       }
@@ -414,7 +433,7 @@ qx.Class.define("osparc.store.Services", {
       });
     },
 
-    __addExtraTypeInfo: function(service) {
+    __addXTypeInfo: function(service) {
       service["xType"] = service["type"];
       if (["backend", "frontend"].includes(service["xType"])) {
         if (osparc.data.model.Node.isFilePicker(service)) {
@@ -429,10 +448,10 @@ qx.Class.define("osparc.store.Services", {
       }
     },
 
-    __addExtraTypeInfos: function(servicesObj) {
+    __addXTypeInfos: function(servicesObj) {
       Object.values(servicesObj).forEach(serviceWVersion => {
         Object.values(serviceWVersion).forEach(service => {
-          this.__addExtraTypeInfo(service);
+          this.__addXTypeInfo(service);
         });
       });
     },
diff --git a/services/static-webserver/client/source/class/osparc/study/Utils.js b/services/static-webserver/client/source/class/osparc/study/Utils.js
@@ -294,7 +294,7 @@ qx.Class.define("osparc.study.Utils", {
       return parameters.length && probes.length;
     },
 
-    getCantExecuteServices: function(studyServices = []) {
+    getCantReadServices: function(studyServices = []) {
       return studyServices.filter(studyService => studyService["myAccessRights"]["execute"] === false);
     },
 
@@ -357,7 +357,7 @@ qx.Class.define("osparc.study.Utils", {
 
     __getBlockedState: function(studyData) {
       if (studyData["services"]) {
-        const cantReadServices = osparc.study.Utils.getCantExecuteServices(studyData["services"]);
+        const cantReadServices = osparc.study.Utils.getCantReadServices(studyData["services"]);
         const inaccessibleServices = osparc.store.Services.getInaccessibleServices(studyData["workbench"]);
         if (cantReadServices.length || inaccessibleServices.length) {
           return "UNKNOWN_SERVICES";
diff --git a/services/static-webserver/client/source/class/osparc/ui/form/HoverMenuButton.js b/services/static-webserver/client/source/class/osparc/ui/form/HoverMenuButton.js
diff --git a/services/static-webserver/client/source/class/osparc/utils/Avatar.js b/services/static-webserver/client/source/class/osparc/utils/Avatar.js
diff --git a/services/static-webserver/client/source/resource/osparc/ui_config.json b/services/static-webserver/client/source/resource/osparc/ui_config.json

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {`
`60`	`60`	`osparc.store.Services.getStudyServices(this._studyData["uuid"])`
`61`	`61`	`.then(resp => {`
`62`	`62`	`const services = resp["services"];`
`63`		`- if (osparc.study.Utils.getCantExecuteServices(services).length) {`
	`63`	`+ if (osparc.study.Utils.getCantReadServices(services).length) {`
`64`	`64`	`msg += this.tr("Some services are inaccessible. Please contact the service owner:");`
`65`	`65`	`msg += "<br><br>";`
`66`	`66`	`}`