fix: find all view ids to be filtered

frontend/rust-lib/flowy-search/src/event_handler.rs

@@ -21,7 +21,9 @@ pub(crate) async fn search_handler(
 ) -> Result<(), FlowyError> {
   let query = data.into_inner();
   let manager = upgrade_manager(manager)?;
-  manager.perform_search(query.search, query.filter, query.channel);
+  manager
+    .perform_search(query.search, query.filter, query.channel)
+    .await;
 
   Ok(())
 }

frontend/rust-lib/flowy-search/src/services/manager.rs

@@ -3,8 +3,9 @@ use std::sync::Arc;
 
 use super::notifier::{SearchNotifier, SearchResultChanged, SearchResultReceiverRunner};
 use crate::entities::{SearchFilterPB, SearchResultNotificationPB, SearchResultPB};
+use collab_folder::Folder;
 use flowy_error::FlowyResult;
-use flowy_folder::manager::FolderManager;
+use flowy_folder::{entities::ViewPB, manager::FolderManager};
 use lib_dispatch::prelude::af_spawn;
 use lib_infra::async_trait::async_trait;
 use tokio::sync::broadcast;
@@ -63,7 +64,42 @@ impl SearchManager {
     self.handlers.get(&search_type)
   }
 
-  pub fn perform_search(
+  async fn get_view_ids_should_be_filtered(&self, folder: &Folder) -> Vec<String> {
+    let mut filtered_ids: Vec<String> = self.folder_manager.get_view_ids_should_be_filtered(folder);
+
+    let view_futures = filtered_ids
+      .iter()
+      .map(|id| self.folder_manager.get_view_pb(id))
+      .collect::<Vec<_>>();
+
+    let view_results = futures::future::join_all(view_futures).await;
+
+    let views = view_results
+      .into_iter()
+      .filter(|view| view.is_ok())
+      .map(|view| view.unwrap())
+      .collect::<Vec<_>>();
+
+    for view in views {
+      let view_ids = self.get_view_ids_recursively(view);
+      filtered_ids.append(&mut view_ids.clone());
+    }
+
+    filtered_ids
+  }
+
+  fn get_view_ids_recursively(&self, view: ViewPB) -> Vec<String> {
+    let mut view_ids = vec![];
+    view_ids.push(view.id.clone());
+
+    for child in view.child_views.iter() {
+      view_ids.append(&mut self.get_view_ids_recursively(child.clone()));
+    }
+
+    view_ids
+  }
+
+  pub async fn perform_search(
     &self,
     query: String,
     filter: Option<SearchFilterPB>,
@@ -86,9 +122,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_views = self.get_view_ids_should_be_filtered(folder).await;
     let max: usize = self.handlers.len();
     let handlers = self.handlers.clone();
     for (_, handler) in handlers {
@@ -100,7 +135,6 @@ impl SearchManager {
 
       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