Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: calendar filters (#6519)
Richard Shiue9798e39e49a9
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dartindex a9912e3ef3..2af635e478 100644--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart@@ -1,5 +1,5 @@import 'package:appflowy/plugins/database/calendar/presentation/calendar_event_editor.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pbenum.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter_test/flutter_test.dart';@@ -277,5 +277,59 @@ void main() {tester.assertRowDetailPageOpened();});++ testWidgets('filter calendar events', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ // Create the calendar view+ await tester.createNewPageWithNameUnderParent(+ layout: ViewLayoutPB.Calendar,+ );++ // Create a new event on the first of this month+ final today = DateTime.now();+ final firstOfThisMonth = DateTime(today.year, today.month);+ await tester.doubleClickCalendarCell(firstOfThisMonth);+ await tester.dismissEventEditor();++ tester.assertNumberOfEventsInCalendar(1);++ await tester.openCalendarEvent(index: 0, date: firstOfThisMonth);+ await tester.tapButton(finderForFieldType(FieldType.MultiSelect));+ await tester.createOption(name: "asdf");+ await tester.createOption(name: "qwer");+ await tester.dismissCellEditor();++ await tester.tapDatabaseFilterButton();+ await tester.tapCreateFilterByFieldType(FieldType.MultiSelect, "Tags");++ await tester.tapFilterButtonInGrid('Tags');+ await tester.tapOptionFilterWithName('asdf');+ await tester.dismissCellEditor();++ tester.assertNumberOfEventsInCalendar(1);++ final secondOfThisMonth = DateTime(today.year, today.month, 2);+ await tester.doubleClickCalendarCell(secondOfThisMonth);+ await tester.dismissEventEditor();+ tester.assertNumberOfEventsInCalendar(2);++ await tester.openCalendarEvent(index: 0, date: secondOfThisMonth);+ await tester.tapButton(finderForFieldType(FieldType.MultiSelect));+ await tester.selectOption(name: "asdf");+ await tester.dismissCellEditor();++ tester.assertNumberOfEventsInCalendar(1);++ await tester.tapFilterButtonInGrid('Tags');+ await tester.tapSelectFilterCondition(+ SelectOptionFilterConditionPB.OptionIsEmpty,+ );+ await tester.dismissCellEditor();++ tester.assertNumberOfEventsInCalendar(1);+ tester.assertNumberOfEventsOnSpecificDay(1, secondOfThisMonth);+ });});}diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dartindex d4e0f6be5d..b6278018e5 100644--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart@@ -154,11 +154,9 @@ void main() {tester.assertNumberOfRowsInGridPage(0);await tester.tapFilterButtonInGrid('date');- await tester.tapDateFilterButtonInGrid();await tester.tapDateFilterCondition(DateTimeFilterCondition.before);tester.assertNumberOfRowsInGridPage(7);- await tester.tapDateFilterButtonInGrid();await tester.tapDateFilterCondition(DateTimeFilterCondition.isEmpty);tester.assertNumberOfRowsInGridPage(3);@@ -189,7 +187,6 @@ void main() {tester.assertNumberOfRowsInGridPage(3);await tester.tapFilterButtonInGrid('Created at');- await tester.tapDateFilterButtonInGrid();await tester.tapDateFilterCondition(DateTimeFilterCondition.before);tester.assertNumberOfRowsInGridPage(0);diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dartindex 81a2df8ce5..d3c032c399 100644--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart@@ -1,6 +1,7 @@import 'dart:io';import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart';import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';import 'package:flutter/gestures.dart';@@ -411,8 +412,11 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> selectOption({required String name}) async {- final option = find.byWidgetPredicate(- (widget) => widget is SelectOptionTagCell && widget.option.name == name,+ final option = find.descendant(+ of: find.byType(SelectOptionCellEditor),+ matching: find.byWidgetPredicate(+ (widget) => widget is SelectOptionTagCell && widget.option.name == name,+ ),);await tapButton(option);@@ -1157,10 +1161,6 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(find.byType(ChecklistFilterConditionList));}- Future<void> tapDateFilterButtonInGrid() async {- await tapButton(find.byType(DateFilterConditionList));- }-/// The [SelectOptionFilterList] must show up first.Future<void> tapOptionFilterWithName(String name) async {final findCell = find.descendant(@@ -1194,7 +1194,20 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(button);}+ Future<void> tapSelectFilterCondition(+ SelectOptionFilterConditionPB condition,+ ) async {+ await tapButton(find.byType(SelectOptionFilterConditionList));+ final button = find.descendant(+ of: find.byType(HoverButton),+ matching: find.text(condition.i18n),+ );++ await tapButton(button);+ }+Future<void> tapDateFilterCondition(DateTimeFilterCondition condition) async {+ await tapButton(find.byType(DateFilterConditionList));final button = find.descendant(of: find.byType(HoverButton),matching: find.text(condition.filterName),diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dartindex 0aa67b9775..96725ca80f 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart@@ -29,6 +29,9 @@ typedef OnNumOfRowsChanged = void Function(UnmodifiableMapView<RowId, RowInfo> rowById,ChangedReason reason,);+typedef OnRowsVisibilityChanged = void Function(+ List<(RowId, bool)> rowVisibilityChanges,+);@freezedclass LoadingState with _$LoadingState {diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dartindex 75c9d336ca..d7a4e4ebdb 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart@@ -122,6 +122,9 @@ class RowCache {if (_isInitialRows) {_hideRows(changeset.invisibleRows);_showRows(changeset.visibleRows);+ _changedNotifier?.receive(+ ChangedReason.updateRowsVisibility(changeset),+ );} else {_pendingVisibilityChanges.add(changeset);}@@ -310,6 +313,7 @@ class RowChangesetNotifier extends ChangeNotifier {initial: (_) {},reorderRows: (_) => notifyListeners(),reorderSingleRow: (_) => notifyListeners(),+ updateRowsVisibility: (_) => notifyListeners(),setInitialRows: (_) => notifyListeners(),didFetchRow: (_) => notifyListeners(),);@@ -372,6 +376,9 @@ class ChangedReason with _$ChangedReason {ReorderSingleRowPB reorderRow,RowInfo rowInfo,) = _ReorderSingleRow;+ const factory ChangedReason.updateRowsVisibility(+ RowsVisibilityChangePB changeset,+ ) = _UpdateRowsVisibility;const factory ChangedReason.setInitialRows() = _SetInitialRows;}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dartindex b2fd09ce85..f16a11cbe7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart@@ -231,15 +231,13 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {Future<CalendarEventData<CalendarDayEvent>?> _loadEvent(RowId rowId) async {final payload = DatabaseViewRowIdPB(viewId: viewId, rowId: rowId);- return DatabaseEventGetCalendarEvent(payload).send().then((result) {- return result.fold(- (eventPB) => _calendarEventDataFromEventPB(eventPB),- (r) {- Log.error(r);- return null;- },- );- });+ return DatabaseEventGetCalendarEvent(payload).send().fold(+ (eventPB) => _calendarEventDataFromEventPB(eventPB),+ (r) {+ Log.error(r);+ return null;+ },+ );}void _loadAllEvents() async {@@ -341,6 +339,30 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {}}},+ onNumOfRowsChanged: (rows, rowById, reason) {+ reason.maybeWhen(+ updateRowsVisibility: (changeset) async {+ if (isClosed) {+ return;+ }+ for (final id in changeset.invisibleRows) {+ if (_containsEvent(id)) {+ add(CalendarEvent.didDeleteEvents([id]));+ }+ }+ for (final row in changeset.visibleRows) {+ final id = row.rowMeta.id;+ if (!_containsEvent(id)) {+ final event = await _loadEvent(id);+ if (event != null) {+ add(CalendarEvent.didReceiveEvent(event));+ }+ }+ }+ },+ orElse: () {},+ );+ },);final onLayoutSettingsChanged = DatabaseLayoutSettingCallbacks(@@ -372,6 +394,10 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {return state.allEvents[index].date.day != event.date.day;}+ bool _containsEvent(String rowId) {+ return state.allEvents.any((element) => element.event!.eventId == rowId);+ }+Int64 _eventTimestamp(CalendarDayEvent event, DateTime date) {final time =event.date.hour * 3600 + event.date.minute * 60 + event.date.second;diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dartindex 41d9535946..40ea55ddf7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart@@ -1,3 +1,5 @@+import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';+import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart';import 'package:flutter/material.dart';import 'package:appflowy/generated/flowy_svgs.g.dart';@@ -31,6 +33,8 @@ import 'layout/sizes.dart';import 'toolbar/calendar_setting_bar.dart';class CalendarPageTabBarBuilderImpl extends DatabaseTabBarItemBuilder {+ final _toggleExtension = ToggleExtensionNotifier();+@overrideWidget content(BuildContext context,@@ -52,6 +56,7 @@ class CalendarPageTabBarBuilderImpl extends DatabaseTabBarItemBuilder {return CalendarSettingBar(key: _makeValueKey(controller),databaseController: controller,+ toggleExtension: _toggleExtension,);}@@ -60,7 +65,18 @@ class CalendarPageTabBarBuilderImpl extends DatabaseTabBarItemBuilder {BuildContext context,DatabaseController controller,) {- return SizedBox.fromSize();+ return DatabaseViewSettingExtension(+ key: _makeValueKey(controller),+ viewId: controller.viewId,+ databaseController: controller,+ toggleExtension: _toggleExtension,+ );+ }++ @override+ void dispose() {+ _toggleExtension.dispose();+ super.dispose();}ValueKey _makeValueKey(DatabaseController controller) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_setting_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_setting_bar.dartindex cc496873ef..c2307c63a5 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_setting_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_setting_bar.dart@@ -1,26 +1,51 @@import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart';import 'package:appflowy/plugins/database/widgets/setting/setting_button.dart';+import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';class CalendarSettingBar extends StatelessWidget {const CalendarSettingBar({super.key,required this.databaseController,+ required this.toggleExtension,});final DatabaseController databaseController;+ final ToggleExtensionNotifier toggleExtension;@overrideWidget build(BuildContext context) {- return SizedBox(- height: 20,- child: Row(- mainAxisAlignment: MainAxisAlignment.end,- children: [- SettingButton(- databaseController: databaseController,- ),- ],+ return BlocProvider(+ create: (context) => FilterEditorBloc(+ viewId: databaseController.viewId,+ fieldController: databaseController.fieldController,+ ),+ child: ValueListenableBuilder<bool>(+ valueListenable: databaseController.isLoading,+ builder: (context, value, child) {+ if (value) {+ return const SizedBox.shrink();+ }+ return SizedBox(+ height: 20,+ child: Row(+ mainAxisAlignment: MainAxisAlignment.end,+ children: [+ FilterButton(+ toggleExtension: toggleExtension,+ ),+ const HSpace(2),+ SettingButton(+ databaseController: databaseController,+ ),+ ],+ ),+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dartindex e487d5c2c3..954277a49f 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart@@ -462,7 +462,7 @@ class _GridRowsState extends State<_GridRows> {}final child = GridRow(- key: ValueKey(rowId),+ key: ValueKey("grid_row_$rowId"),fieldController: databaseController.fieldController,rowId: rowId,viewId: viewId,diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dartindex 4d1d386477..ce0dcc8d7b 100644--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart@@ -44,7 +44,9 @@ class MobileTabBarHeader extends StatelessWidget {controller: state.tabBarControllerByViewId[currentView.viewId]!.controller,features: switch (currentView.layout) {- ViewLayoutPB.Board => [MobileDatabaseControlFeatures.filter],+ ViewLayoutPB.Board || ViewLayoutPB.Calendar => [+ MobileDatabaseControlFeatures.filter,+ ],ViewLayoutPB.Grid => [MobileDatabaseControlFeatures.sort,MobileDatabaseControlFeatures.filter,