fix: find all view ids to be filtered

AppFlowy-IO · Jul 14, 2024 · 28aa392 · 28aa392
1 parent 2605a84
commit 28aa392
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 41 deletions.
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -106,10 +106,10 @@ default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
 
 [patch.crates-io]
-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
+collab = { path = "../../AppFlowy-Collab/collab" }
+collab-entity = { path = "../../AppFlowy-Collab/collab-entity" }
+collab-folder = { path = "../../AppFlowy-Collab/collab-folder" }
+collab-document = { path = "../../AppFlowy-Collab/collab-document" }
+collab-database = { path = "../../AppFlowy-Collab/collab-database" }
+collab-plugins = { path = "../../AppFlowy-Collab/collab-plugins" }
+collab-user = { path = "../../AppFlowy-Collab/collab-user" }
diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
@@ -136,10 +136,10 @@ rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec1
 # To switch to the local path, run:
 # scripts/tool/update_collab_source.sh
 # ⚠️⚠️⚠️️
-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5048762" }
+collab = { path = "../AppFlowy-Collab/collab" }
+collab-entity = { path = "../AppFlowy-Collab/collab-entity" }
+collab-folder = { path = "../AppFlowy-Collab/collab-folder" }
+collab-document = { path = "../AppFlowy-Collab/collab-document" }
+collab-database = { path = "../AppFlowy-Collab/collab-database" }
+collab-plugins = { path = "../AppFlowy-Collab/collab-plugins" }
+collab-user = { path = "../AppFlowy-Collab/collab-user" }
diff --git a/frontend/rust-lib/flowy-folder/src/user_default.rs b/frontend/rust-lib/flowy-folder/src/user_default.rs
@@ -55,6 +55,7 @@ impl DefaultFolderBuilder {
       recent: Default::default(),
       trash: Default::default(),
       private: Default::default(),
+      section_view_relations: Default::default(),
     }
   }
 }

diff --git a/frontend/rust-lib/flowy-search/src/services/manager.rs b/frontend/rust-lib/flowy-search/src/services/manager.rs
@@ -86,8 +86,8 @@ impl SearchManager {
         return;
       },
     };
-    let private_views = self.folder_manager.get_view_ids_should_be_filtered(folder);
-    tracing::warn!("Private views: {:?}", private_views);
+
+    let private_space_ids = self.folder_manager.get_view_ids_should_be_filtered(folder);
 
     let max: usize = self.handlers.len();
     let handlers = self.handlers.clone();
@@ -96,17 +96,25 @@ impl SearchManager {
       let f = filter.clone();
       let ch = channel.clone();
       let notifier = self.notifier.clone();
-      let private_view_ids = private_views.clone();
+
+      let filtered_ids = private_space_ids
+        .iter()
+        .filter_map(|key| folder.section_view_relations.get(key))
+        .flatten()
+        .cloned()
+        .collect::<Vec<String>>();
 
       af_spawn(async move {
         let res = handler.perform_search(q.clone(), f).await;
-
         let items = res.unwrap_or_default();
 
-        // Filter out any items which ID exists in private_views
+        tracing::warn!("Search Result: {:?}", items);
+        tracing::warn!("Filtered IDs: {:?}", filtered_ids);
+
+        // filter out items that are not in the private view
         let items = items
           .into_iter()
-          .filter(|item| !private_view_ids.contains(&item.id))
+          .filter(|item| !filtered_ids.contains(&item.id))
           .collect();
 
         let notification = SearchResultNotificationPB {