[PATCH datacenter-manager 2/3] clippy: pdm-client: use parameter type for pve_list_storages

[Lukas Wagner <l.wagner@proxmox.com>]

This API had a quite excessive number of parameters, some of which also
had the same type. A parameter type for the filter options reduces the
potential for errors. The `formats` parameters was kept as a distinct
function parameter and renamed to `include_formats`, to better convey
the meaning.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 lib/pdm-client/src/lib.rs             | 43 +++++++++++++++++++--------
 ui/src/widget/pve_storage_selector.rs | 19 ++++++++----
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 76b33ef8..c97c9db9 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -97,6 +97,20 @@ impl<T: HttpApiClient> std::ops::DerefMut for PdmClient<T> {
     }
 }
 
+/// Filter for [`PdmClient::pve_list_storages`].
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PveListStoragesFilter {
+    /// Only list stores which support this content type.
+    pub content: Vec<StorageContent>,
+    /// Only list stores which are enabled (not disabled in config).
+    pub enabled: Option<bool>,
+    /// Only list status for  specified storage
+    pub storage: Option<String>,
+    // If target is different to 'node', we only list shared storages which are accessible on
+    // this 'node' and the specified 'target' node.
+    pub target: Option<String>,
+}
+
 impl<T: HttpApiClient> PdmClient<T> {
     pub async fn list_remotes(&self) -> Result<Vec<Remote>, Error> {
         Ok(self
@@ -1103,28 +1117,31 @@ impl<T: HttpApiClient> PdmClient<T> {
         Ok(self.0.get(&path).await?.expect_json()?.data)
     }
 
+    /// List storages for a given PVE remote node.
+    ///
+    /// The storages can be filtered using the `filter` parameter, for details see
+    /// [`PveListStoragesFilter`]. If `include_supported_disk_image_formats` is set
+    /// to true, the result will include information about supported disk image types
+    /// for each storage.
     pub async fn pve_list_storages(
         &self,
         remote: &str,
         node: &str,
-        content: Option<Vec<StorageContent>>,
-        enabled: Option<bool>,
-        format: Option<bool>,
-        storage: Option<String>,
-        target: Option<String>,
+        filter: PveListStoragesFilter,
+        include_supported_disk_image_formats: bool,
     ) -> Result<Vec<StorageInfo>, Error> {
         let mut builder = ApiPathBuilder::new(format!(
             "/api2/extjs/pve/remotes/{remote}/nodes/{node}/storage"
         ))
-        .maybe_arg("enabled", &enabled)
-        .maybe_arg("format", &format)
-        .maybe_arg("storage", &storage)
-        .maybe_arg("target", &target);
-        if let Some(content) = content {
-            for ty in content {
-                builder = builder.arg("content", ty);
-            }
+        .arg("format", include_supported_disk_image_formats)
+        .maybe_arg("enabled", &filter.enabled)
+        .maybe_arg("storage", &filter.storage)
+        .maybe_arg("target", &filter.target);
+
+        for ty in filter.content {
+            builder = builder.arg("content", ty);
         }
+
         let path = builder.build();
 
         Ok(self.0.get(&path).await?.expect_json()?.data)
diff --git a/ui/src/widget/pve_storage_selector.rs b/ui/src/widget/pve_storage_selector.rs
index 488175ab..f43234dc 100644
--- a/ui/src/widget/pve_storage_selector.rs
+++ b/ui/src/widget/pve_storage_selector.rs
@@ -22,7 +22,10 @@ use pwt::{
 };
 use pwt_macros::{builder, widget};
 
-use pdm_client::types::{StorageContent, StorageInfo};
+use pdm_client::{
+    types::{StorageContent, StorageInfo},
+    PveListStoragesFilter,
+};
 
 #[widget(comp=PveStorageSelectorComp, @input)]
 #[derive(Clone, Properties, PartialEq)]
@@ -85,15 +88,19 @@ impl PveStorageSelectorComp {
         content: Option<Vec<StorageContent>>,
         target: Option<AttrValue>,
     ) -> Result<Vec<StorageInfo>, Error> {
+        let filter = PveListStoragesFilter {
+            content: content.unwrap_or_default(),
+            enabled: Some(true),
+            target: target.as_ref().map(AttrValue::to_string),
+            ..Default::default()
+        };
+
         let mut storages = crate::pdm_client()
             .pve_list_storages(
                 &remote,
                 &node.unwrap_or(AttrValue::from("localhost")),
-                content,
-                Some(true),
-                Some(true),
-                None,
-                target.as_ref().map(AttrValue::to_string),
+                filter,
+                true,
             )
             .await?;
 
-- 
2.47.3