From 40cbc06caa0071b8567a4771a6a9e5ac5efd0d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:21:08 +0000
Subject: [PATCH 01/26] Move the selected patterns to the proposal

---
 rust/agama-server/src/software/web.rs | 43 +++++++--------------------
 rust/agama-server/src/web/docs.rs     |  1 -
 rust/agama-server/src/web/event.rs    |  6 +++-
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index f5c7bd6cb5..b7ccc4298b 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -92,7 +92,7 @@ async fn patterns_changed_stream(
             }
             None
         })
-        .filter_map(|e| e.map(Event::PatternsChanged));
+        .filter_map(|e| e.map(|patterns| Event::SoftwareProposalChanged { patterns }));
     Ok(stream)
 }
 
@@ -150,43 +150,16 @@ async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Pro
     Ok(Json(products))
 }
 
-/// Represents a pattern.
-///
-/// It augments the information coming from the D-Bus client.
-#[derive(Serialize, utoipa::ToSchema)]
-pub struct PatternEntry {
-    #[serde(flatten)]
-    pattern: Pattern,
-    selected_by: SelectedBy,
-}
-
 /// Returns the list of software patterns.
 ///
 /// * `state`: service state.
 #[utoipa::path(get, path = "/software/patterns", responses(
-    (status = 200, description = "List of known software patterns", body = Vec<PatternEntry>),
+    (status = 200, description = "List of known software patterns", body = Vec<Pattern>),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn patterns(
-    State(state): State<SoftwareState<'_>>,
-) -> Result<Json<Vec<PatternEntry>>, Error> {
+async fn patterns(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Pattern>>, Error> {
     let patterns = state.software.patterns(true).await?;
-    let selected = state.software.selected_patterns().await?;
-    let items = patterns
-        .into_iter()
-        .map(|pattern| {
-            let selected_by: SelectedBy = selected
-                .get(&pattern.id)
-                .copied()
-                .unwrap_or(SelectedBy::None);
-            PatternEntry {
-                pattern,
-                selected_by,
-            }
-        })
-        .collect();
-
-    Ok(Json(items))
+    Ok(Json(patterns))
 }
 
 /// Sets the software configuration.
@@ -229,7 +202,7 @@ async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<Softw
     let patterns = state.software.user_selected_patterns().await?;
     let config = SoftwareConfig {
         patterns: Some(patterns),
-        product: product,
+        product,
     };
     Ok(Json(config))
 }
@@ -240,6 +213,9 @@ pub struct SoftwareProposal {
     /// Space required for installation. It is returned as a formatted string which includes
     /// a number and a unit (e.g., "GiB").
     size: String,
+    /// Patterns selection. It is respresented as a hash map where the key is the pattern's name
+    /// and the value why the pattern is selected.
+    patterns: HashMap<String, SelectedBy>,
 }
 
 /// Returns the proposal information.
@@ -251,7 +227,8 @@ pub struct SoftwareProposal {
 ))]
 async fn proposal(State(state): State<SoftwareState<'_>>) -> Result<Json<SoftwareProposal>, Error> {
     let size = state.software.used_disk_space().await?;
-    let proposal = SoftwareProposal { size };
+    let patterns = state.software.selected_patterns().await?;
+    let proposal = SoftwareProposal { size, patterns };
     Ok(Json(proposal))
 }
 
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 34ded88acf..b69908b07c 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -26,7 +26,6 @@ use utoipa::OpenApi;
         schemas(crate::l10n::LocaleEntry),
         schemas(crate::l10n::TimezoneEntry),
         schemas(crate::l10n::web::LocaleConfig),
-        schemas(crate::software::web::PatternEntry),
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),
         schemas(crate::manager::web::InstallerStatus),
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 999e4d6619..ef6cbf0f50 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -21,7 +21,11 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
-    PatternsChanged(HashMap<String, SelectedBy>),
+    // TODO: it should include the full software proposal or, at least,
+    // all the relevant changes.
+    SoftwareProposalChanged {
+        patterns: HashMap<String, SelectedBy>,
+    },
     InstallationPhaseChanged {
         phase: InstallationPhase,
     },

From dd0c91797bf1ec0ad006ab01a5b5973ba3dd9296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:55:06 +0000
Subject: [PATCH 02/26] Rename Pattern 'id' to 'name'

