From 51761cbdefa39107b9e1f931f1aa8df6aebb2a94 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 28 Apr 2025 18:27:03 +0200 Subject: many much more generic refactor --- server/src/ui/browser.rs | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'server/src/ui/browser.rs') diff --git a/server/src/ui/browser.rs b/server/src/ui/browser.rs index f7eac93..b780934 100644 --- a/server/src/ui/browser.rs +++ b/server/src/ui/browser.rs @@ -30,29 +30,10 @@ pub fn r_all_items_filter( lang: AcceptLanguage, ) -> Result, Json>, MyError> { let AcceptLanguage(lang) = lang; - let mut items = db.list_nodes_with_udata(sess.user.name.as_str())?; - - items.retain(|(n, _)| matches!(n.visibility, Visibility::Visible)); - - filter_and_sort_nodes( - &filter, - (SortProperty::Title, SortOrder::Ascending), - &mut items, - ); - - let page_size = 100; - let page = page.unwrap_or(0); - let offset = page * page_size; - let from = offset.min(items.len()); - let to = (offset + page_size).min(items.len()); - let max_page = items.len().div_ceil(page_size); - + + let data = all_items()?; Ok(if *aj { - Either::Right(Json(ApiItemsResponse { - count: items.len(), - pages: max_page, - items: items[from..to].to_vec(), - })) + Either::Right(Json(data)) } else { Either::Left(LayoutPage { title: "All Items".to_owned(), -- cgit v1.2.3-70-g09d2