feat: add name filtering

libs/client-api/src/http_collab.rs

@@ -1,7 +1,7 @@
 use crate::http::log_request_id;
 use crate::{blocking_brotli_compress, Client};
 use app_error::AppError;
-use client_api_entity::workspace_dto::AFDatabase;
+use client_api_entity::workspace_dto::{AFDatabase, ListDatabaseParam};
 use client_api_entity::{
   BatchQueryCollabParams, BatchQueryCollabResult, CreateCollabParams, DeleteCollabParams,
   QueryCollab, UpdateCollabWebParams,
@@ -145,11 +145,13 @@ impl Client {
   pub async fn list_databases(
     &self,
     workspace_id: &str,
+    name_filter: Option<String>,
   ) -> Result<Vec<AFDatabase>, AppResponseError> {
     let url = format!("{}/api/workspace/{}/database", self.base_url, workspace_id);
     let resp = self
       .http_client_with_auth(Method::GET, &url)
       .await?
+      .query(&ListDatabaseParam { name_filter })
       .send()
       .await?;
     log_request_id(&resp);

libs/shared-entity/src/dto/workspace_dto.rs

@@ -263,6 +263,11 @@ pub struct QueryWorkspaceParam {
   pub include_member_count: Option<bool>,
 }
 
+#[derive(Default, Debug, Deserialize, Serialize)]
+pub struct ListDatabaseParam {
+  pub name_filter: Option<String>, // logic: if database name contains
+}
+
 #[derive(Default, Debug, Deserialize, Serialize)]
 pub struct QueryWorkspaceFolder {
   pub depth: Option<u32>,
@@ -284,7 +289,7 @@ pub struct PublishedView {
 #[derive(Default, Debug, Clone, Serialize, Deserialize)]
 pub struct AFDatabase {
   pub id: String,
-  pub name: String,
+  pub names: Vec<String>,
   pub fields: Vec<AFDatabaseField>,
 }
 
@@ -293,3 +298,9 @@ pub struct AFDatabaseField {
   pub name: String,
   pub field_type: String,
 }
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct AFDatabaseMeta {
+  pub name: String,
+  pub icon: String,
+}

src/api/workspace.rs

@@ -1801,7 +1801,9 @@ async fn list_database_handler(
   user_uuid: UserUuid,
   workspace_id: web::Path<String>,
   state: Data<AppState>,
+  query: web::Query<ListDatabaseParam>,
 ) -> Result<Json<AppResponse<Vec<AFDatabase>>>> {
+  let name_filter = query.into_inner().name_filter;
   let uid = state.user_cache.get_user_uid(&user_uuid).await?;
   let workspace_id = workspace_id.into_inner();
   let dbs = biz::collab::ops::list_database(
@@ -1809,6 +1811,7 @@ async fn list_database_handler(
     &state.collab_access_control_storage,
     uid,
     workspace_id,
+    name_filter,
   )
   .await?;
   Ok(Json(AppResponse::Ok().with_data(dbs)))

src/biz/collab/ops.rs

@@ -363,6 +363,7 @@ pub async fn list_database(
   collab_storage: &CollabAccessControlStorage,
   uid: i64,
   workspace_uuid_str: String,
+  name_filter: Option<String>,
 ) -> Result<Vec<AFDatabase>, AppError> {
   let workspace_uuid: Uuid = workspace_uuid_str.as_str().parse()?;
   let ws_db_oid = select_workspace_database_oid(pg_pool, &workspace_uuid).await?;
@@ -416,10 +417,21 @@ pub async fn list_database(
                 Arc::new(NoPersistenceDatabaseCollabService),
                 None,
               ) {
-                Some(db_body) => match db_body.metas.get_inline_view_id(&txn) {
+                Some(db_body) => {
-                  Some(iid) => match db_body.views.get_view(&txn, &iid) {
+                  let db_views = db_body.views.get_all_views_meta(&txn);
-                    Some(iview) => {
+                  let names = db_views
-                      let name = iview.name;
+                    .iter()
+                    .map(|v| v.name.clone())
+                    .filter(|name| !name.is_empty())
+                    .collect::<Vec<String>>();
+
+                  // if there exists a name filter,
+                  // there must be at least one view name that contains the filter
+                  if let Some(name_filter) = &name_filter {
+                    if !names.iter().any(|name| name.contains(name_filter)) {
+                      continue;
+                    }
+                  }
 
                   let db_fields = db_body.fields.get_all_fields(&txn);
                   let mut af_fields: Vec<AFDatabaseField> = Vec::with_capacity(db_fields.len());
@@ -431,14 +443,10 @@ pub async fn list_database(
                   }
                   af_databases.push(AFDatabase {
                     id: db_body.get_database_id(&txn),
-                        name,
+                    names,
                     fields: af_fields,
                   });
                 },
-                    None => tracing::warn!("Failed to get inline view: {}", iid),
-                  },
-                  None => tracing::error!("Failed to get inline view id for database: {}", oid),
-                },
                 None => tracing::error!("Failed to create db_body from db_collab, oid: {}", oid),
               },
               Err(err) => tracing::error!("Failed to create db_collab: {:?}", err),

tests/workspace/workspace_crud.rs

@@ -8,13 +8,20 @@ use shared_entity::dto::workspace_dto::PatchWorkspaceParam;
 #[tokio::test]
 async fn workspace_list_database() {
   let (c, _user) = generate_unique_registered_user_client().await;
-  let workspace_id = c.get_workspaces().await.unwrap()[0].workspace_id;
+  let workspace_id = c.get_workspaces().await.unwrap()[0]
-  let dbs = c.list_databases(&workspace_id.to_string()).await.unwrap();
+    .workspace_id
+    .to_string();
+
+  {
+    let dbs = c.list_databases(&workspace_id, None).await.unwrap();
     assert_eq!(dbs.len(), 1);
 
     let db = &dbs[0];
 
-  assert_eq!(db.name, "");
+    assert_eq!(db.names.len(), 2);
+    assert!(db.names.contains(&String::from("Untitled")));
+    assert!(db.names.contains(&String::from("Grid")));
+
     assert!(db.fields.contains(&AFDatabaseField {
       name: "Last modified".to_string(),
       field_type: "LastEditedTime".to_string(),
@@ -37,6 +44,29 @@ async fn workspace_list_database() {
     }));
   }
 
+  {
+    let dbs = c
+      .list_databases(&workspace_id, Some(String::from("nomatch")))
+      .await
+      .unwrap();
+    assert_eq!(dbs.len(), 0);
+  }
+  {
+    let dbs = c
+      .list_databases(&workspace_id, Some(String::from("ntitle")))
+      .await
+      .unwrap();
+    assert_eq!(dbs.len(), 1);
+  }
+  {
+    let dbs = c
+      .list_databases(&workspace_id, Some(String::from("rid")))
+      .await
+      .unwrap();
+    assert_eq!(dbs.len(), 1);
+  }
+}
+
 #[tokio::test]
 async fn add_and_delete_workspace_for_user() {
   let (c, _user) = generate_unique_registered_user_client().await;