frontend: Add basic information about collections

crates/frontend/src/routes/addressbooks.rs

@@ -4,7 +4,7 @@ use askama::Template;
 use askama_web::WebTemplate;
 use axum::{Extension, extract::Path, response::IntoResponse};
 use http::StatusCode;
-use rustical_store::{Addressbook, AddressbookStore, auth::Principal};
+use rustical_store::{Addressbook, AddressbookStore, CollectionMetadata, auth::Principal};
 
 use crate::pages::user::{Section, UserPage};
 
@@ -18,8 +18,8 @@ impl Section for AddressbooksSection {
 #[template(path = "components/sections/addressbooks_section.html")]
 pub struct AddressbooksSection {
     pub user: Principal,
-    pub addressbooks: Vec<Addressbook>,
-    pub deleted_addressbooks: Vec<Addressbook>,
+    pub addressbooks: Vec<(CollectionMetadata, Addressbook)>,
+    pub deleted_addressbooks: Vec<(CollectionMetadata, Addressbook)>,
 }
 
 pub async fn route_addressbooks<AS: AddressbookStore>(
@@ -41,11 +41,33 @@ pub async fn route_addressbooks<AS: AddressbookStore>(
         deleted_addressbooks.extend(addr_store.get_deleted_addressbooks(group).await.unwrap());
     }
 
+    let mut addressbook_infos = vec![];
+    for addressbook in addressbooks {
+        addressbook_infos.push((
+            addr_store
+                .addressbook_metadata(&addressbook.principal, &addressbook.id)
+                .await
+                .unwrap(),
+            addressbook,
+        ));
+    }
+
+    let mut deleted_addressbook_infos = vec![];
+    for addressbook in deleted_addressbooks {
+        deleted_addressbook_infos.push((
+            addr_store
+                .addressbook_metadata(&addressbook.principal, &addressbook.id)
+                .await
+                .unwrap(),
+            addressbook,
+        ));
+    }
+
     UserPage {
         section: AddressbooksSection {
             user: user.clone(),
-            addressbooks,
-            deleted_addressbooks,
+            addressbooks: addressbook_infos,
+            deleted_addressbooks: deleted_addressbook_infos,
         },
         user,
     }

crates/frontend/src/routes/calendars.rs

@@ -5,7 +5,7 @@ use askama::Template;
 use askama_web::WebTemplate;
 use axum::{Extension, extract::Path, response::IntoResponse};
 use http::StatusCode;
-use rustical_store::{Calendar, CalendarStore, auth::Principal};
+use rustical_store::{Calendar, CalendarStore, CollectionMetadata, auth::Principal};
 
 impl Section for CalendarsSection {
     fn name() -> &'static str {
@@ -17,8 +17,8 @@ impl Section for CalendarsSection {
 #[template(path = "components/sections/calendars_section.html")]
 pub struct CalendarsSection {
     pub user: Principal,
-    pub calendars: Vec<Calendar>,
-    pub deleted_calendars: Vec<Calendar>,
+    pub calendars: Vec<(CollectionMetadata, Calendar)>,
+    pub deleted_calendars: Vec<(CollectionMetadata, Calendar)>,
 }
 
 pub async fn route_calendars<CS: CalendarStore>(
@@ -35,16 +35,38 @@ pub async fn route_calendars<CS: CalendarStore>(
         calendars.extend(cal_store.get_calendars(group).await.unwrap());
     }
 
+    let mut calendar_infos = vec![];
+    for calendar in calendars {
+        calendar_infos.push((
+            cal_store
+                .calendar_metadata(&calendar.principal, &calendar.id)
+                .await
+                .unwrap(),
+            calendar,
+        ));
+    }
+
     let mut deleted_calendars = vec![];
     for group in user.memberships() {
         deleted_calendars.extend(cal_store.get_deleted_calendars(group).await.unwrap());
     }
 
+    let mut deleted_calendar_infos = vec![];
+    for calendar in deleted_calendars {
+        deleted_calendar_infos.push((
+            cal_store
+                .calendar_metadata(&calendar.principal, &calendar.id)
+                .await
+                .unwrap(),
+            calendar,
+        ));
+    }
+
     UserPage {
         section: CalendarsSection {
             user: user.clone(),
-            calendars,
-            deleted_calendars,
+            calendars: calendar_infos,
+            deleted_calendars: deleted_calendar_infos,
         },
         user,
     }