feat: config grid filter in backend & add tests

* chore: add search crate

* chore: add task order test

* chore: enable timeout

* add task crate

* chore: run filter task

* chore: run filter task

* chore: filter rows

* chore: cache filter result

* chore: filter rows when open a grid

* chore: add tests

* test: add number filter test

* test: add checkbox fitler test

* chore: fix test

Co-authored-by: nathan <[email protected]>

Author: appflowy

frontend/rust-lib/Cargo.lock

@@ -15,6 +15,7 @@ members = [
   "flowy-error",
   "flowy-revision",
   "flowy-grid",
+  "flowy-task",
 ]
 
 [profile.dev]

frontend/rust-lib/Cargo.toml

@@ -44,7 +44,7 @@ pub extern "C" fn async_event(port: i64, input: *const u8, len: usize) {
             log::error!("sdk not init yet.");
             return;
         }
-        Some(e) => e.dispatcher.clone(),
+        Some(e) => e.event_dispatcher.clone(),
     };
     let _ = EventDispatcher::async_send_with_callback(dispatcher, request, move |resp: EventResponse| {
         log::trace!("[FFI]: Post data to dart through {} port", port);
@@ -62,7 +62,7 @@ pub extern "C" fn sync_event(input: *const u8, len: usize) -> *const u8 {
             log::error!("sdk not init yet.");
             return forget_rust(Vec::default());
         }
-        Some(e) => e.dispatcher.clone(),
+        Some(e) => e.event_dispatcher.clone(),
     };
     let _response = EventDispatcher::sync_send(dispatcher, request);
 

frontend/rust-lib/dart-ffi/src/lib.rs

@@ -112,3 +112,5 @@ impl std::convert::From<protobuf::ProtobufError> for FlowyError {
         FlowyError::internal().context(e)
     }
 }
+
+impl std::error::Error for FlowyError {}

frontend/rust-lib/flowy-error/src/errors.rs

@@ -9,6 +9,7 @@ edition = "2021"
 lib-dispatch = { path = "../lib-dispatch" }
 dart-notify = { path = "../dart-notify" }
 flowy-revision = { path = "../flowy-revision" }
+flowy-task= { path = "../flowy-task" }
 flowy-error = { path = "../flowy-error", features = ["db"]}
 flowy-derive = { path = "../../../shared-lib/flowy-derive" }
 lib-ot = { path = "../../../shared-lib/lib-ot" }
@@ -17,6 +18,7 @@ grid-rev-model = { path = "../../../shared-lib/grid-rev-model" }
 flowy-sync = { path = "../../../shared-lib/flowy-sync" }
 flowy-http-model = { path = "../../../shared-lib/flowy-http-model" }
 flowy-database = { path = "../flowy-database" }
+anyhow = "1.0"
 
 strum = "0.21"
 strum_macros = "0.21"

frontend/rust-lib/flowy-grid/Cargo.toml

@@ -591,6 +591,7 @@ impl std::convert::From<&FieldTypeRevision> for FieldType {
         FieldType::from(*ty)
     }
 }
