[PR #3949] [CLOSED] feat: enable group condition #5966

New issue

Closed

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

mirror commented

2026-03-23 22:21:07 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/3949
Author: @zoli
Created: 11/16/2023
Status: ❌ Closed

Base: main ← Head: feat/group-condition

📝 Commits (5)

9cb1c2a feat: enable group condition
6854a9a refactor: change some namings
6589ce1 style: fix flutter analyze
eca0059 style(merge): merge main and resolve conflicts
0609c64 style: use none named optional positional parameter

📊 Changes

18 files changed (+305 additions, -136 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dart (+2 -0)
📝 frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_info.dart (+11 -0)
📝 frontend/appflowy_flutter/lib/plugins/database_view/application/group/group_service.dart (+5 -1)
📝 frontend/appflowy_flutter/lib/plugins/database_view/application/setting/group_bloc.dart (+23 -4)
📝 frontend/appflowy_flutter/lib/plugins/database_view/widgets/group/database_group.dart (+53 -11)
📝 frontend/resources/translations/en.json (+1 -0)
📝 frontend/rust-lib/event-integration/src/database_event.rs (+9 -1)
📝 frontend/rust-lib/event-integration/tests/database/local_test/test.rs (+2 -2)
📝 frontend/rust-lib/flowy-database2/src/entities/group_entities/configuration.rs (+35 -3)
📝 frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs (+22 -1)
📝 frontend/rust-lib/flowy-database2/src/event_handler.rs (+6 -1)
📝 frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs (+21 -3)
📝 frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs (+4 -7)
📝 frontend/rust-lib/flowy-database2/src/services/group/configuration.rs (+3 -3)
📝 frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs (+91 -94)
📝 frontend/rust-lib/flowy-database2/src/services/group/entities.rs (+14 -2)
📝 frontend/rust-lib/flowy-database2/src/services/group/group_builder.rs (+2 -2)
📝 frontend/scripts/makefile/flutter.toml (+1 -1)

📄 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.

Feature Preview

https://github.com/AppFlowy-IO/AppFlowy/assets/3286303/32e75359-6b47-4c28-888c-265894d27935

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/3949 **Author:** [@zoli](https://github.com/zoli) **Created:** 11/16/2023 **Status:** ❌ Closed **Base:** `main` ← **Head:** `feat/group-condition` --- ### 📝 Commits (5) - [`9cb1c2a`](https://github.com/AppFlowy-IO/AppFlowy/commit/9cb1c2a016adecb7b6c6cba97e23a6c4f9dde244) feat: enable group condition - [`6854a9a`](https://github.com/AppFlowy-IO/AppFlowy/commit/6854a9a2347b32d73bb7ccedf1cbacf50369fa85) refactor: change some namings - [`6589ce1`](https://github.com/AppFlowy-IO/AppFlowy/commit/6589ce10b45cfbf384bd2ba65ccfe5ebb25baca6) style: fix flutter analyze - [`eca0059`](https://github.com/AppFlowy-IO/AppFlowy/commit/eca0059d279e698910c827b09ae9f3ba6778c16f) style(merge): merge main and resolve conflicts - [`0609c64`](https://github.com/AppFlowy-IO/AppFlowy/commit/0609c640a385c4a1339cc5a88031d8ba03327c48) style: use none named optional positional parameter ### 📊 Changes **18 files changed** (+305 additions, -136 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dart` (+2 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_info.dart` (+11 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/application/group/group_service.dart` (+5 -1) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/application/setting/group_bloc.dart` (+23 -4) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/widgets/group/database_group.dart` (+53 -11) 📝 `frontend/resources/translations/en.json` (+1 -0) 📝 `frontend/rust-lib/event-integration/src/database_event.rs` (+9 -1) 📝 `frontend/rust-lib/event-integration/tests/database/local_test/test.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-database2/src/entities/group_entities/configuration.rs` (+35 -3) 📝 `frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs` (+22 -1) 📝 `frontend/rust-lib/flowy-database2/src/event_handler.rs` (+6 -1) 📝 `frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs` (+21 -3) 📝 `frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs` (+4 -7) 📝 `frontend/rust-lib/flowy-database2/src/services/group/configuration.rs` (+3 -3) 📝 `frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs` (+91 -94) 📝 `frontend/rust-lib/flowy-database2/src/services/group/entities.rs` (+14 -2) 📝 `frontend/rust-lib/flowy-database2/src/services/group/group_builder.rs` (+2 -2) 📝 `frontend/scripts/makefile/flutter.toml` (+1 -1) </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. ### Feature Preview https://github.com/AppFlowy-IO/AppFlowy/assets/3286303/32e75359-6b47-4c28-888c-265894d27935 #### 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. - [ ] 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>