refactor(ui): share typed picker adapters

Author: michidk

src/ui.rs

@@ -56,6 +56,14 @@ pub trait Pickable: Clone {
     fn column_constraints(max_widths: &[usize]) -> Vec<Constraint>;
 }
 
+trait WrappedPickable: Pickable {
+    type Inner;
+
+    fn from_inner(inner: Self::Inner) -> Self;
+
+    fn into_inner(self) -> Self::Inner;
+}
+
 /// Configuration options for the generic picker UI.
 #[derive(Debug, Clone, Copy, Default)]
 pub struct PickerOpts {
@@ -614,9 +622,7 @@ pub fn pick_container(
     opts: PickerOpts,
     on_delete: Option<&mut dyn FnMut(&ContainerItem)>,
 ) -> Result<Option<crate::container::Container>> {
-    let items: Vec<ContainerItem> = containers.into_iter().map(ContainerItem).collect();
-    let selected = pick(items, opts, on_delete)?;
-    Ok(selected.map(|item| item.0))
+    pick_wrapped::<ContainerItem>(containers, opts, on_delete)
 }
 
 /// Launches a picker for stored devcontainer configs.
@@ -625,22 +631,28 @@ pub fn pick_config(
     opts: PickerOpts,
     on_delete: Option<&mut dyn FnMut(&ConfigItem)>,
 ) -> Result<Option<crate::config_store::ConfigEntry>> {
-    let items: Vec<ConfigItem> = configs.into_iter().map(ConfigItem).collect();
-    let selected = pick(items, opts, on_delete)?;
-    Ok(selected.map(|item| item.0))
+    pick_wrapped::<ConfigItem>(configs, opts, on_delete)
 }
 
 /// Launches a picker for devcontainer selection.
 pub fn pick_devcontainer(
     dev_containers: Vec<crate::workspace::DevContainer>,
 ) -> Result<Option<crate::workspace::DevContainer>> {
-    let items: Vec<DevContainerItem> = dev_containers.into_iter().map(DevContainerItem).collect();
     let opts = PickerOpts {
         hide_instructions: false,
         hide_info: false,
     };
-    let selected = pick(items, opts, None)?;
-    Ok(selected.map(|item| item.0))
+    pick_wrapped::<DevContainerItem>(dev_containers, opts, None)
+}
+
+fn pick_wrapped<T: WrappedPickable>(
+    values: Vec<T::Inner>,
+    opts: PickerOpts,
+    on_delete: Option<&mut dyn FnMut(&T)>,
+) -> Result<Option<T::Inner>> {
+    let items = values.into_iter().map(T::from_inner).collect();
+    let selected = pick(items, opts, on_delete)?;
+    Ok(selected.map(T::into_inner))
 }
 
 fn add_num_opt(o1: Option<u32>, o2: Option<u32>) -> Option<u32> {

src/ui/items.rs

@@ -1,9 +1,25 @@
-use super::Pickable;
+use super::{Pickable, WrappedPickable};
 use crate::history::{Entry, EntryId};
 use chrono::{DateTime, Local};
 use ratatui::layout::Constraint;
 use std::borrow::Cow;
 
+macro_rules! impl_wrapped_pickable {
+    ($wrapper:ty, $inner:ty) => {
+        impl WrappedPickable for $wrapper {
+            type Inner = $inner;
+
+            fn from_inner(inner: Self::Inner) -> Self {
+                Self(inner)
+            }
+
+            fn into_inner(self) -> Self::Inner {
+                self.0
+            }
+        }
+    };
+}
+
 #[derive(Debug, Clone)]
 pub struct HistoryItem {
     pub id: EntryId,
@@ -113,13 +129,9 @@ impl Pickable for ContainerItem {
     }
 
     fn search_fields(&self) -> Vec<String> {
-        vec![
-            self.0.short_id.clone(),
-            self.0.status.clone(),
-            self.0.image.clone(),
-            self.0.local_folder.clone(),
-            self.0.config_file.clone(),
-        ]
+        let mut fields = self.cells();
+        fields.push(self.0.config_file.clone());
+        fields
     }
 
     fn status_lines(&self) -> Vec<String> {
@@ -137,6 +149,8 @@ impl Pickable for ContainerItem {
     }
 }
 
+impl_wrapped_pickable!(ContainerItem, crate::container::Container);
+
 #[derive(Clone, Debug)]
 pub struct ConfigItem(pub crate::config_store::ConfigEntry);
 
@@ -180,6 +194,8 @@ impl Pickable for ConfigItem {
     }
 }
 
+impl_wrapped_pickable!(ConfigItem, crate::config_store::ConfigEntry);
+
 #[derive(Clone, Debug)]
 pub struct DevContainerItem(pub crate::workspace::DevContainer);
 
@@ -218,3 +234,5 @@ impl Pickable for DevContainerItem {
         ]
     }
 }
+
+impl_wrapped_pickable!(DevContainerItem, crate::workspace::DevContainer);