+
 impl std::convert::From<FieldTypeRevision> for FieldType {
     fn from(ty: FieldTypeRevision) -> Self {
         match ty {

frontend/rust-lib/flowy-grid/src/entities/field_entities.rs

@@ -1,49 +1,49 @@
 use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 use flowy_error::ErrorCode;
-use grid_rev_model::FilterConfigurationRevision;
+use grid_rev_model::FilterRevision;
 use std::sync::Arc;
 
 #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]
-pub struct CheckboxFilterConfigurationPB {
+pub struct CheckboxFilterPB {
     #[pb(index = 1)]
-    pub condition: CheckboxCondition,
+    pub condition: CheckboxFilterCondition,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
 #[repr(u8)]
-pub enum CheckboxCondition {
+pub enum CheckboxFilterCondition {
     IsChecked = 0,
     IsUnChecked = 1,
 }
 
-impl std::convert::From<CheckboxCondition> for i32 {
-    fn from(value: CheckboxCondition) -> Self {
-        value as i32
+impl std::convert::From<CheckboxFilterCondition> for u32 {
+    fn from(value: CheckboxFilterCondition) -> Self {
+        value as u32
     }
 }
 
-impl std::default::Default for CheckboxCondition {
+impl std::default::Default for CheckboxFilterCondition {
     fn default() -> Self {
-        CheckboxCondition::IsChecked
+        CheckboxFilterCondition::IsChecked
     }
 }
 
-impl std::convert::TryFrom<u8> for CheckboxCondition {
+impl std::convert::TryFrom<u8> for CheckboxFilterCondition {
     type Error = ErrorCode;
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
-            0 => Ok(CheckboxCondition::IsChecked),
-            1 => Ok(CheckboxCondition::IsUnChecked),
+            0 => Ok(CheckboxFilterCondition::IsChecked),
+            1 => Ok(CheckboxFilterCondition::IsUnChecked),
             _ => Err(ErrorCode::InvalidData),
         }
     }
 }
 
-impl std::convert::From<Arc<FilterConfigurationRevision>> for CheckboxFilterConfigurationPB {
-    fn from(rev: Arc<FilterConfigurationRevision>) -> Self {
-        CheckboxFilterConfigurationPB {
-            condition: CheckboxCondition::try_from(rev.condition).unwrap_or(CheckboxCondition::IsChecked),
+impl std::convert::From<Arc<FilterRevision>> for CheckboxFilterPB {
+    fn from(rev: Arc<FilterRevision>) -> Self {
+        CheckboxFilterPB {
+            condition: CheckboxFilterCondition::try_from(rev.condition).unwrap_or(CheckboxFilterCondition::IsChecked),
         }
     }
 }

frontend/rust-lib/flowy-grid/src/entities/filter_entities/checkbox_filter.rs

@@ -2,13 +2,13 @@ use crate::entities::parser::NotEmptyStr;
 use crate::entities::FieldType;
 use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 use flowy_error::ErrorCode;
-use grid_rev_model::FilterConfigurationRevision;
+use grid_rev_model::FilterRevision;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use std::sync::Arc;
 
 #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]
-pub struct DateFilterConfigurationPB {
+pub struct DateFilterPB {
     #[pb(index = 1)]
     pub condition: DateFilterCondition,
 
@@ -98,6 +98,11 @@ pub enum DateFilterCondition {
     DateIsEmpty = 6,
 }
 
+impl std::convert::From<DateFilterCondition> for u32 {
+    fn from(value: DateFilterCondition) -> Self {
+        value as u32
+    }
+}
 impl std::default::Default for DateFilterCondition {
     fn default() -> Self {
         DateFilterCondition::DateIs
@@ -120,19 +125,15 @@ impl std::convert::TryFrom<u8> for DateFilterCondition {
         }
     }
 }
-impl std::convert::From<Arc<FilterConfigurationRevision>> for DateFilterConfigurationPB {
-    fn from(rev: Arc<FilterConfigurationRevision>) -> Self {
+impl std::convert::From<Arc<FilterRevision>> for DateFilterPB {
+    fn from(rev: Arc<FilterRevision>) -> Self {
         let condition = DateFilterCondition::try_from(rev.condition).unwrap_or(DateFilterCondition::DateIs);
-        let mut filter = DateFilterConfigurationPB {
+        let mut filter = DateFilterPB {
             condition,
             ..Default::default()
         };
 
-        if let Some(range) = rev
-            .content
-            .as_ref()
-            .and_then(|content| DateRange::from_str(content).ok())
-        {
+        if let Ok(range) = DateRange::from_str(&rev.content) {
             filter.start = range.start;
             filter.end = range.end;
         };

frontend/rust-lib/flowy-grid/src/entities/filter_entities/date_filter.rs

@@ -1,16 +1,16 @@
 use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 use flowy_error::ErrorCode;
-use grid_rev_model::FilterConfigurationRevision;
+use grid_rev_model::FilterRevision;
 
 use std::sync::Arc;
 
 #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]
-pub struct NumberFilterConfigurationPB {
+pub struct NumberFilterPB {
     #[pb(index = 1)]
     pub condition: NumberFilterCondition,
 
-    #[pb(index = 2, one_of)]
-    pub content: Option<String>,
+    #[pb(index = 2)]
+    pub content: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, ProtoBuf_Enum)]
@@ -32,9 +32,9 @@ impl std::default::Default for NumberFilterCondition {
     }
 }
 
-impl std::convert::From<NumberFilterCondition> for i32 {
+impl std::convert::From<NumberFilterCondition> for u32 {
     fn from(value: NumberFilterCondition) -> Self {
-        value as i32
+        value as u32
     }
 }
 impl std::convert::TryFrom<u8> for NumberFilterCondition {
@@ -55,9 +55,9 @@ impl std::convert::TryFrom<u8> for NumberFilterCondition {
     }
 }
 
-impl std::convert::From<Arc<FilterConfigurationRevision>> for NumberFilterConfigurationPB {
-    fn from(rev: Arc<FilterConfigurationRevision>) -> Self {
-        NumberFilterConfigurationPB {
+impl std::convert::From<Arc<FilterRevision>> for NumberFilterPB {
+    fn from(rev: Arc<FilterRevision>) -> Self {
+        NumberFilterPB {
             condition: NumberFilterCondition::try_from(rev.condition).unwrap_or(NumberFilterCondition::Equal),
             content: rev.content.clone(),
         }

frontend/rust-lib/flowy-grid/src/entities/filter_entities/number_filter.rs

@@ -1,11 +1,11 @@
 use crate::services::field::SelectOptionIds;
 use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 use flowy_error::ErrorCode;
-use grid_rev_model::FilterConfigurationRevision;
+use grid_rev_model::FilterRevision;
 use std::sync::Arc;
 
 #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]
-pub struct SelectOptionFilterConfigurationPB {
+pub struct SelectOptionFilterPB {
     #[pb(index = 1)]
     pub condition: SelectOptionCondition,
 
@@ -21,9 +21,9 @@ pub enum SelectOptionCondition {
     OptionIsNotEmpty = 3,
 }
 
-impl std::convert::From<SelectOptionCondition> for i32 {
+impl std::convert::From<SelectOptionCondition> for u32 {
     fn from(value: SelectOptionCondition) -> Self {
-        value as i32
+        value as u32
     }
 }
 
@@ -47,10 +47,10 @@ impl std::convert::TryFrom<u8> for SelectOptionCondition {
     }
 }
 
-impl std::convert::From<Arc<FilterConfigurationRevision>> for SelectOptionFilterConfigurationPB {
-    fn from(rev: Arc<FilterConfigurationRevision>) -> Self {
+impl std::convert::From<Arc<FilterRevision>> for SelectOptionFilterPB {
+    fn from(rev: Arc<FilterRevision>) -> Self {
         let ids = SelectOptionIds::from(rev.content.clone());
-        SelectOptionFilterConfigurationPB {
+        SelectOptionFilterPB {
             condition: SelectOptionCondition::try_from(rev.condition).unwrap_or(SelectOptionCondition::OptionIs),
             option_ids: ids.into_inner(),
         }