final touches

Author: pcrespov

packages/notifications-library/src/notifications_library/_models.py

@@ -30,9 +30,13 @@ class SharerData:
 
 @dataclass(frozen=True)
 class ProductUIData:
-    logo_url: str
-    strong_color: str
     project_alias: str
+    logo_url: str | None = (
+        None  # default_logo = "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-white.svg" in base.html
+    )
+    strong_color: str | None = (
+        None  # default_strong_color = "rgb(131, 0, 191)" in base.html
+    )
 
 
 @dataclass(frozen=True)
@@ -41,5 +45,5 @@ class ProductData:
     display_name: str
     vendor_display_inline: str
     support_email: str
-    homepage_url: str
+    homepage_url: str | None  # default_homepage = "https://osparc.io/" in base.html
     ui: ProductUIData

packages/notifications-library/tests/conftest.py

@@ -61,21 +61,20 @@ def product_data(
 ) -> ProductData:
     vendor: Vendor = product["vendor"]
 
+    vendor_ui = vendor.get("ui", {})
+
     product_ui = ProductUIData(
-        logo_url=vendor.get("ui", {}).get(
-            "logo_url",
-            "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-white.svg",
-        ),
-        strong_color=vendor.get("ui", {}).get("strong_color", "rgb(131, 0, 191)"),
-        project_alias=vendor.get("ui", {}).get("project_alias", "project"),
+        logo_url=vendor_ui.get("logo_url"),
+        strong_color=vendor_ui.get("strong_color"),
+        project_alias=vendor_ui["project_alias"],
     )
 
     return ProductData(  # type: ignore
         product_name=product_name,
         display_name=product["display_name"],
         vendor_display_inline=f"{vendor.get('name','')}, {vendor.get('address','')}",
         support_email=product["support_email"],
-        homepage_url=vendor.get("url", "https://osparc.io/"),
+        homepage_url=vendor.get("url"),
         ui=product_ui,
     )
 

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -263,7 +263,7 @@ def random_product(
             invitation_form=fake.boolean(),
             address=fake.address().replace("\n", ". "),
             ui=VendorUI(
-                logo_url=fake.url(),
+                logo_url="https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-black.svg",
                 strong_color=fake.color(),
                 project_alias=fake.random_element(elements=["project", "study"]),
             ),