vendor.ui

Author: odeimaiz

packages/notifications-library/tests/conftest.py

@@ -56,11 +56,11 @@ def product_data(
     vendor: Vendor = product["vendor"]
 
     product_ui = ProductUIData(
-        logo_url=vendor.get(
-            "logo",
-            "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-black.svg",
+        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("strong_color", "rgb(131, 0, 191)"),
+        strong_color=vendor.get("ui", {}).get("strong_color", "rgb(131, 0, 191)"),
     )
 
     return ProductData(  # type: ignore

packages/postgres-database/src/simcore_postgres_database/models/products.py

@@ -1,8 +1,8 @@
-""" Products table
+"""Products table
 
-    - List of products served by the simcore platform
-    - Products have a name and an associated host (defined by a regex)
-    - Every product has a front-end with exactly the same name
+- List of products served by the simcore platform
+- Products have a name and an associated host (defined by a regex)
+- Every product has a front-end with exactly the same name
 """
 
 import json
@@ -29,6 +29,11 @@
 #
 
 
+class VendorUI(TypedDict, total=True):
+    logo_url: str  # vendor logo url
+    strong_color: str  # vendor main color
+
+
 class Vendor(TypedDict, total=False):
     """
         Brand information about the vendor
@@ -41,14 +46,14 @@ class Vendor(TypedDict, total=False):
 
     url: str  # vendor website
     license_url: str  # Which are the license terms? (if applies)
-    logo: str  # vendor logo
-    strong_color: str  # vendor main color
 
     invitation_url: str  # How to request a trial invitation? (if applies)
     invitation_form: bool  # If True, it takes precendence over invitation_url and asks the FE to show the form (if defined)
 
     release_notes_url_template: str  # a template url where `{vtag}` will be replaced, eg: "http://example.com/{vtag}.md"
 
+    ui: VendorUI
+
 
 class IssueTracker(TypedDict, total=True):
     """Link to actions in an online issue tracker (e.g. in fogbugz, github, gitlab ...)

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

@@ -1,15 +1,15 @@
 """
-    Collection of functions that create fake raw data that can be used
-    to populate postgres DATABASE, create datasets with consistent values, etc
+Collection of functions that create fake raw data that can be used
+to populate postgres DATABASE, create datasets with consistent values, etc
 
-    Built on top of the idea of Faker library (https://faker.readthedocs.io/en/master/),
-    that generate fake data to bootstrap a database, fill-in stress tests, anonymize data ...
-    etc
+Built on top of the idea of Faker library (https://faker.readthedocs.io/en/master/),
+that generate fake data to bootstrap a database, fill-in stress tests, anonymize data ...
+etc
 
-    NOTE: all outputs MUST be Dict-like or built-in data structures that fit at least
-    required fields in postgres_database.models tables or pydantic models.
+NOTE: all outputs MUST be Dict-like or built-in data structures that fit at least
+required fields in postgres_database.models tables or pydantic models.
 
-    NOTE: to reduce coupling, please import simcore_postgres_database inside of the functions
+NOTE: to reduce coupling, please import simcore_postgres_database inside of the functions
 """
 
 import itertools
@@ -232,7 +232,7 @@ def random_product(
         - group_id: product group ID. SEE get_or_create_product_group to produce `group_id`
         - registration_email_template
     """
-    from simcore_postgres_database.models.products import Vendor, products
+    from simcore_postgres_database.models.products import Vendor, VendorUI, products
 
     name = overrides.get("name")
     suffix = fake.unique.word() if name is None else name
@@ -253,12 +253,14 @@ def random_product(
             name=fake.company(),
             copyright=fake.company_suffix(),
             url=fake.url(),
-            logo=fake.url(),
-            strong_color=fake.color(),
             license_url=fake.url(),
             invitation_url=fake.url(),
             invitation_form=fake.boolean(),
             address=fake.address().replace("\n", ". "),
+            ui=VendorUI(
+                logo_url=fake.url(),
+                strong_color=fake.color(),
+            ),
         ),
         "registration_email_template": registration_email_template,
         "created": fake.date_time_this_decade(),

services/web/server/src/simcore_service_webserver/products/_models.py

@@ -239,11 +239,13 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "vendor": {
                             "url": "https://acme.com",
                             "license_url": "https://acme.com/license",
-                            "logo": "https://acme.com/logo",
-                            "strong_color": "#123456",
                             "invitation_form": True,
                             "name": "ACME",
                             "copyright": "© ACME correcaminos",
+                            "ui": {
+                                "logo_url": "https://acme.com/logo",
+                                "strong_color": "#123456",
+                            },
                         },
                         "issues": [
                             {

services/web/server/tests/unit/isolated/products/test_products_model.py

@@ -60,8 +60,10 @@ def test_product_to_static():
             "url": "https://acme.com",
             "license_url": "https://acme.com/license",
             "invitation_form": True,
-            "logo": "https://acme.com/logo",
-            "strong_color": "#123456",
+            "ui": {
+                "logo_url": "https://acme.com/logo",
+                "strong_color": "#123456",
+            },
         },
         "issues": [
             {
@@ -108,7 +110,7 @@ def test_product_host_regex_with_spaces():
 
 
 def test_safe_load_empty_blanks_on_string_cols_from_db(
-    fake_product_from_db: dict[str, Any]
+    fake_product_from_db: dict[str, Any],
 ):
     nullable_strings_column_names = [
         c.name