added deletion of items

2026-04-13 14:58:10 -04:00
parent 8ff4fa74e4
commit a6e2156d97
7 changed files with 139 additions and 31 deletions
@@ -1,7 +1,7 @@
 use dioxus::prelude::*;

 use crate::{
-	components::{MediaItem, MediaItemPlaceHolder},
+	components::{MediaClassChangeEvent, MediaItem, MediaItemPlaceHolder},
 	rpc::{
 		aoba::{MediaModel, PageFilter},
 		get_rpc_client,
@@ -9,7 +9,8 @@ use crate::{
 };

 #[derive(PartialEq, Clone, Props)]
-pub struct MediaGridProps {
+pub struct MediaGridProps
+{
 	pub query: Signal<String>,
 	pub max_page: Signal<i32>,
 	pub total_items: Signal<i32>,
@@ -18,19 +19,21 @@ pub struct MediaGridProps {
 	pub on_page_loaded: Option<EventHandler<PaginationInfo>>,
 }

-pub struct PaginationInfo {
+pub struct PaginationInfo
+{
 	pub total_pages: i32,
 	pub total_items: i32,
 }

 #[component]
-pub fn MediaGrid(props: MediaGridProps) -> Element {
+pub fn MediaGrid(props: MediaGridProps) -> Element
+{
 	let mut error_display = use_signal(|| {
 		rsx! {}
 	});
 	let mut items = use_signal::<Option<Vec<MediaModel>>>(|| None);
 	let media_result = use_resource(use_reactive!(|(props)| async move {
-		items.set(None);
+		// items.set(None);
 		let mut client = get_rpc_client();
 		let request = PageFilter {
 			page_size: Some(props.page_size.cloned()),
@@ -38,24 +41,32 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			query: Some(props.query.cloned()),
 		};
 		let result = client.list_media(request).await;
-		if let Ok(items) = result {
+		if let Ok(items) = result
+		{
 			let res = items.into_inner();

 			return Ok(res);
-		} else {
+		}
+		else
+		{
 			let err = result.err().unwrap();
 			let message = err.message();
 			return Err(format!("Failed to load results: {message}"));
 		}
 	}));

-	use_effect(move || match media_result() {
-		Some(value) => match value {
-			Ok(result) => {
-				if let Some(pagination) = result.pagination {
+	use_effect(move || match media_result()
+	{
+		Some(value) => match value
+		{
+			Ok(result) =>
+			{
+				if let Some(pagination) = result.pagination
+				{
 					let total_pages = pagination.total_pages;
 					let total_items = pagination.total_items;
-					if let Some(handler) = props.on_page_loaded {
+					if let Some(handler) = props.on_page_loaded
+					{
 						handler.call(PaginationInfo {
 							total_pages,
 							total_items,
@@ -71,7 +82,8 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 				}
 			}),
 		},
-		_ => {}
+		_ =>
+		{}
 	});

 	rsx! {
@@ -79,7 +91,35 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			class: "mediaGrid",
 			{error_display}
 			{match items(){
-				Some(itms) => rsx!{MediaList { items: itms }},
+				Some(itms) => rsx!{
+					MediaList {
+						items: itms,
+						on_item_deleted: move |id|{
+							if let Some(cur) = items.cloned(){
+								let filtered = cur.iter()
+									.filter(|i| i.id.clone().expect("No id").value != id)
+									.map(|i|i.clone())
+									.collect();
+								items.set(Some(filtered));
+							}
+						},
+						on_class_changed: move |e: MediaClassChangeEvent|{
+							if let Some(cur) = items.cloned(){
+								let updated = cur.iter()
+									.map(|i|{
+										let mut itm = i.clone();
+										let id = itm.id.clone().expect("No id").value;
+										if id == e.id{
+											itm.class = e.class;
+										}
+										return itm;
+									})
+									.collect();
+								items.set(Some(updated));
+							}
+						}
+					}
+				},
 				None => rsx!{PlaceholderGrid { count: props.page_size.cloned() as usize }}
 			}}
 		}
@@ -87,7 +127,8 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 }

 #[component]
-fn PlaceholderGrid(count: usize) -> Element {
+fn PlaceholderGrid(count: usize) -> Element
+{
 	rsx! {
 		div{
 			class: "mediaGrid",
@@ -99,12 +140,18 @@ fn PlaceholderGrid(count: usize) -> Element {
 }

 #[component]
-fn MediaList(items: Vec<MediaModel>) -> Element {
+fn MediaList(
+	items: Vec<MediaModel>,
+	on_item_deleted: Option<EventHandler<String>>,
+	on_class_changed: Option<EventHandler<MediaClassChangeEvent>>,
+) -> Element
+{
 	rsx! {
-		{items.iter().enumerate().map(|(index, itm)| rsx!{
+		{items.iter().map(|itm| rsx!{
 			MediaItem {
 				item: itm.clone(),
-				index
+				on_deleted: on_item_deleted,
+				on_class_changed: on_class_changed
 			}
 		})}
 	}
@@ -13,17 +13,16 @@ use crate::{

 pub struct MediaClassChangeEvent
 {
-	pub index: usize,
-	pub class: String,
+	pub id: String,
+	pub class: i32,
 }

 #[derive(PartialEq, Clone, Props)]
 pub struct MediaItemProps
 {
 	pub item: MediaModel,
-	pub index: usize,
 	pub on_class_changed: Option<EventHandler<MediaClassChangeEvent>>,
-	pub on_deleted: Option<EventHandler<usize>>,
+	pub on_deleted: Option<EventHandler<String>>,
 }

 #[component]
@@ -100,8 +99,11 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 0).await{
+									if let Ok(_) = set_class(&id, 0).await{
 										class_signal.set("");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 0 });
+										}
 									}
 								});
 							},
@@ -118,12 +120,15 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 				{
 					if class_signal() != "blur" {
 						rsx!{ContextMenuItem {
-							index: 2 as usize,
+							index: 3 as usize,
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 1).await{
+									if let Ok(_) = set_class(&id, 1).await{
 										class_signal.set("blur");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 1 });
+										}
 									}
 								});
 							},
@@ -140,12 +145,15 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 				{
 					if class_signal() != "secret" {
 						rsx!{ContextMenuItem {
-							index: 2 as usize,
+							index: 4 as usize,
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 2).await{
+									if let Ok(_) = set_class(&id, 2).await{
 										class_signal.set("secret");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 2 });
+										}
 									}
 								});
 							},
@@ -160,8 +168,17 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 					}else{rsx!{}}
 				}
 				ContextMenuItem {
-					index: 2 as usize,
-					value: "",
+					index: 5 as usize,
+					value: "{id}",
+					on_select: move |id: String|{
+						spawn(async move {
+							if let Ok(_) = delete_media(id.clone()).await{
+								if let Some(handler) = props.on_deleted {
+									handler.call(id);
+								}
+							}
+						});
+					},
 					div{
 						class: "contextItem",
 						div{
@@ -192,13 +209,19 @@ pub fn MediaItemPlaceHolder() -> Element
 	};
 }

-async fn set_class(id: String, class: i32) -> Result<Response<()>, Status>
+async fn delete_media(id: String) -> Result<Response<()>, Status>
+{
+	let mut client = get_rpc_client();
+	return client.delete_media(Id { value: id }).await;
+}
+
+async fn set_class(id: &String, class: i32) -> Result<Response<()>, Status>
 {
 	let mut client = get_rpc_client();
 	return client
 		.set_media_class(SetMediaClassRequest {
 			class: class,
-			id: Some(Id { value: id }),
+			id: Some(Id { value: id.clone() }),
 		})
 		.await;
 }