order

backend/src/routes/folders.rs

@@ -16,7 +16,10 @@ use crate::{
 };
 
 use super::documents::{hydrate_documents, DocumentResponse};
+use crate::documents::ordering::{ordering_clauses, DocumentSortField, SortDirection};
 use crate::utils::{json::deserialize_patch_field, time::to_iso};
+use diesel::dsl::sql;
+use diesel::sql_types::Text;
 
 #[derive(Deserialize, ToSchema)]
 pub struct CreateFolderRequest {
@@ -51,6 +54,12 @@ pub struct FolderContentsQuery {
     #[serde(default = "default_include_documents")]
     #[schema(default = true)]
     pub include_documents: bool,
+    #[serde(default)]
+    #[schema(default = "title")]
+    pub sort: DocumentSortField,
+    #[serde(default)]
+    #[schema(default = "asc")]
+    pub dir: SortDirection,
 }
 
 const fn default_include_documents() -> bool {
@@ -335,6 +344,12 @@ pub async fn list_folder_contents(
         ..
     }: TenantScopedConn,
 ) -> AppResult<Json<FolderContentsResponse>> {
+    let FolderContentsQuery {
+        include_documents,
+        sort,
+        dir,
+    } = query;
+
     let folder_id = if folder_identifier.eq_ignore_ascii_case("root") {
         None
     } else {
@@ -358,22 +373,28 @@ pub async fn list_folder_contents(
         folders::table
             .filter(folders::parent_id.eq(parent_id))
             .filter(folders::tenant_id.eq(tenant_id))
-            .order(folders::name.asc())
+            .order(sql::<Text>("name COLLATE \"unicode_ci\" ASC"))
             .load(&mut conn)?
     } else {
         folders::table
             .filter(folders::parent_id.is_null())
             .filter(folders::tenant_id.eq(tenant_id))
-            .order(folders::name.asc())
+            .order(sql::<Text>("name COLLATE \"unicode_ci\" ASC"))
             .load(&mut conn)?
     };
     let subfolders = child_folders.into_iter().map(folder_to_info).collect();
 
-    let documents = if query.include_documents {
-        let docs_query = documents::table
+    let documents = if include_documents {
+        let mut docs_query = documents::table
             .filter(documents::deleted_at.is_null())
             .filter(documents::tenant_id.eq(tenant_id))
-            .order(documents::created_at.desc());
+            .into_boxed();
+
+        let (primary_sql, secondary_sql) = ordering_clauses(sort, dir);
+        docs_query = docs_query.order(sql::<Text>(primary_sql));
+        if let Some(second) = secondary_sql {
+            docs_query = docs_query.then_order_by(sql::<Text>(second));
+        }
 
         let docs: Vec<Document> = if let Some(current_folder) = folder_id {
             docs_query