[PR #4585] [MERGED] chore: clean up sort and filter code #6333

New issue

Closed

opened 2026-03-23 22:22:45 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:22:45 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/4585
Author: @richardshiue
Created: 2/2/2024
Status: ✅ Merged
Merged: 2/3/2024
Merged by: @appflowy

Base: main ← Head: feat/sort-switcheroo

📝 Commits (7)

859f69d refactor: port away from extra SortType struct
a43bb6d refactor: add validator to flowy_database and clean up unused structs
680d9d7 refactor: port away from extra FilterType struct
72fe27d chore: analysis options
86b9736 fix: clippy and dart/ts compile
1b6ecbe fix: tauri build
4e0a3d6 Merge branch 'main' into feat/sort-switcheroo

📊 Changes

18 files changed (+537 additions, -663 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/plugins/database/application/sort/sort_service.dart (+1 -3)
📝 frontend/appflowy_tauri/src/appflowy_app/application/database/sort/sort_service.ts (+0 -2)
📝 frontend/rust-lib/Cargo.lock (+2 -16)
📝 frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs (+10 -39)
📝 frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs (+5 -1)
📝 frontend/rust-lib/flowy-database2/src/entities/setting_entities.rs (+10 -58)
📝 frontend/rust-lib/flowy-database2/src/entities/sort_entities.rs (+8 -88)
📝 frontend/rust-lib/flowy-database2/src/event_handler.rs (+8 -5)
📝 frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs (+4 -4)
📝 frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs (+33 -34)
📝 frontend/rust-lib/flowy-database2/src/services/filter/controller.rs (+10 -7)
📝 frontend/rust-lib/flowy-database2/src/services/filter/entities.rs (+18 -51)
📝 frontend/rust-lib/flowy-database2/src/services/sort/controller.rs (+6 -20)
📝 frontend/rust-lib/flowy-database2/src/services/sort/entities.rs (+8 -40)
📝 frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs (+405 -281)
📝 frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rs (+3 -5)
📝 frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rs (+6 -8)
📝 frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs (+0 -1)

📄 Description

Title says all.

Feature Preview

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/4585 **Author:** [@richardshiue](https://github.com/richardshiue) **Created:** 2/2/2024 **Status:** ✅ Merged **Merged:** 2/3/2024 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `feat/sort-switcheroo` --- ### 📝 Commits (7) - [`859f69d`](https://github.com/AppFlowy-IO/AppFlowy/commit/859f69d7b3efbfb3216f9851c66a5c4468ec8adc) refactor: port away from extra SortType struct - [`a43bb6d`](https://github.com/AppFlowy-IO/AppFlowy/commit/a43bb6d2918627f06b7b7edca9998c9a81a9255a) refactor: add validator to flowy_database and clean up unused structs - [`680d9d7`](https://github.com/AppFlowy-IO/AppFlowy/commit/680d9d7627ab37727dd33d5b1ae58207d9201fcb) refactor: port away from extra FilterType struct - [`72fe27d`](https://github.com/AppFlowy-IO/AppFlowy/commit/72fe27d09b5ae4492c4d8e5a073110c921754e5a) chore: analysis options - [`86b9736`](https://github.com/AppFlowy-IO/AppFlowy/commit/86b97368a6d25ec3bcbe43fc8618212e64a02967) fix: clippy and dart/ts compile - [`1b6ecbe`](https://github.com/AppFlowy-IO/AppFlowy/commit/1b6ecbe9e45d66006a214efc0ffd122478db0596) fix: tauri build - [`4e0a3d6`](https://github.com/AppFlowy-IO/AppFlowy/commit/4e0a3d63c5d814f3f467fa5484bd20fd8db20d87) Merge branch 'main' into feat/sort-switcheroo ### 📊 Changes **18 files changed** (+537 additions, -663 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/plugins/database/application/sort/sort_service.dart` (+1 -3) 📝 `frontend/appflowy_tauri/src/appflowy_app/application/database/sort/sort_service.ts` (+0 -2) 📝 `frontend/rust-lib/Cargo.lock` (+2 -16) 📝 `frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs` (+10 -39) 📝 `frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs` (+5 -1) 📝 `frontend/rust-lib/flowy-database2/src/entities/setting_entities.rs` (+10 -58) 📝 `frontend/rust-lib/flowy-database2/src/entities/sort_entities.rs` (+8 -88) 📝 `frontend/rust-lib/flowy-database2/src/event_handler.rs` (+8 -5) 📝 `frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs` (+4 -4) 📝 `frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs` (+33 -34) 📝 `frontend/rust-lib/flowy-database2/src/services/filter/controller.rs` (+10 -7) 📝 `frontend/rust-lib/flowy-database2/src/services/filter/entities.rs` (+18 -51) 📝 `frontend/rust-lib/flowy-database2/src/services/sort/controller.rs` (+6 -20) 📝 `frontend/rust-lib/flowy-database2/src/services/sort/entities.rs` (+8 -40) 📝 `frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs` (+405 -281) 📝 `frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rs` (+3 -5) 📝 `frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rs` (+6 -8) 📝 `frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs` (+0 -1) </details> ### 📄 Description Title says all. ### Feature Preview  ---  #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [x] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [x] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>