[PR #4592] [MERGED] feat: reorder sort precedence #6335

New issue

Closed

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

mirror commented

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

Owner

📋 Pull Request Information

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

Base: main ← Head: feat/sort-reorder

📝 Commits (3)

e3cd018 feat: reorder sorts
c6e2036 chore: add tests, fix tests, fix tauri build and fix clippy
1cde123 fix: add missing import

📊 Changes

28 files changed (+589 additions, -134 deletions)

View changed files

📝 frontend/appflowy_flutter/integration_test/database/database_sort_test.dart (+109 -3)
📝 frontend/appflowy_flutter/integration_test/util/database_test_op.dart (+28 -0)
📝 frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart (+7 -4)
📝 frontend/appflowy_flutter/lib/plugins/database/application/sort/sort_service.dart (+14 -0)
📝 frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dart (+19 -0)
📝 frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart (+68 -22)
📝 frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart (+17 -19)
📝 frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart (+1 -0)
📝 frontend/appflowy_tauri/src-tauri/Cargo.lock (+7 -7)
📝 frontend/appflowy_tauri/src-tauri/Cargo.toml (+33 -13)
📝 frontend/appflowy_tauri/src/appflowy_app/application/database/sort/sort_listeners.ts (+1 -1)
📝 frontend/appflowy_web/wasm-libs/Cargo.toml (+9 -14)
📝 frontend/rust-lib/Cargo.lock (+7 -7)
📝 frontend/rust-lib/Cargo.toml (+7 -7)
📝 frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs (+2 -2)
📝 frontend/rust-lib/flowy-database2/src/entities/mod.rs (+22 -0)
📝 frontend/rust-lib/flowy-database2/src/entities/setting_entities.rs (+6 -3)
📝 frontend/rust-lib/flowy-database2/src/entities/sort_entities.rs (+27 -2)
📝 frontend/rust-lib/flowy-database2/src/event_handler.rs (+10 -6)
📝 frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs (+14 -1)

...and 8 more files

📄 Description

requires https://github.com/AppFlowy-IO/AppFlowy-Collab/pull/156

resolves https://github.com/AppFlowy-IO/AppFlowy/issues/3442

https://github.com/AppFlowy-IO/AppFlowy/assets/71320345/5b7005b6-9e86-40bd-b822-d9f2bda3f2ff

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/4592 **Author:** [@richardshiue](https://github.com/richardshiue) **Created:** 2/2/2024 **Status:** ✅ Merged **Merged:** 2/5/2024 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `feat/sort-reorder` --- ### 📝 Commits (3) - [`e3cd018`](https://github.com/AppFlowy-IO/AppFlowy/commit/e3cd018f16f498ab882088a1d08abba91656cea5) feat: reorder sorts - [`c6e2036`](https://github.com/AppFlowy-IO/AppFlowy/commit/c6e2036016e141ee82915ecf137137760f4cb185) chore: add tests, fix tests, fix tauri build and fix clippy - [`1cde123`](https://github.com/AppFlowy-IO/AppFlowy/commit/1cde123bb9cef1615cd243e0ccd991a63463e396) fix: add missing import ### 📊 Changes **28 files changed** (+589 additions, -134 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/integration_test/database/database_sort_test.dart` (+109 -3) 📝 `frontend/appflowy_flutter/integration_test/util/database_test_op.dart` (+28 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart` (+7 -4) 📝 `frontend/appflowy_flutter/lib/plugins/database/application/sort/sort_service.dart` (+14 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dart` (+19 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart` (+68 -22) 📝 `frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart` (+17 -19) 📝 `frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart` (+1 -0) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.lock` (+7 -7) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.toml` (+33 -13) 📝 `frontend/appflowy_tauri/src/appflowy_app/application/database/sort/sort_listeners.ts` (+1 -1) 📝 `frontend/appflowy_web/wasm-libs/Cargo.toml` (+9 -14) 📝 `frontend/rust-lib/Cargo.lock` (+7 -7) 📝 `frontend/rust-lib/Cargo.toml` (+7 -7) 📝 `frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-database2/src/entities/mod.rs` (+22 -0) 📝 `frontend/rust-lib/flowy-database2/src/entities/setting_entities.rs` (+6 -3) 📝 `frontend/rust-lib/flowy-database2/src/entities/sort_entities.rs` (+27 -2) 📝 `frontend/rust-lib/flowy-database2/src/event_handler.rs` (+10 -6) 📝 `frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs` (+14 -1) _...and 8 more files_ </details> ### 📄 Description requires https://github.com/AppFlowy-IO/AppFlowy-Collab/pull/156 resolves https://github.com/AppFlowy-IO/AppFlowy/issues/3442 https://github.com/AppFlowy-IO/AppFlowy/assets/71320345/5b7005b6-9e86-40bd-b822-d9f2bda3f2ff ### Feature Preview #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [x] 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>