Merge branch 'master' into 2024/fix/tracing

Author: mrnicegyu11

packages/models-library/src/models_library/api_schemas_dynamic_sidecar/ports.py

@@ -11,14 +11,14 @@ class OutputStatus(StrAutoEnum):
     UPLOAD_STARTED = auto()
     UPLOAD_WAS_ABORTED = auto()
     UPLOAD_FINISHED_SUCCESSFULLY = auto()
-    UPLOAD_FINISHED_WITH_ERRROR = auto()
+    UPLOAD_FINISHED_WITH_ERROR = auto()
 
 
 class InputStatus(StrAutoEnum):
     DOWNLOAD_STARTED = auto()
     DOWNLOAD_WAS_ABORTED = auto()
     DOWNLOAD_FINISHED_SUCCESSFULLY = auto()
-    DOWNLOAD_FINISHED_WITH_ERRROR = auto()
+    DOWNLOAD_FINISHED_WITH_ERROR = auto()
 
 
 class _PortStatusCommon(BaseModel):

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/notifications/_notifications_ports.py

@@ -52,7 +52,7 @@ async def send_output_port_upload_finished_with_error(
         self, port_key: ServicePortKey
     ) -> None:
         await self._send_output_port_status(
-            port_key, OutputStatus.UPLOAD_FINISHED_WITH_ERRROR
+            port_key, OutputStatus.UPLOAD_FINISHED_WITH_ERROR
         )
 
     async def send_input_port_download_started(self, port_key: ServicePortKey) -> None:
@@ -74,5 +74,5 @@ async def send_input_port_download_finished_with_error(
         self, port_key: ServicePortKey
     ) -> None:
         await self._send_input_port_status(
-            port_key, InputStatus.DOWNLOAD_FINISHED_WITH_ERRROR
+            port_key, InputStatus.DOWNLOAD_FINISHED_WITH_ERROR
         )

services/dynamic-sidecar/tests/unit/test_modules_notifier.py

@@ -289,7 +289,7 @@ async def test_notifier_send_input_port_status(
                 await port_notifier.send_input_port_download_finished_succesfully(
                     port_key
                 )
-            case InputStatus.DOWNLOAD_FINISHED_WITH_ERRROR:
+            case InputStatus.DOWNLOAD_FINISHED_WITH_ERROR:
                 await port_notifier.send_input_port_download_finished_with_error(
                     port_key
                 )
@@ -378,7 +378,7 @@ async def test_notifier_send_output_port_status(
                 await port_notifier.send_output_port_upload_finished_successfully(
                     port_key
                 )
-            case OutputStatus.UPLOAD_FINISHED_WITH_ERRROR:
+            case OutputStatus.UPLOAD_FINISHED_WITH_ERROR:
                 await port_notifier.send_output_port_upload_finished_with_error(
                     port_key
                 )

services/static-webserver/client/compile.json

@@ -56,7 +56,7 @@
       "class": "osparc.Application",
       "theme": "osparc.theme.products.s4l.ThemeDark",
       "name": "s4llite",
-      "title": "Sim4Life Lite",
+      "title": "Sim4Life.lite",
       "include": [
         "iconfont.material.Load",
         "iconfont.fontawesome5.Load",

services/static-webserver/client/source/class/osparc/dashboard/ContextBreadcrumbs.js

@@ -52,6 +52,10 @@ qx.Class.define("osparc.dashboard.ContextBreadcrumbs", {
     __rebuild: function() {
       this._removeAll();
 
+      if (this.getCurrentWorkspaceId() === -2) {
+        return;
+      }
+
       if (this.getCurrentFolderId()) {
         const currentFolder = osparc.store.Folders.getInstance().getFolder(this.getCurrentFolderId());
         this.__createUpstreamButtons(currentFolder);

services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js

@@ -138,7 +138,8 @@ qx.Class.define("osparc.dashboard.Dashboard", {
         });
         const tabButton = tabPage.getChildControl("button");
         tabButton.set({
-          minWidth: 50
+          minWidth: 50,
+          maxHeight: 36,
         });
         tabButton.ttt = label;
         tabButton.getChildControl("label").set({

services/static-webserver/client/source/class/osparc/dashboard/FolderButtonBase.js

@@ -112,12 +112,10 @@ qx.Class.define("osparc.dashboard.FolderButtonBase", {
     },
 
     _shouldApplyFilter: function(data) {
-      console.log("_shouldApplyFilter", data);
       return false;
     },
 
     _shouldReactToFilter: function(data) {
-      console.log("_shouldReactToFilter", data);
       return false;
     }
   },

services/static-webserver/client/source/class/osparc/dashboard/GridButtonNew.js

@@ -37,6 +37,12 @@ qx.Class.define("osparc.dashboard.GridButtonNew", {
     });
 
     if (title) {
+      title = osparc.utils.Utils.replaceTokens(
+        title,
+        "replace_me_product_name",
+        osparc.store.StaticInfo.getInstance().getDisplayName()
+      );
+
       const titleLabel = this.getChildControl("title");
       titleLabel.set({
         value: title,
@@ -45,6 +51,12 @@ qx.Class.define("osparc.dashboard.GridButtonNew", {
     }
 
     if (description) {
+      description = osparc.utils.Utils.replaceTokens(
+        description,
+        "replace_me_product_name",
+        osparc.store.StaticInfo.getInstance().getDisplayName()
+      );
+
       const descLabel = this.getChildControl("subtitle-text");
       descLabel.setValue(description.toString());
     }

services/static-webserver/client/source/class/osparc/dashboard/ListButtonNew.js

@@ -34,6 +34,12 @@ qx.Class.define("osparc.dashboard.ListButtonNew", {
     });
 
     if (title) {
+      title = osparc.utils.Utils.replaceTokens(
+        title,
+        "replace_me_product_name",
+        osparc.store.StaticInfo.getInstance().getDisplayName()
+      );
+
       const titleLabel = this.getChildControl("title");
       titleLabel.set({
         value: title,

services/static-webserver/client/source/class/osparc/dashboard/NewStudies.js

@@ -167,14 +167,7 @@ qx.Class.define("osparc.dashboard.NewStudies", {
       const newStudyClicked = () => this.fireDataEvent("newStudyClicked", templateInfo);
 
       const title = templateInfo.title;
-      let desc = templateInfo.description;
-      if (desc) {
-        desc = osparc.utils.Utils.replaceTokens(
-          desc,
-          "replace_me_product_name",
-          osparc.store.StaticInfo.getInstance().getDisplayName()
-        );
-      }
+      const desc = templateInfo.description;
       const newPlanButton = new osparc.dashboard.GridButtonNew(title, desc);
       newPlanButton.setCardKey(templateInfo.idToWidget);
       osparc.utils.Utils.setIdToWidget(newPlanButton, templateInfo.idToWidget);