fix: remove unused steps (#1580)

* chore: remove unused code

* chore: update pin-project version to remove rust lint warnings

* chore: fix potential test failed

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

Author: appflowy

.github/workflows/rust_coverage.yml

@@ -1,4 +1,4 @@
-name: Rust coverage tests
+name: Rust code coverage
 
 on:
   push:
@@ -9,65 +9,58 @@ on:
       - "frontend/rust-lib/**"
       - "shared-lib/**"
 
-  pull_request:
-    branches:
-      - "main"
-      - "release/*"
-    paths:
-      - "frontend/rust-lib/**"
-      - "shared-lib/**"
-
 env:
   CARGO_TERM_COLOR: always
 
-
 jobs:
-  test-coverage:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - id: rust_toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: 'stable-2022-04-07'
 
       - name: Cache Cargo
         uses: actions/cache@v2
-        with: 
+        with:
           path: |
             ~/.cargo
           key: ${{ runner.os }}-cargo-${{ steps.rust_toolchain.outputs.rustc_hash }}-${{ hashFiles('./frontend/rust-lib/Cargo.toml') }}
 
       - name: Cache Rust
         uses: actions/cache@v2
-        with: 
+        with:
           path: |
             frontend/rust-lib/target
             shared-lib/target
-          key: ${{ runner.os }}-rust-rust-lib-share-lib-${{ steps.rust_toolchain.outputs.rustc_hash }}-${{ hashFiles('./frontend/rust-lib/Cargo.toml') }}    
+          key: ${{ runner.os }}-rust-rust-lib-share-lib-${{ steps.rust_toolchain.outputs.rustc_hash }}-${{ hashFiles('./frontend/rust-lib/Cargo.toml') }}
 
-      - name: Setup Environment
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub
-            sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list
-            sudo apt-get update
-            sudo apt-get install -y dart curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
-            sudo apt-get install keybinder-3.0
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            echo 'do nothing'
-          fi
-        shell: bash
 
-      - name: Install cargo-make, grcov and llvm-tools-preview
+      - name: Install cargo-make
         working-directory: frontend
         run: |
           cargo install cargo-make
+
+      - name: Setup environment - Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: '3.0.5'
+
+      - name: Install code-coverage tools
+        working-directory: frontend
+        run: |
+          sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub
+          sudo apt-get update
+          sudo apt-get install -y build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
+          sudo apt-get install keybinder-3.0
           cargo install grcov
           rustup component add llvm-tools-preview
 
-      - name: Run Coverage tests and generate LCOV report
+      - name: Run tests
         working-directory: frontend
-        run: cargo make get_ci_test_coverage
+        run: cargo make rust_unit_test_with_coverage

frontend/rust-lib/Cargo.lock

@@ -26,7 +26,7 @@ log = "0.4.14"
 diesel = {version = "1.4.8", features = ["sqlite"]}
 diesel_derives = {version = "1.4.1", features = ["sqlite"]}
 futures = "0.3.15"
-pin-project = "1.0.0"
+pin-project = "1.0"
 strum = "0.21"
 strum_macros = "0.21"
 tokio = { version = "1", features = ["rt"] }

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

@@ -68,14 +68,9 @@ impl FilterController {
     }
 
     #[tracing::instrument(name = "schedule_filter_task", level = "trace", skip(self))]
-    async fn gen_task(&mut self, task_type: FilterEvent) {
+    async fn gen_task(&mut self, task_type: FilterEvent, qos: QualityOfService) {
         let task_id = self.task_scheduler.read().await.next_task_id();
-        let task = Task::new(
-            &self.handler_id,
-            task_id,
-            TaskContent::Text(task_type.to_string()),
-            QualityOfService::UserInteractive,
-        );
+        let task = Task::new(&self.handler_id, task_id, TaskContent::Text(task_type.to_string()), qos);
         self.task_scheduler.write().await.add_task(task);
     }
 
@@ -187,7 +182,11 @@ impl FilterController {
     }
 
     pub async fn did_receive_row_changed(&mut self, row_id: &str) {
-        self.gen_task(FilterEvent::RowDidChanged(row_id.to_string())).await
+        self.gen_task(
+            FilterEvent::RowDidChanged(row_id.to_string()),
+            QualityOfService::UserInteractive,
+        )
+        .await
     }
 
     #[tracing::instrument(level = "trace", skip(self))]
@@ -237,7 +236,9 @@ impl FilterController {
             self.filter_map.remove(filter_type);
         }
 
-        let _ = self.gen_task(FilterEvent::FilterDidChanged).await;
+        let _ = self
+            .gen_task(FilterEvent::FilterDidChanged, QualityOfService::Background)
+            .await;
         tracing::trace!("{:?}", notification);
         notification
     }

frontend/rust-lib/flowy-grid/src/services/filter/controller.rs

@@ -6,6 +6,7 @@
 use std::time::Duration;
 use bytes::Bytes;
 use futures::TryFutureExt;
+use tokio::sync::broadcast::Receiver;
 use flowy_grid::entities::{AlterFilterParams, AlterFilterPayloadPB, DeleteFilterParams, GridLayout, GridSettingChangesetParams, GridSettingPB, RowPB, TextFilterConditionPB, FieldType, NumberFilterConditionPB, CheckboxFilterConditionPB, DateFilterConditionPB, DateFilterContentPB, SelectOptionConditionPB, TextFilterPB, NumberFilterPB, CheckboxFilterPB, DateFilterPB, SelectOptionFilterPB, CellChangesetPB, FilterPB, ChecklistFilterConditionPB, ChecklistFilterPB};
 use flowy_grid::services::field::{SelectOptionCellChangeset, SelectOptionIds};
 use flowy_grid::services::setting::GridSettingChangesetBuilder;
@@ -89,13 +90,15 @@ pub enum FilterScript {
 
 pub struct GridFilterTest {
     inner: GridEditorTest,
+    recv: Option<Receiver<GridViewChanged>>,
 }
 
 impl GridFilterTest {
     pub async fn new() -> Self {
         let editor_test =  GridEditorTest::new_table().await;
         Self {
-            inner: editor_test
+            inner: editor_test,
+            recv: None,
         }
     }
 
@@ -116,17 +119,19 @@ impl GridFilterTest {
     pub async fn run_script(&mut self, script: FilterScript) {
         match script {
             FilterScript::UpdateTextCell { row_index, text} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 self.update_text_cell(row_index, &text).await;
             }
-
             FilterScript::UpdateSingleSelectCell { row_index, option_id} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 self.update_single_select_cell(row_index, &option_id).await;
             }
             FilterScript::InsertFilter { payload } => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateTextFilter { condition, content} => {
-
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::RichText);
                 let text_filter= TextFilterPB {
                     condition,
@@ -139,6 +144,7 @@ impl GridFilterTest {
                 self.insert_filter(payload).await;
             }
             FilterScript::UpdateTextFilter { filter, condition, content} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let params = AlterFilterParams {
                     view_id: self.view_id(),
                     field_id: filter.field_id,
@@ -150,6 +156,7 @@ impl GridFilterTest {
                 self.editor.create_or_update_filter(params).await.unwrap();
             }
             FilterScript::CreateNumberFilter {condition, content} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::Number);
                 let number_filter = NumberFilterPB {
                     condition,
@@ -162,6 +169,7 @@ impl GridFilterTest {
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateCheckboxFilter {condition} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::Checkbox);
                 let checkbox_filter = CheckboxFilterPB {
                     condition
@@ -171,6 +179,7 @@ impl GridFilterTest {
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateDateFilter { condition, start, end, timestamp} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::DateTime);
                 let date_filter = DateFilterPB {
                     condition,
@@ -184,20 +193,23 @@ impl GridFilterTest {
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateMultiSelectFilter { condition, option_ids} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::MultiSelect);
                 let filter = SelectOptionFilterPB { condition, option_ids };
                 let payload =
                     AlterFilterPayloadPB::new( &self.view_id(),field_rev, filter);
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateSingleSelectFilter { condition, option_ids} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::SingleSelect);
                 let filter = SelectOptionFilterPB { condition, option_ids };
                 let payload =
                     AlterFilterPayloadPB::new(& self.view_id(),field_rev, filter);
                 self.insert_filter(payload).await;
             }
             FilterScript::CreateChecklistFilter { condition} => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let field_rev = self.get_first_field_rev(FieldType::Checklist);
                 // let type_option = self.get_checklist_type_option(&field_rev.id);
                 let filter = ChecklistFilterPB { condition };
@@ -216,6 +228,7 @@ impl GridFilterTest {
 
             }
             FilterScript::DeleteFilter {  filter_id, filter_type } => {
+                self.recv = Some(self.editor.subscribe_view_changed(&self.view_id()).await.unwrap());
                 let params = DeleteFilterParams { view_id: self.view_id(),filter_type, filter_id };
                 let _ = self.editor.delete_filter(params).await.unwrap();
             }
@@ -224,24 +237,21 @@ impl GridFilterTest {
                 assert_eq!(expected_setting, setting);
             }
             FilterScript::AssertFilterChanged { visible_row_len, hide_row_len} => {
-                let editor = self.editor.clone();
-                let view_id = self.view_id();
-                let mut receiver =
-                tokio::spawn(async move {
-                     editor.subscribe_view_changed(&view_id).await.unwrap()
-                }).await.unwrap();
-                match tokio::time::timeout(Duration::from_secs(2), receiver.recv()).await {
-                    Ok(changed) =>  {
-                        //
-                        match changed.unwrap() { GridViewChanged::DidReceiveFilterResult(changed) => {
-                            assert_eq!(changed.visible_rows.len(), visible_row_len, "visible rows not match");
-                            assert_eq!(changed.invisible_rows.len(), hide_row_len, "invisible rows not match");
-                        } }
-                    },
-                    Err(e) => {
-                        panic!("Process task timeout: {:?}", e);
+                if let Some(mut receiver) = self.recv.take() {
+                    match tokio::time::timeout(Duration::from_secs(2), receiver.recv()).await {
+                        Ok(changed) =>  {
+                            //
+                            match changed.unwrap() { GridViewChanged::DidReceiveFilterResult(changed) => {
+                                assert_eq!(changed.visible_rows.len(), visible_row_len, "visible rows not match");
+                                assert_eq!(changed.invisible_rows.len(), hide_row_len, "invisible rows not match");
+                            } }
+                        },
+                        Err(e) => {
+                            panic!("Process task timeout: {:?}", e);
+                        }
                     }
                 }
+
             }
             FilterScript::AssertNumberOfVisibleRows { expected } => {
                 let grid = self.editor.get_grid(&self.view_id()).await.unwrap();

frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs

@@ -30,6 +30,7 @@ async fn grid_filter_text_is_not_empty_test() {
             content: "".to_string(),
         },
         AssertFilterCount { count: 1 },
+        // There is only one row in the test data that its text is empty
         AssertFilterChanged {
             visible_row_len: 0,
             hide_row_len: 1,
@@ -44,10 +45,11 @@ async fn grid_filter_text_is_not_empty_test() {
             filter_id: filter.id,
             filter_type: FilterType::from(&field_rev),
         },
-        // AssertFilterChanged {
-        //     visible_row_len: 1,
-        //     hide_row_len: 0,
-        // },
+        AssertFilterCount { count: 0 },
+        AssertFilterChanged {
+            visible_row_len: 1,
+            hide_row_len: 0,
+        },
     ])
     .await;
 }

frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs

@@ -89,6 +89,7 @@ fn crate_log_filter(level: String) -> String {
     filters.push(format!("lib_infra={}", level));
     filters.push(format!("flowy_sync={}", level));
     filters.push(format!("flowy_revision={}", level));
+    filters.push(format!("flowy_task={}", level));
     // filters.push(format!("lib_dispatch={}", level));
 
     filters.push(format!("dart_ffi={}", "info"));

frontend/rust-lib/flowy-sdk/src/lib.rs

@@ -71,12 +71,12 @@ impl TaskDispatcher {
                 Ok(result) => match result {
                     Ok(_) => task.set_state(TaskState::Done),
                     Err(e) => {
-                        tracing::error!("Process task failed: {:?}", e);
+                        tracing::error!("Process {} task failed: {:?}", handler.handler_id(), e);
                         task.set_state(TaskState::Failure);
                     }
                 },
                 Err(e) => {
-                    tracing::error!("Process task timeout: {:?}", e);
+                    tracing::error!("Process {} task timeout: {:?}", handler.handler_id(), e);
                     task.set_state(TaskState::Timeout);
                 }
             }

frontend/rust-lib/flowy-task/src/scheduler.rs

@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-pin-project = "1.0.0"
+pin-project = "1.0"
 futures-core = { version = "0.3", default-features = false }
 paste = "1"
 futures-channel = "0.3.15"