---
 rust/agama-lib/src/software/client.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index 4769976847..9c42094da5 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -7,8 +7,8 @@ use zbus::Connection;
 /// Represents a software product
 #[derive(Debug, Serialize, utoipa::ToSchema)]
 pub struct Pattern {
-    /// Pattern ID (eg., "aaa_base", "gnome")
-    pub id: String,
+    /// Pattern name (eg., "aaa_base", "gnome")
+    pub name: String,
     /// Pattern category (e.g., "Production")
     pub category: String,
     /// Pattern icon path locally on system
@@ -69,8 +69,8 @@ impl<'a> SoftwareClient<'a> {
             .await?
             .into_iter()
             .map(
-                |(id, (category, description, icon, summary, order))| Pattern {
-                    id,
+                |(name, (category, description, icon, summary, order))| Pattern {
+                    name,
                     category,
                     icon,
                     description,

From 64d16254066b3d0baa640a2e174e39b4189c3748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:55:27 +0000
Subject: [PATCH 03/26] Serialize SelectedBy as a number

---
 rust/agama-lib/src/software/client.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index 9c42094da5..d8f1095403 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -1,6 +1,7 @@
 use super::proxies::Software1Proxy;
 use crate::error::ServiceError;
 use serde::Serialize;
+use serde_repr::Serialize_repr;
 use std::collections::HashMap;
 use zbus::Connection;
 
@@ -22,7 +23,8 @@ pub struct Pattern {
 }
 
 /// Represents the reason why a pattern is selected.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize_repr)]
+#[repr(u8)]
 pub enum SelectedBy {
     /// The pattern was selected by the user.
     User = 0,

From 248d040d447fd065881fa3522c015ccba50416b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 17:36:45 +0000
Subject: [PATCH 04/26] Adapt the SoftwareClient to the HTTP/JSON API

---
 web/src/client/index.js    |   4 +-
 web/src/client/software.js | 135 +++++++++----------------------------
 2 files changed, 35 insertions(+), 104 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 206365b695..63b6e2b422 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -78,7 +78,7 @@ const createClient = (url) => {
   const manager = new ManagerClient(client);
   // const monitor = new Monitor(address, MANAGER_SERVICE);
   // const network = new NetworkClient(address);
-  // const software = new SoftwareClient(address);
+  const software = new SoftwareClient(client);
   // const storage = new StorageClient(address);
   // const users = new UsersClient(address);
   // const questions = new QuestionsClient(address);
@@ -139,7 +139,7 @@ const createClient = (url) => {
     manager,
     // monitor,
     // network,
-    // software,
+    software,
     // storage,
     // users,
     // questions,
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 8ed8f2e8f7..4e9907ef5b 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -22,12 +22,9 @@
 // @ts-check
 
 import DBusClient from "./dbus";
-import { WithIssues, WithStatus, WithProgress } from "./mixins";
+import { WithIssues, WithProgress, WithStatus } from "./mixins";
 
 const SOFTWARE_SERVICE = "org.opensuse.Agama.Software1";
-const SOFTWARE_IFACE = "org.opensuse.Agama.Software1";
-const SOFTWARE_PATH = "/org/opensuse/Agama/Software1";
-const PRODUCT_IFACE = "org.opensuse.Agama.Software1.Product";
 const PRODUCT_PATH = "/org/opensuse/Agama/Software1/Product";
 const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
@@ -65,57 +62,6 @@ class BaseProductManager {
     this.proxies = {};
   }
 
-  /**
-   * Returns the list of available products.
-   *
-   * @return {Promise<Array<Product>>}
-   */
-  async getAll() {
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    return proxy.AvailableProducts.map(product => {
-      const [id, name, meta] = product;
-      return { id, name, description: meta.description?.v };
-    });
-  }
-
-  /**
-   * Returns the selected product.
-   *
-   * @return {Promise<Product|null>}
-   */
-  async getSelected() {
-    const products = await this.getAll();
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    if (proxy.SelectedProduct === "") {
-      return null;
-    }
-    return products.find(product => product.id === proxy.SelectedProduct);
-  }
-
-  /**
-   * Selects a product for installation.
-   *
-   * @param {string} id - Product ID.
-   */
-  async select(id) {
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    return proxy.SelectProduct(id);
-  }
-
-  /**
-   * Registers a callback to run when properties in the Product object change.
-   *
-   * @param {(id: string) => void} handler - Callback function.
-   */
-  onChange(handler) {
-    return this.client.onObjectChanged(PRODUCT_PATH, PRODUCT_IFACE, changes => {
-      if ("SelectedProduct" in changes) {
-        const selected = changes.SelectedProduct.v.toString();
-        handler(selected);
-      }
-    });
-  }
-
   /**
    * Returns the registration of the selected product.
    *
@@ -147,7 +93,7 @@ class BaseProductManager {
 
     return {
       success: result[0] === 0,
-      message: result[1]
+      message: result[1],
     };
   }
 
@@ -162,7 +108,7 @@ class BaseProductManager {
 
     return {
       success: result[0] === 0,
-      message: result[1]
+      message: result[1],
     };
   }
 
@@ -203,11 +149,6 @@ class BaseProductManager {
   }
 }
 
-/**
- * Manages product selection.
- */
-class ProductManager extends WithIssues(BaseProductManager, PRODUCT_PATH) { }
-
 /**
  * Software client
  *
@@ -217,10 +158,11 @@ class SoftwareBaseClient {
   /**
    * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
    */
-  constructor(address = undefined) {
-    this.client = new DBusClient(SOFTWARE_SERVICE, address);
-    this.product = new ProductManager(this.client);
-    this.proxies = {};
+  /**
+   * @param {import("./http").HTTPClient} client - HTTP client.
+   */
+  constructor(client) {
+    this.client = client;
   }
 
   /**
@@ -228,67 +170,54 @@ class SoftwareBaseClient {
    *
    * @return {Promise<void>}
    */
-  async probe() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.Probe();
+  probe() {
+    return this.client.post("/software/probe");
   }
 
   /**
    * Returns how much space installation takes on disk
    *
-   * @return {Promise<string>}
+   * @return {Promise<object>}
    */
-  async getUsedSpace() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.UsedDiskSpace();
+  getProposal() {
+    return this.client.get("/software/proposal");
   }
 
   /**
    * Returns available patterns
    *
-   * @param {boolean} filter - `true` = filter the patterns, `false` = all patterns
-   * @return {Promise<Array<string>>}
+   * @return {Promise<object>}
    */
-  async patterns(filter) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.ListPatterns(filter);
+  getPatterns() {
+    return this.client.get("/software/patterns");
   }
 
   /**
    * @typedef {Object.<string, number>} PatternSelection mapping "name" =>
    * "who selected the pattern"
    */
-
-  /**
-   * Returns selected patterns
-   *
-   * @return {Promise<PatternSelection>}
-   */
-  async selectedPatterns() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.SelectedPatterns;
+  config() {
+    return this.client.get("/software/config");
   }
 
   /**
-   * Select a pattern to install
-   *
-   * @param {string} name - name of the pattern
+   * @param {string[]} patterns - name of the user-selected patterns.
    * @return {Promise<void>}
    */
-  async addPattern(name) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.AddPattern(name);
+  selectPatterns(patterns) {
+    return this.client.put("/software/config", { patterns });
   }
 
   /**
-   * Deselect a pattern to install
+   * Registers a callback to run when the select product changes.
    *
-   * @param {string} name - name of the pattern
-   * @return {Promise<void>}
+   * @param {(changes: object) => void} handler - Callback function.
+   * @return {import ("./http").RemoveFn} Function to remove the callback.
    */
-  async removePattern(name) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.RemovePattern(name);
+  onSelectedPatternsChanged(handler) {
+    return this.client.onEvent("SoftwareProposalChanged", ({ patterns }) => {
+      handler(patterns);
+    });
   }
 }
 
@@ -297,10 +226,12 @@ class SoftwareBaseClient {
  */
 class SoftwareClient extends WithIssues(
   WithProgress(
-    WithStatus(SoftwareBaseClient, SOFTWARE_PATH),
-    SOFTWARE_PATH,
+    WithStatus(SoftwareBaseClient, "software/status", SOFTWARE_SERVICE),
+    "software/progress",
+    SOFTWARE_SERVICE,
   ),
-  SOFTWARE_PATH,
+  "software/issues/software",
+  "/org/opensuse/Agama/Software1",
 ) {}
 
 class ProductBaseClient {

From bcbfb4e8c7a4923d06fc656ac6e974c82f79f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 17:39:40 +0000
Subject: [PATCH 05/26] Initial adaptation of the software section to the
 HTTP/JSON API

---
 web/src/components/overview/OverviewPage.jsx  |  8 +-
 .../components/overview/SoftwareSection.jsx   | 36 ++++----
 .../overview/SoftwareSection.test.jsx         | 18 ++--
 web/src/components/software/PatternItem.jsx   | 37 ++------
 .../components/software/PatternSelector.jsx   | 91 ++++++++++++-------
 5 files changed, 94 insertions(+), 96 deletions(-)

diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index 6c18505320..b51a6129d0 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -22,14 +22,14 @@
 import React, { useState } from "react";
 import { useProduct } from "~/context/product";
 import { Navigate } from "react-router-dom";
-import { Page, InstallButton } from "~/components/core";
+import { InstallButton, Page } from "~/components/core";
 import {
   L10nSection,
   NetworkSection,
   ProductSection,
   SoftwareSection,
   StorageSection,
-  UsersSection
+  UsersSection,
 } from "~/components/overview";
 import { _ } from "~/i18n";
 
@@ -47,11 +47,8 @@ export default function OverviewPage() {
   //     // TRANSLATORS: page title
   //     title={_("Installation Summary")}
   //   >
-  //     <ProductSection />
-  //     <L10nSection />
   //     <NetworkSection />
   //     <StorageSection showErrors />
-  //     <SoftwareSection showErrors />
   //     <UsersSection showErrors={showErrors} />
 
   //     <Page.Actions>
@@ -68,6 +65,7 @@ export default function OverviewPage() {
     >
       <ProductSection />
       <L10nSection />
+      <SoftwareSection showErrors />
     </Page>
   );
 }
diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index a5ac99b8fc..b6887a2502 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -19,7 +19,7 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useReducer, useEffect } from "react";
+import React, { useEffect, useReducer } from "react";
 import { BUSY } from "~/client/status";
 import { Button } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
@@ -35,7 +35,7 @@ const initialState = {
   errorsRead: false,
   size: "",
   patterns: {},
-  progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false }
+  progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false },
 };
 
 const reducer = (state, action) => {
@@ -82,8 +82,8 @@ export default function SoftwareSection({ showErrors }) {
   useEffect(() => {
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
-      const size = await cancellablePromise(client.getUsedSpace());
-      const patterns = await cancellablePromise(client.patterns(true));
+      const { size } = await cancellablePromise(client.getProposal());
+      const patterns = await cancellablePromise(client.getPatterns(true));
 
       dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size, patterns } });
     };
@@ -95,7 +95,7 @@ export default function SoftwareSection({ showErrors }) {
     cancellablePromise(client.getProgress()).then(({ message, current, total, finished }) => {
       dispatch({
         type: "UPDATE_PROGRESS",
-        payload: { message, current, total, finished }
+        payload: { message, current, total, finished },
       });
     });
   }, [client, cancellablePromise]);
@@ -104,7 +104,7 @@ export default function SoftwareSection({ showErrors }) {
     return client.onProgressChange(({ message, current, total, finished }) => {
       dispatch({
         type: "UPDATE_PROGRESS",
-        payload: { message, current, total, finished }
+        payload: { message, current, total, finished },
       });
     });
   }, [client, cancellablePromise]);
@@ -114,24 +114,24 @@ export default function SoftwareSection({ showErrors }) {
   const SectionContent = () => {
     if (state.busy) {
       const { message, current, total } = state.progress;
-      return (
-        <ProgressText message={message} current={current} total={total} />
-      );
+      return <ProgressText message={message} current={current} total={total} />;
     }
 
     return (
       <>
         <UsedSize size={state.size} />
         {errors.length > 0 &&
-          <Button
-            isInline
-            variant="link"
-            icon={<Icon name="refresh" size="xxs" />}
-            onClick={probe}
-          >
-            {/* TRANSLATORS: clickable link label */}
-            {_("Refresh the repositories")}
-          </Button>}
+          (
+            <Button
+              isInline
+              variant="link"
+              icon={<Icon name="refresh" size="xxs" />}
+              onClick={probe}
+            >
+              {/* TRANSLATORS: clickable link label */}
+              {_("Refresh the repositories")}
+            </Button>
+          )}
       </>
     );
   };
diff --git a/web/src/components/overview/SoftwareSection.test.jsx b/web/src/components/overview/SoftwareSection.test.jsx
index d0fdf55711..f0f94638b3 100644
--- a/web/src/components/overview/SoftwareSection.test.jsx
+++ b/web/src/components/overview/SoftwareSection.test.jsx
@@ -35,14 +35,14 @@ const kdePattern = {
     "Packages providing the Plasma desktop environment and applications from KDE.",
     "./pattern-kde",
     "KDE Applications and Plasma 5 Desktop",
-    "1110"
-  ]
+    "1110",
+  ],
 };
 
 let getStatusFn = jest.fn().mockResolvedValue(IDLE);
 let getProgressFn = jest.fn().mockResolvedValue({});
 let getIssuesFn = jest.fn().mockResolvedValue([]);
-let patternsFn = jest.fn().mockResolvedValue(kdePattern);
+let getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
@@ -53,8 +53,8 @@ beforeEach(() => {
         getIssues: getIssuesFn,
         onStatusChange: noop,
         onProgressChange: noop,
-        patterns: patternsFn,
-        getUsedSpace: jest.fn().mockResolvedValue("500 MB")
+        getPatterns: getPatternsFn,
+        getProposal: jest.fn().mockResolvedValue({ size: "500 MiB" }),
       },
     };
   });
@@ -63,13 +63,13 @@ beforeEach(() => {
 describe("when the proposal is calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(IDLE);
-    patternsFn = jest.fn().mockResolvedValue(kdePattern);
+    getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
   });
 
   it("renders the required space", async () => {
     installerRender(<SoftwareSection showErrors />);
     await screen.findByText("Installation will take");
-    await screen.findByText("500 MB");
+    await screen.findByText("500 MiB");
   });
 
   describe("patterns are available", () => {
@@ -83,7 +83,7 @@ describe("when the proposal is calculated", () => {
 
   describe("no patterns are available", () => {
     beforeEach(() => {
-      patternsFn = jest.fn().mockResolvedValue({});
+      getPatternsFn = jest.fn().mockResolvedValue({});
     });
 
     it("the header is a plain text", async () => {
@@ -110,7 +110,7 @@ describe("when the proposal is being calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(BUSY);
     getProgressFn = jest.fn().mockResolvedValue(
-      { message: "Initializing target repositories", current: 1, total: 4, finished: false }
+      { message: "Initializing target repositories", current: 1, total: 4, finished: false },
     );
   });
 
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index cc6f5ac7e8..75cdc464de 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -77,53 +77,32 @@ function stateAriaLabel(selected) {
  * @param {function} onChange callback called when the pattern status is changed
  * @returns {JSX.Element}
  */
-function PatternItem({ pattern, onChange }) {
-  const client = useInstallerClient();
+function PatternItem({ pattern, onToggle }) {
   const [icon, setIcon] = useState();
 
-  const onClick = () => {
-    switch (pattern.selected) {
-      // available pattern (not selected)
-      case undefined:
-        client.software.addPattern(pattern.name).then(onChange);
-        break;
-      // user selected
-      case 0:
-        client.software.removePattern(pattern.name).then(onChange);
-        break;
-      // auto selected
-      case 1:
-        // try to deselect an automatically selected pattern,
-        // that can work only for soft dependencies (Recommends, Suggests,...),
-        // the hard dependencies (Requires) cannot be changed
-        client.software.removePattern(pattern.name).then(onChange);
-        break;
-      default:
-        console.error("Unknown patterns status: ", pattern.selected);
-    }
-  };
-
   // download the pattern icon from the system
   useEffect(() => {
     if (icon) return;
     cockpit.file(sprintf(ICON_PATH, pattern.icon)).read()
-      .then((data) => { setIcon(data) });
+      .then((data) => {
+        setIcon(data);
+      });
   }, [pattern.icon, icon]);
 
-  const patternIcon = (icon)
+  const patternIcon = icon
     // use a Base64 encoded inline pattern image
     ? <img src={"data:image/svg+xml;base64," + btoa(icon)} aria-hidden="true" />
     // fallback icon
     : <Icon name="apps" aria-hidden="true" />;
 
   return (
-    <div className="pattern-container" onClick={onClick}>
+    <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
       <div className="pattern-checkbox">
-        <img src={stateIcon(pattern.selected)} aria-label={stateAriaLabel(pattern.selected)} />
+        <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
       </div>
       <div className="pattern-label">
         <div className="pattern-label-icon">
-          { patternIcon }
+          {patternIcon}
         </div>
         <div className="pattern-label-text">{pattern.summary}</div>
       </div>
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 06de61c3b0..6c8e0dbc50 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -61,7 +61,7 @@ function convert(pattern_data, selected) {
       icon: pattern[2],
       summary: pattern[3],
       order: pattern[4],
-      selected: selected[name]
+      selected: selected[name],
     });
   });
 
@@ -83,10 +83,10 @@ function groupPatterns(patterns) {
   const pattern_groups = {};
 
   patterns.forEach((pattern) => {
-    if (pattern_groups[pattern.group]) {
-      pattern_groups[pattern.group].push(pattern);
+    if (pattern_groups[pattern.category]) {
+      pattern_groups[pattern.category].push(pattern);
     } else {
-      pattern_groups[pattern.group] = [pattern];
+      pattern_groups[pattern.category] = [pattern];
     }
   });
 
@@ -138,7 +138,8 @@ function sortGroups(groups) {
  */
 function PatternSelector() {
   const [patterns, setPatterns] = useState();
-  const [selected, setSelected] = useState();
+  const [visiblePatterns, setVisiblePatterns] = useState(undefined);
+  const [selected, setSelected] = useState({});
   const [errors, setErrors] = useState([]);
   const [used, setUsed] = useState();
   const [searchValue, setSearchValue] = useState("");
@@ -148,55 +149,75 @@ function PatternSelector() {
     setSearchValue(value);
   };
 
-  // refresh the page content after changing a pattern status
-  const refreshCb = useCallback(() => {
-    const refresh = async () => {
-      setSelected(await client.software.selectedPatterns());
-      setUsed(await client.software.getUsedSpace());
-      setErrors(await client.software.getIssues());
-    };
-
-    refresh();
-  }, [client.software]);
+  useEffect(() => {
+    return client.software.onSelectedPatternsChanged(setSelected);
+  }, [client.software, setSelected]);
 
   useEffect(() => {
-    // patterns already loaded
     if (patterns) return;
 
     const loadData = async () => {
-      setSelected(await client.software.selectedPatterns());
-      setUsed(await client.software.getUsedSpace());
+      setPatterns(await client.software.getPatterns());
+      const { patterns: selected, size } = await client.software.getProposal();
+      setSelected(selected);
+      setUsed(size);
       setErrors(await client.software.getIssues());
-      setPatterns(await client.software.patterns(true));
     };
 
     loadData();
   }, [patterns, client.software]);
 
-  // initial empty screen, the patterns are loaded very quickly, no need for any progress
-  if (!patterns) return null;
+  useEffect(() => {
+    if (!patterns) return;
 
-  let patternsData = convert(patterns, selected);
+    let visible = patterns.map((pattern) => {
+      const selected_by = (selected[pattern.name] === undefined) ? 2 : selected[pattern.name];
+      return { ...pattern, selected_by };
+    });
 
-  // filtering - search the required text in the name and pattern description
-  if (searchValue !== "") {
-    // case insensitive search
-    const searchData = searchValue.toUpperCase();
-    patternsData = patternsData.filter((p) =>
-      p.name.toUpperCase().indexOf(searchData) !== -1 ||
-      p.description.toUpperCase().indexOf(searchData) !== -1
-    );
-  }
+    // filtering - search the required text in the name and pattern description
+    if (searchValue !== "") {
+      // case insensitive search
+      const searchData = searchValue.toUpperCase();
+      visible = visible.filter((p) =>
+        p.name.toUpperCase().indexOf(searchData) !== -1 ||
+        p.description.toUpperCase().indexOf(searchData) !== -1
+      );
+    }
+
+    setVisiblePatterns(visible);
+  }, [patterns, selected, searchValue]);
+
+  const onToggle = useCallback((name) => {
+    const selected = visiblePatterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+
+    const index = selected.indexOf(name);
+    if (index === -1) {
+      selected.push(name);
+    } else {
+      selected.splice(index, 1);
+    }
 
-  const groups = groupPatterns(patternsData);
+    client.software.selectPatterns(selected);
+  }, [visiblePatterns, client.software]);
+
+  // initial empty screen, the patterns are loaded very quickly, no need for any progress
+  if (!visiblePatterns) return null;
 
+  const groups = groupPatterns(visiblePatterns);
   const selector = sortGroups(groups).map((group) => {
     return (
       <PatternGroup
         key={group}
         name={group}
       >
-        { (groups[group]).map(p => <PatternItem key={p.name} pattern={p} onChange={refreshCb} />) }
+        {groups[group].map((p) => (
+          <PatternItem
+            key={p.name}
+            pattern={p}
+            onToggle={(name) => onToggle(name)}
+          />
+        ))}
       </PatternGroup>
     );
   });
@@ -218,11 +239,11 @@ function PatternSelector() {
           onChange={(_event, value) => onSearchChange(value)}
           onClear={() => onSearchChange("")}
           // do not display the counter when search filter is empty
-          resultsCount={searchValue === "" ? 0 : patternsData.length}
+          resultsCount={searchValue === "" ? 0 : groups.length}
         />
       </Section>
 
-      { selector }
+      {selector}
     </>
   );
 }

From e8adad1353d601b7a3347ba22694094f78028770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 07:24:18 +0000
Subject: [PATCH 06/26] Move the PatternsSelector to a pop-up

---
 web/src/client/software.js                   |  32 +++-
 web/src/components/software/PatternItem.jsx  |   1 -
 web/src/components/software/SoftwarePage.jsx | 177 +++++++++++++++----
 web/src/components/software/UsedSize.jsx     |   7 +-
 4 files changed, 179 insertions(+), 38 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 4e9907ef5b..1493c5a1a1 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -49,6 +49,22 @@ const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
  * @property {string} message - Result message.
  */
 
+/**
+ * @typedef {object} SoftwareProposal
+ * @property {string} size - Used space in human-readable form.
+ * @property {Object.<string, number>} patterns - Selected patterns and the reason.
+ */
+
+/**
+ * @typedef {Object} Pattern
+ * @property {string} name - pattern name (internal ID)
+ * @property {string} category - pattern category
+ * @property {string} summary - pattern name (user visible)
+ * @property {string} description - long description of the pattern
+ * @property {number} order - display order (string!)
+ * @property {string} icon - icon name (not path or file name!)
+ */
+
 /**
  * Product manager.
  * @ignore
@@ -177,7 +193,7 @@ class SoftwareBaseClient {
   /**
    * Returns how much space installation takes on disk
    *
-   * @return {Promise<object>}
+   * @return {Promise<SoftwareProposal>}
    */
   getProposal() {
     return this.client.get("/software/proposal");
@@ -186,10 +202,18 @@ class SoftwareBaseClient {
   /**
    * Returns available patterns
    *
-   * @return {Promise<object>}
+   * @return {Promise<Pattern[]>}
    */
-  getPatterns() {
-    return this.client.get("/software/patterns");
+  async getPatterns() {
+    const patterns = await this.client.get("/software/patterns");
+    return patterns.map((pattern) => ({
+      name: pattern.name,
+      category: pattern.category,
+      summary: pattern.summary,
+      description: pattern.description,
+      order: parseInt(pattern.order),
+      icon: pattern.icon,
+    }));
   }
 
   /**
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index 75cdc464de..36806a2cc5 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -24,7 +24,6 @@ import { sprintf } from "sprintf-js";
 
 import cockpit from "../../lib/cockpit";
 
-import { useInstallerClient } from "~/context/installer";
 import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
 
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index ae57d48d97..2fc1be63ac 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -19,42 +19,137 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useState, useEffect } from "react";
-import { Skeleton } from "@patternfly/react-core";
+// @ts-check
 
-import { Page } from "~/components/core";
+import React, { useEffect, useState } from "react";
+import { Button, Skeleton } from "@patternfly/react-core";
+
+import { Page, Popup, Section } from "~/components/core";
 import { Center } from "~/components/layout";
-import { PatternSelector } from "~/components/software";
+import { PatternSelector, UsedSize } from "~/components/software";
 import { useInstallerClient } from "~/context/installer";
-import { useCancellablePromise } from "~/utils";
+import { noop, useCancellablePromise } from "~/utils";
 import { BUSY } from "~/client/status";
 import { _ } from "~/i18n";
 
+/**
+ * @typedef {Object} Pattern
+ * @property {string} name - pattern name (internal ID)
+ * @property {string} category -  pattern category
+ * @property {string} summary - pattern name (user visible)
+ * @property {string} description -  long description of the pattern
+ * @property {number} order - display order (string!)
+ * @property {number} selected_by - who selected the pattern
+ */
+
+/**
+ * Builds a list of patterns include its selection status
+ *
+ * @param {import("~/client/software").Pattern[]} patterns - Patterns from the HTTP API
+ * @param {Object.<string, number>} selection - Patterns selection
+ * @return {Pattern[]} List of patterns including its selection status
+ */
+function buildPatterns(patterns, selection) {
+  return patterns.map((pattern) => {
+    const selected_by = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
+    return {
+      ...pattern,
+      selected_by,
+    };
+  }).sort((a, b) => a.order - b.order);
+}
+
+/**
+ * Popup for selecting software patterns.
+ * @component
+ *
+ * @param {object} props
+ * @param {Pattern[]} props.patterns - List of patterns
+ * @param {boolean} props.isOpen - Whether the pop-up should be open
+ * @param {function} props.onFinish - Callback to be called when the selection is finished
+ */
+const PatternsSelectorPopup = ({
+  patterns,
+  isOpen = false,
+  onFinish = noop,
+}) => {
+  console.log("isOpen", isOpen);
+  return (
+    <Popup title={_("Software selection")} isOpen={isOpen}>
+      <PatternSelector patterns={patterns} />
+
+      <Popup.Actions>
+        <Popup.PrimaryAction
+          onClick={() => onFinish()}
+        >
+          {_("Close")}
+        </Popup.PrimaryAction>
+      </Popup.Actions>
+    </Popup>
+  );
+};
+
+const SelectPatternsButton = ({ patterns }) => {
+  const [isPopupOpen, setIsPopupOpen] = useState(false);
+
+  const openPopup = () => setIsPopupOpen(true);
+  const closePopup = () => setIsPopupOpen(false);
+
+  return (
+    <>
+      <Button
+        variant="primary"
+        onClick={openPopup}
+      >
+        {_("Change")}
+      </Button>
+      <PatternsSelectorPopup
+        patterns={patterns}
+        isOpen={isPopupOpen}
+        onFinish={closePopup}
+      />
+    </>
+  );
+};
+
 /**
  * Software page content depending on the current service state
  * @component
- * @param {number} status current backend service status
+ * @param {object} props
+ * @param {number} props.status - current backend service status
+ * @param {string} props.used- used space in human readable format
+ * @param {Pattern[]} props.patterns - patterns
  * @returns {JSX.Element}
  */
-function Content({ status }) {
-  switch (status) {
-    case undefined:
-      return null;
-    case BUSY:
-      return (
-        <Center>
-          <Skeleton width="20%" />
-          <Skeleton width="35%" />
-          <Skeleton width="70%" />
-          <Skeleton width="65%" />
-          <Skeleton width="80%" />
-          <Skeleton width="75%" />
-        </Center>
-      );
-    default:
-      return <PatternSelector />;
+const Content = ({ patterns, status, used }) => {
+  if (status === BUSY) {
+    return (
+      <Center>
+        <Skeleton width="20%" />
+        <Skeleton width="35%" />
+        <Skeleton width="70%" />
+        <Skeleton width="65%" />
+        <Skeleton width="80%" />
+        <Skeleton width="75%" />
+      </Center>
+    );
   }
-}
+
+  // return <PatternSelector />;
+  return (
+    <Section title={_("Software selection")} aria-label={_("List of software patterns")}>
+      <UsedSize size={used} />
+      <ul>
+        {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
+          <li key={pattern.name}>
+            {pattern.summary}
+          </li>
+        ))}
+      </ul>
+      <SelectPatternsButton patterns={patterns} />
+    </Section>
+  );
+};
 
 /**
  * Software page component
@@ -62,24 +157,42 @@ function Content({ status }) {
  * @returns {JSX.Element}
  */
 function SoftwarePage() {
-  const [status, setStatus] = useState();
+  const [status, setStatus] = useState(BUSY);
+  const [patterns, setPatterns] = useState([]);
+  const [used, setUsed] = useState("");
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
 
-  const updateStatus = (status) => {
-    setStatus(status);
-  };
-
   useEffect(() => {
-    cancellablePromise(client.software.getStatus().then(updateStatus));
+    cancellablePromise(client.software.getStatus().then(setStatus));
 
-    return client.software.onStatusChange(updateStatus);
+    return client.software.onStatusChange(setStatus);
   }, [client, cancellablePromise]);
 
+  useEffect(() => {
+    if (!patterns) return;
+
+    return client.software.onSelectedPatternsChanged((selection) => {
+      client.software.getProposal().then(({ size }) => setUsed(size));
+      setPatterns(buildPatterns(patterns, selection));
+    });
+  }, [client.software, patterns]);
+
+  useEffect(() => {
+    const loadPatterns = async () => {
+      const patterns = await cancellablePromise(client.software.getPatterns());
+      const { patterns: selection, size } = await cancellablePromise(client.software.getProposal());
+      setUsed(size);
+      setPatterns(buildPatterns(patterns, selection));
+    };
+
+    loadPatterns();
+  }, [client.software, cancellablePromise]);
+
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
-      <Content status={status} />
+      <Content patterns={patterns} status={status} used={used} />
     </Page>
   );
 }
diff --git a/web/src/components/software/UsedSize.jsx b/web/src/components/software/UsedSize.jsx
index 6e68738244..036b5230f7 100644
--- a/web/src/components/software/UsedSize.jsx
+++ b/web/src/components/software/UsedSize.jsx
@@ -25,12 +25,17 @@ import { Em } from "~/components/core";
 import { _ } from "~/i18n";
 
 export default function UsedSize({ size }) {
+  console.log("size", size);
   if (size === undefined || size === "" || size === "0 B") return null;
 
   // TRANSLATORS: %s will be replaced by the estimated installation size,
   // example: "728.8 MiB"
   const [msg1, msg2] = _("Installation will take %s").split("%s");
   return (
-    <>{msg1}<Em>{size}</Em>{msg2}</>
+    <>
+      {msg1}
+      <Em>{size}</Em>
+      {msg2}
+    </>
   );
 }

From 61b0c0f509ce9b050332a82411f9cdfaf2625e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 13:04:44 +0000
Subject: [PATCH 07/26] Add a onOptionClick option to the Selector

---
 web/src/components/core/Selector.jsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/web/src/components/core/Selector.jsx b/web/src/components/core/Selector.jsx
index 243695d0f2..383fc55a16 100644
--- a/web/src/components/core/Selector.jsx
+++ b/web/src/components/core/Selector.jsx
@@ -20,8 +20,8 @@
  */
 
 // @ts-check
-import React from 'react';
-import { noop } from '~/utils';
+import React from "react";
+import { noop } from "~/utils";
 
 /**
  * @callback onSelectionChangeCallback
@@ -62,6 +62,7 @@ import { noop } from '~/utils';
  * @param {string} [props.optionIdKey="id"] - Key used for retrieve options id.
  * @param {Array<*>} [props.selectedIds=[]] - Identifiers for selected options.
  * @param {onSelectionChangeCallback} [props.onSelectionChange=noop] - Callback to be called when the selection changes.
+ * @param {function|undefined} [props.onOptionClick] - Callback to be called when the selection changes.
  * @param {object} [props.props] - Other props sent to the internal selector <ul> component
  */
 const Selector = ({
@@ -72,9 +73,12 @@ const Selector = ({
   optionIdKey = "id",
   selectedIds = [],
   onSelectionChange = noop,
+  onOptionClick,
   ...props
 }) => {
-  const onOptionClick = (optionId) => {
+  const onOptionClicked = (optionId) => {
+    if (typeof onOptionClick === "function") return onOptionClick(optionId);
+
     const alreadySelected = selectedIds.includes(optionId);
 
     if (!isMultiple) {
@@ -90,12 +94,12 @@ const Selector = ({
   };
 
   return (
-    <ul { ...props } id={id} data-type="agama/list" role="grid">
-      { options.map(option => {
+    <ul {...props} id={id} data-type="agama/list" role="grid">
+      {options.map((option) => {
         const optionId = option[optionIdKey];
         const optionHtmlId = `${id}-option-${optionId}`;
         const isSelected = selectedIds.includes(optionId);
-        const onClick = () => onOptionClick(optionId);
+        const onClick = () => onOptionClicked(optionId);
 
         return (
           <li
@@ -112,7 +116,7 @@ const Selector = ({
                 onChange={onClick}
                 aria-labelledby={optionHtmlId}
               />
-              { renderOption(option) }
+              {renderOption(option)}
             </div>
           </li>
         );

From eec9124c5adac289b1033e4ead4fe583de6609fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 13:07:22 +0000
Subject: [PATCH 08/26] Revamp the software page

---
 .../components/overview/SoftwareSection.jsx   |   2 +
 web/src/components/software/PatternItem.jsx   |  25 +---
 .../components/software/PatternSelector.jsx   | 120 ++++++++----------
 web/src/components/software/SoftwarePage.jsx  |  86 +++++--------
 4 files changed, 91 insertions(+), 142 deletions(-)

diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index b6887a2502..f4b3a45150 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -80,6 +80,8 @@ export default function SoftwareSection({ showErrors }) {
   }, [client, cancellablePromise]);
 
   useEffect(() => {
+    if (state.busy) return;
+
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
       const { size } = await cancellablePromise(client.getProposal());
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index 36806a2cc5..1686bd5ed5 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -19,12 +19,9 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { sprintf } from "sprintf-js";
 
-import cockpit from "../../lib/cockpit";
-
-import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
 
 import iconAvailable from "./icons/package-available.svg";
@@ -77,32 +74,12 @@ function stateAriaLabel(selected) {
  * @returns {JSX.Element}
  */
 function PatternItem({ pattern, onToggle }) {
-  const [icon, setIcon] = useState();
-
-  // download the pattern icon from the system
-  useEffect(() => {
-    if (icon) return;
-    cockpit.file(sprintf(ICON_PATH, pattern.icon)).read()
-      .then((data) => {
-        setIcon(data);
-      });
-  }, [pattern.icon, icon]);
-
-  const patternIcon = icon
-    // use a Base64 encoded inline pattern image
-    ? <img src={"data:image/svg+xml;base64," + btoa(icon)} aria-hidden="true" />
-    // fallback icon
-    : <Icon name="apps" aria-hidden="true" />;
-
   return (
     <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
       <div className="pattern-checkbox">
         <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
       </div>
       <div className="pattern-label">
-        <div className="pattern-label-icon">
-          {patternIcon}
-        </div>
         <div className="pattern-label-text">{pattern.summary}</div>
       </div>
       <div className="pattern-summary">{pattern.description}</div>
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 6c8e0dbc50..eaacdd75ca 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -23,11 +23,10 @@ import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
 import { useInstallerClient } from "~/context/installer";
-import { Section, ValidationErrors } from "~/components/core";
+import { If, Section, Selector, ValidationErrors } from "~/components/core";
 import PatternGroup from "./PatternGroup";
 import PatternItem from "./PatternItem";
 import { toValidationError } from "~/utils";
-import UsedSize from "./UsedSize";
 import { _ } from "~/i18n";
 
 /**
@@ -76,37 +75,32 @@ function convert(pattern_data, selected) {
 /**
  * Group the patterns with the same group name
  * @param {Array<Pattern>} patterns input
- * @returns {PatternGroups}
+ * @return {PatternGroups}
  */
 function groupPatterns(patterns) {
-  // group patterns
-  const pattern_groups = {};
+  const groups = {};
 
   patterns.forEach((pattern) => {
-    if (pattern_groups[pattern.category]) {
-      pattern_groups[pattern.category].push(pattern);
+    if (groups[pattern.category]) {
+      groups[pattern.category].push(pattern);
     } else {
-      pattern_groups[pattern.category] = [pattern];
+      groups[pattern.category] = [pattern];
     }
   });
 
   // sort patterns by the "order" value
-  Object.keys(pattern_groups).forEach((group) => {
-    pattern_groups[group].sort((p1, p2) => {
+  Object.keys(groups).forEach((group) => {
+    groups[group].sort((p1, p2) => {
       if (p1.order === p2.order) {
         // there should be no patterns with the same name
         return p1.name < p2.name ? -1 : 1;
       } else {
-        // patterns with undefined (empty) order are always at the end
-        if (p1.order === "") return 1;
-        if (p2.order === "") return -1;
-
-        return p1.order < p2.order ? -1 : 1;
+        return p1.order - p2.order;
       }
     });
   });
 
-  return pattern_groups;
+  return groups;
 }
 
 /**
@@ -134,62 +128,42 @@ function sortGroups(groups) {
 /**
  * Pattern selector component
  * @component
+ * @param {object} props
+ * @param {import("~/components/software/SoftwarePage").Pattern[]} props.patterns - list of patterns
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @returns {JSX.Element}
  */
-function PatternSelector() {
-  const [patterns, setPatterns] = useState();
-  const [visiblePatterns, setVisiblePatterns] = useState(undefined);
-  const [selected, setSelected] = useState({});
+function PatternSelector({ patterns, proposal }) {
   const [errors, setErrors] = useState([]);
-  const [used, setUsed] = useState();
+  const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
 
+  const { patterns: selection, used } = proposal;
+
   const onSearchChange = (value) => {
     setSearchValue(value);
   };
 
-  useEffect(() => {
-    return client.software.onSelectedPatternsChanged(setSelected);
-  }, [client.software, setSelected]);
-
-  useEffect(() => {
-    if (patterns) return;
-
-    const loadData = async () => {
-      setPatterns(await client.software.getPatterns());
-      const { patterns: selected, size } = await client.software.getProposal();
-      setSelected(selected);
-      setUsed(size);
-      setErrors(await client.software.getIssues());
-    };
-
-    loadData();
-  }, [patterns, client.software]);
-
   useEffect(() => {
     if (!patterns) return;
 
-    let visible = patterns.map((pattern) => {
-      const selected_by = (selected[pattern.name] === undefined) ? 2 : selected[pattern.name];
-      return { ...pattern, selected_by };
-    });
-
     // filtering - search the required text in the name and pattern description
     if (searchValue !== "") {
       // case insensitive search
       const searchData = searchValue.toUpperCase();
-      visible = visible.filter((p) =>
+      const filtered = patterns.filter((p) =>
         p.name.toUpperCase().indexOf(searchData) !== -1 ||
         p.description.toUpperCase().indexOf(searchData) !== -1
       );
+      setVisiblePatterns(filtered);
+    } else {
+      setVisiblePatterns(patterns);
     }
-
-    setVisiblePatterns(visible);
-  }, [patterns, selected, searchValue]);
+  }, [patterns, searchValue]);
 
   const onToggle = useCallback((name) => {
-    const selected = visiblePatterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+    const selected = patterns.filter((p) => p.selected_by === 0).map((p) => p.name);
 
     const index = selected.indexOf(name);
     if (index === -1) {
@@ -199,38 +173,52 @@ function PatternSelector() {
     }
 
     client.software.selectPatterns(selected);
-  }, [visiblePatterns, client.software]);
+  }, [patterns, client.software]);
 
   // initial empty screen, the patterns are loaded very quickly, no need for any progress
-  if (!visiblePatterns) return null;
+  if (visiblePatterns.length === 0) return null;
 
   const groups = groupPatterns(visiblePatterns);
-  const selector = sortGroups(groups).map((group) => {
+
+  const renderPatternOption = (pattern) => (
+    <>
+      <div>
+        <b>{pattern.summary}</b>
+      </div>
+      <div>{pattern.description}</div>
+      {/* eslint-disable-next-line i18next/no-literal-string */}
+      <If condition={pattern.selected_by === 1} then={<div>auto</div>} />
+    </>
+  );
+
+  const selector = sortGroups(groups).map((groupName) => {
+    const selectedIds = groups[groupName].filter((p) => p.selected_by !== 2).map((p) => p.name);
     return (
-      <PatternGroup
-        key={group}
-        name={group}
+      <Section
+        key={groupName}
+        title={groupName}
       >
-        {groups[group].map((p) => (
-          <PatternItem
-            key={p.name}
-            pattern={p}
-            onToggle={(name) => onToggle(name)}
-          />
-        ))}
-      </PatternGroup>
+        <Selector
+          isMultiple
+          renderOption={renderPatternOption}
+          options={groups[groupName]}
+          onOptionClick={onToggle}
+          optionIdKey="name"
+          selectedIds={selectedIds}
+          dataItemsType="agama/software-patterns"
+        />
+      </Section>
     );
   });
 
   // FIXME: ValidationErrors should be replaced by an equivalent component to show issues.
   // Note that only the Users client uses the old Validation D-Bus interface.
-  const validationErrors = errors.map(toValidationError);
+  // const validationErrors = errors.map(toValidationError);
+  // <ValidationErrors errors={validationErrors} sectionId="software" />
 
   return (
     <>
       <Section aria-label={_("Software summary and filter options")}>
-        <UsedSize size={used} />
-        <ValidationErrors errors={validationErrors} sectionId="software" />
         <SearchInput
           // TRANSLATORS: search field placeholder text
           placeholder={_("Search")}
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 2fc1be63ac..df2f75ec9b 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -24,8 +24,7 @@
 import React, { useEffect, useState } from "react";
 import { Button, Skeleton } from "@patternfly/react-core";
 
-import { Page, Popup, Section } from "~/components/core";
-import { Center } from "~/components/layout";
+import { If, Page, Popup, Section, SectionSkeleton } from "~/components/core";
 import { PatternSelector, UsedSize } from "~/components/software";
 import { useInstallerClient } from "~/context/installer";
 import { noop, useCancellablePromise } from "~/utils";
@@ -65,18 +64,19 @@ function buildPatterns(patterns, selection) {
  *
  * @param {object} props
  * @param {Pattern[]} props.patterns - List of patterns
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @param {boolean} props.isOpen - Whether the pop-up should be open
  * @param {function} props.onFinish - Callback to be called when the selection is finished
  */
 const PatternsSelectorPopup = ({
   patterns,
+  proposal,
   isOpen = false,
   onFinish = noop,
 }) => {
-  console.log("isOpen", isOpen);
   return (
-    <Popup title={_("Software selection")} isOpen={isOpen}>
-      <PatternSelector patterns={patterns} />
+    <Popup className="large" title={_("Software selection")} isOpen={isOpen}>
+      <PatternSelector patterns={patterns} proposal={proposal} />
 
       <Popup.Actions>
         <Popup.PrimaryAction
@@ -89,7 +89,7 @@ const PatternsSelectorPopup = ({
   );
 };
 
-const SelectPatternsButton = ({ patterns }) => {
+const SelectPatternsButton = ({ patterns, proposal }) => {
   const [isPopupOpen, setIsPopupOpen] = useState(false);
 
   const openPopup = () => setIsPopupOpen(true);
@@ -105,6 +105,7 @@ const SelectPatternsButton = ({ patterns }) => {
       </Button>
       <PatternsSelectorPopup
         patterns={patterns}
+        proposal={proposal}
         isOpen={isPopupOpen}
         onFinish={closePopup}
       />
@@ -112,45 +113,6 @@ const SelectPatternsButton = ({ patterns }) => {
   );
 };
 
-/**
- * Software page content depending on the current service state
- * @component
- * @param {object} props
- * @param {number} props.status - current backend service status
- * @param {string} props.used- used space in human readable format
- * @param {Pattern[]} props.patterns - patterns
- * @returns {JSX.Element}
- */
-const Content = ({ patterns, status, used }) => {
-  if (status === BUSY) {
-    return (
-      <Center>
-        <Skeleton width="20%" />
-        <Skeleton width="35%" />
-        <Skeleton width="70%" />
-        <Skeleton width="65%" />
-        <Skeleton width="80%" />
-        <Skeleton width="75%" />
-      </Center>
-    );
-  }
-
-  // return <PatternSelector />;
-  return (
-    <Section title={_("Software selection")} aria-label={_("List of software patterns")}>
-      <UsedSize size={used} />
-      <ul>
-        {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
-          <li key={pattern.name}>
-            {pattern.summary}
-          </li>
-        ))}
-      </ul>
-      <SelectPatternsButton patterns={patterns} />
-    </Section>
-  );
-};
-
 /**
  * Software page component
  * @component
@@ -159,7 +121,7 @@ const Content = ({ patterns, status, used }) => {
 function SoftwarePage() {
   const [status, setStatus] = useState(BUSY);
   const [patterns, setPatterns] = useState([]);
-  const [used, setUsed] = useState("");
+  const [proposal, setProposal] = useState({ patterns: {}, size: "" });
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
 
@@ -173,26 +135,46 @@ function SoftwarePage() {
     if (!patterns) return;
 
     return client.software.onSelectedPatternsChanged((selection) => {
-      client.software.getProposal().then(({ size }) => setUsed(size));
+      client.software.getProposal().then((proposal) => setProposal(proposal));
       setPatterns(buildPatterns(patterns, selection));
     });
   }, [client.software, patterns]);
 
   useEffect(() => {
+    if (patterns.length > 0) return;
+
     const loadPatterns = async () => {
       const patterns = await cancellablePromise(client.software.getPatterns());
-      const { patterns: selection, size } = await cancellablePromise(client.software.getProposal());
-      setUsed(size);
-      setPatterns(buildPatterns(patterns, selection));
+      const proposal = await cancellablePromise(client.software.getProposal());
+      setPatterns(buildPatterns(patterns, proposal.patterns));
+      setProposal(proposal);
     };
 
     loadPatterns();
-  }, [client.software, cancellablePromise]);
+  }, [client.software, patterns, cancellablePromise]);
 
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
-      <Content patterns={patterns} status={status} used={used} />
+      <Section title={_("Software selection")}>
+        <If
+          condition={status === BUSY}
+          then={<SectionSkeleton numRows={5} />}
+          else={
+            <>
+              <UsedSize size={proposal.size} />
+              <ul>
+                {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
+                  <li key={pattern.name}>
+                    {pattern.summary}
+                  </li>
+                ))}
+              </ul>
+              <SelectPatternsButton patterns={patterns} proposal={proposal} />
+            </>
+          }
+        />
+      </Section>
     </Page>
   );
 }

From 48e54162c0fe39f6bc8ab48b22f4c16d9ac577f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 16:05:09 +0000
Subject: [PATCH 09/26] Improve the usability of the software page

---
 web/src/components/software/PatternGroup.jsx  |  36 ------
 .../components/software/PatternGroup.test.jsx |  41 -------
 web/src/components/software/PatternItem.jsx   |  90 --------------
 .../components/software/PatternItem.test.jsx  | 115 ------------------
 .../components/software/PatternSelector.jsx   |  47 +------
 web/src/components/software/SoftwarePage.jsx  |  60 +++++++--
 web/src/components/software/UsedSize.jsx      |   1 -
 7 files changed, 50 insertions(+), 340 deletions(-)
 delete mode 100644 web/src/components/software/PatternGroup.jsx
 delete mode 100644 web/src/components/software/PatternGroup.test.jsx
 delete mode 100644 web/src/components/software/PatternItem.jsx
 delete mode 100644 web/src/components/software/PatternItem.test.jsx

diff --git a/web/src/components/software/PatternGroup.jsx b/web/src/components/software/PatternGroup.jsx
deleted file mode 100644
index 9c1b71a545..0000000000
--- a/web/src/components/software/PatternGroup.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { Section } from "~/components/core";
-
-/**
- * Pattern group component
- * @component
- * @param {string} name name of the group
- * @param {JSX.Element} children the wrapped content with the patterns belonging to this group
- * @returns {JSX.Element}
- */
-export default function PatternGroup({ name, children }) {
-  return (
-    <Section title={name}>{children}</Section>
-  );
-}
diff --git a/web/src/components/software/PatternGroup.test.jsx b/web/src/components/software/PatternGroup.test.jsx
deleted file mode 100644
index d757172880..0000000000
--- a/web/src/components/software/PatternGroup.test.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-
-import { screen } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-
-import PatternGroup from "./PatternGroup";
-
-describe("PatternGroup", () => {
-  const name = "Pattern name";
-  const content = "Just a children content";
-
-  it("displays the pattern name and the content", async () => {
-    plainRender(<PatternGroup name={name}>{content}</PatternGroup>);
-
-    // the name is displayed
-    screen.getByText(name);
-    // the content is displayed
-    screen.getByText(content);
-  });
-});
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
deleted file mode 100644
index 1686bd5ed5..0000000000
--- a/web/src/components/software/PatternItem.jsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React, { useState } from "react";
-import { sprintf } from "sprintf-js";
-
-import { _ } from "~/i18n";
-
-import iconAvailable from "./icons/package-available.svg";
-import iconInstall from "./icons/package-install.svg";
-import iconAutoInstall from "./icons/package-install-auto.svg";
-
-// path to pattern icons, %s is replaced by the icon name
-const ICON_PATH = "/usr/share/icons/hicolor/scalable/apps/%s.svg";
-
-/**
- * Get checkbox status icon for the required pattern installation status
- * @param {number} state pattern selection status
- * @returns {string} Raw SVG icon data
- */
-function stateIcon(state) {
-  switch (state) {
-    case 0:
-      return iconInstall;
-    case 1:
-      return iconAutoInstall;
-    default:
-      return iconAvailable;
-  }
-}
-
-/**
- * Get ARIA label for the required pattern installation status
- * @param {number} state pattern selection status
- * @returns {string} Label
- */
-function stateAriaLabel(selected) {
-  switch (selected) {
-    case 0:
-      // TRANSLATORS: pattern status, selected to install (by user)
-      return _("selected");
-    case 1:
-      // TRANSLATORS: pattern status, selected to install (by dependencies)
-      return _("automatically selected");
-    default:
-      // TRANSLATORS: pattern status, not selected to install
-      return _("not selected");
-  }
-}
-
-/**
- * Pattern component
- * @component
- * @param {Pattern} pattern pattern to display
- * @param {function} onChange callback called when the pattern status is changed
- * @returns {JSX.Element}
- */
-function PatternItem({ pattern, onToggle }) {
-  return (
-    <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
-      <div className="pattern-checkbox">
-        <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
-      </div>
-      <div className="pattern-label">
-        <div className="pattern-label-text">{pattern.summary}</div>
-      </div>
-      <div className="pattern-summary">{pattern.description}</div>
-    </div>
-  );
-}
-
-export default PatternItem;
diff --git a/web/src/components/software/PatternItem.test.jsx b/web/src/components/software/PatternItem.test.jsx
deleted file mode 100644
index 295858cade..0000000000
--- a/web/src/components/software/PatternItem.test.jsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { act, screen } from "@testing-library/react";
-import { installerRender } from "~/test-utils";
-
-import { createClient } from "~/client";
-import cockpit from "../../lib/cockpit";
-
-import PatternItem from "./PatternItem";
-
-jest.mock("~/client");
-const addPatternFn = jest.fn().mockResolvedValue();
-const removePatternFn = jest.fn().mockResolvedValue();
-beforeEach(() => {
-  createClient.mockImplementation(() => {
-    return {
-      software: {
-        addPattern: addPatternFn,
-        removePattern: removePatternFn,
-      },
-    };
-  });
-});
-
-jest.mock("../../lib/cockpit");
-const readFn = jest.fn().mockResolvedValue("");
-const fileFn = jest.fn();
-fileFn.mockImplementation(() => {
-  return {
-    read: readFn
-  };
-});
-cockpit.file.mockImplementation(fileFn);
-
-const pattern = {
-  category: "Documentation",
-  description: "Help and Documentation, various books.",
-  icon: "./pattern-documentation",
-  name: "books",
-  order: "5200",
-  summary: "Documentation"
-};
-
-describe("PatternItem", () => {
-  it("displays the pattern summary and description", async () => {
-    await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    // the summary is displayed
-    screen.getByText(pattern.summary);
-    // the description is displayed
-    screen.getByText(pattern.description);
-  });
-
-  it("displays the pattern icon if it as available", async () => {
-    readFn.mockResolvedValue("<?xml version=\"1.0\" ?>");
-    const { container } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    expect(container.querySelector(".pattern-label-icon img")).not.toBeNull();
-  });
-
-  it("displays the generic fallback icon if the pattern icon is not available", async () => {
-    readFn.mockResolvedValue("");
-    const { container } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    expect(container.querySelector(".pattern-label-icon svg")).not.toBeNull();
-  });
-
-  it("selects unselected pattern after clicking it", async () => {
-    pattern.selected = undefined;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    // console.log(prettyDOM(container));
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(addPatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-
-  it("deselects selected pattern after clicking it", async () => {
-    pattern.selected = 0;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(removePatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-
-  it("deselects automatically selected pattern after clicking it", async () => {
-    pattern.selected = 1;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(removePatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-});
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index eaacdd75ca..fcf58ec394 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -23,10 +23,7 @@ import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
 import { useInstallerClient } from "~/context/installer";
-import { If, Section, Selector, ValidationErrors } from "~/components/core";
-import PatternGroup from "./PatternGroup";
-import PatternItem from "./PatternItem";
-import { toValidationError } from "~/utils";
+import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 
 /**
@@ -41,32 +38,6 @@ import { _ } from "~/i18n";
  *   means it is not selected to install
  */
 
-/**
- * Convert DBus pattern data to JS objects
- * @param {Object.<string, Array<string>>} pattern_data input pattern data
- * @param {PatternSelection} selected selected patterns
- * @returns {Array<Pattern>} converted patterns
- */
-function convert(pattern_data, selected) {
-  const patterns = [];
-
-  Object.keys(pattern_data).forEach((name) => {
-    const pattern = pattern_data[name];
-
-    patterns.push({
-      name,
-      group: pattern[0],
-      description: pattern[1],
-      icon: pattern[2],
-      summary: pattern[3],
-      order: pattern[4],
-      selected: selected[name],
-    });
-  });
-
-  return patterns;
-}
-
 /**
  * @typedef {Object.<string, Array<Pattern>} PatternGroups mapping "group name" =>
  * list of patterns
@@ -134,17 +105,10 @@ function sortGroups(groups) {
  * @returns {JSX.Element}
  */
 function PatternSelector({ patterns, proposal }) {
-  const [errors, setErrors] = useState([]);
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
 
-  const { patterns: selection, used } = proposal;
-
-  const onSearchChange = (value) => {
-    setSearchValue(value);
-  };
-
   useEffect(() => {
     if (!patterns) return;
 
@@ -211,11 +175,6 @@ function PatternSelector({ patterns, proposal }) {
     );
   });
 
-  // FIXME: ValidationErrors should be replaced by an equivalent component to show issues.
-  // Note that only the Users client uses the old Validation D-Bus interface.
-  // const validationErrors = errors.map(toValidationError);
-  // <ValidationErrors errors={validationErrors} sectionId="software" />
-
   return (
     <>
       <Section aria-label={_("Software summary and filter options")}>
@@ -224,8 +183,8 @@ function PatternSelector({ patterns, proposal }) {
           placeholder={_("Search")}
           aria-label={_("Search")}
           value={searchValue}
-          onChange={(_event, value) => onSearchChange(value)}
-          onClear={() => onSearchChange("")}
+          onChange={(_event, value) => setSearchValue(value)}
+          onClear={() => setSearchValue("")}
           // do not display the counter when search filter is empty
           resultsCount={searchValue === "" ? 0 : groups.length}
         />
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index df2f75ec9b..54bcc2d215 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -22,7 +22,7 @@
 // @ts-check
 
 import React, { useEffect, useState } from "react";
-import { Button, Skeleton } from "@patternfly/react-core";
+import { Button } from "@patternfly/react-core";
 
 import { If, Page, Popup, Section, SectionSkeleton } from "~/components/core";
 import { PatternSelector, UsedSize } from "~/components/software";
@@ -98,10 +98,10 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   return (
     <>
       <Button
-        variant="primary"
+        variant="link"
         onClick={openPopup}
       >
-        {_("Change")}
+        {_("Change selection")}
       </Button>
       <PatternsSelectorPopup
         patterns={patterns}
@@ -113,6 +113,40 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   );
 };
 
+const SelectedPatternsList = ({ patterns, proposal }) => {
+  const selected = patterns.filter((p) => p.selected_by !== 2);
+  let description;
+
+  if (selected.length === 0) {
+    description = (
+      <>
+        {_("No additional software was selected.")}
+      </>
+    );
+  } else {
+    description = (
+      <>
+        <p>{_("The following software patterns are selected for installation:")}</p>
+        <ul>
+          {selected.map((pattern) => (
+            <li key={pattern.name}>
+              {pattern.summary}
+            </li>
+          ))}
+        </ul>
+      </>
+    );
+  }
+  return (
+    <>
+      {description}
+      <div>
+        <SelectPatternsButton patterns={patterns} proposal={proposal} />
+      </div>
+    </>
+  );
+};
+
 /**
  * Software page component
  * @component
@@ -121,6 +155,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
 function SoftwarePage() {
   const [status, setStatus] = useState(BUSY);
   const [patterns, setPatterns] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
   const [proposal, setProposal] = useState({ patterns: {}, size: "" });
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
@@ -141,36 +176,35 @@ function SoftwarePage() {
   }, [client.software, patterns]);
 
   useEffect(() => {
-    if (patterns.length > 0) return;
+    if (patterns.length !== 0) return;
 
     const loadPatterns = async () => {
       const patterns = await cancellablePromise(client.software.getPatterns());
       const proposal = await cancellablePromise(client.software.getProposal());
       setPatterns(buildPatterns(patterns, proposal.patterns));
       setProposal(proposal);
+      setIsLoading(false);
     };
 
     loadPatterns();
   }, [client.software, patterns, cancellablePromise]);
 
+  console.log("SoftPage");
+
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
+      {/* TRANSLATORS: page title */}
       <Section title={_("Software selection")}>
         <If
           condition={status === BUSY}
           then={<SectionSkeleton numRows={5} />}
           else={
             <>
-              <UsedSize size={proposal.size} />
-              <ul>
-                {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
-                  <li key={pattern.name}>
-                    {pattern.summary}
-                  </li>
-                ))}
-              </ul>
-              <SelectPatternsButton patterns={patterns} proposal={proposal} />
+              <SelectedPatternsList patterns={patterns} proposal={proposal} />
+              <div>
+                <UsedSize size={proposal.size} />
+              </div>
             </>
           }
         />
diff --git a/web/src/components/software/UsedSize.jsx b/web/src/components/software/UsedSize.jsx
index 036b5230f7..df49c860eb 100644
--- a/web/src/components/software/UsedSize.jsx
+++ b/web/src/components/software/UsedSize.jsx
@@ -25,7 +25,6 @@ import { Em } from "~/components/core";
 import { _ } from "~/i18n";
 
 export default function UsedSize({ size }) {
-  console.log("size", size);
   if (size === undefined || size === "" || size === "0 B") return null;
 
   // TRANSLATORS: %s will be replaced by the estimated installation size,

From 089fa8af57940214adf8826a7f1ff7b5ef4596a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 20:57:19 +0000
Subject: [PATCH 10/26] Introduce a SelectedBy "enum"

---
 web/src/client/software.js                      | 15 +++++++++++++++
 web/src/components/software/PatternSelector.jsx | 10 +++++++---
 web/src/components/software/SoftwarePage.jsx    |  9 +++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 1493c5a1a1..c5dc480c8d 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -28,6 +28,21 @@ const SOFTWARE_SERVICE = "org.opensuse.Agama.Software1";
 const PRODUCT_PATH = "/org/opensuse/Agama/Software1/Product";
 const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
+/**
+ * Enum for the reasons to select a pattern
+ *
+ * @readonly
+ * @enum { number }
+ */
+const SelectedBy = Object.freeze({
+  /** Selected by the user */
+  USER: 0,
+  /** Automatically selected as a dependency of another package */
+  AUTO: 1,
+  /** No selected */
+  NONE: 2,
+});
+
 /**
  * @typedef {object} Product
  * @property {string} id - Product ID (e.g., "Leap")
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index fcf58ec394..7a0459293c 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -25,6 +25,7 @@ import { SearchInput } from "@patternfly/react-core";
 import { useInstallerClient } from "~/context/installer";
 import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
+import { SelectedBy } from "~/client/software";
 
 /**
  * @typedef {Object} Pattern
@@ -127,7 +128,8 @@ function PatternSelector({ patterns, proposal }) {
   }, [patterns, searchValue]);
 
   const onToggle = useCallback((name) => {
-    const selected = patterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+    const selected = patterns.filter((p) => p.selectedBy === SelectedBy.USER)
+      .map((p) => p.name);
 
     const index = selected.indexOf(name);
     if (index === -1) {
@@ -151,12 +153,14 @@ function PatternSelector({ patterns, proposal }) {
       </div>
       <div>{pattern.description}</div>
       {/* eslint-disable-next-line i18next/no-literal-string */}
-      <If condition={pattern.selected_by === 1} then={<div>auto</div>} />
+      <If condition={pattern.selectedBy === SelectedBy.AUTO} then={<div>auto</div>} />
     </>
   );
 
   const selector = sortGroups(groups).map((groupName) => {
-    const selectedIds = groups[groupName].filter((p) => p.selected_by !== 2).map((p) => p.name);
+    const selectedIds = groups[groupName].filter((p) => p.selectedBy !== SelectedBy.NONE).map((p) =>
+      p.name
+    );
     return (
       <Section
         key={groupName}
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 54bcc2d215..fe667b7ba9 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -30,6 +30,7 @@ import { useInstallerClient } from "~/context/installer";
 import { noop, useCancellablePromise } from "~/utils";
 import { BUSY } from "~/client/status";
 import { _ } from "~/i18n";
+import { SelectedBy } from "~/client/software";
 
 /**
  * @typedef {Object} Pattern
@@ -38,7 +39,7 @@ import { _ } from "~/i18n";
  * @property {string} summary - pattern name (user visible)
  * @property {string} description -  long description of the pattern
  * @property {number} order - display order (string!)
- * @property {number} selected_by - who selected the pattern
+ * @property {number} selectedBy - who selected the pattern
  */
 
 /**
@@ -50,10 +51,10 @@ import { _ } from "~/i18n";
  */
 function buildPatterns(patterns, selection) {
   return patterns.map((pattern) => {
-    const selected_by = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
+    const selectedBy = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
     return {
       ...pattern,
-      selected_by,
+      selectedBy,
     };
   }).sort((a, b) => a.order - b.order);
 }
@@ -114,7 +115,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
 };
 
 const SelectedPatternsList = ({ patterns, proposal }) => {
-  const selected = patterns.filter((p) => p.selected_by !== 2);
+  const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
 
   if (selected.length === 0) {

From a13e6a877c06e9927b9e4b68ff3816e84dc39db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:50:46 +0000
Subject: [PATCH 11/26] Fix software clients type checking and a few tests

---
 web/src/client/software.js      | 12 +++--
 web/src/client/software.test.js | 77 ++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index c5dc480c8d..1fa1d8672b 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -70,6 +70,12 @@ const SelectedBy = Object.freeze({
  * @property {Object.<string, number>} patterns - Selected patterns and the reason.
  */
 
+/**
+ * @typedef {object} SoftwareConfig
+ * @property {Array<string>|undefined} patterns - Name of the selected packages.
+ * @property {string|undefined} product - Product to install.
+ */
+
 /**
  * @typedef {Object} Pattern
  * @property {string} name - pattern name (internal ID)
@@ -220,6 +226,7 @@ class SoftwareBaseClient {
    * @return {Promise<Pattern[]>}
    */
   async getPatterns() {
+    /** @type Array<{ name: string, category: string, summary: string, description: string, order: string, icon: string }> */
     const patterns = await this.client.get("/software/patterns");
     return patterns.map((pattern) => ({
       name: pattern.name,
@@ -232,8 +239,7 @@ class SoftwareBaseClient {
   }
 
   /**
-   * @typedef {Object.<string, number>} PatternSelection mapping "name" =>
-   * "who selected the pattern"
+   * @return {Promise<SoftwareConfig>}
    */
   config() {
     return this.client.get("/software/config");
@@ -328,4 +334,4 @@ class ProductBaseClient {
 class ProductClient
   extends WithIssues(ProductBaseClient, "software/issues/product", PRODUCT_PATH) {}
 
-export { ProductClient, SoftwareClient };
+export { ProductClient, SelectedBy, SoftwareClient };
diff --git a/web/src/client/software.test.js b/web/src/client/software.test.js
index dfcdaeaed7..5aeeaf6339 100644
--- a/web/src/client/software.test.js
+++ b/web/src/client/software.test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022-2023] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -22,7 +22,20 @@
 // @ts-check
 
 import DBusClient from "./dbus";
-import { SoftwareClient } from "./software";
+import { HTTPClient } from "./http";
+import { ProductClient, SoftwareClient } from "./software";
+
+jest.mock("./http", () => {
+  return {
+    HTTPClient: jest.fn().mockImplementation(() => {
+      return {
+        get: mockGetFn,
+      };
+    }),
+  };
+});
+
+const mockGetFn = jest.fn();
 
 jest.mock("./dbus");
 
@@ -33,13 +46,25 @@ const productProxy = {
   wait: jest.fn(),
   AvailableProducts: [
     ["MicroOS", "openSUSE MicroOS", {}],
-    ["Tumbleweed", "openSUSE Tumbleweed", {}]
+    ["Tumbleweed", "openSUSE Tumbleweed", {}],
   ],
-  SelectedProduct: "MicroOS"
+  SelectedProduct: "MicroOS",
 };
 
 const registrationProxy = {};
 
+const tumbleweed = {
+  id: "Tumbleweed",
+  name: "openSUSE Tumbleweed",
+  description: "Tumbleweed is...",
+};
+
+const microos = {
+  id: "MicroOS",
+  name: "openSUSE MicroOS",
+  description: "MicroOS is...",
+};
+
 beforeEach(() => {
   // @ts-ignore
   DBusClient.mockImplementation(() => {
@@ -47,30 +72,32 @@ beforeEach(() => {
       proxy: (iface) => {
         if (iface === PRODUCT_IFACE) return productProxy;
         if (iface === REGISTRATION_IFACE) return registrationProxy;
-      }
+      },
     };
   });
 });
 
-describe("#product", () => {
+describe("ProductClient", () => {
   describe("#getAll", () => {
-    it("returns the list of available products", async () => {
-      const client = new SoftwareClient();
-      const availableProducts = await client.product.getAll();
-      expect(availableProducts).toEqual([
-        { id: "MicroOS", name: "openSUSE MicroOS" },
-        { id: "Tumbleweed", name: "openSUSE Tumbleweed" }
+    it.only("returns the list of available products", async () => {
+      const http = new HTTPClient(new URL("http://localhost"));
+      const client = new ProductClient(http);
+      mockGetFn.mockResolvedValue([tumbleweed, microos]);
+      const products = await client.getAll();
+      expect(products).toEqual([
+        { id: "Tumbleweed", name: "openSUSE Tumbleweed", description: "Tumbleweed is..." },
+        { id: "MicroOS", name: "openSUSE MicroOS", description: "MicroOS is..." },
       ]);
     });
   });
 
   describe("#getSelected", () => {
-    it("returns the selected product", async () => {
-      const client = new SoftwareClient();
-      const selectedProduct = await client.product.getSelected();
-      expect(selectedProduct).toEqual(
-        { id: "MicroOS", name: "openSUSE MicroOS" }
-      );
+    it.only("returns the selected product", async () => {
+      const http = new HTTPClient(new URL("http://localhost"));
+      const client = new ProductClient(http);
+      mockGetFn.mockResolvedValue({ product: "microos" });
+      const selected = await client.getSelected();
+      expect(selected).toEqual("microos");
     });
   });
 
@@ -88,7 +115,7 @@ describe("#product", () => {
         expect(registration).toStrictEqual({
           code: null,
           email: null,
-          requirement: "optional"
+          requirement: "optional",
         });
       });
     });
@@ -106,7 +133,7 @@ describe("#product", () => {
         expect(registration).toStrictEqual({
           code: "111222",
           email: "test@test.com",
-          requirement: "mandatory"
+          requirement: "mandatory",
         });
       });
     });
@@ -122,7 +149,7 @@ describe("#product", () => {
       await client.product.register("111222", "test@test.com");
       expect(registrationProxy.Register).toHaveBeenCalledWith(
         "111222",
-        { Email: { t: "s", v: "test@test.com" } }
+        { Email: { t: "s", v: "test@test.com" } },
       );
     });
 
@@ -136,7 +163,7 @@ describe("#product", () => {
         const result = await client.product.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: true,
-          message: ""
+          message: "",
         });
       });
     });
@@ -151,7 +178,7 @@ describe("#product", () => {
         const result = await client.product.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: false,
-          message: "error message"
+          message: "error message",
         });
       });
     });
@@ -168,7 +195,7 @@ describe("#product", () => {
         const result = await client.product.deregister();
         expect(result).toStrictEqual({
           success: true,
-          message: ""
+          message: "",
         });
       });
     });
@@ -183,7 +210,7 @@ describe("#product", () => {
         const result = await client.product.deregister();
         expect(result).toStrictEqual({
           success: false,
-          message: "error message"
+          message: "error message",
         });
       });
     });

From dee2bd549594ac0f161e6afdb138ff5b1054019d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:51:37 +0000
Subject: [PATCH 12/26] Type checking fixes

---
 web/src/components/software/PatternSelector.jsx |  2 +-
 web/src/components/software/SoftwarePage.jsx    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 7a0459293c..d0306c5095 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -105,7 +105,7 @@ function sortGroups(groups) {
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @returns {JSX.Element}
  */
-function PatternSelector({ patterns, proposal }) {
+function PatternSelector({ patterns }) {
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index fe667b7ba9..5d9a10569f 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -114,6 +114,14 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   );
 };
 
+/**
+ * List of selected patterns.
+ * @component
+ * @param {object} props
+ * @param {Pattern[]} props.patterns - List of patterns, including selected and unselected ones.
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @return {JSX.Element}
+ */
 const SelectedPatternsList = ({ patterns, proposal }) => {
   const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
@@ -190,15 +198,13 @@ function SoftwarePage() {
     loadPatterns();
   }, [client.software, patterns, cancellablePromise]);
 
-  console.log("SoftPage");
-
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
       {/* TRANSLATORS: page title */}
       <Section title={_("Software selection")}>
         <If
-          condition={status === BUSY}
+          condition={status === BUSY || isLoading}
           then={<SectionSkeleton numRows={5} />}
           else={
             <>

From 1eab869afae9ff48e21eac1c43451ade0545b404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:58:29 +0000
Subject: [PATCH 13/26] Add description to the list of selected patterns

---
 web/src/components/software/SoftwarePage.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 5d9a10569f..e6de10a9c4 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -139,7 +139,10 @@ const SelectedPatternsList = ({ patterns, proposal }) => {
         <ul>
           {selected.map((pattern) => (
             <li key={pattern.name}>
-              {pattern.summary}
+              <div>
+                <b>{pattern.summary}</b>
+              </div>
+              <div>{pattern.description}</div>
             </li>
           ))}
         </ul>

From c37c01a9f0a9f21ce23b53a61a04401fee2fa2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:49:03 +0000
Subject: [PATCH 14/26] Fix patterns removal when they are in auto mode

---
 rust/agama-lib/src/software/client.rs      | 14 +++++++++++---
 rust/agama-lib/src/software/proxies.rs     |  2 +-
 rust/agama-lib/src/software/store.rs       | 11 ++++++++---
 rust/agama-server/src/software/web.rs      | 15 ++++++++++++---
 service/lib/agama/dbus/software/manager.rb |  4 +++-
 service/lib/agama/software/manager.rb      | 22 +++++++++++++++++-----
 6 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index d8f1095403..1364956196 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -120,11 +120,19 @@ impl<'a> SoftwareClient<'a> {
     }
 
     /// Selects patterns by user
-    pub async fn select_patterns(&self, patterns: &[String]) -> Result<(), ServiceError> {
-        let patterns: Vec<&str> = patterns.iter().map(AsRef::as_ref).collect();
+    pub async fn select_patterns(
+        &self,
+        patterns: HashMap<String, bool>,
+    ) -> Result<(), ServiceError> {
+        let (add, remove): (Vec<_>, Vec<_>) =
+            patterns.into_iter().partition(|(_, install)| *install);
+
+        let add: Vec<_> = add.iter().map(|(name, _)| name.as_ref()).collect();
+        let remove: Vec<_> = remove.iter().map(|(name, _)| name.as_ref()).collect();
+
         let wrong_patterns = self
             .software_proxy
-            .set_user_patterns(patterns.as_slice())
+            .set_user_patterns(add.as_slice(), remove.as_slice())
             .await?;
         if !wrong_patterns.is_empty() {
             Err(ServiceError::UnknownPatterns(wrong_patterns))
diff --git a/rust/agama-lib/src/software/proxies.rs b/rust/agama-lib/src/software/proxies.rs
index e7298f2187..cdb79b4829 100644
--- a/rust/agama-lib/src/software/proxies.rs
+++ b/rust/agama-lib/src/software/proxies.rs
@@ -48,7 +48,7 @@ trait Software1 {
     fn remove_pattern(&self, id: &str) -> zbus::Result<bool>;
 
     /// SetUserPatterns method
-    fn set_user_patterns(&self, ids: &[&str]) -> zbus::Result<Vec<String>>;
+    fn set_user_patterns(&self, add: &[&str], remove: &[&str]) -> zbus::Result<Vec<String>>;
 
     /// UsedDiskSpace method
     fn used_disk_space(&self) -> zbus::Result<String>;
diff --git a/rust/agama-lib/src/software/store.rs b/rust/agama-lib/src/software/store.rs
index 66b6f6b092..5bb5ee21c4 100644
--- a/rust/agama-lib/src/software/store.rs
+++ b/rust/agama-lib/src/software/store.rs
@@ -1,5 +1,7 @@
 //! Implements the store for the storage settings.
 
+use std::collections::HashMap;
+
 use super::{SoftwareClient, SoftwareSettings};
 use crate::error::ServiceError;
 use zbus::Connection;
@@ -22,9 +24,12 @@ impl<'a> SoftwareStore<'a> {
     }
 
     pub async fn store(&self, settings: &SoftwareSettings) -> Result<(), ServiceError> {
-        self.software_client
-            .select_patterns(&settings.patterns)
-            .await?;
+        let patterns: HashMap<String, bool> = settings
+            .patterns
+            .iter()
+            .map(|name| (name.to_owned(), true))
+            .collect();
+        self.software_client.select_patterns(patterns).await?;
 
         Ok(())
     }
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index b7ccc4298b..249fa38dab 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -35,9 +35,12 @@ struct SoftwareState<'a> {
     software: SoftwareClient<'a>,
 }
 
+/// Software service configuration (product, patterns, etc.).
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct SoftwareConfig {
-    patterns: Option<Vec<String>>,
+    /// A map where the keys are the patter names and the values whether they should be installed or not.
+    patterns: Option<HashMap<String, bool>>,
+    /// Name of the product to install.
     product: Option<String>,
 }
 
@@ -179,7 +182,7 @@ async fn set_config(
     }
 
     if let Some(patterns) = config.patterns {
-        state.software.select_patterns(&patterns).await?;
+        state.software.select_patterns(patterns).await?;
     }
 
     Ok(())
@@ -199,7 +202,13 @@ async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<Softw
     } else {
         Some(product)
     };
-    let patterns = state.software.user_selected_patterns().await?;
+    let patterns = state
+        .software
+        .user_selected_patterns()
+        .await?
+        .into_iter()
+        .map(|p| (p, true))
+        .collect();
     let config = SoftwareConfig {
         patterns: Some(patterns),
         product,
diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
index 6fec2df0f4..5028663df1 100644
--- a/service/lib/agama/dbus/software/manager.rb
+++ b/service/lib/agama/dbus/software/manager.rb
@@ -89,7 +89,9 @@ def issues
 
           dbus_method(:AddPattern, "in id:s, out result:b") { |p| backend.add_pattern(p) }
           dbus_method(:RemovePattern, "in id:s, out result:b") { |p| backend.remove_pattern(p) }
-          dbus_method(:SetUserPatterns, "in ids:as, out wrong:as") { |ids| [backend.assign_patterns(ids)] }
+          dbus_method(:SetUserPatterns, "in add:as, in remove:as, out wrong:as") do |add, remove|
+           [backend.assign_patterns(add, remove)]
+          end
 
           dbus_method :ProvisionsSelected, "in Provisions:as, out Result:ab" do |provisions|
             [provisions.map { |p| backend.provision_selected?(p) }]
diff --git a/service/lib/agama/software/manager.rb b/service/lib/agama/software/manager.rb
index a6ebf38ff2..139ca59e3a 100644
--- a/service/lib/agama/software/manager.rb
+++ b/service/lib/agama/software/manager.rb
@@ -249,16 +249,28 @@ def remove_pattern(id)
         true
       end
 
-      def assign_patterns(ids)
-        wrong_patterns = ids.reject { |p| pattern_exist?(p) }
+      def assign_patterns(add, remove)
+        wrong_patterns = [add, remove].flatten.reject { |p| pattern_exist?(p) }
         return wrong_patterns unless wrong_patterns.empty?
 
         user_patterns = Yast::PackagesProposal.GetResolvables(PROPOSAL_ID, :pattern)
         user_patterns.each { |p| Yast::Pkg.ResolvableNeutral(p, :pattern, force = false) }
-        Yast::PackagesProposal.SetResolvables(PROPOSAL_ID, :pattern, ids)
-        ids.each { |p| Yast::Pkg.ResolvableInstall(p, :pattern) }
-        logger.info "Setting patterns to #{ids.inspect}"
+        logger.info "Adding patterns: #{add.join(", ")}. Removing patterns: #{remove.join(",")}."
+
+        Yast::PackagesProposal.SetResolvables(PROPOSAL_ID, :pattern, add)
+        add.each do |id|
+          res = Yast::Pkg.ResolvableInstall(id, :pattern)
+          logger.info "Adding pattern #{id}: #{res.inspect}"
+        end
+
+        remove.each do |id|
+          res = Yast::Pkg.ResolvableNeutral(id, :pattern, force = false)
+          logger.info "Removing pattern #{id}: #{res.inspect}"
+          Yast::PackagesProposal.RemoveResolvables(PROPOSAL_ID, :pattern, [id])
+        end
+
         proposal.solve_dependencies
+
         selected_patterns_changed
 
         []

From 426d78b6f73bceb11da0704d37759ae9caa7b2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:54:54 +0000
Subject: [PATCH 15/26] Adapt the PatternSelector to selectPatterns changes

---
 web/src/client/software.js                      |  6 ++++--
 web/src/components/software/PatternSelector.jsx | 14 ++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 1fa1d8672b..04a0c51117 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -72,7 +72,8 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {object} SoftwareConfig
- * @property {Array<string>|undefined} patterns - Name of the selected packages.
+ * @property {Array<string>|undefined} patterns - An object where the keys are the pattern names
+ *   and the values whether to install them or not.
  * @property {string|undefined} product - Product to install.
  */
 
@@ -246,7 +247,8 @@ class SoftwareBaseClient {
   }
 
   /**
-   * @param {string[]} patterns - name of the user-selected patterns.
+   * @param {Object.<string, boolean>} patterns - An object where the keys are the pattern names
+   *   and the values whether to install them or not.
    * @return {Promise<void>}
    */
   selectPatterns(patterns) {
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index d0306c5095..eabe3a2c4a 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -129,14 +129,12 @@ function PatternSelector({ patterns }) {
 
   const onToggle = useCallback((name) => {
     const selected = patterns.filter((p) => p.selectedBy === SelectedBy.USER)
-      .map((p) => p.name);
-
-    const index = selected.indexOf(name);
-    if (index === -1) {
-      selected.push(name);
-    } else {
-      selected.splice(index, 1);
-    }
+      .reduce((all, p) => {
+        all[p.name] = true;
+        return all;
+      }, {});
+    const pattern = patterns.find((p) => p.name === name);
+    selected[name] = pattern.selectedBy === SelectedBy.NONE;
 
     client.software.selectPatterns(selected);
   }, [patterns, client.software]);

From fcabdccb549cc56182e2ad4b4b37110e945d2d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:58:44 +0000
Subject: [PATCH 16/26] Fix a typo in the documentation

---
 rust/agama-server/src/software/web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index 249fa38dab..6e968c189a 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -38,7 +38,7 @@ struct SoftwareState<'a> {
 /// Software service configuration (product, patterns, etc.).
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct SoftwareConfig {
-    /// A map where the keys are the patter names and the values whether they should be installed or not.
+    /// A map where the keys are the pattern names and the values whether to install them or not.
     patterns: Option<HashMap<String, bool>>,
     /// Name of the product to install.
     product: Option<String>,

From e5bdecc2f4236daf254dd370ef3c1106cb4db1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 15:41:02 +0000
Subject: [PATCH 17/26] Fix PatternSelector type checking

---
 web/src/client/mixins.js            | 4 ++--
 web/src/components/core/Page.jsx    | 3 +--
 web/src/components/core/Section.jsx | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index c7a9b28b7d..927610784d 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -150,7 +150,7 @@ const WithStatus = (superclass, status_path, service_name) =>
      * Register a callback to run when the "CurrentInstallationPhase" changes
      *
      * @param {function} handler - callback function
-     * @return {function} function to disable the callback
+     * @return {import ("./http").RemoveFn} function to disable the callback
      */
     onStatusChange(handler) {
       return this.client.onEvent("ServiceStatusChanged", ({ status, service }) => {
@@ -207,7 +207,7 @@ const WithProgress = (superclass, progress_path, service_name) =>
      * Register a callback to run when the progress changes
      *
      * @param {ProgressHandler} handler - callback function
-     * @return {import ("./dbus").RemoveFn} function to disable the callback
+     * @return {import ("./http").RemoveFn} function to disable the callback
      */
     onProgressChange(handler) {
       return this.client.onEvent("Progress", ({ service, ...progress }) => {
diff --git a/web/src/components/core/Page.jsx b/web/src/components/core/Page.jsx
index e425ca5757..cd053549d0 100644
--- a/web/src/components/core/Page.jsx
+++ b/web/src/components/core/Page.jsx
@@ -162,8 +162,7 @@ const BackAction = () => {
  * @param {string} [props.title="Agama"] - The title for the page. By default it
  *   uses the name of the tool, do not mark it for translation.
  * @param {boolean} [props.mountSidebar=true] - Whether include the core/Sidebar component.
- * @param {JSX.Element[]} [props.children] - The page content.
- *
+ * @param {React.ReactNode} [props.children] - The page content.
  */
 const Page = ({
   icon,
diff --git a/web/src/components/core/Section.jsx b/web/src/components/core/Section.jsx
index f57d77965a..831d5f792d 100644
--- a/web/src/components/core/Section.jsx
+++ b/web/src/components/core/Section.jsx
@@ -56,7 +56,7 @@ import { If, ValidationErrors } from "~/components/core";
  * @property {string} [className] - Class name for section html tag.
  * @property {string} [id] - Id of the section ("software", "product", "storage", "storage-actions", ...)
  * @property {import("~/client/mixins").ValidationError[]} [props.errors] - Validation errors to be shown before the title.
- * @property {JSX.Element[]} [children] - The section content.
+ * @property {React.ReactNode} [children] - The section content.
  * @property {string} [aria-label] - aria-label attribute, required if title if not given
  *
  * @param { SectionProps } props

From 801cb6e6993feb0fc9d90165e6198f8080e2c4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:43:58 +0000
Subject: [PATCH 18/26] Move the software selection to the SoftwarePage

---
 .../components/software/PatternSelector.jsx   | 10 +++----
 web/src/components/software/SoftwarePage.jsx  | 27 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index eabe3a2c4a..f8615055b6 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -26,6 +26,7 @@ import { useInstallerClient } from "~/context/installer";
 import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 import { SelectedBy } from "~/client/software";
+import { noop } from "~/utils";
 
 /**
  * @typedef {Object} Pattern
@@ -102,13 +103,12 @@ function sortGroups(groups) {
  * @component
  * @param {object} props
  * @param {import("~/components/software/SoftwarePage").Pattern[]} props.patterns - list of patterns
- * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @param {function} [props.onSelectionChanged] - Callback to be called when the selection changes
  * @returns {JSX.Element}
  */
-function PatternSelector({ patterns }) {
+function PatternSelector({ patterns, onSelectionChanged = noop }) {
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
-  const client = useInstallerClient();
 
   useEffect(() => {
     if (!patterns) return;
@@ -136,8 +136,8 @@ function PatternSelector({ patterns }) {
     const pattern = patterns.find((p) => p.name === name);
     selected[name] = pattern.selectedBy === SelectedBy.NONE;
 
-    client.software.selectPatterns(selected);
-  }, [patterns, client.software]);
+    onSelectionChanged(selected);
+  }, [patterns, onSelectionChanged]);
 
   // initial empty screen, the patterns are loaded very quickly, no need for any progress
   if (visiblePatterns.length === 0) return null;
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index e6de10a9c4..fa00082ada 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -68,16 +68,20 @@ function buildPatterns(patterns, selection) {
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @param {boolean} props.isOpen - Whether the pop-up should be open
  * @param {function} props.onFinish - Callback to be called when the selection is finished
+ * @param {function} props.onSelectionChanged - Callback to be called when the selection changes
  */
 const PatternsSelectorPopup = ({
   patterns,
-  proposal,
   isOpen = false,
+  onSelectionChanged = noop,
   onFinish = noop,
 }) => {
   return (
     <Popup className="large" title={_("Software selection")} isOpen={isOpen}>
-      <PatternSelector patterns={patterns} proposal={proposal} />
+      <PatternSelector
+        patterns={patterns}
+        onSelectionChanged={onSelectionChanged}
+      />
 
       <Popup.Actions>
         <Popup.PrimaryAction
@@ -90,7 +94,7 @@ const PatternsSelectorPopup = ({
   );
 };
 
-const SelectPatternsButton = ({ patterns, proposal }) => {
+const SelectPatternsButton = ({ patterns, proposal, onSelectionChanged }) => {
   const [isPopupOpen, setIsPopupOpen] = useState(false);
 
   const openPopup = () => setIsPopupOpen(true);
@@ -109,6 +113,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
         proposal={proposal}
         isOpen={isPopupOpen}
         onFinish={closePopup}
+        onSelectionChanged={onSelectionChanged}
       />
     </>
   );
@@ -120,9 +125,10 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
  * @param {object} props
  * @param {Pattern[]} props.patterns - List of patterns, including selected and unselected ones.
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @param {function} props.onSelectionChanged - Callback to be called when the selection changes
  * @return {JSX.Element}
  */
-const SelectedPatternsList = ({ patterns, proposal }) => {
+const SelectedPatternsList = ({ patterns, proposal, onSelectionChanged }) => {
   const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
 
@@ -153,7 +159,11 @@ const SelectedPatternsList = ({ patterns, proposal }) => {
     <>
       {description}
       <div>
-        <SelectPatternsButton patterns={patterns} proposal={proposal} />
+        <SelectPatternsButton
+          patterns={patterns}
+          proposal={proposal}
+          onSelectionChanged={onSelectionChanged}
+        />
       </div>
     </>
   );
@@ -211,7 +221,12 @@ function SoftwarePage() {
           then={<SectionSkeleton numRows={5} />}
           else={
             <>
-              <SelectedPatternsList patterns={patterns} proposal={proposal} />
+              <SelectedPatternsList
+                patterns={patterns}
+                proposal={proposal}
+                onSelectionChanged={(selected) => client.software.selectPatterns(selected)}
+              />
+
               <div>
                 <UsedSize size={proposal.size} />
               </div>

From 53c59ace75c012342ab76f706c31e3fd29e5a5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:46:54 +0000
Subject: [PATCH 19/26] Clean-up the PatternSelector component

---
 web/src/components/software/PatternSelector.jsx | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index f8615055b6..227c5e8d71 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -22,8 +22,7 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
-import { useInstallerClient } from "~/context/installer";
-import { If, Section, Selector } from "~/components/core";
+import { Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 import { SelectedBy } from "~/client/software";
 import { noop } from "~/utils";
@@ -85,16 +84,7 @@ function sortGroups(groups) {
   return Object.keys(groups).sort((g1, g2) => {
     const order1 = groups[g1][0].order;
     const order2 = groups[g2][0].order;
-
-    if (order1 === order2) {
-      return g1 === g2 ? 0 : (g1 < g2 ? -1 : 1);
-    }
-
-    // patterns with undefined (empty) order are always at the end
-    if (order1 === "") return 1;
-    if (order2 === "") return -1;
-
-    return order1 < order2 ? -1 : 1;
+    return order1 - order2;
   });
 }
 
@@ -150,8 +140,6 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
         <b>{pattern.summary}</b>
       </div>
       <div>{pattern.description}</div>
-      {/* eslint-disable-next-line i18next/no-literal-string */}
-      <If condition={pattern.selectedBy === SelectedBy.AUTO} then={<div>auto</div>} />
     </>
   );
 
@@ -171,7 +159,6 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
           onOptionClick={onToggle}
           optionIdKey="name"
           selectedIds={selectedIds}
-          dataItemsType="agama/software-patterns"
         />
       </Section>
     );

From d7cf9edc6f3b959063d14438c434b30bb91407cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:53:39 +0000
Subject: [PATCH 20/26] Adapt the PatternSelector tests

---
 .../software/PatternSelector.test.json        | 132 ++++++++++--------
 .../software/PatternSelector.test.jsx         |  93 +++++-------
 2 files changed, 106 insertions(+), 119 deletions(-)

diff --git a/web/src/components/software/PatternSelector.test.json b/web/src/components/software/PatternSelector.test.json
index e1d64533e2..58c301ba47 100644
--- a/web/src/components/software/PatternSelector.test.json
+++ b/web/src/components/software/PatternSelector.test.json
@@ -1,58 +1,74 @@
-{
-  "32bit": [
-    "Base Technologies",
-    "This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software.",
-    "./pattern-cli",
-    "32-Bit Runtime Environment",
-    "1180"
-  ],
-  "base": [
-    "Base Technologies",
-    "This is the base runtime system.  It contains only a basic multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own.",
-    "./pattern-basis",
-    "Base System",
-    "1030"
-  ],
-  "documentation": [
-    "Documentation",
-    "Help and Support Documentation",
-    "./pattern-documentation",
-    "Help and Support Documentation",
-    "1005"
-  ],
-  "books": [
-    "Documentation",
-    "Help and Documentation, various books.",
-    "./pattern-documentation",
-    "Documentation",
-    "5200"
-  ],
-  "devel_C_C++": [
-    "Development",
-    "Tools and libraries for software development using C/C++ and other derivative\nof the C programming language.",
-    "./pattern-c-devel",
-    "C/C++ Development",
-    "3240"
-  ],
-  "devel_basis": [
-    "Development",
-    "Minimal set of tools for compiling and linking applications.",
-    "./pattern-basis-devel",
-    "Base Development",
-    "3140"
-  ],
-  "devel_rpm_build": [
-    "Development",
-    "Minimal set of tools and libraries for building packages using the RPM package manager.",
-    "./pattern-rpm-devel",
-    "RPM Build Environment",
-    "3280"
-  ],
-  "wsl_base": [
-    "Development",
-    "This package contains the wsl_base pattern: recommended configs,tools,libraries for using WSL.",
-    "./pattern-generic",
-    "Base WSL packages",
-    ""
-  ]
-}
+[
+  {
+    "name": "xfce",
+    "category": "Graphical Environments",
+    "icon": "./pattern-xfce",
+    "description": "Xfce is a lightweight desktop environment for various *NIX systems.",
+    "summary": "XFCE Desktop Environment",
+    "order": "1310"
+  },
+  {
+    "name": "basic_desktop",
+    "category": "Graphical Environments",
+    "icon": "./pattern-x11",
+    "description": "This pattern installs a rather basic desktop (icewm)",
+    "summary": "A very basic desktop (previously part of x11 pattern)",
+    "order": "1802"
+  },
+  {
+    "name": "yast2_server",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for server system administration.",
+    "summary": "YaST Server Utilities",
+    "order": "1224"
+  },
+  {
+    "name": "office",
+    "category": "Desktop Functions",
+    "icon": "./pattern-office",
+    "description": "Office software for your desktop environment including LibreOffice.",
+    "summary": "Office Software",
+    "order": "1640"
+  },
+  {
+    "name": "gnome",
+    "category": "Graphical Environments",
+    "icon": "./pattern-gnome-wayland",
+    "description": "The GNOME desktop environment is an intuitive and attractive desktop for users.\nThis pattern installs components for GNOME to run with Wayland and X11 technologies.",
+    "summary": "GNOME Desktop Environment (Wayland)",
+    "order": "1010"
+  },
+  {
+    "name": "kde",
+    "category": "Graphical Environments",
+    "icon": "./pattern-kde",
+    "description": "Packages providing the Plasma desktop environment and applications from KDE.",
+    "summary": "KDE Applications and Plasma Desktop",
+    "order": "1110"
+  },
+  {
+    "name": "multimedia",
+    "category": "Desktop Functions",
+    "icon": "./pattern-multimedia",
+    "description": "Multimedia players, sound editing tools, video and image manipulation applications.",
+    "summary": "Multimedia",
+    "order": "1580"
+  },
+  {
+    "name": "yast2_basis",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for basic system administration.",
+    "summary": "YaST Base Utilities",
+    "order": "1220"
+  },
+  {
+    "name": "yast2_desktop",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for desktop system administration.",
+    "summary": "YaST Desktop Utilities",
+    "order": "1222"
+  }
+]
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index 5039721310..f871f29f34 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -21,84 +21,55 @@
 
 import React from "react";
 import { screen, within } from "@testing-library/react";
-import { installerRender } from "~/test-utils";
-
-import { createClient } from "~/client";
+import { plainRender } from "~/test-utils";
 
 import test_patterns from "./PatternSelector.test.json";
 import PatternSelector from "./PatternSelector";
 
-jest.mock("~/client");
-const selectedPatternsFn = jest.fn().mockResolvedValue([]);
-const getUsedSpaceFn = jest.fn().mockResolvedValue("1 Gb");
-const getIssuesFn = jest.fn().mockResolvedValue([]);
-const patternsFn = jest.fn().mockResolvedValue(test_patterns);
-
-beforeEach(() => {
-  createClient.mockImplementation(() => {
-    return {
-      software: {
-        selectedPatterns: selectedPatternsFn,
-        getUsedSpace: getUsedSpaceFn,
-        getIssues: getIssuesFn,
-        patterns: patternsFn
-      },
-    };
-  });
-});
-
-const PatternItemMock = ({ pattern }) => <h3>{pattern.summary}</h3>;
-jest.mock("~/components/software/PatternItem", () => ({ pattern }) => { return <PatternItemMock pattern={pattern} /> });
-
 describe("PatternSelector", () => {
-  it("displays a summary", async () => {
-    installerRender(<PatternSelector />);
-    const summarySection = await screen.findByRole("region", { name: /Software summary/ });
-    within(summarySection).findByText(/Installation will take/);
-  });
-
-  it("displays an input for filtering", async () => {
-    installerRender(<PatternSelector />);
-    const summarySection = await screen.findByRole("region", { name: /Software summary/ });
-    within(summarySection).getByRole("textbox", { name: "Search" });
-  });
-
-  it("displays the pattern groups in correct order", async () => {
-    installerRender(<PatternSelector />);
-    const headings = await screen.findAllByRole("heading", { level: 2 });
-    const headingsText = headings.map(node => node.textContent);
-    expect(headingsText).toEqual(["Documentation", "Base Technologies", "Development"]);
+  it("displays the pattern groups in the correct order", () => {
+    plainRender(<PatternSelector patterns={test_patterns} />);
+    const headings = screen.getAllByRole("heading", { level: 2 });
+    const headingsText = headings.map((node) => node.textContent);
+    expect(headingsText).toEqual([
+      "Graphical Environments",
+      "Base Technologies",
+      "Desktop Functions",
+    ]);
   });
 
   it("displays the patterns in a group in correct order", async () => {
-    installerRender(<PatternSelector />);
+    plainRender(
+      <PatternSelector patterns={test_patterns} />,
+    );
 
-    // the "Development" pattern group
-    const develGroup = await screen.findByRole("region", { name: "Development" });
+    // the "Base Technologies" pattern group
+    const baseGroup = await screen.findByRole("region", { name: "Base Technologies" });
 
-    // the "Development" pattern names
-    const develPatternsHeadings = within(develGroup).getAllByRole("heading", { level: 3 });
-    const develPatterns = develPatternsHeadings.map((node) => node.textContent);
+    // the pattern names
+    const rows = within(baseGroup).getAllByRole("row");
 
-    // sorted by order, the WSL pattern with empty order is the last one
-    expect(develPatterns).toEqual(["Base Development", "C/C++ Development", "RPM Build Environment", "Base WSL packages"]);
+    expect(rows[0]).toHaveTextContent(/YaST Base Utilities/);
+    expect(rows[1]).toHaveTextContent(/YaST Desktop Utilities/);
+    expect(rows[2]).toHaveTextContent(/YaST Server Utilities/);
   });
 
   it("displays only the matching patterns when using the search filter", async () => {
-    const { user } = installerRender(<PatternSelector />);
+    const { user } = plainRender(
+      <PatternSelector patterns={test_patterns} />,
+    );
 
-    // enter "wsl" into the search filter
+    // enter "multimedia" into the search filter
     const searchFilter = await screen.findByRole("textbox", { name: "Search" });
-    await user.type(searchFilter, "wsl");
-
-    // the "Development" pattern group
-    const develGroup = screen.getByRole("region", { name: "Development" });
+    await user.type(searchFilter, "multimedia");
 
-    // the "Development" pattern names
-    const develPatternsHeadings = within(develGroup).getAllByRole("heading", { level: 3 });
-    const develPatterns = develPatternsHeadings.map((node) => node.textContent);
+    const headings = screen.getAllByRole("heading", { level: 2 });
+    const headingsText = headings.map((node) => node.textContent);
+    expect(headingsText).toEqual(["Desktop Functions"]);
 
-    // only the WSL pattern is displayed
-    expect(develPatterns).toEqual(["Base WSL packages"]);
+    const desktopGroup = screen.getByRole("region", { name: "Desktop Functions" });
+    expect(within(desktopGroup).queryByRole("row", { name: /Multimedia/ })).toBeInTheDocument();
+    expect(within(desktopGroup).queryByRole("row", { name: /Office Software/ })).not
+      .toBeInTheDocument();
   });
 });

From 738ed3e3d745e9e78b81bf6ba6e997d7fdde99f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:53:50 +0000
Subject: [PATCH 21/26] Copyright updates

---
 web/src/components/software/PatternSelector.jsx      | 2 +-
 web/src/components/software/PatternSelector.test.jsx | 2 +-
 web/src/components/software/SoftwarePage.jsx         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 227c5e8d71..419f7ec52a 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index f871f29f34..2f33f41c7f 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index fa00082ada..2c51e3180a 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *

From 97eabe8105f4b437fd0efb516037f82558c8ef15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 20:56:10 +0000
Subject: [PATCH 22/26] Extend SoftwarePage and PatternSelector tests

---
 .../components/software/PatternSelector.jsx   |  2 +-
 .../software/PatternSelector.test.jsx         | 29 ++++++++++++--
 .../components/software/SoftwarePage.test.jsx | 39 +++++++++++++++----
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 419f7ec52a..7773075b86 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -35,7 +35,7 @@ import { noop } from "~/utils";
  * @property {string} description long description of the pattern
  * @property {string} order display order (string!)
  * @property {string} icon icon name (not path or file name!)
- * @property {number|undefined} selected who selected the pattern, undefined
+ * @property {number} selected who selected the pattern, undefined
  *   means it is not selected to install
  */
 
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index 2f33f41c7f..6e8e60bca5 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -25,10 +25,13 @@ import { plainRender } from "~/test-utils";
 
 import test_patterns from "./PatternSelector.test.json";
 import PatternSelector from "./PatternSelector";
+import { SelectedBy } from "~/client/software";
+
+const patterns = test_patterns.map((p) => ({ ...p, selectedBy: SelectedBy.NONE }));
 
 describe("PatternSelector", () => {
   it("displays the pattern groups in the correct order", () => {
-    plainRender(<PatternSelector patterns={test_patterns} />);
+    plainRender(<PatternSelector patterns={patterns} />);
     const headings = screen.getAllByRole("heading", { level: 2 });
     const headingsText = headings.map((node) => node.textContent);
     expect(headingsText).toEqual([
@@ -40,7 +43,7 @@ describe("PatternSelector", () => {
 
   it("displays the patterns in a group in correct order", async () => {
     plainRender(
-      <PatternSelector patterns={test_patterns} />,
+      <PatternSelector patterns={patterns} />,
     );
 
     // the "Base Technologies" pattern group
@@ -56,7 +59,7 @@ describe("PatternSelector", () => {
 
   it("displays only the matching patterns when using the search filter", async () => {
     const { user } = plainRender(
-      <PatternSelector patterns={test_patterns} />,
+      <PatternSelector patterns={patterns} />,
     );
 
     // enter "multimedia" into the search filter
@@ -72,4 +75,24 @@ describe("PatternSelector", () => {
     expect(within(desktopGroup).queryByRole("row", { name: /Office Software/ })).not
       .toBeInTheDocument();
   });
+
+  it("displays the checkbox depending whether the patter is selected", async () => {
+    const pattern = patterns.find((p) => p.name === "yast2_basis");
+    pattern.selectedBy = SelectedBy.USER;
+
+    plainRender(
+      <PatternSelector patterns={patterns} />,
+    );
+
+    // the "Base Technologies" pattern group
+    const baseGroup = await screen.findByRole("region", { name: "Base Technologies" });
+
+    const rowBasis = within(baseGroup).getByRole("row", { name: /YaST Base/ });
+    const checkboxBasis = await within(rowBasis).findByRole("checkbox");
+    expect(checkboxBasis).toBeChecked();
+
+    const rowDesktop = within(baseGroup).getByRole("row", { name: /YaST Desktop/ });
+    const checkboxDesktop = await within(rowDesktop).findByRole("checkbox");
+    expect(checkboxDesktop).not.toBeChecked();
+  });
 });
diff --git a/web/src/components/software/SoftwarePage.test.jsx b/web/src/components/software/SoftwarePage.test.jsx
index d27aaea9d8..fab6768193 100644
--- a/web/src/components/software/SoftwarePage.test.jsx
+++ b/web/src/components/software/SoftwarePage.test.jsx
@@ -21,36 +21,49 @@
 
 import React from "react";
 
-import { act, screen } from "@testing-library/react";
+import { act, screen, within } from "@testing-library/react";
 import { installerRender } from "~/test-utils";
 import { BUSY, IDLE } from "~/client/status";
 import { createClient } from "~/client";
-
+import test_patterns from "./PatternSelector.test.json";
 import SoftwarePage from "./SoftwarePage";
 
 jest.mock("~/client");
+
 const getStatusFn = jest.fn();
 const onStatusChangeFn = jest.fn();
+const onSelectedPatternsChangedFn = jest.fn();
+const selectPatternsFn = jest.fn();
+const proposal = {
+  patterns: { yast2_basis: 1 },
+  size: "1.8 GiB",
+};
+
 beforeEach(() => {
   createClient.mockImplementation(() => {
     return {
       software: {
         getStatus: getStatusFn,
-        onStatusChange: onStatusChangeFn
+        onStatusChange: onStatusChangeFn,
+        onSelectedPatternsChanged: onSelectedPatternsChangedFn,
+        getPatterns: jest.fn().mockResolvedValue(test_patterns),
+        getProposal: jest.fn().mockResolvedValue(proposal),
+        selectPatterns: selectPatternsFn,
       },
     };
   });
 });
+
 jest.mock("@patternfly/react-core", () => {
   const original = jest.requireActual("@patternfly/react-core");
 
   return {
     ...original,
-    Skeleton: () => <span>Skeleton Mock</span>
+    Skeleton: () => <span>Skeleton Mock</span>,
   };
 });
+
 jest.mock("~/components/core/Sidebar", () => () => <div>Agama sidebar</div>);
-jest.mock("~/components/software/PatternSelector", () => () => "PatternSelector Mock");
 
 describe("SoftwarePage", () => {
   it("displays a progress when the backend in busy", async () => {
@@ -59,9 +72,19 @@ describe("SoftwarePage", () => {
     screen.getAllByText("Skeleton Mock");
   });
 
-  it("displays the PatternSelector when the backend in ready", async () => {
+  it("clicking in a pattern's checkbox selects the pattern", async () => {
     getStatusFn.mockResolvedValue(IDLE);
-    await act(async () => installerRender(<SoftwarePage />));
-    screen.getByText("PatternSelector Mock");
+
+    const { user } = installerRender(<SoftwarePage />);
+    const button = await screen.findByRole("button", { name: "Change selection" });
+    await user.click(button);
+
+    const basePatterns = await screen.findByRole("region", {
+      name: "Base Technologies",
+    });
+    const row = await within(basePatterns).findByRole("row", { name: /YaST Base/ });
+    const checkbox = await within(row).findByRole("checkbox");
+
+    expect(checkbox).toBeChecked();
   });
 });

From c2090899d5f2a53282fd2e5deb7010dd3ae4c633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 22:33:21 +0000
Subject: [PATCH 23/26] Fix indentation

---
 rust/Cargo.lock                            | 858 ++++++++++-----------
 service/lib/agama/dbus/software/manager.rb |   2 +-
 2 files changed, 410 insertions(+), 450 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index a1074e1097..aa3ca3b46b 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -49,7 +49,7 @@ version = "1.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -158,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -197,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -245,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "async-broadcast"
@@ -261,13 +261,13 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener 4.0.0",
- "event-listener-strategy",
+ "event-listener 5.2.0",
+ "event-listener-strategy 0.5.0",
  "futures-core",
  "pin-project-lite",
 ]
@@ -307,18 +307,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.2"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
+checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
 dependencies = [
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.3.0",
  "parking",
- "polling 3.3.1",
- "rustix 0.38.28",
+ "polling 3.5.0",
+ "rustix 0.38.32",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -335,12 +335,12 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
- "event-listener 4.0.0",
- "event-listener-strategy",
+ "event-listener 4.0.3",
+ "event-listener-strategy 0.4.0",
  "pin-project-lite",
 ]
 
@@ -357,19 +357,19 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-recursion"
-version = "1.0.5"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
+checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -378,13 +378,13 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.2",
  "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -409,24 +409,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.5.0"
+version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -452,10 +452,10 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -487,7 +487,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -510,7 +510,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "headers",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -523,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c"
 dependencies = [
  "addr2line",
  "cc",
@@ -554,7 +554,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
  "itertools",
@@ -565,7 +565,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -591,9 +591,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
@@ -620,20 +620,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
  "async-channel",
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.3.0",
  "piper",
  "tracing",
 ]
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -652,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "bytecount"
@@ -670,18 +670,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cexpr"
@@ -700,22 +697,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76"
+checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -754,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.0"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -764,9 +761,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.0"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -777,14 +774,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.0"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -830,22 +827,22 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "const-random"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
  "const-random-macro",
 ]
@@ -888,30 +885,27 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.17"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -931,24 +925,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.44"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.4.10",
- "winapi",
+ "socket2 0.5.6",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.70+curl-8.5.0"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -956,7 +950,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -980,7 +974,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -991,7 +985,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1002,9 +996,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
  "serde",
@@ -1064,9 +1058,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
+checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -1074,13 +1068,13 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
+checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1118,9 +1112,20 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "4.0.0"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1133,7 +1138,17 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
 dependencies = [
- "event-listener 4.0.0",
+ "event-listener 4.0.3",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
+dependencies = [
+ "event-listener 5.2.0",
  "pin-project-lite",
 ]
 
@@ -1220,24 +1235,24 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -1256,9 +1271,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1266,32 +1281,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -1314,9 +1329,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1359,17 +1374,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.11",
- "indexmap 2.1.0",
+ "http 0.2.12",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1378,17 +1393,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 1.0.0",
- "indexmap 2.1.0",
+ "http 1.1.0",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1422,7 +1437,7 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "headers-core",
- "http 1.0.0",
+ "http 1.1.0",
  "httpdate",
  "mime",
  "sha1",
@@ -1434,20 +1449,20 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1475,9 +1490,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1486,9 +1501,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -1502,7 +1517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.11",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -1513,18 +1528,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
  "bytes",
- "futures-util",
- "http 1.0.0",
+ "futures-core",
+ "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
 ]
@@ -1557,14 +1572,14 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
- "http 0.2.11",
+ "h2 0.3.25",
+ "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tower-service",
  "tracing",
@@ -1573,20 +1588,21 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.2",
- "http 1.0.0",
+ "h2 0.4.3",
+ "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "smallvec",
  "tokio",
 ]
 
@@ -1611,11 +1627,11 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
 ]
 
@@ -1671,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -1682,9 +1698,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
  "instant",
@@ -1745,9 +1761,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1792,9 +1808,9 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "9.2.0"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
  "base64 0.21.7",
  "js-sys",
@@ -1819,9 +1835,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libsystemd"
@@ -1843,9 +1859,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.12"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
 dependencies = [
  "cc",
  "libc",
@@ -1867,9 +1883,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "locale_config"
@@ -1896,9 +1912,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "value-bag",
 ]
@@ -1908,6 +1924,9 @@ name = "macaddr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "malloc_buf"
@@ -1926,9 +1945,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memoffset"
@@ -1972,18 +1991,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
@@ -2026,7 +2045,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "libc",
 ]
@@ -2084,28 +2103,33 @@ checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2126,9 +2150,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -2145,9 +2169,9 @@ dependencies = [
 
 [[package]]
 name = "num_threads"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 dependencies = [
  "libc",
 ]
@@ -2189,9 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -2208,7 +2232,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2225,7 +2249,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2368,9 +2392,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546"
+checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8"
 dependencies = [
  "memchr",
  "thiserror",
@@ -2379,9 +2403,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809"
+checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2389,22 +2413,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e"
+checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a"
+checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293"
 dependencies = [
  "once_cell",
  "pest",
@@ -2466,7 +2490,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2494,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "polling"
@@ -2516,14 +2540,14 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.3.1"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e"
+checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -2582,9 +2606,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2649,9 +2673,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2661,9 +2685,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2678,17 +2702,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
- "http 0.2.11",
+ "h2 0.3.25",
+ "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
  "hyper-tls",
@@ -2718,16 +2742,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2737,7 +2762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "serde",
  "serde_derive",
 ]
@@ -2780,14 +2805,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys 0.4.13",
  "windows-sys 0.52.0",
 ]
 
@@ -2808,17 +2833,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2852,29 +2877,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -2883,9 +2908,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
@@ -2899,7 +2924,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2925,15 +2950,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270"
+checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
 dependencies = [
  "base64 0.21.7",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2943,23 +2968,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d"
+checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.27"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "itoa",
  "ryu",
  "serde",
@@ -3026,9 +3051,9 @@ dependencies = [
 
 [[package]]
 name = "simplelog"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
 dependencies = [
  "log",
  "termcolor",
@@ -3052,9 +3077,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
@@ -3068,12 +3093,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3119,9 +3144,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3167,28 +3192,27 @@ dependencies = [
 
 [[package]]
 name = "temp-dir"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
+checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
- "redox_syscall",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "rustix 0.38.32",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -3199,35 +3223,35 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3235,13 +3259,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
@@ -3257,10 +3282,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -3290,9 +3316,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3301,7 +3327,7 @@ dependencies = [
  "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -3315,7 +3341,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3330,9 +3356,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3341,9 +3367,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-test"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719"
+checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
 dependencies = [
  "async-stream",
  "bytes",
@@ -3380,14 +3406,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.6",
+ "toml_edit 0.22.9",
 ]
 
 [[package]]
@@ -3405,22 +3431,22 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "toml_datetime",
- "winnow 0.5.28",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.6"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.1",
+ "winnow 0.6.5",
 ]
 
 [[package]]
@@ -3441,16 +3467,16 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "async-compression",
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "bytes",
  "futures-core",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "http-range-header",
@@ -3498,7 +3524,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3562,7 +3588,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.0.0",
+ "http 1.1.0",
  "httparse",
  "log",
  "rand",
@@ -3606,9 +3632,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -3618,18 +3644,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -3639,9 +3665,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "untrusted"
@@ -3688,7 +3714,7 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_json",
  "utoipa-gen",
@@ -3704,14 +3730,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
  "serde",
@@ -3725,9 +3751,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.4.2"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe"
+checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8"
 
 [[package]]
 name = "vcpkg"
@@ -3764,9 +3790,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3774,24 +3800,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3801,9 +3827,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3811,28 +3837,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3875,16 +3901,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3902,22 +3919,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3937,25 +3939,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3964,15 +3960,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3982,15 +3972,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4000,15 +3984,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4018,15 +3996,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4036,15 +4008,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4054,15 +4020,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4072,24 +4032,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
-version = "0.5.28"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]
@@ -4106,11 +4066,11 @@ dependencies = [
 
 [[package]]
 name = "xdg-home"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
+checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
 dependencies = [
- "nix 0.26.4",
+ "libc",
  "winapi",
 ]
 
@@ -4125,9 +4085,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "3.14.1"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
+checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
  "async-broadcast",
  "async-process",
@@ -4161,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "3.14.1"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
+checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4175,9 +4135,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
+checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
  "serde",
  "static_assertions",
@@ -4186,29 +4146,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.31"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.31"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "zvariant"
-version = "3.15.0"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
+checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
 dependencies = [
  "byteorder",
  "enumflags2",
@@ -4220,9 +4180,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "3.15.0"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
+checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
index 5028663df1..5a72a9b989 100644
--- a/service/lib/agama/dbus/software/manager.rb
+++ b/service/lib/agama/dbus/software/manager.rb
@@ -90,7 +90,7 @@ def issues
           dbus_method(:AddPattern, "in id:s, out result:b") { |p| backend.add_pattern(p) }
           dbus_method(:RemovePattern, "in id:s, out result:b") { |p| backend.remove_pattern(p) }
           dbus_method(:SetUserPatterns, "in add:as, in remove:as, out wrong:as") do |add, remove|
-           [backend.assign_patterns(add, remove)]
+            [backend.assign_patterns(add, remove)]
           end
 
           dbus_method :ProvisionsSelected, "in Provisions:as, out Result:ab" do |provisions|

From 5d84a2f2a713dd2987ba1264970b175065773119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 23 Mar 2024 10:12:12 +0000
Subject: [PATCH 24/26] Allow visiting Software section even if it is not ready

---
 .../components/overview/SoftwareSection.jsx   | 11 ++----
 .../overview/SoftwareSection.test.jsx         | 38 +++----------------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index f4b3a45150..a427ca901e 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -34,7 +34,6 @@ const initialState = {
   errors: [],
   errorsRead: false,
   size: "",
-  patterns: {},
   progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false },
 };
 
@@ -52,8 +51,8 @@ const reducer = (state, action) => {
     case "UPDATE_PROPOSAL": {
       if (state.busy) return state;
 
-      const { errors, size, patterns } = action.payload;
-      return { ...state, errors, size, patterns, errorsRead: true };
+      const { errors, size } = action.payload;
+      return { ...state, errors, size, errorsRead: true };
     }
 
     default: {
@@ -85,9 +84,8 @@ export default function SoftwareSection({ showErrors }) {
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
       const { size } = await cancellablePromise(client.getProposal());
-      const patterns = await cancellablePromise(client.getPatterns(true));
 
-      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size, patterns } });
+      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size } });
     };
 
     updateProposal();
@@ -146,8 +144,7 @@ export default function SoftwareSection({ showErrors }) {
       icon="apps"
       loading={state.busy}
       errors={errors.map(toValidationError)}
-      // do not display the pattern selector when there are no patterns to display
-      path={Object.keys(state.patterns).length > 0 ? "/software" : null}
+      path="/software"
       id="software"
     >
       <SectionContent />
diff --git a/web/src/components/overview/SoftwareSection.test.jsx b/web/src/components/overview/SoftwareSection.test.jsx
index f0f94638b3..f71d7ced1b 100644
--- a/web/src/components/overview/SoftwareSection.test.jsx
+++ b/web/src/components/overview/SoftwareSection.test.jsx
@@ -30,19 +30,17 @@ import { SoftwareSection } from "~/components/overview";
 jest.mock("~/client");
 
 const kdePattern = {
-  kde: [
-    "Graphical Environments",
-    "Packages providing the Plasma desktop environment and applications from KDE.",
-    "./pattern-kde",
-    "KDE Applications and Plasma 5 Desktop",
-    "1110",
-  ],
+  "name": "kde",
+  "category": "Graphical Environments",
+  "icon": "./pattern-kde",
+  "description": "Packages providing the Plasma desktop environment and applications from KDE.",
+  "summary": "KDE Applications and Plasma Desktop",
+  "order": "1110",
 };
 
 let getStatusFn = jest.fn().mockResolvedValue(IDLE);
 let getProgressFn = jest.fn().mockResolvedValue({});
 let getIssuesFn = jest.fn().mockResolvedValue([]);
-let getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
@@ -53,7 +51,6 @@ beforeEach(() => {
         getIssues: getIssuesFn,
         onStatusChange: noop,
         onProgressChange: noop,
-        getPatterns: getPatternsFn,
         getProposal: jest.fn().mockResolvedValue({ size: "500 MiB" }),
       },
     };
@@ -63,7 +60,6 @@ beforeEach(() => {
 describe("when the proposal is calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(IDLE);
-    getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
   });
 
   it("renders the required space", async () => {
@@ -72,28 +68,6 @@ describe("when the proposal is calculated", () => {
     await screen.findByText("500 MiB");
   });
 
-  describe("patterns are available", () => {
-    it("the header is a link", async () => {
-      const { container } = installerRender(<SoftwareSection showErrors />);
-      // wait until the component is fully rendered
-      await screen.findByText("Installation will take");
-      expect(container.querySelector("h2 a[href='/software']")).not.toBeNull();
-    });
-  });
-
-  describe("no patterns are available", () => {
-    beforeEach(() => {
-      getPatternsFn = jest.fn().mockResolvedValue({});
-    });
-
-    it("the header is a plain text", async () => {
-      const { container } = installerRender(<SoftwareSection showErrors />);
-      // wait until the component is fully rendered
-      await screen.findByText("Installation will take");
-      expect(container.querySelector("h2 a")).toBeNull();
-    });
-  });
-
   describe("and there are errors", () => {
     beforeEach(() => {
       getIssuesFn = jest.fn().mockResolvedValue([{ description: "Could not install..." }]);

From 15b20923e86cdee1551c0335b9bf116b62779eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 12:45:02 +0000
Subject: [PATCH 25/26] Update documentation style in software.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com>
---
 web/src/client/software.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 04a0c51117..3e86692d6a 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -79,12 +79,12 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {Object} Pattern
- * @property {string} name - pattern name (internal ID)
- * @property {string} category - pattern category
- * @property {string} summary - pattern name (user visible)
- * @property {string} description - long description of the pattern
- * @property {number} order - display order (string!)
- * @property {string} icon - icon name (not path or file name!)
+ * @property {string} name - Pattern name (internal ID).
+ * @property {string} category - Pattern category.
+ * @property {string} summary - User visible pattern name.
+ * @property {string} description - Long description of the pattern.
+ * @property {number} order - Display order (string!).
+ * @property {string} icon - Icon name (not path or file name!).
  */
 
 /**

From 5b937df8af7aaf4f12233497091f8ada631d42ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 12:57:24 +0000
Subject: [PATCH 26/26] Documentation fixes

---
 web/src/client/software.js                      | 2 +-
 web/src/components/software/PatternSelector.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 3e86692d6a..764a9d14c2 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -72,7 +72,7 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {object} SoftwareConfig
- * @property {Array<string>|undefined} patterns - An object where the keys are the pattern names
+ * @propery {Object.<string, boolean>} patterns - An object where the keys are the pattern names
  *   and the values whether to install them or not.
  * @property {string|undefined} product - Product to install.
  */
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 7773075b86..ceedc238fd 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -33,7 +33,7 @@ import { noop } from "~/utils";
  * @property {string} group pattern group
  * @property {string} summary pattern name (user visible)
  * @property {string} description long description of the pattern
- * @property {string} order display order (string!)
+ * @property {string} order display order
  * @property {string} icon icon name (not path or file name!)
  * @property {number} selected who selected the pattern, undefined
  *   means it is not selected to install