From d6a0f0a9ff14670cb5307e137a26780d151f9de3 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 21 Jul 2024 15:29:30 +0200
Subject: [PATCH] Do not use Item in generate_labels

---
 src/frontend/item.rs              | 6 +++---
 src/frontend/item_class.rs        | 2 +-
 src/frontend/templates/helpers.rs | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/frontend/item.rs b/src/frontend/item.rs
index 5882d9a..f00c607 100644
--- a/src/frontend/item.rs
+++ b/src/frontend/item.rs
@@ -86,7 +86,7 @@ async fn show(
                     },
                     colour: Colour::Success,
                 }),
-                PageActionGroup::generate_labels(&[&item]),
+                PageActionGroup::generate_labels(&[item.id]),
                 (PageActionGroup::Button {
                     action: PageAction {
                         method: PageActionMethod::Get,
@@ -163,7 +163,7 @@ async fn show(
                     }
                     div {
                         (PageActionGroup::generate_labels(
-                            &children.iter().collect::<Vec<&Item>>(),
+                            &children.iter().map(|i| i.id).collect::<Vec<Uuid>>(),
                         ))
                     }
                 }
@@ -416,7 +416,7 @@ async fn add_post(
                 title: Some("Added Items"),
                 page_title: Some(Box::new("Added Items")),
                 page_actions: vec![PageActionGroup::generate_labels(
-                    &items.iter().collect::<Vec<&Item>>(),
+                    &items.iter().map(|i| i.id).collect::<Vec<Uuid>>(),
                 )],
                 user: Some(user),
                 ..Default::default()
diff --git a/src/frontend/item_class.rs b/src/frontend/item_class.rs
index c58f1d7..7efaf0a 100644
--- a/src/frontend/item_class.rs
+++ b/src/frontend/item_class.rs
@@ -147,7 +147,7 @@ async fn show(
                     }
                     div {
                         (PageActionGroup::generate_labels(
-                            &items.iter().collect::<Vec<&Item>>(),
+                            &items.iter().map(|i| i.id).collect::<Vec<Uuid>>(),
                         ))
                     }
                 }
diff --git a/src/frontend/templates/helpers.rs b/src/frontend/templates/helpers.rs
index 7898733..378bb3d 100644
--- a/src/frontend/templates/helpers.rs
+++ b/src/frontend/templates/helpers.rs
@@ -5,7 +5,6 @@
 use std::fmt::{self, Display};
 
 use crate::label::LabelPreset;
-use crate::models::*;
 use maud::{html, Markup, PreEscaped, Render};
 use uuid::Uuid;
 
@@ -217,7 +216,7 @@ impl Render for PageActionGroup {
 }
 
 impl PageActionGroup {
-    pub fn generate_labels(items: &[&Item]) -> PageActionGroup {
+    pub fn generate_labels(ids: &[Uuid]) -> PageActionGroup {
         PageActionGroup::Dropdown {
             name: "Generate Label".to_string(),
             actions: enum_iterator::all::<LabelPreset>()
@@ -226,9 +225,8 @@ impl PageActionGroup {
                     target: format!(
                         "/labels/generate?preset={}&ids={}",
                         &serde_variant::to_variant_name(&preset).unwrap(),
-                        items
-                            .iter()
-                            .map(|item| item.id.to_string())
+                        ids.iter()
+                            .map(|id| id.to_string())
                             .collect::<Vec<String>>()
                             .join(",")
                     ),