many much more generic refactor

1 files changed, 3 insertions, 22 deletions

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<Either<DynLayoutPage<'_>, Json<ApiItemsResponse>>, 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(),