[PR #5248] [MERGED] feat: enable group condition #6727

New issue

Closed

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

mirror commented

2026-03-23 23:16:23 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/5248
Author: @zoli
Created: 5/2/2024
Status: ✅ Merged
Merged: 6/12/2024
Merged by: @Xazin

Base: main ← Head: feat/group-condition-2

📝 Commits (9)

2c9064f feat: enable group condition
87c53a8 style: merge branch 'main' into feat/group-condition-2
e6f5e4e style: added i18n for date field group conditions
f2f87b3 fix: flutter analyze
55f9a57 fix: test use i18n
5db6b9f Merge branch 'main' into feat/group-condition-2
d96bdee fix: more localization
e6ccffc Merge branch 'main' into feat/group-condition-2
eceec77 chore: merge branch 'upstream/main' into HEAD

📊 Changes

16 files changed (+421 additions, -70 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart (+2 -0)
📝 frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart (+10 -0)
📝 frontend/appflowy_flutter/lib/plugins/database/application/setting/group_bloc.dart (+21 -4)
📝 frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart (+58 -25)
📝 frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart (+4 -2)
📝 frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart (+69 -13)
➕ frontend/appflowy_flutter/test/bloc_test/board_test/group_by_date_test.dart (+115 -0)
📝 frontend/resources/translations/en.json (+11 -0)
📝 frontend/rust-lib/event-integration-test/src/database_event.rs (+7 -1)
📝 frontend/rust-lib/event-integration-test/tests/database/local_test/test.rs (+2 -2)
📝 frontend/rust-lib/flowy-database2/src/entities/group_entities/configuration.rs (+75 -5)
📝 frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs (+17 -2)
📝 frontend/rust-lib/flowy-database2/src/event_handler.rs (+1 -1)
📝 frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs (+20 -3)
📝 frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs (+5 -8)
📝 frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs (+4 -4)

📄 Description

As part of #2734 this enables group configuration so grouping by a field can also have more options such as group condition. For example when grouping by a date field type the user can choose to group by day, month, week, etc.
Currently, group condition is available only for date field type.

This is based on what I was trying to do in https://github.com/AppFlowy-IO/AppFlowy/pull/3949.

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/5248 **Author:** [@zoli](https://github.com/zoli) **Created:** 5/2/2024 **Status:** ✅ Merged **Merged:** 6/12/2024 **Merged by:** [@Xazin](https://github.com/Xazin) **Base:** `main` ← **Head:** `feat/group-condition-2` --- ### 📝 Commits (9) - [`2c9064f`](https://github.com/AppFlowy-IO/AppFlowy/commit/2c9064f892d0da5ba44c536d91cb3d9c05b481e0) feat: enable group condition - [`87c53a8`](https://github.com/AppFlowy-IO/AppFlowy/commit/87c53a8a1b9f2a2d4b585318e9ef13d53400da01) style: merge branch 'main' into feat/group-condition-2 - [`e6f5e4e`](https://github.com/AppFlowy-IO/AppFlowy/commit/e6f5e4e2aa2a0df7cbf448736102a216301886aa) style: added i18n for date field group conditions - [`f2f87b3`](https://github.com/AppFlowy-IO/AppFlowy/commit/f2f87b32482769e01efebaaba712913c30979fb8) fix: flutter analyze - [`55f9a57`](https://github.com/AppFlowy-IO/AppFlowy/commit/55f9a575ae3d99151dbeb371d9e4ace9bf10e49f) fix: test use i18n - [`5db6b9f`](https://github.com/AppFlowy-IO/AppFlowy/commit/5db6b9fc06135acb4502c44d68b3c2a2575e6601) Merge branch 'main' into feat/group-condition-2 - [`d96bdee`](https://github.com/AppFlowy-IO/AppFlowy/commit/d96bdee4165efd22b5eef98c103f5e15f7a8d91d) fix: more localization - [`e6ccffc`](https://github.com/AppFlowy-IO/AppFlowy/commit/e6ccffc087b4e27428b29c2d3417ef5ef1dd5ee9) Merge branch 'main' into feat/group-condition-2 - [`eceec77`](https://github.com/AppFlowy-IO/AppFlowy/commit/eceec77baf0a86e267ed8cf0cc0d83a85bece56b) chore: merge branch 'upstream/main' into HEAD ### 📊 Changes **16 files changed** (+421 additions, -70 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart` (+2 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart` (+10 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database/application/setting/group_bloc.dart` (+21 -4) 📝 `frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart` (+58 -25) 📝 `frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart` (+4 -2) 📝 `frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart` (+69 -13) ➕ `frontend/appflowy_flutter/test/bloc_test/board_test/group_by_date_test.dart` (+115 -0) 📝 `frontend/resources/translations/en.json` (+11 -0) 📝 `frontend/rust-lib/event-integration-test/src/database_event.rs` (+7 -1) 📝 `frontend/rust-lib/event-integration-test/tests/database/local_test/test.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-database2/src/entities/group_entities/configuration.rs` (+75 -5) 📝 `frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs` (+17 -2) 📝 `frontend/rust-lib/flowy-database2/src/event_handler.rs` (+1 -1) 📝 `frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs` (+20 -3) 📝 `frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs` (+5 -8) 📝 `frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs` (+4 -4) </details> ### 📄 Description As part of #2734 this enables group configuration so grouping by a field can also have more options such as group condition. For example when grouping by a date field type the user can choose to group by day, month, week, etc. Currently, group condition is available only for date field type. This is based on what I was trying to do in https://github.com/AppFlowy-IO/AppFlowy/pull/3949. #### 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>