agama-project · imobachgs · Sep 5, 2024 · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024
diff --git a/products.d/agama-products.changes b/products.d/agama-products.changes
@@ -4,6 +4,12 @@ Tue Sep  3 10:24:30 UTC 2024 - Lubos Kocman <[email protected]>
 - Add kde to Leap 16.0, remove Xfce until it's fully submitted to 16.0
   initial set of ~800 KIDE related packages were just merged to Leap 16.0
 
+-------------------------------------------------------------------
+Wed Aug 21 19:07:28 UTC 2024 - Lubos Kocman <[email protected]>
+
+- Add product icons. Resolves Issue #1415
+  Not setting any icon will default to default.svg icon
+
 -------------------------------------------------------------------
 Fri Aug  2 09:12:25 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>
 

diff --git a/products.d/leap_160.yaml b/products.d/leap_160.yaml
@@ -5,9 +5,10 @@ name: Leap 16.0 Alpha
 # at the at translations/description key below to avoid using obsolete
 # translations!!
 # ------------------------------------------------------------------------------
-description: 'Leap 16.0 is the latest version of a community distribution based
+description: 'The latest version of a community distribution based
   on the latest SUSE Linux Enterprise Server.'
 # Do not manually change any translations! See README.md for more details.
+icon: Leap16.svg
 translations:
   description:
     ca: El Leap 16.0 és la darrera versió d'una distribució comunitària basada en

diff --git a/products.d/microos.yaml b/products.d/microos.yaml
@@ -9,6 +9,7 @@ description: 'A quick, small distribution designed to host container workloads
   with automated administration & patching. openSUSE MicroOS provides
   transactional (atomic) updates upon a read-only btrfs root file system. As
   rolling release distribution the software is always up-to-date.'
+icon: MicroOS.svg
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:

diff --git a/products.d/sles_160.yaml b/products.d/sles_160.yaml
@@ -5,11 +5,12 @@ name: SUSE Linux Enteprise Server 16.0 Alpha
 # at the at translations/description key below to avoid using obsolete
 # translations!!
 # ------------------------------------------------------------------------------
-description: "SUSE Linux Enterprise Server is the open, reliable, compliant, and
+description: "An open, reliable, compliant, and
   future-proof Linux Server choice that ensures the enterprise's business
   continuity. It is the secure and adaptable OS for long-term supported,
   innovation-ready infrastructure running business-critical workloads
   on-premises, in the cloud, and at the edge."
+icon: SUSE.svg
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:

diff --git a/products.d/tumbleweed.yaml b/products.d/tumbleweed.yaml
@@ -5,10 +5,11 @@ name: openSUSE Tumbleweed
 # at the at translations/description key below to avoid using obsolete
 # translations!!
 # ------------------------------------------------------------------------------
-description: 'The Tumbleweed distribution is a pure rolling release version of
+description: 'A pure rolling release version of
   openSUSE containing the latest "stable" versions of all software instead of
   relying on rigid periodic release cycles. The project does this for users that
   want the newest stable software.'
+icon: Tumbleweed.svg
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:

diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json
@@ -30,6 +30,7 @@
         "id": {
           "title": "Product identifier",
           "description": "The id field from a products.d/foo.yaml file",
+          "icon": "Product Icon path specified in products.d/foo.yaml file",
           "type": "string"
         },
         "registrationCode": {

diff --git a/rust/agama-lib/src/product/client.rs b/rust/agama-lib/src/product/client.rs
@@ -16,6 +16,8 @@ pub struct Product {
     pub name: String,
     /// Product description
     pub description: String,
+    /// Product icon (e.g., "default.svg")
+    pub icon: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)]
@@ -74,10 +76,15 @@ impl<'a> ProductClient<'a> {
                     Some(value) => value.try_into().unwrap(),
                     None => "",
                 };
+                let icon = match data.get("icon") {
+                    Some(value) => value.try_into().unwrap(),
+                    None => "default.svg",
+                };
                 Product {
                     id,
                     name,
                     description: description.to_string(),
+                    icon: icon.to_string(),
                 }
             })
             .collect();

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
@@ -16,6 +16,12 @@ Mon Aug 26 11:19:27 UTC 2024 - Martin Vidner <[email protected]>
   for Software (gh#openSUSE/agama#1548)
   - added SoftwareHTTPClient
 
+-------------------------------------------------------------------
+Wed Aug 21 19:07:28 UTC 2024 - Lubos Kocman <[email protected]>
+
+- Add product icons. Resolves Issue #1415
+  Not setting any icon will default to default.svg icon
+
 -------------------------------------------------------------------
 Thu Aug 15 08:33:02 UTC 2024 - Josef Reidinger <[email protected]>
 

diff --git a/service/lib/agama/dbus/software/product.rb b/service/lib/agama/dbus/software/product.rb
@@ -54,7 +54,14 @@ def issues
 
         def available_products
           backend.products.map do |product|
-            [product.id, product.display_name, { "description" => product.localized_description }]
+            [
+              product.id,
+              product.display_name,
+              {
+                "description" => product.localized_description,
+                "icon"        => product.icon
+              }
+            ]
           end
         end
 

diff --git a/service/lib/agama/software/product.rb b/service/lib/agama/software/product.rb
@@ -48,6 +48,13 @@ class Product
       # @return [String, nil] E.g., "1.0".
       attr_accessor :version
 
+      # Product icon. Please use specify filename with svg suffix and ensure referenced
+      # file exists inside agama/web/src/assests/product.
+      # `default.svg` will be used unless specified otherwise.
+      #
+      # @return [String] E.g. "leap.svg"
+      attr_accessor :icon
+
       # List of repositories.
       #
       # @return [Array<String>] Empty if the product requires registration.
@@ -99,6 +106,7 @@ class Product
       # @param id [string] Product id.
       def initialize(id)
         @id = id
+        @icon = "default.svg"
         @repositories = []
         @labels = []
         @mandatory_packages = []

diff --git a/service/lib/agama/software/product_builder.rb b/service/lib/agama/software/product_builder.rb
@@ -64,6 +64,7 @@ def initialize_product(id, data, attrs)
           product.description = attrs["description"]
           product.name = data[:name]
           product.version = data[:version]
+          product.icon = attrs["icon"] if attrs["icon"]
         end
       end
 
@@ -98,6 +99,7 @@ def product_data_from_config(id)
         {
           name:               config.products.dig(id, "software", "base_product"),
           version:            config.products.dig(id, "software", "version"),
+          icon:               config.products.dig(id, "software", "icon"),
           labels:             config.arch_elements_from(
             id, "software", "installation_labels", property: :label
           ),

diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
@@ -27,6 +27,12 @@ Mon Aug 26 10:01:27 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>
 - Do not depend on f2fs-tools and nilfs-utils
   (jsc#PED-8669, gh#openSUSE/agama#1554).
 
+-------------------------------------------------------------------
+Wed Aug 21 19:07:28 UTC 2024 - Lubos Kocman <[email protected]>
+
+- Add product icons. Resolves Issue #1415
+  Not setting any icon will default to default.svg icon
+
 -------------------------------------------------------------------
 Mon Aug 19 15:13:46 UTC 2024 - Lubos Kocman <[email protected]>
 

diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 21 19:07:28 UTC 2024 - Lubos Kocman <[email protected]>
+
+- Add product icons. Resolves Issue #1415
+  Not setting any icon will default to default.svg icon
+
 -------------------------------------------------------------------
 Tue Aug 13 14:57:21 UTC 2024 - David Diaz <[email protected]>
 

diff --git a/web/src/assets/products/Leap16.svg b/web/src/assets/products/Leap16.svg
diff --git a/web/src/assets/products/MicroOS.svg b/web/src/assets/products/MicroOS.svg