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
refactor(flutter_desktop): filter blocs (#6356)
Richard Shiue9b811f0166be
diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dartindex 6e2c95db71..8c7b155c1d 100644--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart@@ -20,14 +20,14 @@ import 'package:appflowy/plugins/database/grid/presentation/widgets/calculationsimport 'package:appflowy/plugins/database/grid/presentation/widgets/calculations/calculation_type_item.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/common/type_option_separator.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/choicechip.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/create_filter_list.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/disclosure_button.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/footer/grid_footer.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/row/row.dart';@@ -958,7 +958,7 @@ extension AppFlowyDatabaseTest on WidgetTester {Future<void> tapCreateFilterByFieldType(FieldType type, String title) async {final findFilter = find.byWidgetPredicate((widget) =>- widget is GridFilterPropertyCell &&+ widget is FilterableFieldButton &&widget.fieldInfo.fieldType == type &&widget.fieldInfo.name == title,);@@ -966,8 +966,9 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> tapFilterButtonInGrid(String name) async {- final findFilter = find.byType(FilterMenuItem);- final button = find.descendant(of: findFilter, matching: find.text(name));+ final button = find.byWidgetPredicate(+ (widget) => widget is ChoiceChipButton && widget.fieldInfo.name == name,+ );await tapButton(button);}@@ -1098,7 +1099,7 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> tapDateFilterButtonInGrid() async {- await tapButton(find.byType(DateFilterConditionPBList));+ await tapButton(find.byType(DateFilterConditionList));}/// The [SelectOptionFilterList] must show up first.diff --git a/frontend/appflowy_flutter/ios/Podfile.lock b/frontend/appflowy_flutter/ios/Podfile.lockindex d9c5905736..3089e3f56e 100644--- a/frontend/appflowy_flutter/ios/Podfile.lock+++ b/frontend/appflowy_flutter/ios/Podfile.lock@@ -56,8 +56,6 @@ PODS:- Flutter- keyboard_height_plugin (0.0.1):- Flutter- - open_file_ios (0.0.1):- - Flutter- open_filex (0.0.2):- Flutter- package_info_plus (0.4.5):@@ -104,7 +102,6 @@ DEPENDENCIES:- integration_test (from `.symlinks/plugins/integration_test/ios`)- irondash_engine_context (from `.symlinks/plugins/irondash_engine_context/ios`)- keyboard_height_plugin (from `.symlinks/plugins/keyboard_height_plugin/ios`)- - open_file_ios (from `.symlinks/plugins/open_file_ios/ios`)- open_filex (from `.symlinks/plugins/open_filex/ios`)- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)@@ -151,8 +148,6 @@ EXTERNAL SOURCES::path: ".symlinks/plugins/irondash_engine_context/ios"keyboard_height_plugin::path: ".symlinks/plugins/keyboard_height_plugin/ios"- open_file_ios:- :path: ".symlinks/plugins/open_file_ios/ios"open_filex::path: ".symlinks/plugins/open_filex/ios"package_info_plus:@@ -189,7 +184,6 @@ SPEC CHECKSUMS:integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4irondash_engine_context: 3458bf979b90d616ffb8ae03a150bafe2e860cc9keyboard_height_plugin: 43fa8bba20fd5c4fdeed5076466b8b9d43cc6b86- open_file_ios: 461db5853723763573e140de3193656f91990d9eopen_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1cpath_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dartindex 8dd224390c..5ee05475a6 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart@@ -4,6 +4,7 @@ import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';import 'package:appflowy/mobile/presentation/widgets/widgets.dart';import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';+import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';@@ -139,7 +140,7 @@ class _Overview extends StatelessWidget {return Column(children: [Expanded(- child: state.sortInfos.isEmpty+ child: state.sorts.isEmpty? Center(child: Column(mainAxisSize: MainAxisSize.min,@@ -167,10 +168,10 @@ class _Overview extends StatelessWidget {onReorder: (oldIndex, newIndex) => context.read<SortEditorBloc>().add(SortEditorEvent.reorderSort(oldIndex, newIndex)),- itemCount: state.sortInfos.length,+ itemCount: state.sorts.length,itemBuilder: (context, index) => _SortItem(key: ValueKey("sort_item_$index"),- sort: state.sortInfos[index],+ sort: state.sorts[index],),),),@@ -386,7 +387,7 @@ class _SortDetail extends StatelessWidget {return isCreatingNewSort? const _SortDetailContent(): BlocSelector<SortEditorBloc, SortEditorState, SortInfo>(- selector: (state) => state.sortInfos.firstWhere(+ selector: (state) => state.sorts.firstWhere((sortInfo) =>sortInfo.sortId ==context.read<MobileSortEditorCubit>().state.editingSortId,@@ -489,7 +490,7 @@ class _SortDetailContent extends StatelessWidget {child: BlocBuilder<SortEditorBloc, SortEditorState>(builder: (context, state) {final fields = state.allFields- .where((field) => field.canCreateSort || field.hasSort)+ .where((field) => field.fieldType.canCreateSort).toList();return ListView.builder(itemCount: fields.length,@@ -503,9 +504,11 @@ class _SortDetailContent extends StatelessWidget {fieldInfo.id: sortInfo!.fieldId == fieldInfo.id;- final enabled = fieldInfo.canCreateSort ||- isCreatingNewSort && !fieldInfo.hasSort ||+ final canSort =+ fieldInfo.fieldType.canCreateSort && !fieldInfo.hasSort;+ final beingEdited =!isCreatingNewSort && sortInfo!.fieldId == fieldInfo.id;+ final enabled = canSort || beingEdited;return FlowyOptionTile.checkbox(text: fieldInfo.field.name,diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dartindex 48785fc87f..d700d3b7ba 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart@@ -1,7 +1,7 @@import 'dart:collection';// TODO(RS): remove dependency on presentation code-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/protobuf/flowy-database2/database_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';@@ -15,7 +15,7 @@ import 'row/row_service.dart';part 'defines.freezed.dart';typedef OnFieldsChanged = void Function(UnmodifiableListView<FieldInfo>);-typedef OnFiltersChanged = void Function(List<FilterInfo>);+typedef OnFiltersChanged = void Function(List<DatabaseFilter>);typedef OnSortsChanged = void Function(List<SortInfo>);typedef OnDatabaseChanged = void Function(DatabasePB);diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dartindex 3b9ff53853..f1b027df48 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart@@ -1,5 +1,6 @@import 'dart:collection';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/setting/setting_listener.dart';import 'package:appflowy/plugins/database/domain/database_view_service.dart';@@ -10,7 +11,6 @@ import 'package:appflowy/plugins/database/domain/filter_listener.dart';import 'package:appflowy/plugins/database/domain/filter_service.dart';import 'package:appflowy/plugins/database/domain/sort_listener.dart';import 'package:appflowy/plugins/database/domain/sort_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';@@ -39,9 +39,9 @@ class _GridFieldNotifier extends ChangeNotifier {}class _GridFilterNotifier extends ChangeNotifier {- List<FilterInfo> _filters = [];+ List<DatabaseFilter> _filters = [];- set filters(List<FilterInfo> filters) {+ set filters(List<DatabaseFilter> filters) {_filters = filters;notifyListeners();}@@ -50,7 +50,7 @@ class _GridFilterNotifier extends ChangeNotifier {notifyListeners();}- List<FilterInfo> get filters => _filters;+ List<DatabaseFilter> get filters => _filters;}class _GridSortNotifier extends ChangeNotifier {@@ -71,7 +71,7 @@ class _GridSortNotifier extends ChangeNotifier {typedef OnReceiveUpdateFields = void Function(List<FieldInfo>);typedef OnReceiveField = void Function(FieldInfo);typedef OnReceiveFields = void Function(List<FieldInfo>);-typedef OnReceiveFilters = void Function(List<FilterInfo>);+typedef OnReceiveFilters = void Function(List<DatabaseFilter>);typedef OnReceiveSorts = void Function(List<SortInfo>);class FieldController {@@ -132,7 +132,7 @@ class FieldController {// GettersList<FieldInfo> get fieldInfos => [..._fieldNotifier.fieldInfos];- List<FilterInfo> get filterInfos => [..._filterNotifier?.filters ?? []];+ List<DatabaseFilter> get filters => [..._filterNotifier?.filters ?? []];List<SortInfo> get sortInfos => [..._sortNotifier?.sorts ?? []];List<GroupSettingPB> get groupSettings =>_groupConfigurationByFieldId.entries.map((e) => e.value).toList();@@ -142,12 +142,12 @@ class FieldController {.firstWhereOrNull((element) => element.id == fieldId);}- FilterInfo? getFilterByFilterId(String filterId) {+ DatabaseFilter? getFilterByFilterId(String filterId) {return _filterNotifier?.filters.firstWhereOrNull((element) => element.filterId == filterId);}- FilterInfo? getFilterByFieldId(String fieldId) {+ DatabaseFilter? getFilterByFieldId(String fieldId) {return _filterNotifier?.filters.firstWhereOrNull((element) => element.fieldId == fieldId);}@@ -172,21 +172,8 @@ class FieldController {result.fold((FilterChangesetNotificationPB changeset) {- final List<FilterInfo> filters = [];- for (final filter in changeset.filters.items) {- final fieldInfo = _findFieldInfo(- fieldInfos: fieldInfos,- fieldId: filter.data.fieldId,- fieldType: filter.data.fieldType,- );-- if (fieldInfo != null) {- final filterInfo = FilterInfo(viewId, filter, fieldInfo);- filters.add(filterInfo);- }- }-- _filterNotifier?.filters = filters;+ _filterNotifier?.filters =+ _filterInfoListFromPBs(changeset.filters.items);_updateFieldInfos();},(err) => Log.error(err),@@ -606,20 +593,8 @@ class FieldController {}/// Attach corresponding `FieldInfo`s to the `FilterPB`s- List<FilterInfo> _filterInfoListFromPBs(List<FilterPB> filterPBs) {- FilterInfo? getFilterInfo(FilterPB filterPB) {- final fieldInfo = _findFieldInfo(- fieldInfos: fieldInfos,- fieldId: filterPB.data.fieldId,- fieldType: filterPB.data.fieldType,- );- return fieldInfo != null ? FilterInfo(viewId, filterPB, fieldInfo) : null;- }-- return filterPBs- .map((filterPB) => getFilterInfo(filterPB))- .whereType<FilterInfo>()- .toList();+ List<DatabaseFilter> _filterInfoListFromPBs(List<FilterPB> filterPBs) {+ return filterPBs.map(DatabaseFilter.fromPB).toList();}/// Attach corresponding `FieldInfo`s to the `SortPB`s@@ -676,7 +651,7 @@ class FieldController {if (listenWhen != null && listenWhen() == false) {return;}- onFilters(filterInfos);+ onFilters(filters);}_filterCallbacks[onFilters] = callback;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dartindex 01930dc31b..10e6c87c50 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart@@ -1,6 +1,5 @@import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:protobuf/protobuf.dart';part 'field_info.freezed.dart';@@ -37,70 +36,4 @@ class FieldInfo with _$FieldInfo {FieldVisibility? get visibility => fieldSettings?.visibility;bool? get wrapCellContent => fieldSettings?.wrapCellContent;-- bool get canBeGroup {- switch (field.fieldType) {- case FieldType.URL:- case FieldType.Checkbox:- case FieldType.MultiSelect:- case FieldType.SingleSelect:- case FieldType.DateTime:- return true;- default:- return false;- }- }-- bool get canCreateFilter {- if (isGroupField) {- return false;- }-- switch (field.fieldType) {- case FieldType.Number:- case FieldType.Checkbox:- case FieldType.MultiSelect:- case FieldType.RichText:- case FieldType.SingleSelect:- case FieldType.Checklist:- case FieldType.URL:- case FieldType.Time:- case FieldType.DateTime:- return true;- default:- return false;- }- }-- bool get canCreateSort {- if (hasSort) {- return false;- }-- switch (field.fieldType) {- case FieldType.RichText:- case FieldType.Checkbox:- case FieldType.Number:- case FieldType.DateTime:- case FieldType.SingleSelect:- case FieldType.MultiSelect:- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- case FieldType.Checklist:- case FieldType.URL:- case FieldType.Time:- return true;- default:- return false;- }- }-- List<ProtobufEnum> get groupConditions {- switch (field.fieldType) {- case FieldType.DateTime:- return DateConditionPB.values;- default:- return [];- }- }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dartnew file mode 100644index 0000000000..c2b47d7413--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart@@ -0,0 +1,458 @@+import 'dart:typed_data';++import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';+import 'package:appflowy/util/int64_extension.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:fixnum/fixnum.dart';++abstract class DatabaseFilter {+ const DatabaseFilter({+ required this.filterId,+ required this.fieldId,+ required this.fieldType,+ });++ factory DatabaseFilter.fromPB(FilterPB filterPB) {+ final FilterDataPB(:fieldId, :fieldType) = filterPB.data;+ switch (fieldType) {+ case FieldType.RichText:+ case FieldType.URL:+ final data = TextFilterPB.fromBuffer(filterPB.data.data);+ return TextFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ content: data.content,+ );+ case FieldType.Number:+ final data = NumberFilterPB.fromBuffer(filterPB.data.data);+ return NumberFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ content: data.content,+ );+ case FieldType.Checkbox:+ final data = CheckboxFilterPB.fromBuffer(filterPB.data.data);+ return CheckboxFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ );+ case FieldType.Checklist:+ final data = ChecklistFilterPB.fromBuffer(filterPB.data.data);+ return ChecklistFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ );+ case FieldType.SingleSelect:+ case FieldType.MultiSelect:+ final data = SelectOptionFilterPB.fromBuffer(filterPB.data.data);+ return SelectOptionFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ optionIds: data.optionIds,+ );+ case FieldType.DateTime:+ final data = DateFilterPB.fromBuffer(filterPB.data.data);+ return DateTimeFilter(+ filterId: filterPB.id,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: data.condition,+ timestamp: data.hasTimestamp() ? data.timestamp.toDateTime() : null,+ start: data.hasStart() ? data.start.toDateTime() : null,+ end: data.hasEnd() ? data.end.toDateTime() : null,+ );+ default:+ throw ArgumentError();+ }+ }++ final String filterId;+ final String fieldId;+ final FieldType fieldType;++ String get conditionName;++ String getDescription(FieldInfo field);++ Uint8List writeToBuffer();+}++final class TextFilter extends DatabaseFilter {+ const TextFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ required this.content,+ });++ final TextFilterConditionPB condition;+ final String content;++ @override+ String get conditionName => condition.filterName;++ @override+ String getDescription(FieldInfo field) {+ final filterDesc = condition.choicechipPrefix;++ if (condition == TextFilterConditionPB.TextIsEmpty ||+ condition == TextFilterConditionPB.TextIsNotEmpty) {+ return filterDesc;+ }++ return content.isEmpty ? filterDesc : "$filterDesc $content";+ }++ @override+ Uint8List writeToBuffer() {+ final filterPB = TextFilterPB()..condition = condition;++ if (condition != TextFilterConditionPB.TextIsEmpty &&+ condition != TextFilterConditionPB.TextIsNotEmpty) {+ filterPB.content = content;+ }+ return filterPB.writeToBuffer();+ }++ TextFilter copyWith({+ TextFilterConditionPB? condition,+ String? content,+ }) {+ return TextFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ content: content ?? this.content,+ );+ }+}++final class NumberFilter extends DatabaseFilter {+ const NumberFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ required this.content,+ });++ final NumberFilterConditionPB condition;+ final String content;++ @override+ String get conditionName => condition.filterName;++ @override+ String getDescription(FieldInfo field) {+ if (condition == NumberFilterConditionPB.NumberIsEmpty ||+ condition == NumberFilterConditionPB.NumberIsNotEmpty) {+ return condition.shortName;+ }++ return "${condition.shortName} $content";+ }++ @override+ Uint8List writeToBuffer() {+ final filterPB = NumberFilterPB()..condition = condition;++ if (condition != NumberFilterConditionPB.NumberIsEmpty &&+ condition != NumberFilterConditionPB.NumberIsNotEmpty) {+ filterPB.content = content;+ }+ return filterPB.writeToBuffer();+ }++ NumberFilter copyWith({+ NumberFilterConditionPB? condition,+ String? content,+ }) {+ return NumberFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ content: content ?? this.content,+ );+ }+}++final class CheckboxFilter extends DatabaseFilter {+ const CheckboxFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ });++ final CheckboxFilterConditionPB condition;++ @override+ String get conditionName => condition.filterName;++ @override+ String getDescription(FieldInfo field) => condition.filterName;++ @override+ Uint8List writeToBuffer() {+ return (CheckboxFilterPB()..condition = condition).writeToBuffer();+ }++ CheckboxFilter copyWith({+ CheckboxFilterConditionPB? condition,+ }) {+ return CheckboxFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ );+ }+}++final class ChecklistFilter extends DatabaseFilter {+ const ChecklistFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ });++ final ChecklistFilterConditionPB condition;++ @override+ String get conditionName => condition.filterName;++ @override+ String getDescription(FieldInfo field) => condition.filterName;++ @override+ Uint8List writeToBuffer() {+ return (ChecklistFilterPB()..condition = condition).writeToBuffer();+ }++ ChecklistFilter copyWith({+ ChecklistFilterConditionPB? condition,+ }) {+ return ChecklistFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ );+ }+}++final class SelectOptionFilter extends DatabaseFilter {+ const SelectOptionFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ required this.optionIds,+ });++ final SelectOptionFilterConditionPB condition;+ final List<String> optionIds;++ @override+ String get conditionName => condition.i18n;++ @override+ String getDescription(FieldInfo field) {+ if (condition == SelectOptionFilterConditionPB.OptionIsEmpty ||+ condition == SelectOptionFilterConditionPB.OptionIsNotEmpty) {+ return condition.i18n;+ }++ final delegate = fieldType == FieldType.SingleSelect+ ? const SingleSelectOptionFilterDelegateImpl()+ : const MultiSelectOptionFilterDelegateImpl();+ final options = delegate.getOptions(field);++ final optionNames =+ options.where((option) => optionIds.contains(option.id)).join(', ');+ return "${condition.i18n} $optionNames";+ }++ @override+ Uint8List writeToBuffer() {+ final filterPB = SelectOptionFilterPB()..condition = condition;++ if (condition != SelectOptionFilterConditionPB.OptionIsEmpty &&+ condition != SelectOptionFilterConditionPB.OptionIsNotEmpty) {+ filterPB.optionIds.addAll(optionIds);+ }+ return filterPB.writeToBuffer();+ }++ SelectOptionFilter copyWith({+ SelectOptionFilterConditionPB? condition,+ List<String>? optionIds,+ }) {+ return SelectOptionFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ optionIds: optionIds ?? this.optionIds,+ );+ }+}++final class DateTimeFilter extends DatabaseFilter {+ const DateTimeFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ this.timestamp,+ this.start,+ this.end,+ });++ final DateFilterConditionPB condition;+ final DateTime? timestamp;+ final DateTime? start;+ final DateTime? end;++ @override+ String get conditionName => condition.name;++ @override+ String getDescription(FieldInfo field) {+ return switch (condition) {+ DateFilterConditionPB.DateIsEmpty ||+ DateFilterConditionPB.DateIsNotEmpty =>+ condition.filterName,+ DateFilterConditionPB.DateWithIn =>+ "${condition.filterName} ${start?.defaultFormat ?? ""} - ${end?.defaultFormat ?? ""}",+ _ => "${condition.filterName} ${timestamp?.defaultFormat ?? ""}"+ };+ }++ @override+ Uint8List writeToBuffer() {+ final filterPB = DateFilterPB()..condition = condition;++ Int64 dateTimeToInt(DateTime dateTime) {+ return Int64(dateTime.millisecondsSinceEpoch ~/ 1000);+ }++ switch (condition) {+ case DateFilterConditionPB.DateIs:+ case DateFilterConditionPB.DateBefore:+ case DateFilterConditionPB.DateOnOrBefore:+ case DateFilterConditionPB.DateAfter:+ case DateFilterConditionPB.DateOnOrAfter:+ if (timestamp != null) {+ filterPB.timestamp = dateTimeToInt(timestamp!);+ }+ break;+ case DateFilterConditionPB.DateWithIn:+ if (start != null) {+ filterPB.start = dateTimeToInt(start!);+ }+ if (end != null) {+ filterPB.end = dateTimeToInt(end!);+ }+ default:+ break;+ }++ return filterPB.writeToBuffer();+ }++ DateTimeFilter copyWith({+ DateFilterConditionPB? condition,+ DateTime? timestamp,+ }) {+ return DateTimeFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ start: start,+ end: end,+ condition: condition ?? this.condition,+ timestamp: timestamp ?? this.timestamp,+ );+ }++ DateTimeFilter copyWithRange({+ required DateTime? start,+ required DateTime? end,+ }) {+ return DateTimeFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition,+ start: start,+ end: end,+ timestamp: timestamp,+ );+ }+}++final class TimeFilter extends DatabaseFilter {+ const TimeFilter({+ required super.filterId,+ required super.fieldId,+ required super.fieldType,+ required this.condition,+ required this.content,+ });++ final NumberFilterConditionPB condition;+ final String content;++ @override+ String get conditionName => condition.filterName;++ @override+ String getDescription(FieldInfo field) {+ if (condition == NumberFilterConditionPB.NumberIsEmpty ||+ condition == NumberFilterConditionPB.NumberIsNotEmpty) {+ return condition.shortName;+ }++ return "${condition.shortName} $content";+ }++ @override+ Uint8List writeToBuffer() {+ return (NumberFilterPB()+ ..condition = condition+ ..content = content)+ .writeToBuffer();+ }++ TimeFilter copyWith({NumberFilterConditionPB? condition, String? content}) {+ return TimeFilter(+ filterId: filterId,+ fieldId: fieldId,+ fieldType: fieldType,+ condition: condition ?? this.condition,+ content: content ?? this.content,+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/toolbar/board_setting_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/toolbar/board_setting_bar.dartindex aa2883ff73..9e3203e093 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/toolbar/board_setting_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/toolbar/board_setting_bar.dart@@ -1,5 +1,5 @@import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.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';@@ -19,35 +19,33 @@ class BoardSettingBar extends StatelessWidget {@overrideWidget build(BuildContext context) {- return BlocProvider<DatabaseFilterMenuBloc>(- create: (context) => DatabaseFilterMenuBloc(+ return BlocProvider(+ create: (context) => FilterEditorBloc(viewId: databaseController.viewId,fieldController: databaseController.fieldController,- )..add(const DatabaseFilterMenuEvent.initial()),- child: BlocListener<DatabaseFilterMenuBloc, DatabaseFilterMenuState>(- listenWhen: (p, c) => p.isVisible != c.isVisible,- listener: (context, state) => toggleExtension.toggle(),- 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: [- const FilterButton(),- const HSpace(2),- SettingButton(- databaseController: databaseController,- ),- ],- ),- );- },- ),+ ),+ 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/domain/filter_service.dart b/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dartindex d86363e75e..e4c4d47a86 100644--- a/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart@@ -299,12 +299,9 @@ class FilterBackendService {}Future<FlowyResult<void, FlowyError>> deleteFilter({- required String fieldId,required String filterId,}) async {- final deleteFilterPayload = DeleteFilterPB()- ..fieldId = fieldId- ..filterId = filterId;+ final deleteFilterPayload = DeleteFilterPB()..filterId = filterId;final payload = DatabaseSettingChangesetPB()..viewId = viewIddiff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checkbox_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checkbox_filter_editor_bloc.dartdeleted file mode 100644index 17449bda44..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checkbox_filter_editor_bloc.dart+++ /dev/null@@ -1,105 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/checkbox_filter.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/util.pb.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'checkbox_filter_editor_bloc.freezed.dart';--class CheckboxFilterEditorBloc- extends Bloc<CheckboxFilterEditorEvent, CheckboxFilterEditorState> {- CheckboxFilterEditorBloc({required this.filterInfo})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(CheckboxFilterEditorState.initial(filterInfo)) {- _dispatch();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<CheckboxFilterEditorEvent>(- (event, emit) async {- await event.when(- initial: () async {- _startListening();- },- updateCondition: (CheckboxFilterConditionPB condition) {- _filterBackendSvc.insertCheckboxFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- didReceiveFilter: (FilterPB filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- final checkboxFilter = filterInfo.checkboxFilter()!;- emit(- state.copyWith(- filterInfo: filterInfo,- filter: checkboxFilter,- ),- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(CheckboxFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class CheckboxFilterEditorEvent with _$CheckboxFilterEditorEvent {- const factory CheckboxFilterEditorEvent.initial() = _Initial;- const factory CheckboxFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory CheckboxFilterEditorEvent.updateCondition(- CheckboxFilterConditionPB condition,- ) = _UpdateCondition;- const factory CheckboxFilterEditorEvent.delete() = _Delete;-}--@freezed-class CheckboxFilterEditorState with _$CheckboxFilterEditorState {- const factory CheckboxFilterEditorState({- required FilterInfo filterInfo,- required CheckboxFilterPB filter,- }) = _GridFilterState;-- factory CheckboxFilterEditorState.initial(FilterInfo filterInfo) {- return CheckboxFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.checkboxFilter()!,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checklist_filter_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checklist_filter_bloc.dartdeleted file mode 100644index 1decdd8215..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/checklist_filter_bloc.dart+++ /dev/null@@ -1,107 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/checklist_filter.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/util.pb.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'checklist_filter_bloc.freezed.dart';--class ChecklistFilterEditorBloc- extends Bloc<ChecklistFilterEditorEvent, ChecklistFilterEditorState> {- ChecklistFilterEditorBloc({required this.filterInfo})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(ChecklistFilterEditorState.initial(filterInfo)) {- _dispatch();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<ChecklistFilterEditorEvent>(- (event, emit) async {- await event.when(- initial: () async {- _startListening();- },- updateCondition: (ChecklistFilterConditionPB condition) {- _filterBackendSvc.insertChecklistFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- didReceiveFilter: (FilterPB filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- final checklistFilter = filterInfo.checklistFilter()!;- emit(- state.copyWith(- filterInfo: filterInfo,- filter: checklistFilter,- ),- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(ChecklistFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class ChecklistFilterEditorEvent with _$ChecklistFilterEditorEvent {- const factory ChecklistFilterEditorEvent.initial() = _Initial;- const factory ChecklistFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory ChecklistFilterEditorEvent.updateCondition(- ChecklistFilterConditionPB condition,- ) = _UpdateCondition;- const factory ChecklistFilterEditorEvent.delete() = _Delete;-}--@freezed-class ChecklistFilterEditorState with _$ChecklistFilterEditorState {- const factory ChecklistFilterEditorState({- required FilterInfo filterInfo,- required ChecklistFilterPB filter,- required String filterDesc,- }) = _GridFilterState;-- factory ChecklistFilterEditorState.initial(FilterInfo filterInfo) {- return ChecklistFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.checklistFilter()!,- filterDesc: '',- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/date_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/date_filter_editor_bloc.dartdeleted file mode 100644index 476e0b2bfb..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/date_filter_editor_bloc.dart+++ /dev/null@@ -1,132 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'date_filter_editor_bloc.freezed.dart';--class DateFilterEditorBloc- extends Bloc<DateFilterEditorEvent, DateFilterEditorState> {- DateFilterEditorBloc({required this.filterInfo})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(DateFilterEditorState.initial(filterInfo)) {- _dispatch();- _startListening();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<DateFilterEditorEvent>(- (event, emit) async {- event.when(- didReceiveFilter: (filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- emit(- state.copyWith(- filterInfo: filterInfo,- filter: filterInfo.dateFilter()!,- ),- );- },- updateCondition: (DateFilterConditionPB condition) {- _filterBackendSvc.insertDateFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- start: state.filter.start.toInt(),- end: state.filter.end.toInt(),- timestamp: state.filter.timestamp.toInt(),- );- },- updateDate: (date) {- _filterBackendSvc.insertDateFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- timestamp: date.millisecondsSinceEpoch ~/ 1000,- );- },- updateRange: (start, end) {- assert(start != null || end != null);- _filterBackendSvc.insertDateFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- start: start != null- ? start.millisecondsSinceEpoch ~/ 1000- : state.filter.start.toInt(),- end: end != null- ? end.millisecondsSinceEpoch ~/ 1000- : state.filter.end.toInt(),- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(DateFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class DateFilterEditorEvent with _$DateFilterEditorEvent {- const factory DateFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory DateFilterEditorEvent.updateCondition(- DateFilterConditionPB condition,- ) = _UpdateCondition;- const factory DateFilterEditorEvent.updateDate(- DateTime date,- ) = _UpdateDate;- const factory DateFilterEditorEvent.updateRange({- DateTime? start,- DateTime? end,- }) = _UpdateRange;- const factory DateFilterEditorEvent.delete() = _Delete;-}--@freezed-class DateFilterEditorState with _$DateFilterEditorState {- const factory DateFilterEditorState({- required FilterInfo filterInfo,- required DateFilterPB filter,- }) = _DateFilterEditorState;-- factory DateFilterEditorState.initial(FilterInfo filterInfo) {- return DateFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.dateFilter()!,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_create_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dartsimilarity index 56%rename from frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_create_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dartindex c1777bdbd3..d5edf4506e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_create_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart@@ -2,87 +2,101 @@ import 'dart:async';import 'package:appflowy/plugins/database/application/field/field_controller.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';import 'package:appflowy/plugins/database/domain/filter_service.dart';+import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';+import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';import 'package:appflowy_result/appflowy_result.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-part 'filter_create_bloc.freezed.dart';+part 'filter_editor_bloc.freezed.dart';-class GridCreateFilterBloc- extends Bloc<GridCreateFilterEvent, GridCreateFilterState> {- GridCreateFilterBloc({required this.viewId, required this.fieldController})+class FilterEditorBloc extends Bloc<FilterEditorEvent, FilterEditorState> {+ FilterEditorBloc({required this.viewId, required this.fieldController}): _filterBackendSvc = FilterBackendService(viewId: viewId),- super(GridCreateFilterState.initial(fieldController.fieldInfos)) {+ super(+ FilterEditorState.initial(+ viewId,+ fieldController.filters,+ _getCreatableFilter(fieldController.fieldInfos),+ ),+ ) {_dispatch();+ _startListening();}final String viewId;- final FilterBackendService _filterBackendSvc;final FieldController fieldController;+ final FilterBackendService _filterBackendSvc;++ void Function(List<DatabaseFilter>)? _onFilterFn;void Function(List<FieldInfo>)? _onFieldFn;void _dispatch() {- on<GridCreateFilterEvent>(+ on<FilterEditorEvent>((event, emit) async {- event.when(- initial: () {- _startListening();+ await event.when(+ didReceiveFilters: (filters) {+ emit(state.copyWith(filters: filters));},didReceiveFields: (List<FieldInfo> fields) {emit(state.copyWith(- allFields: fields,- creatableFields: _filterFields(fields, state.filterText),+ fields: _getCreatableFilter(fields),),);},- didReceiveFilterText: (String text) {- emit(- state.copyWith(- filterText: text,- creatableFields: _filterFields(state.allFields, text),- ),+ createFilter: (field) {+ return _createDefaultFilter(field);+ },+ updateFilter: (filter) {+ return _filterBackendSvc.updateFilter(+ filterId: filter.filterId,+ fieldId: filter.fieldId,+ fieldType: filter.fieldType,+ data: filter.writeToBuffer(),);},- createDefaultFilter: (FieldInfo field) {- emit(state.copyWith(didCreateFilter: true));- _createDefaultFilter(field);+ deleteFilter: (filterId) async {+ return _filterBackendSvc.deleteFilter(filterId: filterId);},);},);}- List<FieldInfo> _filterFields(- List<FieldInfo> fields,- String filterText,- ) {- final List<FieldInfo> allFields = List.from(fields);- final keyword = filterText.toLowerCase();- allFields.retainWhere((field) {- if (!field.canCreateFilter) {- return false;- }-- if (filterText.isNotEmpty) {- return field.name.toLowerCase().contains(keyword);- }+ void _startListening() {+ _onFilterFn = (filters) {+ add(FilterEditorEvent.didReceiveFilters(filters));+ };- return true;- });+ _onFieldFn = (fields) {+ add(FilterEditorEvent.didReceiveFields(fields));+ };- return allFields;+ fieldController.addListener(+ onFilters: (filters) {+ _onFilterFn?.call(filters);+ },+ onReceiveFields: (fields) {+ _onFieldFn?.call(fields);+ },+ );}- void _startListening() {- _onFieldFn = (fields) {- fields.retainWhere((field) => field.canCreateFilter);- add(GridCreateFilterEvent.didReceiveFields(fields));- };- fieldController.addListener(onReceiveFields: _onFieldFn);+ @override+ Future<void> close() async {+ if (_onFilterFn != null) {+ fieldController.removeListener(onFiltersListener: _onFilterFn!);+ _onFilterFn = null;+ }+ if (_onFieldFn != null) {+ fieldController.removeListener(onFieldsListener: _onFieldFn!);+ _onFieldFn = null;+ }+ return super.close();}Future<FlowyResult<void, FlowyError>> _createDefaultFilter(@@ -151,51 +165,45 @@ class GridCreateFilterBlocthrow UnimplementedError();}}-- @override- Future<void> close() async {- if (_onFieldFn != null) {- fieldController.removeListener(onFieldsListener: _onFieldFn);- _onFieldFn = null;- }- return super.close();- }}@freezed-class GridCreateFilterEvent with _$GridCreateFilterEvent {- const factory GridCreateFilterEvent.initial() = _Initial;- const factory GridCreateFilterEvent.didReceiveFields(List<FieldInfo> fields) =+class FilterEditorEvent with _$FilterEditorEvent {+ const factory FilterEditorEvent.didReceiveFilters(+ List<DatabaseFilter> filters,+ ) = _DidReceiveFilters;+ const factory FilterEditorEvent.didReceiveFields(List<FieldInfo> fields) =_DidReceiveFields;-- const factory GridCreateFilterEvent.createDefaultFilter(FieldInfo field) =- _CreateDefaultFilter;-- const factory GridCreateFilterEvent.didReceiveFilterText(String text) =- _DidReceiveFilterText;+ const factory FilterEditorEvent.createFilter(FieldInfo field) = _CreateFilter;+ const factory FilterEditorEvent.updateFilter(DatabaseFilter filter) =+ _UpdateFilter;+ const factory FilterEditorEvent.deleteFilter(String filterId) = _DeleteFilter;}@freezed-class GridCreateFilterState with _$GridCreateFilterState {- const factory GridCreateFilterState({- required String filterText,- required List<FieldInfo> creatableFields,- required List<FieldInfo> allFields,- required bool didCreateFilter,- }) = _GridFilterState;-- factory GridCreateFilterState.initial(List<FieldInfo> fields) {- return GridCreateFilterState(- filterText: "",- creatableFields: getCreatableFilter(fields),- allFields: fields,- didCreateFilter: false,- );- }+class FilterEditorState with _$FilterEditorState {+ const factory FilterEditorState({+ required String viewId,+ required List<DatabaseFilter> filters,+ required List<FieldInfo> fields,+ }) = _FilterEditorState;++ factory FilterEditorState.initial(+ String viewId,+ List<DatabaseFilter> filterInfos,+ List<FieldInfo> fields,+ ) =>+ FilterEditorState(+ viewId: viewId,+ filters: filterInfos,+ fields: fields,+ );}-List<FieldInfo> getCreatableFilter(List<FieldInfo> fieldInfos) {+List<FieldInfo> _getCreatableFilter(List<FieldInfo> fieldInfos) {final List<FieldInfo> creatableFields = List.from(fieldInfos);- creatableFields.retainWhere((element) => element.canCreateFilter);+ creatableFields.retainWhere(+ (field) => field.fieldType.canCreateFilter,+ );return creatableFields;}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_menu_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_menu_bloc.dartdeleted file mode 100644index cc26e42b83..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_menu_bloc.dart+++ /dev/null@@ -1,129 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/application/field/field_controller.dart';-import 'package:appflowy/plugins/database/application/field/field_info.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'filter_menu_bloc.freezed.dart';--class DatabaseFilterMenuBloc- extends Bloc<DatabaseFilterMenuEvent, DatabaseFilterMenuState> {- DatabaseFilterMenuBloc({required this.viewId, required this.fieldController})- : super(- DatabaseFilterMenuState.initial(- viewId,- fieldController.filterInfos,- fieldController.fieldInfos,- ),- ) {- _dispatch();- }-- final String viewId;- final FieldController fieldController;- void Function(List<FilterInfo>)? _onFilterFn;- void Function(List<FieldInfo>)? _onFieldFn;-- void _dispatch() {- on<DatabaseFilterMenuEvent>(- (event, emit) async {- event.when(- initial: () {- _startListening();- },- didReceiveFilters: (filters) {- emit(state.copyWith(filters: filters));- },- toggleMenu: () {- final isVisible = !state.isVisible;- emit(state.copyWith(isVisible: isVisible));- },- didReceiveFields: (List<FieldInfo> fields) {- emit(- state.copyWith(- fields: fields,- creatableFields: getCreatableFilter(fields),- ),- );- },- );- },- );- }-- void _startListening() {- _onFilterFn = (filters) {- add(DatabaseFilterMenuEvent.didReceiveFilters(filters));- };-- _onFieldFn = (fields) {- add(DatabaseFilterMenuEvent.didReceiveFields(fields));- };-- fieldController.addListener(- onFilters: (filters) {- _onFilterFn?.call(filters);- },- onReceiveFields: (fields) {- _onFieldFn?.call(fields);- },- );- }-- @override- Future<void> close() async {- if (_onFilterFn != null) {- fieldController.removeListener(onFiltersListener: _onFilterFn!);- _onFilterFn = null;- }- if (_onFieldFn != null) {- fieldController.removeListener(onFieldsListener: _onFieldFn!);- _onFieldFn = null;- }- return super.close();- }-}--@freezed-class DatabaseFilterMenuEvent with _$DatabaseFilterMenuEvent {- const factory DatabaseFilterMenuEvent.initial() = _Initial;- const factory DatabaseFilterMenuEvent.didReceiveFilters(- List<FilterInfo> filters,- ) = _DidReceiveFilters;- const factory DatabaseFilterMenuEvent.didReceiveFields(- List<FieldInfo> fields,- ) = _DidReceiveFields;- const factory DatabaseFilterMenuEvent.toggleMenu() = _SetMenuVisibility;-}--@freezed-class DatabaseFilterMenuState with _$DatabaseFilterMenuState {- const factory DatabaseFilterMenuState({- required String viewId,- required List<FilterInfo> filters,- required List<FieldInfo> fields,- required List<FieldInfo> creatableFields,- required bool isVisible,- }) = _DatabaseFilterMenuState;-- factory DatabaseFilterMenuState.initial(- String viewId,- List<FilterInfo> filterInfos,- List<FieldInfo> fields,- ) =>- DatabaseFilterMenuState(- viewId: viewId,- filters: filterInfos,- fields: fields,- creatableFields: getCreatableFilter(fields),- isVisible: false,- );-}--List<FieldInfo> getCreatableFilter(List<FieldInfo> fieldInfos) {- final List<FieldInfo> creatableFields = List.from(fieldInfos);- creatableFields.retainWhere((element) => element.canCreateFilter);- return creatableFields;-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/number_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/number_filter_editor_bloc.dartdeleted file mode 100644index d68dd17537..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/number_filter_editor_bloc.dart+++ /dev/null@@ -1,111 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'number_filter_editor_bloc.freezed.dart';--class NumberFilterEditorBloc- extends Bloc<NumberFilterEditorEvent, NumberFilterEditorState> {- NumberFilterEditorBloc({required this.filterInfo})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(NumberFilterEditorState.initial(filterInfo)) {- _dispatch();- _startListening();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<NumberFilterEditorEvent>(- (event, emit) async {- event.when(- didReceiveFilter: (filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- emit(- state.copyWith(- filterInfo: filterInfo,- filter: filterInfo.numberFilter()!,- ),- );- },- updateCondition: (NumberFilterConditionPB condition) {- _filterBackendSvc.insertNumberFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- content: state.filter.content,- );- },- updateContent: (content) {- _filterBackendSvc.insertNumberFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- content: content,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(NumberFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class NumberFilterEditorEvent with _$NumberFilterEditorEvent {- const factory NumberFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory NumberFilterEditorEvent.updateCondition(- NumberFilterConditionPB condition,- ) = _UpdateCondition;- const factory NumberFilterEditorEvent.updateContent(String content) =- _UpdateContent;- const factory NumberFilterEditorEvent.delete() = _Delete;-}--@freezed-class NumberFilterEditorState with _$NumberFilterEditorState {- const factory NumberFilterEditorState({- required FilterInfo filterInfo,- required NumberFilterPB filter,- }) = _NumberFilterEditorState;-- factory NumberFilterEditorState.initial(FilterInfo filterInfo) {- return NumberFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.numberFilter()!,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_bloc.dartdeleted file mode 100644index 3f44cb6d36..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_bloc.dart+++ /dev/null@@ -1,146 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option_filter.pbserver.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/util.pb.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'select_option_filter_bloc.freezed.dart';--class SelectOptionFilterEditorBloc- extends Bloc<SelectOptionFilterEditorEvent, SelectOptionFilterEditorState> {- SelectOptionFilterEditorBloc({- required this.filterInfo,- required this.delegate,- }) : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(SelectOptionFilterEditorState.initial(filterInfo)) {- _dispatch();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;- final SelectOptionFilterDelegate delegate;-- void _dispatch() {- on<SelectOptionFilterEditorEvent>(- (event, emit) async {- event.when(- initial: () {- _startListening();- _loadOptions();- },- updateCondition: (SelectOptionFilterConditionPB condition) {- _filterBackendSvc.insertSelectOptionFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- optionIds: state.filter.optionIds,- fieldType: state.filterInfo.fieldInfo.fieldType,- );- },- updateContent: (List<String> optionIds) {- _filterBackendSvc.insertSelectOptionFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- optionIds: optionIds,- fieldType: state.filterInfo.fieldInfo.fieldType,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- didReceiveFilter: (FilterPB filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- final selectOptionFilter = filterInfo.selectOptionFilter()!;- emit(- state.copyWith(- filterInfo: filterInfo,- filter: selectOptionFilter,- ),- );- },- updateFilterDescription: (String desc) {- emit(state.copyWith(filterDesc: desc));- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(SelectOptionFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- void _loadOptions() {- if (!isClosed) {- final options = delegate.loadOptions();- String filterDesc = '';- for (final option in options) {- if (state.filter.optionIds.contains(option.id)) {- filterDesc += "${option.name} ";- }- }- add(SelectOptionFilterEditorEvent.updateFilterDescription(filterDesc));- }- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class SelectOptionFilterEditorEvent with _$SelectOptionFilterEditorEvent {- const factory SelectOptionFilterEditorEvent.initial() = _Initial;- const factory SelectOptionFilterEditorEvent.didReceiveFilter(- FilterPB filter,- ) = _DidReceiveFilter;- const factory SelectOptionFilterEditorEvent.updateCondition(- SelectOptionFilterConditionPB condition,- ) = _UpdateCondition;- const factory SelectOptionFilterEditorEvent.updateContent(- List<String> optionIds,- ) = _UpdateContent;- const factory SelectOptionFilterEditorEvent.updateFilterDescription(- String desc,- ) = _UpdateDesc;- const factory SelectOptionFilterEditorEvent.delete() = _Delete;-}--@freezed-class SelectOptionFilterEditorState with _$SelectOptionFilterEditorState {- const factory SelectOptionFilterEditorState({- required FilterInfo filterInfo,- required SelectOptionFilterPB filter,- required String filterDesc,- }) = _GridFilterState;-- factory SelectOptionFilterEditorState.initial(FilterInfo filterInfo) {- return SelectOptionFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.selectOptionFilter()!,- filterDesc: '',- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_list_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_list_bloc.dartdeleted file mode 100644index 84e1284822..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_filter_list_bloc.dart+++ /dev/null@@ -1,158 +0,0 @@-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'select_option_filter_list_bloc.freezed.dart';--class SelectOptionFilterListBloc<T>- extends Bloc<SelectOptionFilterListEvent, SelectOptionFilterListState> {- SelectOptionFilterListBloc({- required this.delegate,- required List<String> selectedOptionIds,- }) : super(SelectOptionFilterListState.initial(selectedOptionIds)) {- _dispatch();- }-- final SelectOptionFilterDelegate delegate;-- void _dispatch() {- on<SelectOptionFilterListEvent>(- (event, emit) async {- await event.when(- initial: () async {- _startListening();- _loadOptions();- },- selectOption: (option, condition) {- final selectedOptionIds = delegate.selectOption(- state.selectedOptionIds,- option.id,- condition,- );-- _updateSelectOptions(- selectedOptionIds: selectedOptionIds,- emit: emit,- );- },- unSelectOption: (option) {- final selectedOptionIds = Set<String>.from(state.selectedOptionIds);- selectedOptionIds.remove(option.id);-- _updateSelectOptions(- selectedOptionIds: selectedOptionIds,- emit: emit,- );- },- didReceiveOptions: (newOptions) {- final List<SelectOptionPB> options = List.from(newOptions);- options.retainWhere(- (element) => element.name.contains(state.predicate),- );-- final visibleOptions = options.map((option) {- return VisibleSelectOption(- option,- state.selectedOptionIds.contains(option.id),- );- }).toList();-- emit(- state.copyWith(- options: options,- visibleOptions: visibleOptions,- ),- );- },- filterOption: (optionName) {- _updateSelectOptions(predicate: optionName, emit: emit);- },- );- },- );- }-- void _updateSelectOptions({- String? predicate,- Set<String>? selectedOptionIds,- required Emitter<SelectOptionFilterListState> emit,- }) {- final List<VisibleSelectOption> visibleOptions = _makeVisibleOptions(- predicate ?? state.predicate,- selectedOptionIds ?? state.selectedOptionIds,- );-- emit(- state.copyWith(- predicate: predicate ?? state.predicate,- visibleOptions: visibleOptions,- selectedOptionIds: selectedOptionIds ?? state.selectedOptionIds,- ),- );- }-- List<VisibleSelectOption> _makeVisibleOptions(- String predicate,- Set<String> selectedOptionIds,- ) {- final List<SelectOptionPB> options = List.from(state.options);- options.retainWhere((element) => element.name.contains(predicate));-- return options.map((option) {- return VisibleSelectOption(option, selectedOptionIds.contains(option.id));- }).toList();- }-- void _loadOptions() {- if (!isClosed) {- final options = delegate.loadOptions();- add(SelectOptionFilterListEvent.didReceiveOptions(options));- }- }-- void _startListening() {}-}--@freezed-class SelectOptionFilterListEvent with _$SelectOptionFilterListEvent {- const factory SelectOptionFilterListEvent.initial() = _Initial;- const factory SelectOptionFilterListEvent.selectOption(- SelectOptionPB option,- SelectOptionFilterConditionPB condition,- ) = _SelectOption;- const factory SelectOptionFilterListEvent.unSelectOption(- SelectOptionPB option,- ) = _UnSelectOption;- const factory SelectOptionFilterListEvent.didReceiveOptions(- List<SelectOptionPB> options,- ) = _DidReceiveOptions;- const factory SelectOptionFilterListEvent.filterOption(String optionName) =- _SelectOptionFilter;-}--@freezed-class SelectOptionFilterListState with _$SelectOptionFilterListState {- const factory SelectOptionFilterListState({- required List<SelectOptionPB> options,- required List<VisibleSelectOption> visibleOptions,- required Set<String> selectedOptionIds,- required String predicate,- }) = _SelectOptionFilterListState;-- factory SelectOptionFilterListState.initial(List<String> selectedOptionIds) {- return SelectOptionFilterListState(- options: [],- predicate: '',- visibleOptions: [],- selectedOptionIds: selectedOptionIds.toSet(),- );- }-}--class VisibleSelectOption {- VisibleSelectOption(this.optionPB, this.isSelected);-- final SelectOptionPB optionPB;- final bool isSelected;-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dartsimilarity index 67%rename from frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dartrename to frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dartindex 7a7aa25cad..505aa0e12d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dart@@ -1,12 +1,14 @@+import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';abstract class SelectOptionFilterDelegate {- List<SelectOptionPB> loadOptions();+ const SelectOptionFilterDelegate();++ List<SelectOptionPB> getOptions(FieldInfo fieldInfo);Set<String> selectOption(- Set<String> currentOptionIds,+ List<String> currentOptionIds,String optionId,SelectOptionFilterConditionPB condition,);@@ -14,19 +16,17 @@ abstract class SelectOptionFilterDelegate {class SingleSelectOptionFilterDelegateImplimplements SelectOptionFilterDelegate {- SingleSelectOptionFilterDelegateImpl({required this.filterInfo});-- final FilterInfo filterInfo;+ const SingleSelectOptionFilterDelegateImpl();@override- List<SelectOptionPB> loadOptions() {+ List<SelectOptionPB> getOptions(FieldInfo fieldInfo) {final parser = SingleSelectTypeOptionDataParser();- return parser.fromBuffer(filterInfo.fieldInfo.field.typeOptionData).options;+ return parser.fromBuffer(fieldInfo.field.typeOptionData).options;}@overrideSet<String> selectOption(- Set<String> currentOptionIds,+ List<String> currentOptionIds,String optionId,SelectOptionFilterConditionPB condition,) {@@ -56,19 +56,18 @@ class SingleSelectOptionFilterDelegateImplclass MultiSelectOptionFilterDelegateImplimplements SelectOptionFilterDelegate {- MultiSelectOptionFilterDelegateImpl({required this.filterInfo});-- final FilterInfo filterInfo;+ const MultiSelectOptionFilterDelegateImpl();@override- List<SelectOptionPB> loadOptions() {- final parser = MultiSelectTypeOptionDataParser();- return parser.fromBuffer(filterInfo.fieldInfo.field.typeOptionData).options;+ List<SelectOptionPB> getOptions(FieldInfo fieldInfo) {+ return MultiSelectTypeOptionDataParser()+ .fromBuffer(fieldInfo.field.typeOptionData)+ .options;}@overrideSet<String> selectOption(- Set<String> currentOptionIds,+ List<String> currentOptionIds,String optionId,SelectOptionFilterConditionPB condition,) =>diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/text_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/text_filter_editor_bloc.dartdeleted file mode 100644index e4fa67c4a8..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/text_filter_editor_bloc.dart+++ /dev/null@@ -1,130 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'text_filter_editor_bloc.freezed.dart';--class TextFilterEditorBloc- extends Bloc<TextFilterEditorEvent, TextFilterEditorState> {- TextFilterEditorBloc({required this.filterInfo, required this.fieldType})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(TextFilterEditorState.initial(filterInfo)) {- _dispatch();- }-- final FilterInfo filterInfo;- final FieldType fieldType;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<TextFilterEditorEvent>(- (event, emit) async {- event.when(- initial: () {- _startListening();- },- updateCondition: (TextFilterConditionPB condition) {- fieldType == FieldType.RichText- ? _filterBackendSvc.insertTextFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- content: state.filter.content,- )- : _filterBackendSvc.insertURLFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- content: state.filter.content,- );- },- updateContent: (String content) {- fieldType == FieldType.RichText- ? _filterBackendSvc.insertTextFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- content: content,- )- : _filterBackendSvc.insertURLFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- content: content,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- didReceiveFilter: (FilterPB filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- final textFilter = filterInfo.textFilter()!;- emit(- state.copyWith(- filterInfo: filterInfo,- filter: textFilter,- ),- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(TextFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class TextFilterEditorEvent with _$TextFilterEditorEvent {- const factory TextFilterEditorEvent.initial() = _Initial;- const factory TextFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory TextFilterEditorEvent.updateCondition(- TextFilterConditionPB condition,- ) = _UpdateCondition;- const factory TextFilterEditorEvent.updateContent(String content) =- _UpdateContent;- const factory TextFilterEditorEvent.delete() = _Delete;-}--@freezed-class TextFilterEditorState with _$TextFilterEditorState {- const factory TextFilterEditorState({- required FilterInfo filterInfo,- required TextFilterPB filter,- }) = _GridFilterState;-- factory TextFilterEditorState.initial(FilterInfo filterInfo) {- return TextFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.textFilter()!,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/time_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/time_filter_editor_bloc.dartdeleted file mode 100644index 65625ca7f2..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/time_filter_editor_bloc.dart+++ /dev/null@@ -1,111 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/domain/filter_listener.dart';-import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--part 'time_filter_editor_bloc.freezed.dart';--class TimeFilterEditorBloc- extends Bloc<TimeFilterEditorEvent, TimeFilterEditorState> {- TimeFilterEditorBloc({required this.filterInfo})- : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),- _listener = FilterListener(- viewId: filterInfo.viewId,- filterId: filterInfo.filter.id,- ),- super(TimeFilterEditorState.initial(filterInfo)) {- _dispatch();- _startListening();- }-- final FilterInfo filterInfo;- final FilterBackendService _filterBackendSvc;- final FilterListener _listener;-- void _dispatch() {- on<TimeFilterEditorEvent>(- (event, emit) async {- event.when(- didReceiveFilter: (filter) {- final filterInfo = state.filterInfo.copyWith(filter: filter);- emit(- state.copyWith(- filterInfo: filterInfo,- filter: filterInfo.timeFilter()!,- ),- );- },- updateCondition: (NumberFilterConditionPB condition) {- _filterBackendSvc.insertTimeFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: condition,- content: state.filter.content,- );- },- updateContent: (content) {- _filterBackendSvc.insertTimeFilter(- filterId: filterInfo.filter.id,- fieldId: filterInfo.fieldInfo.id,- condition: state.filter.condition,- content: content,- );- },- delete: () {- _filterBackendSvc.deleteFilter(- fieldId: filterInfo.fieldInfo.id,- filterId: filterInfo.filter.id,- );- },- );- },- );- }-- void _startListening() {- _listener.start(- onUpdated: (filter) {- if (!isClosed) {- add(TimeFilterEditorEvent.didReceiveFilter(filter));- }- },- );- }-- @override- Future<void> close() async {- await _listener.stop();- return super.close();- }-}--@freezed-class TimeFilterEditorEvent with _$TimeFilterEditorEvent {- const factory TimeFilterEditorEvent.didReceiveFilter(FilterPB filter) =- _DidReceiveFilter;- const factory TimeFilterEditorEvent.updateCondition(- NumberFilterConditionPB condition,- ) = _UpdateCondition;- const factory TimeFilterEditorEvent.updateContent(String content) =- _UpdateContent;- const factory TimeFilterEditorEvent.delete() = _Delete;-}--@freezed-class TimeFilterEditorState with _$TimeFilterEditorState {- const factory TimeFilterEditorState({- required FilterInfo filterInfo,- required TimeFilterPB filter,- }) = _TimeFilterEditorState;-- factory TimeFilterEditorState.initial(FilterInfo filterInfo) {- return TimeFilterEditorState(- filterInfo: filterInfo,- filter: filterInfo.timeFilter()!,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dartindex 54e281ab9a..69be5f595c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart@@ -2,9 +2,9 @@ import 'dart:async';import 'package:appflowy/plugins/database/application/defines.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';@@ -94,7 +94,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {),);},- didReceveFilters: (List<FilterInfo> filters) {+ didReceveFilters: (filters) {emit(state.copyWith(filters: filters),);@@ -192,7 +192,7 @@ class GridEvent with _$GridEvent {DatabasePB grid,) = _DidReceiveGridUpdate;- const factory GridEvent.didReceveFilters(List<FilterInfo> filters) =+ const factory GridEvent.didReceveFilters(List<DatabaseFilter> filters) =_DidReceiveFilters;const factory GridEvent.didReceveSorts(List<SortInfo> sorts) =_DidReceiveSorts;@@ -211,7 +211,7 @@ class GridState with _$GridState {required bool reorderable,required ChangedReason reason,required List<SortInfo> sorts,- required List<FilterInfo> filters,+ required List<DatabaseFilter> filters,required bool openRowDetail,}) = _GridState;diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/simple_text_filter_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/simple_text_filter_bloc.dartnew file mode 100644index 0000000000..bbf010d279--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/simple_text_filter_bloc.dart@@ -0,0 +1,65 @@+import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:freezed_annotation/freezed_annotation.dart';++part 'simple_text_filter_bloc.freezed.dart';++class SimpleTextFilterBloc<T>+ extends Bloc<SimpleTextFilterEvent<T>, SimpleTextFilterState<T>> {+ SimpleTextFilterBloc({+ required this.values,+ required this.comparator,+ this.filterText = "",+ }) : super(SimpleTextFilterState(values: values)) {+ _dispatch();+ }++ final String Function(T) comparator;++ final List<T> values;+ String filterText;++ void _dispatch() {+ on<SimpleTextFilterEvent<T>>((event, emit) async {+ event.when(+ updateFilter: (String filter) {+ filterText = filter.toLowerCase();+ _filter(emit);+ },+ receiveNewValues: (List<T> newValues) {+ values+ ..clear()+ ..addAll(newValues);+ _filter(emit);+ },+ );+ });+ }++ void _filter(Emitter<SimpleTextFilterState<T>> emit) {+ final List<T> result = [...values];++ result.retainWhere((value) {+ if (filterText.isNotEmpty) {+ return comparator(value).toLowerCase().contains(filterText);+ }+ return true;+ });++ emit(SimpleTextFilterState(values: result));+ }+}++@freezed+class SimpleTextFilterEvent<T> with _$SimpleTextFilterEvent<T> {+ const factory SimpleTextFilterEvent.updateFilter(String filter) =+ _UpdateFilter;+ const factory SimpleTextFilterEvent.receiveNewValues(List<T> newValues) =+ _ReceiveNewValues<T>;+}++@freezed+class SimpleTextFilterState<T> with _$SimpleTextFilterState<T> {+ const factory SimpleTextFilterState({+ required List<T> values,+ }) = _SimpleTextFilterState<T>;+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dartindex 5f2bd8cf89..4d54f1aaac 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/sort/sort_editor_bloc.dart@@ -4,6 +4,7 @@ import 'package:appflowy/plugins/database/application/field/field_controller.darimport 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/domain/sort_service.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';+import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:collection/collection.dart';@@ -42,13 +43,10 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {emit(state.copyWith(allFields: fields,- creatableFields: getCreatableSorts(fields),+ creatableFields: _getCreatableSorts(fields),),);},- updateCreateSortFilter: (text) {- emit(state.copyWith(filter: text));- },createSort: (String fieldId,SortConditionPB? condition,@@ -64,7 +62,7 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {String? fieldId,SortConditionPB? condition,) async {- final sortInfo = state.sortInfos+ final sortInfo = state.sorts.firstWhereOrNull((element) => element.sortId == sortId);if (sortInfo == null) {return;@@ -82,7 +80,7 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {result.fold((l) => {}, (err) => Log.error(err));},didReceiveSorts: (List<SortInfo> sortInfos) {- emit(state.copyWith(sortInfos: sortInfos));+ emit(state.copyWith(sorts: sortInfos));},deleteSort: (SortInfo sortInfo) async {final result = await _sortBackendSvc.deleteSort(@@ -96,12 +94,12 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {toIndex--;}- final fromId = state.sortInfos[fromIndex].sortId;- final toId = state.sortInfos[toIndex].sortId;+ final fromId = state.sorts[fromIndex].sortId;+ final toId = state.sorts[toIndex].sortId;- final newSorts = [...state.sortInfos];+ final newSorts = [...state.sorts];newSorts.insert(toIndex, newSorts.removeAt(fromIndex));- emit(state.copyWith(sortInfos: newSorts));+ emit(state.copyWith(sorts: newSorts));final result = await _sortBackendSvc.reorderSort(fromSortId: fromId,toSortId: toId,@@ -146,8 +144,6 @@ class SortEditorEvent with _$SortEditorEvent {_DidReceiveFields;const factory SortEditorEvent.didReceiveSorts(List<SortInfo> sortInfos) =_DidReceiveSorts;- const factory SortEditorEvent.updateCreateSortFilter(String text) =- _UpdateCreateSortFilter;const factory SortEditorEvent.createSort({required String fieldId,SortConditionPB? condition,@@ -166,27 +162,27 @@ class SortEditorEvent with _$SortEditorEvent {@freezedclass SortEditorState with _$SortEditorState {const factory SortEditorState({- required List<SortInfo> sortInfos,- required List<FieldInfo> creatableFields,+ required List<SortInfo> sorts,required List<FieldInfo> allFields,- required String filter,+ required List<FieldInfo> creatableFields,}) = _SortEditorState;factory SortEditorState.initial(- List<SortInfo> sortInfos,+ List<SortInfo> sorts,List<FieldInfo> fields,) {return SortEditorState(- creatableFields: getCreatableSorts(fields),+ sorts: sorts,allFields: fields,- sortInfos: sortInfos,- filter: "",+ creatableFields: _getCreatableSorts(fields),);}}-List<FieldInfo> getCreatableSorts(List<FieldInfo> fieldInfos) {+List<FieldInfo> _getCreatableSorts(List<FieldInfo> fieldInfos) {final List<FieldInfo> creatableFields = List.from(fieldInfos);- creatableFields.retainWhere((element) => element.canCreateSort);+ creatableFields.retainWhere(+ (field) => field.fieldType.canCreateSort && !field.hasSort,+ );return creatableFields;}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dartindex 85370cc7a1..05948a8adb 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart@@ -1,80 +1,61 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/checkbox_filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/checkbox_filter.pbenum.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../condition_button.dart';import '../disclosure_button.dart';-import '../filter_info.dart';import 'choicechip.dart';-class CheckboxFilterChoicechip extends StatefulWidget {- const CheckboxFilterChoicechip({required this.filterInfo, super.key});-- final FilterInfo filterInfo;-- @override- State<CheckboxFilterChoicechip> createState() =>- _CheckboxFilterChoicechipState();-}--class _CheckboxFilterChoicechipState extends State<CheckboxFilterChoicechip> {- late CheckboxFilterEditorBloc bloc;-- @override- void initState() {- super.initState();- bloc = CheckboxFilterEditorBloc(filterInfo: widget.filterInfo)- ..add(const CheckboxFilterEditorEvent.initial());- }+class CheckboxFilterChoicechip extends StatelessWidget {+ const CheckboxFilterChoicechip({+ super.key,+ required this.filterId,+ });- @override- void dispose() {- bloc.close();- super.dispose();- }+ final String filterId;@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: bloc,- child: BlocBuilder<CheckboxFilterEditorBloc, CheckboxFilterEditorState>(- builder: (blocContext, state) {- return AppFlowyPopover(- controller: PopoverController(),- constraints: BoxConstraints.loose(const Size(200, 76)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (BuildContext context) {- return CheckboxFilterEditor(bloc: bloc);- },- child: ChoiceChipButton(- filterInfo: widget.filterInfo,- filterDesc: _makeFilterDesc(state),- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 76)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: CheckboxFilterEditor(+ filterId: filterId,+ ),+ );+ },+ child: SingleFilterBlocSelector<CheckboxFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.condition.filterName,);},),);}-- String _makeFilterDesc(CheckboxFilterEditorState state) {- final prefix = LocaleKeys.grid_checkboxFilter_choicechipPrefix_is.tr();- return "$prefix ${state.filter.condition.filterName}";- }}class CheckboxFilterEditor extends StatefulWidget {- const CheckboxFilterEditor({required this.bloc, super.key});+ const CheckboxFilterEditor({+ super.key,+ required this.filterId,+ });- final CheckboxFilterEditorBloc bloc;+ final String filterId;@overrideState<CheckboxFilterEditor> createState() => _CheckboxFilterEditorState();@@ -91,61 +72,50 @@ class _CheckboxFilterEditorState extends State<CheckboxFilterEditor> {@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: widget.bloc,- child: BlocBuilder<CheckboxFilterEditorBloc, CheckboxFilterEditorState>(- builder: (context, state) {- final List<Widget> children = [- _buildFilterPanel(context, state),- ];-- return Padding(- padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),- child: IntrinsicHeight(child: Column(children: children)),- );- },- ),- );- }-- Widget _buildFilterPanel(- BuildContext context,- CheckboxFilterEditorState state,- ) {- return SizedBox(- height: 20,- child: Row(- children: [- Expanded(- child: FlowyText(- state.filterInfo.fieldInfo.field.name,- overflow: TextOverflow.ellipsis,+ return SingleFilterBlocSelector<CheckboxFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {+ return Padding(+ padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),+ child: IntrinsicHeight(+ child: Row(+ children: [+ Expanded(+ child: FlowyText(+ field.name,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ const HSpace(4),+ CheckboxFilterConditionList(+ filter: filter,+ popoverMutex: popoverMutex,+ onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));+ },+ ),+ DisclosureButton(+ popoverMutex: popoverMutex,+ onAction: (action) {+ switch (action) {+ case FilterDisclosureAction.delete:+ context.read<FilterEditorBloc>().add(+ FilterEditorEvent.deleteFilter(+ filter.filterId,+ ),+ );+ break;+ }+ },+ ),+ ],),),- const HSpace(4),- CheckboxFilterConditionList(- filterInfo: state.filterInfo,- popoverMutex: popoverMutex,- onCondition: (condition) {- context- .read<CheckboxFilterEditorBloc>()- .add(CheckboxFilterEditorEvent.updateCondition(condition));- },- ),- DisclosureButton(- popoverMutex: popoverMutex,- onAction: (action) {- switch (action) {- case FilterDisclosureAction.delete:- context- .read<CheckboxFilterEditorBloc>()- .add(const CheckboxFilterEditorEvent.delete());- break;- }- },- ),- ],- ),+ );+ },);}}@@ -153,18 +123,17 @@ class _CheckboxFilterEditorState extends State<CheckboxFilterEditor> {class CheckboxFilterConditionList extends StatelessWidget {const CheckboxFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final CheckboxFilter filter;final PopoverMutex popoverMutex;- final Function(CheckboxFilterConditionPB) onCondition;+ final void Function(CheckboxFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final checkboxFilter = filterInfo.checkboxFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,@@ -173,17 +142,17 @@ class CheckboxFilterConditionList extends StatelessWidget {.map((action) => ConditionWrapper(action,- checkboxFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: checkboxFilter.condition.filterName,+ conditionName: filter.conditionName,onTap: () => controller.show(),);},- onSelected: (action, controller) async {+ onSelected: (action, controller) {onCondition(action.inner);controller.close();},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dartnew file mode 100644index 0000000000..45363ad60e--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart@@ -0,0 +1,171 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/checklist_filter.pbenum.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../condition_button.dart';+import '../disclosure_button.dart';+import 'choicechip.dart';++class ChecklistFilterChoicechip extends StatelessWidget {+ const ChecklistFilterChoicechip({+ super.key,+ required this.filterId,+ });++ final String filterId;++ @override+ Widget build(BuildContext context) {+ return AppFlowyPopover(+ controller: PopoverController(),+ constraints: BoxConstraints.loose(const Size(200, 160)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: ChecklistFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<ChecklistFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),+ );+ },+ ),+ );+ }+}++class ChecklistFilterEditor extends StatefulWidget {+ const ChecklistFilterEditor({+ super.key,+ required this.filterId,+ });++ final String filterId;++ @override+ ChecklistState createState() => ChecklistState();+}++class ChecklistState extends State<ChecklistFilterEditor> {+ final PopoverMutex popoverMutex = PopoverMutex();++ @override+ void dispose() {+ popoverMutex.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return SingleFilterBlocSelector<ChecklistFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {+ return SizedBox(+ height: 20,+ child: Row(+ children: [+ Expanded(+ child: FlowyText(+ field.name,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ const HSpace(4),+ ChecklistFilterConditionList(+ filter: filter,+ popoverMutex: popoverMutex,+ onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));+ },+ ),+ DisclosureButton(+ popoverMutex: popoverMutex,+ onAction: (action) {+ switch (action) {+ case FilterDisclosureAction.delete:+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.deleteFilter(filter.filterId));+ break;+ }+ },+ ),+ ],+ ),+ );+ },+ );+ }+}++class ChecklistFilterConditionList extends StatelessWidget {+ const ChecklistFilterConditionList({+ super.key,+ required this.filter,+ required this.popoverMutex,+ required this.onCondition,+ });++ final ChecklistFilter filter;+ final PopoverMutex popoverMutex;+ final void Function(ChecklistFilterConditionPB) onCondition;++ @override+ Widget build(BuildContext context) {+ return PopoverActionList<ConditionWrapper>(+ asBarrier: true,+ direction: PopoverDirection.bottomWithCenterAligned,+ mutex: popoverMutex,+ actions: ChecklistFilterConditionPB.values+ .map((action) => ConditionWrapper(action))+ .toList(),+ buildChild: (controller) {+ return ConditionButton(+ conditionName: filter.condition.filterName,+ onTap: () => controller.show(),+ );+ },+ onSelected: (action, controller) {+ onCondition(action.inner);+ controller.close();+ },+ );+ }+}++class ConditionWrapper extends ActionCell {+ ConditionWrapper(this.inner);++ final ChecklistFilterConditionPB inner;++ @override+ String get name => inner.filterName;+}++extension ChecklistFilterConditionPBExtension on ChecklistFilterConditionPB {+ String get filterName {+ switch (this) {+ case ChecklistFilterConditionPB.IsComplete:+ return LocaleKeys.grid_checklistFilter_isComplete.tr();+ case ChecklistFilterConditionPB.IsIncomplete:+ return LocaleKeys.grid_checklistFilter_isIncomplted.tr();+ default:+ return "";+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist/checklist.dartdeleted file mode 100644index e10e35dd7b..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart+++ /dev/null@@ -1,181 +0,0 @@-import 'package:flutter/material.dart';--import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/checklist_filter_bloc.dart';-import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/checklist_filter.pbenum.dart';-import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../condition_button.dart';-import '../../disclosure_button.dart';-import '../../filter_info.dart';-import '../choicechip.dart';--class ChecklistFilterChoicechip extends StatefulWidget {- const ChecklistFilterChoicechip({required this.filterInfo, super.key});-- final FilterInfo filterInfo;-- @override- State<ChecklistFilterChoicechip> createState() =>- _ChecklistFilterChoicechipState();-}--class _ChecklistFilterChoicechipState extends State<ChecklistFilterChoicechip> {- late final ChecklistFilterEditorBloc bloc;- final PopoverMutex popoverMutex = PopoverMutex();-- @override- void initState() {- super.initState();- bloc = ChecklistFilterEditorBloc(filterInfo: widget.filterInfo);- bloc.add(const ChecklistFilterEditorEvent.initial());- }-- @override- void dispose() {- bloc.close();- popoverMutex.dispose();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: bloc,- child: BlocBuilder<ChecklistFilterEditorBloc, ChecklistFilterEditorState>(- builder: (blocContext, state) {- return AppFlowyPopover(- controller: PopoverController(),- constraints: BoxConstraints.loose(const Size(200, 160)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (BuildContext context) {- return ChecklistFilterEditor(- bloc: bloc,- popoverMutex: popoverMutex,- );- },- child: ChoiceChipButton(- filterInfo: widget.filterInfo,- filterDesc: state.filterDesc,- ),- );- },- ),- );- }-}--class ChecklistFilterEditor extends StatefulWidget {- const ChecklistFilterEditor({- super.key,- required this.bloc,- required this.popoverMutex,- });-- final ChecklistFilterEditorBloc bloc;- final PopoverMutex popoverMutex;-- @override- ChecklistState createState() => ChecklistState();-}--class ChecklistState extends State<ChecklistFilterEditor> {- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: widget.bloc,- child: BlocBuilder<ChecklistFilterEditorBloc, ChecklistFilterEditorState>(- builder: (context, state) {- return SizedBox(- height: 20,- child: Row(- children: [- Expanded(- child: FlowyText(- state.filterInfo.fieldInfo.field.name,- overflow: TextOverflow.ellipsis,- ),- ),- const HSpace(4),- ChecklistFilterConditionList(- filterInfo: state.filterInfo,- ),- DisclosureButton(- popoverMutex: widget.popoverMutex,- onAction: (action) {- switch (action) {- case FilterDisclosureAction.delete:- context- .read<ChecklistFilterEditorBloc>()- .add(const ChecklistFilterEditorEvent.delete());- break;- }- },- ),- ],- ),- );- },- ),- );- }-}--class ChecklistFilterConditionList extends StatelessWidget {- const ChecklistFilterConditionList({- super.key,- required this.filterInfo,- });-- final FilterInfo filterInfo;-- @override- Widget build(BuildContext context) {- final checklistFilter = filterInfo.checklistFilter()!;- return PopoverActionList<ConditionWrapper>(- asBarrier: true,- direction: PopoverDirection.bottomWithCenterAligned,- actions: ChecklistFilterConditionPB.values- .map((action) => ConditionWrapper(action))- .toList(),- buildChild: (controller) {- return ConditionButton(- conditionName: checklistFilter.condition.filterName,- onTap: () => controller.show(),- );- },- onSelected: (action, controller) async {- context- .read<ChecklistFilterEditorBloc>()- .add(ChecklistFilterEditorEvent.updateCondition(action.inner));- controller.close();- },- );- }-}--class ConditionWrapper extends ActionCell {- ConditionWrapper(this.inner);-- final ChecklistFilterConditionPB inner;-- @override- String get name => inner.filterName;-}--extension ChecklistFilterConditionPBExtension on ChecklistFilterConditionPB {- String get filterName {- switch (this) {- case ChecklistFilterConditionPB.IsComplete:- return LocaleKeys.grid_checklistFilter_isComplete.tr();- case ChecklistFilterConditionPB.IsIncomplete:- return LocaleKeys.grid_checklistFilter_isIncomplted.tr();- default:- return "";- }- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/choicechip.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/choicechip.dartindex 85af9b3934..28d6042460 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/choicechip.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/choicechip.dart@@ -1,55 +1,59 @@+import 'dart:math' as math;+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/util/field_type_extension.dart';+import 'package:collection/collection.dart';import 'package:flowy_infra/theme_extension.dart';-import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';-import 'dart:math' as math;--import '../filter_info.dart';+import 'package:flutter_bloc/flutter_bloc.dart';class ChoiceChipButton extends StatelessWidget {const ChoiceChipButton({super.key,- required this.filterInfo,+ required this.fieldInfo,this.filterDesc = '',this.onTap,});- final FilterInfo filterInfo;+ final FieldInfo fieldInfo;final String filterDesc;final VoidCallback? onTap;@overrideWidget build(BuildContext context) {- final borderSide = BorderSide(- color: AFThemeExtension.of(context).toggleOffFill,- );-- final decoration = BoxDecoration(- color: Colors.transparent,- border: Border.fromBorderSide(borderSide),- borderRadius: const BorderRadius.all(Radius.circular(14)),- );+ final buttonText =+ filterDesc.isEmpty ? fieldInfo.name : "${fieldInfo.name}: $filterDesc";return SizedBox(height: 28,child: FlowyButton(- decoration: decoration,+ decoration: BoxDecoration(+ color: Colors.transparent,+ border: Border.fromBorderSide(+ BorderSide(+ color: AFThemeExtension.of(context).toggleOffFill,+ ),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),useIntrinsicWidth: true,text: FlowyText(+ buttonText,lineHeight: 1.0,- filterInfo.fieldInfo.field.name,color: AFThemeExtension.of(context).textColor,),margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),radius: const BorderRadius.all(Radius.circular(14)),leftIcon: FlowySvg(- filterInfo.fieldInfo.fieldType.svgData,+ fieldInfo.fieldType.svgData,color: Theme.of(context).iconTheme.color,),- rightIcon: _ChoicechipFilterDesc(filterDesc: filterDesc),+ rightIcon: const _ChoicechipDownArrow(),hoverColor: AFThemeExtension.of(context).lightGreyHover,onTap: onTap,),@@ -57,28 +61,54 @@ class ChoiceChipButton extends StatelessWidget {}}-class _ChoicechipFilterDesc extends StatelessWidget {- const _ChoicechipFilterDesc({this.filterDesc = ''});-- final String filterDesc;+class _ChoicechipDownArrow extends StatelessWidget {+ const _ChoicechipDownArrow();@overrideWidget build(BuildContext context) {- final arrow = Transform.rotate(+ return Transform.rotate(angle: -math.pi / 2,child: FlowySvg(FlowySvgs.arrow_left_s,color: AFThemeExtension.of(context).textColor,),);- return Padding(- padding: const EdgeInsets.symmetric(horizontal: 2),- child: Row(- children: [- if (filterDesc.isNotEmpty) FlowyText(': $filterDesc'),- arrow,- ],- ),+ }+}++class SingleFilterBlocSelector<T extends DatabaseFilter>+ extends StatelessWidget {+ const SingleFilterBlocSelector({+ super.key,+ required this.filterId,+ required this.builder,+ });++ final String filterId;+ final Widget Function(BuildContext, T, FieldInfo) builder;++ @override+ Widget build(BuildContext context) {+ return BlocSelector<FilterEditorBloc, FilterEditorState, (T, FieldInfo)?>(+ selector: (state) {+ final filter = state.filters+ .firstWhereOrNull((filter) => filter.filterId == filterId) as T?;+ if (filter == null) {+ return null;+ }+ final field = state.fields+ .firstWhereOrNull((field) => field.id == filter.fieldId);+ if (field == null) {+ return null;+ }+ return (filter, field);+ },+ builder: (context, selection) {+ if (selection == null) {+ return const SizedBox.shrink();+ }+ return builder(context, selection.$1, selection.$2);+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dartindex 6865da3fa8..8a22036fc1 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart@@ -1,52 +1,48 @@-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/date_filter_editor_bloc.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:appflowy/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart';+import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:appflowy/util/int64_extension.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';import '../condition_button.dart';import '../disclosure_button.dart';-import '../filter_info.dart';import 'choicechip.dart';-class DateFilterChoicechip extends StatefulWidget {+class DateFilterChoicechip extends StatelessWidget {const DateFilterChoicechip({super.key,- required this.filterInfo,+ required this.filterId,});- final FilterInfo filterInfo;-- @override- State<DateFilterChoicechip> createState() => _DateFilterChoicechipState();-}+ final String filterId;-class _DateFilterChoicechipState extends State<DateFilterChoicechip> {@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (_) => DateFilterEditorBloc(filterInfo: widget.filterInfo),- child: BlocBuilder<DateFilterEditorBloc, DateFilterEditorState>(- builder: (context, state) {- return AppFlowyPopover(- constraints: BoxConstraints.loose(const Size(200, 120)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (_) {- return BlocProvider.value(- value: context.read<DateFilterEditorBloc>(),- child: const DateFilterEditor(),- );- },- child: ChoiceChipButton(filterInfo: state.filterInfo),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 120)),+ direction: PopoverDirection.bottomWithLeftAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: DateFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<DateTimeFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),);},),@@ -55,7 +51,12 @@ class _DateFilterChoicechipState extends State<DateFilterChoicechip> {}class DateFilterEditor extends StatefulWidget {- const DateFilterEditor({super.key});+ const DateFilterEditor({+ super.key,+ required this.filterId,+ });++ final String filterId;@overrideState<DateFilterEditor> createState() => _DateFilterEditorState();@@ -63,27 +64,25 @@ class DateFilterEditor extends StatefulWidget {class _DateFilterEditorState extends State<DateFilterEditor> {final popoverMutex = PopoverMutex();- final _popover = PopoverController();- final _textEditingController = TextEditingController();+ final popooverController = PopoverController();@overridevoid dispose() {popoverMutex.dispose();- _textEditingController.dispose();super.dispose();}@overrideWidget build(BuildContext context) {- return BlocBuilder<DateFilterEditorBloc, DateFilterEditorState>(- builder: (context, state) {+ return SingleFilterBlocSelector<DateTimeFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {final List<Widget> children = [- _buildFilterPanel(context),- if (state.filter.condition != DateFilterConditionPB.DateIsEmpty &&- state.filter.condition !=- DateFilterConditionPB.DateIsNotEmpty) ...[+ _buildFilterPanel(filter, field),+ if (filter.condition != DateFilterConditionPB.DateIsEmpty &&+ filter.condition != DateFilterConditionPB.DateIsNotEmpty) ...[const VSpace(4),- _buildFilterDateField(context),+ _buildFilterContentField(filter),],];@@ -95,28 +94,30 @@ class _DateFilterEditorState extends State<DateFilterEditor> {);}- Widget _buildFilterPanel(BuildContext context) {- final state = context.watch<DateFilterEditorBloc>().state;+ Widget _buildFilterPanel(+ DateTimeFilter filter,+ FieldInfo field,+ ) {return SizedBox(height: 20,child: Row(children: [Expanded(child: FlowyText(- state.filterInfo.fieldInfo.name,+ field.name,overflow: TextOverflow.ellipsis,),),const HSpace(4),Expanded(- child: DateFilterConditionPBList(- filterInfo: state.filterInfo,+ child: DateFilterConditionList(+ filter: filter,popoverMutex: popoverMutex,onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);context- .read<DateFilterEditorBloc>()- .add(DateFilterEditorEvent.updateCondition(condition));- _popover.close();+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},),),@@ -127,8 +128,8 @@ class _DateFilterEditorState extends State<DateFilterEditor> {switch (action) {case FilterDisclosureAction.delete:context- .read<DateFilterEditorBloc>()- .add(const DateFilterEditorEvent.delete());+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.deleteFilter(filter.filterId));break;}},@@ -138,73 +139,75 @@ class _DateFilterEditorState extends State<DateFilterEditor> {);}- Widget _buildFilterDateField(BuildContext context) {- final filter = context.watch<DateFilterEditorBloc>().state.filter;-+ Widget _buildFilterContentField(DateTimeFilter filter) {final isRange = filter.condition == DateFilterConditionPB.DateWithIn;String? text;if (isRange) {text =- "${filter.start.dateTime.defaultFormat ?? ""} - ${filter.end.dateTime.defaultFormat ?? ""}";+ "${filter.start?.defaultFormat ?? ""} - ${filter.end?.defaultFormat ?? ""}";text = text == " - " ? null : text;} else {- text = filter.timestamp.dateTime.defaultFormat;+ text = filter.timestamp.defaultFormat;}- _textEditingController.text = text ?? "";return AppFlowyPopover(- controller: _popover,+ controller: popooverController,triggerActions: PopoverTriggerFlags.none,direction: PopoverDirection.bottomWithLeftAligned,constraints: BoxConstraints.loose(const Size(260, 620)),+ offset: const Offset(0, 4),margin: EdgeInsets.zero,- child: FlowyTextField(- controller: _textEditingController,- readOnly: true,- onTap: _popover.show,- autoFocus: false,- hintText: LocaleKeys.grid_field_dateTime.tr(),+ mutex: popoverMutex,+ child: FlowyButton(+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: Corners.s6Border,+ ),+ onTap: popooverController.show,+ text: FlowyText(+ text ?? "",+ overflow: TextOverflow.ellipsis,+ ),),popupBuilder: (_) {return BlocProvider.value(- value: context.read<DateFilterEditorBloc>(),- child: BlocBuilder<DateFilterEditorBloc, DateFilterEditorState>(- builder: (context, state) {- final filter = state.filter;- final isRange =- filter.condition == DateFilterConditionPB.DateWithIn;-+ value: context.read<FilterEditorBloc>(),+ child: SingleFilterBlocSelector<DateTimeFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {return AppFlowyDatePicker(isRange: isRange,timeHintText: LocaleKeys.grid_field_selectTime.tr(),includeTime: false,dateFormat: DateFormatPB.Friendly,timeFormat: TimeFormatPB.TwentyFourHour,- selectedDay: filter.timestamp.dateTime,- startDay: isRange ? filter.start.dateTime : null,- endDay: isRange ? filter.end.dateTime : null,+ selectedDay: isRange ? filter.start : filter.timestamp,+ startDay: isRange ? filter.start : null,+ endDay: isRange ? filter.end : null,onDaySelected: (selectedDay, _) {- Function(DateTime) event =- (date) => DateFilterEditorEvent.updateDate(date);- if (isRange) {- event = (date) =>- DateFilterEditorEvent.updateRange(start: date);- }-- context.read<DateFilterEditorBloc>().add(event(selectedDay));+ final newFilter = isRange+ ? filter.copyWithRange(start: selectedDay, end: null)+ : filter.copyWith(timestamp: selectedDay);+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));if (isRange) {- _popover.close();+ popooverController.close();}},- onRangeSelected: (start, end, _) =>- context.read<DateFilterEditorBloc>().add(- DateFilterEditorEvent.updateRange(- start: start,- end: end,- ),- ),- onIncludeTimeChanged: (_) => {},+ onRangeSelected: (start, end, _) {+ final newFilter = filter.copyWithRange(+ start: start,+ end: end,+ );+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));+ },+ onIncludeTimeChanged: (_) {},);},),@@ -214,21 +217,20 @@ class _DateFilterEditorState extends State<DateFilterEditor> {}}-class DateFilterConditionPBList extends StatelessWidget {- const DateFilterConditionPBList({+class DateFilterConditionList extends StatelessWidget {+ const DateFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final DateTimeFilter filter;final PopoverMutex popoverMutex;final Function(DateFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final dateFilter = filterInfo.dateFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,@@ -237,13 +239,13 @@ class DateFilterConditionPBList extends StatelessWidget {.map((action) => ConditionWrapper(action,- dateFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: dateFilter.condition.filterName,+ conditionName: filter.condition.filterName,onTap: () => controller.show(),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dartindex bbd9240bc4..c9466f3d53 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart@@ -1,54 +1,46 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/number_filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../condition_button.dart';import '../disclosure_button.dart';-import '../filter_info.dart';import 'choicechip.dart';-class NumberFilterChoiceChip extends StatefulWidget {+class NumberFilterChoiceChip extends StatelessWidget {const NumberFilterChoiceChip({super.key,- required this.filterInfo,+ required this.filterId,});- final FilterInfo filterInfo;-- @override- State<NumberFilterChoiceChip> createState() => _NumberFilterChoiceChipState();-}+ final String filterId;-class _NumberFilterChoiceChipState extends State<NumberFilterChoiceChip> {@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (_) => NumberFilterEditorBloc(- filterInfo: widget.filterInfo,- ),- child: BlocBuilder<NumberFilterEditorBloc, NumberFilterEditorState>(- builder: (context, state) {- return AppFlowyPopover(- constraints: BoxConstraints.loose(const Size(200, 100)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (_) {- return BlocProvider.value(- value: context.read<NumberFilterEditorBloc>(),- child: const NumberFilterEditor(),- );- },- child: ChoiceChipButton(- filterInfo: state.filterInfo,- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 100)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: NumberFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<NumberFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),);},),@@ -57,7 +49,12 @@ class _NumberFilterChoiceChipState extends State<NumberFilterChoiceChip> {}class NumberFilterEditor extends StatefulWidget {- const NumberFilterEditor({super.key});+ const NumberFilterEditor({+ super.key,+ required this.filterId,+ });++ final String filterId;@overrideState<NumberFilterEditor> createState() => _NumberFilterEditorState();@@ -74,15 +71,15 @@ class _NumberFilterEditorState extends State<NumberFilterEditor> {@overrideWidget build(BuildContext context) {- return BlocBuilder<NumberFilterEditorBloc, NumberFilterEditorState>(- builder: (context, state) {+ return SingleFilterBlocSelector<NumberFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {final List<Widget> children = [- _buildFilterPanel(context, state),- if (state.filter.condition != NumberFilterConditionPB.NumberIsEmpty &&- state.filter.condition !=- NumberFilterConditionPB.NumberIsNotEmpty) ...[+ _buildFilterPanel(filter, field),+ if (filter.condition != NumberFilterConditionPB.NumberIsEmpty &&+ filter.condition != NumberFilterConditionPB.NumberIsNotEmpty) ...[const VSpace(4),- _buildFilterNumberField(context, state),+ _buildFilterNumberField(filter),],];@@ -95,8 +92,8 @@ class _NumberFilterEditorState extends State<NumberFilterEditor> {}Widget _buildFilterPanel(- BuildContext context,- NumberFilterEditorState state,+ NumberFilter filter,+ FieldInfo field,) {return SizedBox(height: 20,@@ -104,19 +101,20 @@ class _NumberFilterEditorState extends State<NumberFilterEditor> {children: [Expanded(child: FlowyText(- state.filterInfo.fieldInfo.name,+ field.name,overflow: TextOverflow.ellipsis,),),const HSpace(4),Expanded(- child: NumberFilterConditionPBList(- filterInfo: state.filterInfo,+ child: NumberFilterConditionList(+ filter: filter,popoverMutex: popoverMutex,onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);context- .read<NumberFilterEditorBloc>()- .add(NumberFilterEditorEvent.updateCondition(condition));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},),),@@ -126,9 +124,11 @@ class _NumberFilterEditorState extends State<NumberFilterEditor> {onAction: (action) {switch (action) {case FilterDisclosureAction.delete:- context- .read<NumberFilterEditorBloc>()- .add(const NumberFilterEditorEvent.delete());+ context.read<FilterEditorBloc>().add(+ FilterEditorEvent.deleteFilter(+ filter.filterId,+ ),+ );break;}},@@ -139,38 +139,37 @@ class _NumberFilterEditorState extends State<NumberFilterEditor> {}Widget _buildFilterNumberField(- BuildContext context,- NumberFilterEditorState state,+ NumberFilter filter,) {return FlowyTextField(- text: state.filter.content,+ text: filter.content,hintText: LocaleKeys.grid_settings_typeAValue.tr(),debounceDuration: const Duration(milliseconds: 300),autoFocus: false,onChanged: (text) {+ final newFilter = filter.copyWith(content: text);context- .read<NumberFilterEditorBloc>()- .add(NumberFilterEditorEvent.updateContent(text));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},);}}-class NumberFilterConditionPBList extends StatelessWidget {- const NumberFilterConditionPBList({+class NumberFilterConditionList extends StatelessWidget {+ const NumberFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final NumberFilter filter;final PopoverMutex popoverMutex;- final Function(NumberFilterConditionPB) onCondition;+ final void Function(NumberFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final numberFilter = filterInfo.numberFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,@@ -179,13 +178,13 @@ class NumberFilterConditionPBList extends StatelessWidget {.map((action) => ConditionWrapper(action,- numberFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: numberFilter.condition.filterName,+ conditionName: filter.condition.filterName,onTap: () => controller.show(),);},@@ -212,6 +211,22 @@ class ConditionWrapper extends ActionCell {}extension NumberFilterConditionPBExtension on NumberFilterConditionPB {+ String get shortName {+ return switch (this) {+ NumberFilterConditionPB.Equal => "=",+ NumberFilterConditionPB.NotEqual => "≠",+ NumberFilterConditionPB.LessThan => "<",+ NumberFilterConditionPB.LessThanOrEqualTo => "≤",+ NumberFilterConditionPB.GreaterThan => ">",+ NumberFilterConditionPB.GreaterThanOrEqualTo => "≥",+ NumberFilterConditionPB.NumberIsEmpty =>+ LocaleKeys.grid_numberFilter_isEmpty.tr(),+ NumberFilterConditionPB.NumberIsNotEmpty =>+ LocaleKeys.grid_numberFilter_isNotEmpty.tr(),+ _ => "",+ };+ }+String get filterName {return switch (this) {NumberFilterConditionPB.Equal => LocaleKeys.grid_numberFilter_equal.tr(),diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dartindex d33dba6293..f74361d03c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart@@ -1,7 +1,7 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/condition_button.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';@@ -11,33 +11,34 @@ import 'package:flutter/widgets.dart';class SelectOptionFilterConditionList extends StatelessWidget {const SelectOptionFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,+ required this.fieldType,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final SelectOptionFilter filter;+ final FieldType fieldType;final PopoverMutex popoverMutex;- final Function(SelectOptionFilterConditionPB) onCondition;+ final void Function(SelectOptionFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final selectOptionFilter = filterInfo.selectOptionFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,direction: PopoverDirection.bottomWithCenterAligned,- actions: _conditionsForFieldType(filterInfo.fieldInfo.fieldType)+ actions: _conditionsForFieldType(fieldType).map((action) => ConditionWrapper(action,- selectOptionFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: selectOptionFilter.condition.i18n,+ conditionName: filter.condition.i18n,onTap: () => controller.show(),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dartindex b3c1482453..d36b34c226 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart@@ -1,115 +1,118 @@import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/select_option_filter_bloc.dart';-import 'package:appflowy/plugins/database/grid/application/filter/select_option_filter_list_bloc.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';+import 'package:flowy_infra/theme_extension.dart';+import 'package:flowy_infra_ui/style_widget/hover.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'select_option_loader.dart';-class SelectOptionFilterList extends StatelessWidget {const SelectOptionFilterList({super.key,- required this.filterInfo,- required this.selectedOptionIds,- required this.onSelectedOptions,+ required this.filter,+ required this.field,+ required this.delegate,+ required this.options,});- final FilterInfo filterInfo;- final List<String> selectedOptionIds;- final Function(List<String>) onSelectedOptions;+ final SelectOptionFilter filter;+ final FieldInfo field;+ final SelectOptionFilterDelegate delegate;+ final List<SelectOptionPB> options;@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (context) {- return SelectOptionFilterListBloc(- selectedOptionIds: selectedOptionIds,- delegate: filterInfo.fieldInfo.fieldType == FieldType.SingleSelect- ? SingleSelectOptionFilterDelegateImpl(filterInfo: filterInfo)- : MultiSelectOptionFilterDelegateImpl(filterInfo: filterInfo),- )..add(const SelectOptionFilterListEvent.initial());+ return ListView.separated(+ physics: const NeverScrollableScrollPhysics(),+ shrinkWrap: true,+ itemCount: options.length,+ separatorBuilder: (context, index) =>+ VSpace(GridSize.typeOptionSeparatorHeight),+ itemBuilder: (context, index) {+ final option = options[index];+ final isSelected = filter.optionIds.contains(option.id);+ return SelectOptionFilterCell(+ option: option,+ isSelected: isSelected,+ onTap: () => _onTapHandler(context, option, isSelected),+ );},- child:- BlocConsumer<SelectOptionFilterListBloc, SelectOptionFilterListState>(- listenWhen: (previous, current) =>- previous.selectedOptionIds != current.selectedOptionIds,- listener: (context, state) {- onSelectedOptions(state.selectedOptionIds.toList());- },- builder: (context, state) {- return ListView.separated(- physics: const NeverScrollableScrollPhysics(),- shrinkWrap: true,- itemCount: state.visibleOptions.length,- separatorBuilder: (context, index) {- return VSpace(GridSize.typeOptionSeparatorHeight);- },- itemBuilder: (BuildContext context, int index) {- final option = state.visibleOptions[index];- return SelectOptionFilterCell(- option: option.optionPB,- isSelected: option.isSelected,- );- },- );- },- ),);}++ void _onTapHandler(+ BuildContext context,+ SelectOptionPB option,+ bool isSelected,+ ) {+ if (isSelected) {+ final selectedOptionIds = Set<String>.from(filter.optionIds)+ ..remove(option.id);++ _updateSelectOptions(context, filter, selectedOptionIds);+ } else {+ final selectedOptionIds = delegate.selectOption(+ filter.optionIds,+ option.id,+ filter.condition,+ );++ _updateSelectOptions(context, filter, selectedOptionIds);+ }+ }++ void _updateSelectOptions(+ BuildContext context,+ SelectOptionFilter filter,+ Set<String> selectedOptionIds,+ ) {+ final optionIds =+ options.map((e) => e.id).where(selectedOptionIds.contains).toList();+ final newFilter = filter.copyWith(optionIds: optionIds);+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));+ }}-class SelectOptionFilterCell extends StatefulWidget {+class SelectOptionFilterCell extends StatelessWidget {const SelectOptionFilterCell({super.key,required this.option,required this.isSelected,+ required this.onTap,});final SelectOptionPB option;final bool isSelected;+ final VoidCallback onTap;- @override- State<SelectOptionFilterCell> createState() => _SelectOptionFilterCellState();-}--class _SelectOptionFilterCellState extends State<SelectOptionFilterCell> {@overrideWidget build(BuildContext context) {return SizedBox(height: GridSize.popoverItemHeight,- child: SelectOptionTagCell(- option: widget.option,- onSelected: () {- if (widget.isSelected) {- context- .read<SelectOptionFilterListBloc>()- .add(SelectOptionFilterListEvent.unSelectOption(widget.option));- } else {- context.read<SelectOptionFilterListBloc>().add(- SelectOptionFilterListEvent.selectOption(- widget.option,- context- .read<SelectOptionFilterEditorBloc>()- .state- .filter- .condition,- ),- );- }- },- children: [- if (widget.isSelected)- const Padding(- padding: EdgeInsets.only(right: 6),- child: FlowySvg(FlowySvgs.check_s),- ),- ],+ child: FlowyHover(+ resetHoverOnRebuild: false,+ style: HoverStyle(+ hoverColor: AFThemeExtension.of(context).lightGreyHover,+ ),+ child: SelectOptionTagCell(+ option: option,+ onSelected: onTap,+ children: [+ if (isSelected)+ const Padding(+ padding: EdgeInsets.only(right: 6),+ child: FlowySvg(FlowySvgs.check_s),+ ),+ ],+ ),),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dartindex 734aaf143e..17bed513be 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart@@ -1,77 +1,44 @@-import 'package:flutter/material.dart';--import 'package:appflowy/plugins/database/grid/application/filter/select_option_filter_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option_filter.pb.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../../disclosure_button.dart';-import '../../filter_info.dart';import '../choicechip.dart';import 'condition_list.dart';import 'option_list.dart';-import 'select_option_loader.dart';--class SelectOptionFilterChoicechip extends StatefulWidget {- const SelectOptionFilterChoicechip({required this.filterInfo, super.key});- final FilterInfo filterInfo;-- @override- State<SelectOptionFilterChoicechip> createState() =>- _SelectOptionFilterChoicechipState();-}+class SelectOptionFilterChoicechip extends StatelessWidget {+ const SelectOptionFilterChoicechip({+ super.key,+ required this.filterId,+ });-class _SelectOptionFilterChoicechipState- extends State<SelectOptionFilterChoicechip> {- late SelectOptionFilterEditorBloc bloc;-- @override- void initState() {- super.initState();- if (widget.filterInfo.fieldInfo.fieldType == FieldType.SingleSelect) {- bloc = SelectOptionFilterEditorBloc(- filterInfo: widget.filterInfo,- delegate:- SingleSelectOptionFilterDelegateImpl(filterInfo: widget.filterInfo),- );- } else {- bloc = SelectOptionFilterEditorBloc(- filterInfo: widget.filterInfo,- delegate:- MultiSelectOptionFilterDelegateImpl(filterInfo: widget.filterInfo),- );- }- bloc.add(const SelectOptionFilterEditorEvent.initial());- }-- @override- void dispose() {- bloc.close();- super.dispose();- }+ final String filterId;@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: bloc,- child: BlocBuilder<SelectOptionFilterEditorBloc,- SelectOptionFilterEditorState>(- builder: (blocContext, state) {- return AppFlowyPopover(- controller: PopoverController(),- constraints: BoxConstraints.loose(const Size(240, 160)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (BuildContext context) {- return SelectOptionFilterEditor(bloc: bloc);- },- child: ChoiceChipButton(- filterInfo: widget.filterInfo,- filterDesc: state.filterDesc,- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(240, 160)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: SelectOptionFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<SelectOptionFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),);},),@@ -80,9 +47,12 @@ class _SelectOptionFilterChoicechipState}class SelectOptionFilterEditor extends StatefulWidget {- const SelectOptionFilterEditor({required this.bloc, super.key});+ const SelectOptionFilterEditor({+ super.key,+ required this.filterId,+ });- final SelectOptionFilterEditorBloc bloc;+ final String filterId;@overrideState<SelectOptionFilterEditor> createState() =>@@ -100,53 +70,47 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: widget.bloc,- child: BlocBuilder<SelectOptionFilterEditorBloc,- SelectOptionFilterEditorState>(- builder: (context, state) {- final List<Widget> slivers = [- SliverToBoxAdapter(child: _buildFilterPanel(context, state)),- ];-- if (state.filter.condition !=- SelectOptionFilterConditionPB.OptionIsEmpty &&- state.filter.condition !=- SelectOptionFilterConditionPB.OptionIsNotEmpty) {- slivers.add(const SliverToBoxAdapter(child: VSpace(4)));- slivers.add(+ return SingleFilterBlocSelector<SelectOptionFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {+ final List<Widget> slivers = [+ SliverToBoxAdapter(child: _buildFilterPanel(filter, field)),+ ];++ if (![+ SelectOptionFilterConditionPB.OptionIsEmpty,+ SelectOptionFilterConditionPB.OptionIsNotEmpty,+ ].contains(filter.condition)) {+ final delegate = makeDelegate(field);+ slivers+ ..add(const SliverToBoxAdapter(child: VSpace(4)))+ ..add(SliverToBoxAdapter(child: SelectOptionFilterList(- filterInfo: state.filterInfo,- selectedOptionIds: state.filter.optionIds,- onSelectedOptions: (optionIds) {- context.read<SelectOptionFilterEditorBloc>().add(- SelectOptionFilterEditorEvent.updateContent(- optionIds,- ),- );- },+ filter: filter,+ field: field,+ delegate: delegate,+ options: delegate.getOptions(field),),),);- }-- return Padding(- padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),- child: CustomScrollView(- shrinkWrap: true,- slivers: slivers,- physics: StyledScrollPhysics(),- ),- );- },- ),+ }++ return Padding(+ padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),+ child: CustomScrollView(+ shrinkWrap: true,+ slivers: slivers,+ physics: StyledScrollPhysics(),+ ),+ );+ },);}Widget _buildFilterPanel(- BuildContext context,- SelectOptionFilterEditorState state,+ SelectOptionFilter filter,+ FieldInfo field,) {return SizedBox(height: 20,@@ -154,18 +118,20 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {children: [Expanded(child: FlowyText(- state.filterInfo.fieldInfo.field.name,+ field.field.name,overflow: TextOverflow.ellipsis,),),const HSpace(4),SelectOptionFilterConditionList(- filterInfo: state.filterInfo,+ filter: filter,+ fieldType: field.fieldType,popoverMutex: popoverMutex,onCondition: (condition) {- context.read<SelectOptionFilterEditorBloc>().add(- SelectOptionFilterEditorEvent.updateCondition(condition),- );+ final newFilter = filter.copyWith(condition: condition);+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},),DisclosureButton(@@ -174,8 +140,8 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {switch (action) {case FilterDisclosureAction.delete:context- .read<SelectOptionFilterEditorBloc>()- .add(const SelectOptionFilterEditorEvent.delete());+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.deleteFilter(filter.filterId));break;}},@@ -184,4 +150,9 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {),);}++ SelectOptionFilterDelegate makeDelegate(FieldInfo field) =>+ field.fieldType == FieldType.SingleSelect+ ? const SingleSelectOptionFilterDelegateImpl()+ : const MultiSelectOptionFilterDelegateImpl();}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dartindex 0ee63f25da..cbbff3d40f 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart@@ -1,71 +1,60 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/text_filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../condition_button.dart';import '../disclosure_button.dart';-import '../filter_info.dart';import 'choicechip.dart';class TextFilterChoicechip extends StatelessWidget {- const TextFilterChoicechip({required this.filterInfo, super.key});+ const TextFilterChoicechip({+ super.key,+ required this.filterId,+ });- final FilterInfo filterInfo;+ final String filterId;@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (_) => TextFilterEditorBloc(- filterInfo: filterInfo,- fieldType: FieldType.RichText,- )..add(const TextFilterEditorEvent.initial()),- child: BlocBuilder<TextFilterEditorBloc, TextFilterEditorState>(- builder: (context, state) {- return AppFlowyPopover(- constraints: BoxConstraints.loose(const Size(200, 76)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (popoverContext) {- return BlocProvider.value(- value: context.read<TextFilterEditorBloc>(),- child: const TextFilterEditor(),- );- },- child: ChoiceChipButton(- filterInfo: filterInfo,- filterDesc: _makeFilterDesc(state),- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 76)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: TextFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<TextFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),);},),);}-- String _makeFilterDesc(TextFilterEditorState state) {- String filterDesc = state.filter.condition.choicechipPrefix;- if (state.filter.condition == TextFilterConditionPB.TextIsEmpty ||- state.filter.condition == TextFilterConditionPB.TextIsNotEmpty) {- return filterDesc;- }-- if (state.filter.content.isNotEmpty) {- filterDesc += " ${state.filter.content}";- }-- return filterDesc;- }}class TextFilterEditor extends StatefulWidget {- const TextFilterEditor({super.key});+ const TextFilterEditor({+ super.key,+ required this.filterId,+ });++ final String filterId;@overrideState<TextFilterEditor> createState() => _TextFilterEditorState();@@ -82,16 +71,17 @@ class _TextFilterEditorState extends State<TextFilterEditor> {@overrideWidget build(BuildContext context) {- return BlocBuilder<TextFilterEditorBloc, TextFilterEditorState>(- builder: (context, state) {+ return SingleFilterBlocSelector<TextFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {final List<Widget> children = [- _buildFilterPanel(context, state),+ _buildFilterPanel(filter, field),];- if (state.filter.condition != TextFilterConditionPB.TextIsEmpty &&- state.filter.condition != TextFilterConditionPB.TextIsNotEmpty) {+ if (filter.condition != TextFilterConditionPB.TextIsEmpty &&+ filter.condition != TextFilterConditionPB.TextIsNotEmpty) {children.add(const VSpace(4));- children.add(_buildFilterTextField(context, state));+ children.add(_buildFilterTextField(filter, field));}return Padding(@@ -102,26 +92,27 @@ class _TextFilterEditorState extends State<TextFilterEditor> {);}- Widget _buildFilterPanel(BuildContext context, TextFilterEditorState state) {+ Widget _buildFilterPanel(TextFilter filter, FieldInfo field) {return SizedBox(height: 20,child: Row(children: [Expanded(child: FlowyText(- state.filterInfo.fieldInfo.name,+ field.name,overflow: TextOverflow.ellipsis,),),const HSpace(4),Expanded(- child: TextFilterConditionPBList(- filterInfo: state.filterInfo,+ child: TextFilterConditionList(+ filter: filter,popoverMutex: popoverMutex,onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);context- .read<TextFilterEditorBloc>()- .add(TextFilterEditorEvent.updateCondition(condition));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},),),@@ -132,8 +123,8 @@ class _TextFilterEditorState extends State<TextFilterEditor> {switch (action) {case FilterDisclosureAction.delete:context- .read<TextFilterEditorBloc>()- .add(const TextFilterEditorEvent.delete());+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.deleteFilter(filter.filterId));break;}},@@ -143,39 +134,36 @@ class _TextFilterEditorState extends State<TextFilterEditor> {);}- Widget _buildFilterTextField(- BuildContext context,- TextFilterEditorState state,- ) {+ Widget _buildFilterTextField(TextFilter filter, FieldInfo field) {return FlowyTextField(- text: state.filter.content,+ text: filter.content,hintText: LocaleKeys.grid_settings_typeAValue.tr(),debounceDuration: const Duration(milliseconds: 300),autoFocus: false,onChanged: (text) {+ final newFilter = filter.copyWith(content: text);context- .read<TextFilterEditorBloc>()- .add(TextFilterEditorEvent.updateContent(text));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},);}}-class TextFilterConditionPBList extends StatelessWidget {- const TextFilterConditionPBList({+class TextFilterConditionList extends StatelessWidget {+ const TextFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final TextFilter filter;final PopoverMutex popoverMutex;- final Function(TextFilterConditionPB) onCondition;+ final void Function(TextFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final textFilter = filterInfo.textFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,@@ -184,13 +172,13 @@ class TextFilterConditionPBList extends StatelessWidget {.map((action) => ConditionWrapper(action,- textFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: textFilter.condition.filterName,+ conditionName: filter.condition.filterName,onTap: () => controller.show(),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dartindex 22e999d010..1891704e88 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart@@ -1,54 +1,45 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/time_filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../condition_button.dart';import '../disclosure_button.dart';-import '../filter_info.dart';import 'choicechip.dart';-class TimeFilterChoiceChip extends StatefulWidget {+class TimeFilterChoiceChip extends StatelessWidget {const TimeFilterChoiceChip({super.key,- required this.filterInfo,+ required this.filterId,});- final FilterInfo filterInfo;+ final String filterId;- @override- State<TimeFilterChoiceChip> createState() => _TimeFilterChoiceChipState();-}--class _TimeFilterChoiceChipState extends State<TimeFilterChoiceChip> {@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (_) => TimeFilterEditorBloc(- filterInfo: widget.filterInfo,- ),- child: BlocBuilder<TimeFilterEditorBloc, TimeFilterEditorState>(- builder: (context, state) {- return AppFlowyPopover(- constraints: BoxConstraints.loose(const Size(200, 100)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (_) {- return BlocProvider.value(- value: context.read<TimeFilterEditorBloc>(),- child: const TimeFilterEditor(),- );- },- child: ChoiceChipButton(- filterInfo: state.filterInfo,- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 100)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: TimeFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<TimeFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,);},),@@ -57,8 +48,12 @@ class _TimeFilterChoiceChipState extends State<TimeFilterChoiceChip> {}class TimeFilterEditor extends StatefulWidget {- const TimeFilterEditor({super.key});+ const TimeFilterEditor({+ super.key,+ required this.filterId,+ });+ final String filterId;@overrideState<TimeFilterEditor> createState() => _TimeFilterEditorState();}@@ -74,15 +69,15 @@ class _TimeFilterEditorState extends State<TimeFilterEditor> {@overrideWidget build(BuildContext context) {- return BlocBuilder<TimeFilterEditorBloc, TimeFilterEditorState>(- builder: (context, state) {+ return SingleFilterBlocSelector<TimeFilter>(+ filterId: widget.filterId,+ builder: (context, filter, field) {final List<Widget> children = [- _buildFilterPanel(context, state),- if (state.filter.condition != NumberFilterConditionPB.NumberIsEmpty &&- state.filter.condition !=- NumberFilterConditionPB.NumberIsNotEmpty) ...[+ _buildFilterPanel(filter, field),+ if (filter.condition != NumberFilterConditionPB.NumberIsEmpty &&+ filter.condition != NumberFilterConditionPB.NumberIsNotEmpty) ...[const VSpace(4),- _buildFilterTimeField(context, state),+ _buildFilterTimeField(filter, field),],];@@ -95,8 +90,8 @@ class _TimeFilterEditorState extends State<TimeFilterEditor> {}Widget _buildFilterPanel(- BuildContext context,- TimeFilterEditorState state,+ TimeFilter filter,+ FieldInfo field,) {return SizedBox(height: 20,@@ -104,19 +99,20 @@ class _TimeFilterEditorState extends State<TimeFilterEditor> {children: [Expanded(child: FlowyText(- state.filterInfo.fieldInfo.name,+ field.name,overflow: TextOverflow.ellipsis,),),const HSpace(4),Expanded(- child: TimeFilterConditionPBList(- filterInfo: state.filterInfo,+ child: TimeFilterConditionList(+ filter: filter,popoverMutex: popoverMutex,onCondition: (condition) {+ final newFilter = filter.copyWith(condition: condition);context- .read<TimeFilterEditorBloc>()- .add(TimeFilterEditorEvent.updateCondition(condition));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},),),@@ -127,8 +123,8 @@ class _TimeFilterEditorState extends State<TimeFilterEditor> {switch (action) {case FilterDisclosureAction.delete:context- .read<TimeFilterEditorBloc>()- .add(const TimeFilterEditorEvent.delete());+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.deleteFilter(filter.filterId));break;}},@@ -139,38 +135,38 @@ class _TimeFilterEditorState extends State<TimeFilterEditor> {}Widget _buildFilterTimeField(- BuildContext context,- TimeFilterEditorState state,+ TimeFilter filter,+ FieldInfo field,) {return FlowyTextField(- text: state.filter.content,+ text: filter.content,hintText: LocaleKeys.grid_settings_typeAValue.tr(),debounceDuration: const Duration(milliseconds: 300),autoFocus: false,onChanged: (text) {+ final newFilter = filter.copyWith(content: text);context- .read<TimeFilterEditorBloc>()- .add(TimeFilterEditorEvent.updateContent(text));+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.updateFilter(newFilter));},);}}-class TimeFilterConditionPBList extends StatelessWidget {- const TimeFilterConditionPBList({+class TimeFilterConditionList extends StatelessWidget {+ const TimeFilterConditionList({super.key,- required this.filterInfo,+ required this.filter,required this.popoverMutex,required this.onCondition,});- final FilterInfo filterInfo;+ final TimeFilter filter;final PopoverMutex popoverMutex;- final Function(NumberFilterConditionPB) onCondition;+ final void Function(NumberFilterConditionPB) onCondition;@overrideWidget build(BuildContext context) {- final timeFilter = filterInfo.timeFilter()!;return PopoverActionList<ConditionWrapper>(asBarrier: true,mutex: popoverMutex,@@ -179,13 +175,13 @@ class TimeFilterConditionPBList extends StatelessWidget {.map((action) => ConditionWrapper(action,- timeFilter.condition == action,+ filter.condition == action,),).toList(),buildChild: (controller) {return ConditionButton(- conditionName: timeFilter.condition.filterName,+ conditionName: filter.condition.filterName,onTap: () => controller.show(),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dartindex 53d2b0ace8..657974c6f5 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart@@ -1,58 +1,41 @@-import 'package:appflowy/plugins/database/grid/application/filter/text_filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../filter_info.dart';import 'choicechip.dart';-class URLFilterChoiceChip extends StatelessWidget {- const URLFilterChoiceChip({required this.filterInfo, super.key});+class URLFilterChoicechip extends StatelessWidget {+ const URLFilterChoicechip({+ super.key,+ required this.filterId,+ });- final FilterInfo filterInfo;+ final String filterId;@overrideWidget build(BuildContext context) {- return BlocProvider(- create: (_) => TextFilterEditorBloc(- filterInfo: filterInfo,- fieldType: FieldType.URL,- ),- child: BlocBuilder<TextFilterEditorBloc, TextFilterEditorState>(- builder: (context, state) {- return AppFlowyPopover(- constraints: BoxConstraints.loose(const Size(200, 76)),- direction: PopoverDirection.bottomWithCenterAligned,- popupBuilder: (popoverContext) {- return BlocProvider.value(- value: context.read<TextFilterEditorBloc>(),- child: const TextFilterEditor(),- );- },- child: ChoiceChipButton(- filterInfo: filterInfo,- filterDesc: _makeFilterDesc(state),- ),+ return AppFlowyPopover(+ constraints: BoxConstraints.loose(const Size(200, 76)),+ direction: PopoverDirection.bottomWithCenterAligned,+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: TextFilterEditor(filterId: filterId),+ );+ },+ child: SingleFilterBlocSelector<TextFilter>(+ filterId: filterId,+ builder: (context, filter, field) {+ return ChoiceChipButton(+ fieldInfo: field,+ filterDesc: filter.getDescription(field),);},),);}-- String _makeFilterDesc(TextFilterEditorState state) {- String filterDesc = state.filter.condition.choicechipPrefix;- if (state.filter.condition == TextFilterConditionPB.TextIsEmpty ||- state.filter.condition == TextFilterConditionPB.TextIsNotEmpty) {- return filterDesc;- }-- if (state.filter.content.isNotEmpty) {- filterDesc += " ${state.filter.content}";- }-- return filterDesc;- }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/condition_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/condition_button.dartindex 7ebe4e9f03..2be7810546 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/condition_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/condition_button.dart@@ -1,5 +1,6 @@import 'dart:math' as math;import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -38,7 +39,7 @@ class ConditionButton extends StatelessWidget {overflow: TextOverflow.ellipsis,),margin: const EdgeInsets.symmetric(horizontal: 4),- radius: const BorderRadius.all(Radius.circular(2)),+ radius: Corners.s6Border,rightIcon: arrow,hoverColor: AFThemeExtension.of(context).lightGreyHover,onTap: onTap,diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/create_filter_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/create_filter_list.dartindex 849a436e80..9a963c848e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/create_filter_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/create_filter_list.dart@@ -1,8 +1,8 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/simple_text_filter_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/util/field_type_extension.dart';import 'package:easy_localization/easy_localization.dart';@@ -12,59 +12,46 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/style_widget/text_field.dart';import 'package:flowy_infra_ui/widget/spacing.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../../../application/field/field_controller.dart';-import '../../../application/filter/filter_create_bloc.dart';--class GridCreateFilterList extends StatefulWidget {- const GridCreateFilterList({+class CreateDatabaseViewFilterList extends StatelessWidget {+ const CreateDatabaseViewFilterList({super.key,- required this.viewId,- required this.fieldController,- required this.onClosed,- this.onCreateFilter,+ this.onTap,});- final String viewId;- final FieldController fieldController;- final VoidCallback onClosed;- final VoidCallback? onCreateFilter;-- @override- State<StatefulWidget> createState() => _GridCreateFilterListState();-}--class _GridCreateFilterListState extends State<GridCreateFilterList> {- late final GridCreateFilterBloc editBloc;-- @override- void initState() {- super.initState();- editBloc = GridCreateFilterBloc(- viewId: widget.viewId,- fieldController: widget.fieldController,- )..add(const GridCreateFilterEvent.initial());- }+ final VoidCallback? onTap;@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: editBloc,- child: BlocListener<GridCreateFilterBloc, GridCreateFilterState>(+ final filterBloc = context.read<FilterEditorBloc>();+ return BlocProvider(+ create: (_) => SimpleTextFilterBloc<FieldInfo>(+ values: List.from(filterBloc.state.fields),+ comparator: (val) => val.name,+ ),+ child: BlocListener<FilterEditorBloc, FilterEditorState>(+ listenWhen: (previous, current) => previous.fields != current.fields,listener: (context, state) {- if (state.didCreateFilter) {- widget.onClosed();- }+ context+ .read<SimpleTextFilterBloc<FieldInfo>>()+ .add(SimpleTextFilterEvent.receiveNewValues(state.fields));},- child: BlocBuilder<GridCreateFilterBloc, GridCreateFilterState>(+ child: BlocBuilder<SimpleTextFilterBloc<FieldInfo>,+ SimpleTextFilterState<FieldInfo>>(builder: (context, state) {- final cells = state.creatableFields.map((fieldInfo) {+ final cells = state.values.map((fieldInfo) {return SizedBox(height: GridSize.popoverItemHeight,- child: GridFilterPropertyCell(+ child: FilterableFieldButton(fieldInfo: fieldInfo,- onTap: (fieldInfo) => createFilter(fieldInfo),+ onTap: (fieldInfo) {+ context+ .read<FilterEditorBloc>()+ .add(FilterEditorEvent.createFilter(fieldInfo));+ onTap?.call();+ },),);}).toList();@@ -94,17 +81,6 @@ class _GridCreateFilterListState extends State<GridCreateFilterList> {),);}-- @override- void dispose() {- editBloc.close();- super.dispose();- }-- void createFilter(FieldInfo field) {- editBloc.add(GridCreateFilterEvent.createDefaultFilter(field));- widget.onCreateFilter?.call();- }}class _FilterTextFieldDelegate extends SliverPersistentHeaderDelegate {@@ -126,8 +102,8 @@ class _FilterTextFieldDelegate extends SliverPersistentHeaderDelegate {hintText: LocaleKeys.grid_settings_filterBy.tr(),onChanged: (text) {context- .read<GridCreateFilterBloc>()- .add(GridCreateFilterEvent.didReceiveFilterText(text));+ .read<SimpleTextFilterBloc<FieldInfo>>()+ .add(SimpleTextFilterEvent.updateFilter(text));},),);@@ -145,8 +121,8 @@ class _FilterTextFieldDelegate extends SliverPersistentHeaderDelegate {}}-class GridFilterPropertyCell extends StatelessWidget {- const GridFilterPropertyCell({+class FilterableFieldButton extends StatelessWidget {+ const FilterableFieldButton({super.key,required this.fieldInfo,required this.onTap,diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_info.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_info.dartdeleted file mode 100644index 0f355ebc4c..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_info.dart+++ /dev/null@@ -1,69 +0,0 @@-import 'package:appflowy/plugins/database/application/field/field_info.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';--class FilterInfo {- FilterInfo(this.viewId, this.filter, this.fieldInfo);-- final String viewId;- final FilterPB filter;- final FieldInfo fieldInfo;-- FilterInfo copyWith({FilterPB? filter, FieldInfo? fieldInfo}) {- return FilterInfo(- viewId,- filter ?? this.filter,- fieldInfo ?? this.fieldInfo,- );- }-- String get filterId => filter.id;-- String get fieldId => filter.data.fieldId;-- DateFilterPB? dateFilter() {- final fieldType = filter.data.fieldType;- return fieldType == FieldType.DateTime ||- fieldType == FieldType.CreatedTime ||- fieldType == FieldType.LastEditedTime- ? DateFilterPB.fromBuffer(filter.data.data)- : null;- }-- TextFilterPB? textFilter() {- return filter.data.fieldType == FieldType.RichText ||- filter.data.fieldType == FieldType.URL- ? TextFilterPB.fromBuffer(filter.data.data)- : null;- }-- CheckboxFilterPB? checkboxFilter() {- return filter.data.fieldType == FieldType.Checkbox- ? CheckboxFilterPB.fromBuffer(filter.data.data)- : null;- }-- SelectOptionFilterPB? selectOptionFilter() {- return filter.data.fieldType == FieldType.SingleSelect ||- filter.data.fieldType == FieldType.MultiSelect- ? SelectOptionFilterPB.fromBuffer(filter.data.data)- : null;- }-- ChecklistFilterPB? checklistFilter() {- return filter.data.fieldType == FieldType.Checklist- ? ChecklistFilterPB.fromBuffer(filter.data.data)- : null;- }-- NumberFilterPB? numberFilter() {- return filter.data.fieldType == FieldType.Number- ? NumberFilterPB.fromBuffer(filter.data.data)- : null;- }-- TimeFilterPB? timeFilter() {- return filter.data.fieldType == FieldType.Time- ? TimeFilterPB.fromBuffer(filter.data.data)- : null;- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dartindex 145c5aa1d9..cea141caa7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart@@ -1,13 +1,13 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/field/field_controller.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/foundation.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'create_filter_list.dart';@@ -23,43 +23,47 @@ class FilterMenu extends StatelessWidget {@overrideWidget build(BuildContext context) {- return BlocProvider<DatabaseFilterMenuBloc>(- create: (context) => DatabaseFilterMenuBloc(+ return BlocProvider(+ create: (context) => FilterEditorBloc(viewId: fieldController.viewId,fieldController: fieldController,- )..add(- const DatabaseFilterMenuEvent.initial(),- ),- child: BlocBuilder<DatabaseFilterMenuBloc, DatabaseFilterMenuState>(+ ),+ child: BlocBuilder<FilterEditorBloc, FilterEditorState>(+ buildWhen: (previous, current) {+ final previousIds = previous.filters.map((e) => e.filterId).toList();+ final currentIds = current.filters.map((e) => e.filterId).toList();+ return !listEquals(previousIds, currentIds);+ },builder: (context, state) {final List<Widget> children = [];children.addAll(state.filters.map(- (filterInfo) => FilterMenuItem(- key: ValueKey(filterInfo.filter.id),- filterInfo: filterInfo,+ (filter) => FilterMenuItem(+ key: ValueKey(filter.filterId),+ filterId: filter.filterId,+ fieldType: state.fields+ .firstWhere(+ (element) => element.id == filter.fieldId,+ )+ .fieldType,),).toList(),);- if (state.creatableFields.isNotEmpty) {- children.add(AddFilterButton(viewId: state.viewId));+ if (state.fields.isNotEmpty) {+ children.add(+ AddFilterButton(+ viewId: state.viewId,+ ),+ );}- return Expanded(- child: Row(- children: [- Expanded(- child: Wrap(- spacing: 6,- runSpacing: 4,- children: children,- ),- ),- ],- ),+ return Wrap(+ spacing: 6,+ runSpacing: 4,+ children: children,);},),@@ -82,7 +86,6 @@ class _AddFilterButtonState extends State<AddFilterButton> {@overrideWidget build(BuildContext context) {return wrapPopover(- context,SizedBox(height: 28,child: FlowyButton(@@ -103,18 +106,18 @@ class _AddFilterButtonState extends State<AddFilterButton> {);}- Widget wrapPopover(BuildContext buildContext, Widget child) {+ Widget wrapPopover(Widget child) {return AppFlowyPopover(controller: popoverController,constraints: BoxConstraints.loose(const Size(200, 300)),triggerActions: PopoverTriggerFlags.none,child: child,- popupBuilder: (BuildContext context) {- final bloc = buildContext.read<DatabaseFilterMenuBloc>();- return GridCreateFilterList(- viewId: widget.viewId,- fieldController: bloc.fieldController,- onClosed: () => popoverController.close(),+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: CreateDatabaseViewFilterList(+ onTap: () => popoverController.close(),+ ),);},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dartindex ee9f168130..afc4b631dd 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart@@ -1,37 +1,39 @@+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter/material.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';-import 'choicechip/checkbox.dart';-import 'choicechip/checklist/checklist.dart';+import 'choicechip/checklist.dart';import 'choicechip/date.dart';import 'choicechip/number.dart';import 'choicechip/select_option/select_option.dart';import 'choicechip/text.dart';import 'choicechip/url.dart';-import 'filter_info.dart';class FilterMenuItem extends StatelessWidget {- const FilterMenuItem({required this.filterInfo, super.key});+ const FilterMenuItem({+ super.key,+ required this.fieldType,+ required this.filterId,+ });- final FilterInfo filterInfo;+ final FieldType fieldType;+ final String filterId;@overrideWidget build(BuildContext context) {- return switch (filterInfo.fieldInfo.fieldType) {- FieldType.Checkbox => CheckboxFilterChoicechip(filterInfo: filterInfo),- FieldType.DateTime => DateFilterChoicechip(filterInfo: filterInfo),+ return switch (fieldType) {+ FieldType.RichText => TextFilterChoicechip(filterId: filterId),+ FieldType.Number => NumberFilterChoiceChip(filterId: filterId),+ FieldType.URL => URLFilterChoicechip(filterId: filterId),+ FieldType.Checkbox => CheckboxFilterChoicechip(filterId: filterId),+ FieldType.Checklist => ChecklistFilterChoicechip(filterId: filterId),+ FieldType.DateTime => DateFilterChoicechip(filterId: filterId),+ FieldType.SingleSelect ||FieldType.MultiSelect =>- SelectOptionFilterChoicechip(filterInfo: filterInfo),- FieldType.Number => NumberFilterChoiceChip(filterInfo: filterInfo),- FieldType.RichText => TextFilterChoicechip(filterInfo: filterInfo),- FieldType.SingleSelect =>- SelectOptionFilterChoicechip(filterInfo: filterInfo),- FieldType.URL => URLFilterChoiceChip(filterInfo: filterInfo),- FieldType.Checklist => ChecklistFilterChoicechip(filterInfo: filterInfo),+ SelectOptionFilterChoicechip(filterId: filterId),// FieldType.Time =>// TimeFilterChoiceChip(filterInfo: filterInfo),- _ => const SizedBox(),+ _ => const SizedBox.shrink(),};}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/create_sort_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/create_sort_list.dartindex e85071a971..50e4012344 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/create_sort_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/create_sort_list.dart@@ -1,6 +1,7 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/grid/application/simple_text_filter_bloc.dart';import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/util/field_type_extension.dart';@@ -24,44 +25,58 @@ class CreateDatabaseViewSortList extends StatelessWidget {@overrideWidget build(BuildContext context) {- return BlocBuilder<SortEditorBloc, SortEditorState>(- builder: (context, state) {- final filter = state.filter.toLowerCase();- final cells = state.creatableFields- .where((field) => field.field.name.toLowerCase().contains(filter))- .map((fieldInfo) {- return GridSortPropertyCell(- fieldInfo: fieldInfo,- onTap: () {- context- .read<SortEditorBloc>()- .add(SortEditorEvent.createSort(fieldId: fieldInfo.id));- onTap.call();- },- );- }).toList();+ final sortBloc = context.read<SortEditorBloc>();+ return BlocProvider(+ create: (_) => SimpleTextFilterBloc<FieldInfo>(+ values: List.from(sortBloc.state.creatableFields),+ comparator: (val) => val.name,+ ),+ child: BlocListener<SortEditorBloc, SortEditorState>(+ listenWhen: (previous, current) =>+ previous.creatableFields != current.creatableFields,+ listener: (context, state) {+ context.read<SimpleTextFilterBloc<FieldInfo>>().add(+ SimpleTextFilterEvent.receiveNewValues(state.creatableFields),+ );+ },+ child: BlocBuilder<SimpleTextFilterBloc<FieldInfo>,+ SimpleTextFilterState<FieldInfo>>(+ builder: (context, state) {+ final cells = state.values.map((fieldInfo) {+ return GridSortPropertyCell(+ fieldInfo: fieldInfo,+ onTap: () {+ context+ .read<SortEditorBloc>()+ .add(SortEditorEvent.createSort(fieldId: fieldInfo.id));+ onTap.call();+ },+ );+ }).toList();- final List<Widget> slivers = [- SliverPersistentHeader(- pinned: true,- delegate: _SortTextFieldDelegate(),- ),- SliverToBoxAdapter(- child: ListView.separated(+ final List<Widget> slivers = [+ SliverPersistentHeader(+ pinned: true,+ delegate: _SortTextFieldDelegate(),+ ),+ SliverToBoxAdapter(+ child: ListView.separated(+ shrinkWrap: true,+ itemCount: cells.length,+ itemBuilder: (_, index) => cells[index],+ separatorBuilder: (_, __) =>+ VSpace(GridSize.typeOptionSeparatorHeight),+ ),+ ),+ ];+ return CustomScrollView(shrinkWrap: true,- itemCount: cells.length,- itemBuilder: (_, index) => cells[index],- separatorBuilder: (_, __) =>- VSpace(GridSize.typeOptionSeparatorHeight),- ),- ),- ];- return CustomScrollView(- shrinkWrap: true,- slivers: slivers,- physics: StyledScrollPhysics(),- );- },+ slivers: slivers,+ physics: StyledScrollPhysics(),+ );+ },+ ),+ ),);}}@@ -85,8 +100,8 @@ class _SortTextFieldDelegate extends SliverPersistentHeaderDelegate {hintText: LocaleKeys.grid_settings_sortBy.tr(),onChanged: (text) {context- .read<SortEditorBloc>()- .add(SortEditorEvent.updateCreateSortFilter(text));+ .read<SimpleTextFilterBloc<FieldInfo>>()+ .add(SimpleTextFilterEvent.updateFilter(text));},),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dartindex bbcbc0a7f0..a08e0c4ae8 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart@@ -38,12 +38,12 @@ class _SortEditorState extends State<SortEditor> {Widget build(BuildContext context) {return BlocBuilder<SortEditorBloc, SortEditorState>(builder: (context, state) {- final sortInfos = state.sortInfos;+ final sortInfos = state.sorts;return ReorderableListView.builder(onReorder: (oldIndex, newIndex) => context.read<SortEditorBloc>().add(SortEditorEvent.reorderSort(oldIndex, newIndex)),- itemCount: state.sortInfos.length,+ itemCount: state.sorts.length,itemBuilder: (context, index) => DatabaseSortItem(key: ValueKey(sortInfos[index].sortId),index: index,@@ -215,9 +215,6 @@ class _DatabaseAddSortButtonState extends State<DatabaseAddSortButton> {),);},- onClose: () => context- .read<SortEditorBloc>()- .add(const SortEditorEvent.updateCreateSortFilter("")),child: SizedBox(height: GridSize.popoverItemHeight,child: FlowyButton(diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dartindex 43f583bd07..da7d63f9c5 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart@@ -31,7 +31,7 @@ class SortMenu extends StatelessWidget {),child: BlocBuilder<SortEditorBloc, SortEditorState>(builder: (context, state) {- if (state.sortInfos.isEmpty) {+ if (state.sorts.isEmpty) {return const SizedBox.shrink();}@@ -47,7 +47,7 @@ class SortMenu extends StatelessWidget {child: const SortEditor(),);},- child: SortChoiceChip(sortInfos: state.sortInfos),+ child: SortChoiceChip(sortInfos: state.sorts),);},),diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dartindex 21c61713e4..9343951bfa 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart@@ -1,5 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.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_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';@@ -12,7 +13,12 @@ import '../../layout/sizes.dart';import '../filter/create_filter_list.dart';class FilterButton extends StatefulWidget {- const FilterButton({super.key});+ const FilterButton({+ super.key,+ required this.toggleExtension,+ });++ final ToggleExtensionNotifier toggleExtension;@overrideState<FilterButton> createState() => _FilterButtonState();@@ -23,14 +29,13 @@ class _FilterButtonState extends State<FilterButton> {@overrideWidget build(BuildContext context) {- return BlocBuilder<DatabaseFilterMenuBloc, DatabaseFilterMenuState>(+ return BlocBuilder<FilterEditorBloc, FilterEditorState>(builder: (context, state) {final textColor = state.filters.isEmpty? AFThemeExtension.of(context).textColor: Theme.of(context).colorScheme.primary;return _wrapPopover(- context,FlowyTextButton(LocaleKeys.grid_settings_filter.tr(),fontColor: textColor,@@ -41,11 +46,11 @@ class _FilterButtonState extends State<FilterButton> {padding: GridSize.toolbarSettingButtonInsets,radius: Corners.s4Border,onPressed: () {- final bloc = context.read<DatabaseFilterMenuBloc>();+ final bloc = context.read<FilterEditorBloc>();if (bloc.state.filters.isEmpty) {_popoverController.show();} else {- bloc.add(const DatabaseFilterMenuEvent.toggleMenu());+ widget.toggleExtension.toggle();}},),@@ -54,7 +59,7 @@ class _FilterButtonState extends State<FilterButton> {);}- Widget _wrapPopover(BuildContext buildContext, Widget child) {+ Widget _wrapPopover(Widget child) {return AppFlowyPopover(controller: _popoverController,direction: PopoverDirection.bottomWithLeftAligned,@@ -62,17 +67,17 @@ class _FilterButtonState extends State<FilterButton> {offset: const Offset(0, 8),triggerActions: PopoverTriggerFlags.none,child: child,- popupBuilder: (BuildContext context) {- final bloc = buildContext.read<DatabaseFilterMenuBloc>();- return GridCreateFilterList(- viewId: bloc.viewId,- fieldController: bloc.fieldController,- onClosed: () => _popoverController.close(),- onCreateFilter: () {- if (!bloc.state.isVisible) {- bloc.add(const DatabaseFilterMenuEvent.toggleMenu());- }- },+ popupBuilder: (_) {+ return BlocProvider.value(+ value: context.read<FilterEditorBloc>(),+ child: CreateDatabaseViewFilterList(+ onTap: () {+ if (!widget.toggleExtension.isToggled) {+ widget.toggleExtension.toggle();+ }+ _popoverController.close();+ },+ ),);},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dartindex 312bfd7511..651bdd6061 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart@@ -1,5 +1,5 @@import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:appflowy/plugins/database/widgets/setting/setting_button.dart';@@ -24,45 +24,41 @@ class GridSettingBar extends StatelessWidget {Widget build(BuildContext context) {return MultiBlocProvider(providers: [- BlocProvider<DatabaseFilterMenuBloc>(- create: (context) => DatabaseFilterMenuBloc(+ BlocProvider(+ create: (context) => FilterEditorBloc(viewId: controller.viewId,fieldController: controller.fieldController,- )..add(const DatabaseFilterMenuEvent.initial()),+ ),),- BlocProvider<SortEditorBloc>(+ BlocProvider(create: (context) => SortEditorBloc(viewId: controller.viewId,fieldController: controller.fieldController,),),],- child: BlocListener<DatabaseFilterMenuBloc, DatabaseFilterMenuState>(- listenWhen: (p, c) => p.isVisible != c.isVisible,- listener: (context, state) => toggleExtension.toggle(),- child: ValueListenableBuilder<bool>(- valueListenable: controller.isLoading,- builder: (context, value, child) {- if (value) {- return const SizedBox.shrink();- }- return SizedBox(- height: 20,- child: Row(- mainAxisAlignment: MainAxisAlignment.end,- children: [- const FilterButton(),- const HSpace(2),- SortButton(toggleExtension: toggleExtension),- const HSpace(2),- SettingButton(- databaseController: controller,- ),- ],- ),- );- },- ),+ child: ValueListenableBuilder<bool>(+ valueListenable: controller.isLoading,+ builder: (context, isLoading, child) {+ if (isLoading) {+ return const SizedBox.shrink();+ }+ return SizedBox(+ height: 20,+ child: Row(+ mainAxisAlignment: MainAxisAlignment.end,+ children: [+ FilterButton(toggleExtension: toggleExtension),+ const HSpace(2),+ SortButton(toggleExtension: toggleExtension),+ const HSpace(2),+ SettingButton(+ databaseController: controller,+ ),+ ],+ ),+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dartindex be4740cea0..c0eab46858 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart@@ -28,12 +28,11 @@ class _SortButtonState extends State<SortButton> {Widget build(BuildContext context) {return BlocBuilder<SortEditorBloc, SortEditorState>(builder: (context, state) {- final textColor = state.sortInfos.isEmpty+ final textColor = state.sorts.isEmpty? AFThemeExtension.of(context).textColor: Theme.of(context).colorScheme.primary;return wrapPopover(- context,FlowyTextButton(LocaleKeys.grid_settings_sort.tr(),fontColor: textColor,@@ -44,7 +43,7 @@ class _SortButtonState extends State<SortButton> {padding: GridSize.toolbarSettingButtonInsets,radius: Corners.s4Border,onPressed: () {- if (state.sortInfos.isEmpty) {+ if (state.sorts.isEmpty) {_popoverController.show();} else {widget.toggleExtension.toggle();@@ -56,7 +55,7 @@ class _SortButtonState extends State<SortButton> {);}- Widget wrapPopover(BuildContext context, Widget child) {+ Widget wrapPopover(Widget child) {return AppFlowyPopover(controller: _popoverController,direction: PopoverDirection.bottomWithLeftAligned,@@ -76,9 +75,6 @@ class _SortButtonState extends State<SortButton> {),);},- onClose: () => context- .read<SortEditorBloc>()- .add(const SortEditorEvent.updateCreateSortFilter("")),child: child,);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dartindex 4ed594581b..69e5d27d37 100644--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart@@ -68,7 +68,9 @@ class _DatabaseViewSettingContent extends StatelessWidget {children: [SortMenu(fieldController: fieldController),const HSpace(6),- FilterMenu(fieldController: fieldController),+ Expanded(+ child: FilterMenu(fieldController: fieldController),+ ),],),),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 ddddd90fb4..4c8878d800 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@@ -14,16 +14,9 @@ import 'package:collection/collection.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../grid/presentation/grid_page.dart';--class MobileTabBarHeader extends StatefulWidget {+class MobileTabBarHeader extends StatelessWidget {const MobileTabBarHeader({super.key});- @override- State<MobileTabBarHeader> createState() => _MobileTabBarHeaderState();-}--class _MobileTabBarHeaderState extends State<MobileTabBarHeader> {@overrideWidget build(BuildContext context) {return Padding(@@ -50,7 +43,6 @@ class _MobileTabBarHeaderState extends State<MobileTabBarHeader> {return MobileDatabaseControls(controller: state.tabBarControllerByViewId[currentView.viewId]!.controller,- toggleExtension: ToggleExtensionNotifier(),);},),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dartindex af8b60b8db..bcce67dcfc 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart@@ -41,7 +41,7 @@ class DatabaseGroupList extends StatelessWidget {child: BlocBuilder<DatabaseGroupBloc, DatabaseGroupState>(builder: (context, state) {final field = state.fieldInfos.firstWhereOrNull(- (field) => field.canBeGroup && field.isGroupField,+ (field) => field.fieldType.canBeGroup && field.isGroupField,);final showHideUngroupedToggle =field?.fieldType != FieldType.Checkbox;@@ -93,7 +93,9 @@ class DatabaseGroupList extends StatelessWidget {),),),- ...state.fieldInfos.where((fieldInfo) => fieldInfo.canBeGroup).map(+ ...state.fieldInfos+ .where((fieldInfo) => fieldInfo.fieldType.canBeGroup)+ .map((fieldInfo) => _GridGroupCell(fieldInfo: fieldInfo,name: fieldInfo.name,@@ -103,7 +105,7 @@ class DatabaseGroupList extends StatelessWidget {key: ValueKey(fieldInfo.id),),),- if (field?.groupConditions.isNotEmpty ?? false) ...[+ if (field?.fieldType.groupConditions.isNotEmpty ?? false) ...[const TypeOptionSeparator(spacing: 0),SizedBox(height: GridSize.popoverItemHeight,@@ -117,7 +119,7 @@ class DatabaseGroupList extends StatelessWidget {),),),- ...field!.groupConditions.map(+ ...field!.fieldType.groupConditions.map((condition) => _GridGroupCell(fieldInfo: field,name: condition.name,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dartindex f3a548932d..88d8c02c6d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart@@ -4,9 +4,8 @@ import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';import 'package:appflowy/mobile/presentation/database/view/database_field_list.dart';import 'package:appflowy/mobile/presentation/database/view/database_sort_bottom_sheet.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';-import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:appflowy/workspace/application/view/view_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -18,21 +17,19 @@ class MobileDatabaseControls extends StatelessWidget {const MobileDatabaseControls({super.key,required this.controller,- required this.toggleExtension,});final DatabaseController controller;- final ToggleExtensionNotifier toggleExtension;@overrideWidget build(BuildContext context) {return MultiBlocProvider(providers: [- BlocProvider<DatabaseFilterMenuBloc>(- create: (context) => DatabaseFilterMenuBloc(+ BlocProvider(+ create: (context) => FilterEditorBloc(viewId: controller.viewId,fieldController: controller.fieldController,- )..add(const DatabaseFilterMenuEvent.initial()),+ ),),BlocProvider<SortEditorBloc>(create: (context) => SortEditorBloc(@@ -41,38 +38,34 @@ class MobileDatabaseControls extends StatelessWidget {),),],- child: BlocListener<DatabaseFilterMenuBloc, DatabaseFilterMenuState>(- listenWhen: (p, c) => p.isVisible != c.isVisible,- listener: (context, state) => toggleExtension.toggle(),- child: ValueListenableBuilder<bool>(- valueListenable: controller.isLoading,- builder: (context, isLoading, child) {- if (isLoading) {- return const SizedBox.shrink();- }+ child: ValueListenableBuilder<bool>(+ valueListenable: controller.isLoading,+ builder: (context, isLoading, child) {+ if (isLoading) {+ return const SizedBox.shrink();+ }- return SeparatedRow(- separatorBuilder: () => const HSpace(8.0),- children: [- _DatabaseControlButton(- icon: FlowySvgs.sort_ascending_s,- count: context.watch<SortEditorBloc>().state.sortInfos.length,- onTap: () => _showEditSortPanelFromToolbar(- context,- controller,- ),+ return SeparatedRow(+ separatorBuilder: () => const HSpace(8.0),+ children: [+ _DatabaseControlButton(+ icon: FlowySvgs.sort_ascending_s,+ count: context.watch<SortEditorBloc>().state.sorts.length,+ onTap: () => _showEditSortPanelFromToolbar(+ context,+ controller,),- _DatabaseControlButton(- icon: FlowySvgs.m_field_hide_s,- onTap: () => _showDatabaseFieldListFromToolbar(- context,- controller,- ),+ ),+ _DatabaseControlButton(+ icon: FlowySvgs.m_field_hide_s,+ onTap: () => _showDatabaseFieldListFromToolbar(+ context,+ controller,),- ],- );- },- ),+ ),+ ],+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/util/field_type_extension.dart b/frontend/appflowy_flutter/lib/util/field_type_extension.dartindex 6521346ecf..34da0ef09c 100644--- a/frontend/appflowy_flutter/lib/util/field_type_extension.dart+++ b/frontend/appflowy_flutter/lib/util/field_type_extension.dart@@ -4,6 +4,7 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:easy_localization/easy_localization.dart';+import 'package:protobuf/protobuf.dart';extension FieldTypeExtension on FieldType {String get i18n => switch (this) {@@ -91,4 +92,73 @@ extension FieldTypeExtension on FieldType {FieldType.Media => const Color(0xFFBE9090),_ => throw UnimplementedError(),};++ bool get canBeGroup => switch (this) {+ FieldType.URL ||+ FieldType.Checkbox ||+ FieldType.MultiSelect ||+ FieldType.SingleSelect ||+ FieldType.DateTime =>+ true,+ _ => false+ };++ bool get canCreateFilter => switch (this) {+ FieldType.Number ||+ FieldType.Checkbox ||+ FieldType.MultiSelect ||+ FieldType.RichText ||+ FieldType.SingleSelect ||+ FieldType.Checklist ||+ FieldType.URL ||+ FieldType.DateTime =>+ true,+ _ => false+ };++ bool get canCreateSort => switch (this) {+ FieldType.RichText ||+ FieldType.Checkbox ||+ FieldType.Number ||+ FieldType.DateTime ||+ FieldType.SingleSelect ||+ FieldType.MultiSelect ||+ FieldType.LastEditedTime ||+ FieldType.CreatedTime ||+ FieldType.Checklist ||+ FieldType.URL ||+ FieldType.Time =>+ true,+ _ => false+ };++ bool get canEditHeader => switch (this) {+ FieldType.MultiSelect => true,+ FieldType.SingleSelect => true,+ _ => false,+ };++ bool get canCreateNewGroup => switch (this) {+ FieldType.MultiSelect => true,+ FieldType.SingleSelect => true,+ _ => false,+ };++ bool get canDeleteGroup => switch (this) {+ FieldType.URL ||+ FieldType.SingleSelect ||+ FieldType.MultiSelect ||+ FieldType.DateTime =>+ true,+ _ => false,+ };++ List<ProtobufEnum> get groupConditions {+ switch (this) {+ case FieldType.DateTime:+ return DateConditionPB.values;+ default:+ return [];+ }+ }}diff --git a/frontend/appflowy_flutter/lib/util/int64_extension.dart b/frontend/appflowy_flutter/lib/util/int64_extension.dartindex ddaabd5bbd..8c7f1579f5 100644--- a/frontend/appflowy_flutter/lib/util/int64_extension.dart+++ b/frontend/appflowy_flutter/lib/util/int64_extension.dart@@ -2,7 +2,4 @@ import 'package:fixnum/fixnum.dart';extension DateConversion on Int64 {DateTime toDateTime() => DateTime.fromMillisecondsSinceEpoch(toInt() * 1000);-- DateTime? get dateTime =>- toInt() != 0 ? DateTime.fromMillisecondsSinceEpoch(toInt() * 1000) : null;}diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dartindex 64113fc550..4af2137c89 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dart@@ -6,7 +6,7 @@ import '../util.dart';Future<FieldEditorBloc> createEditorBloc(AppFlowyGridTest gridTest) async {final context = await gridTest.createTestGrid();- final fieldInfo = context.singleSelectFieldContext();+ final fieldInfo = context.getSelectOptionField();return FieldEditorBloc(viewId: context.gridView.id,fieldController: context.fieldController,diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dartindex d02a319ab1..aec7cc56c3 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart@@ -16,7 +16,7 @@ void main() {test('create a text filter)', () async {final context = await gridTest.createTestGrid();final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();await service.insertTextFilter(fieldId: textField.id,condition: TextFilterConditionPB.TextIsEmpty,@@ -24,13 +24,13 @@ void main() {);await gridResponseFuture();- assert(context.fieldController.filterInfos.length == 1);+ assert(context.fieldController.filters.length == 1);});test('delete a text filter)', () async {final context = await gridTest.createTestGrid();final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();await service.insertTextFilter(fieldId: textField.id,condition: TextFilterConditionPB.TextIsEmpty,@@ -38,14 +38,13 @@ void main() {);await gridResponseFuture();- final filterInfo = context.fieldController.filterInfos.first;+ final filter = context.fieldController.filters.first;await service.deleteFilter(- fieldId: textField.id,- filterId: filterInfo.filter.id,+ filterId: filter.filterId,);await gridResponseFuture();- expect(context.fieldController.filterInfos.length, 0);+ expect(context.fieldController.filters.length, 0);});test('filter rows with condition: text is empty', () async {@@ -60,7 +59,7 @@ void main() {)..add(const GridEvent.initial());await gridResponseFuture();- final textField = context.textFieldContext();+ final textField = context.getTextField();await service.insertTextFilter(fieldId: textField.id,condition: TextFilterConditionPB.TextIsEmpty,@@ -84,7 +83,7 @@ void main() {)..add(const GridEvent.initial());await gridResponseFuture();- final textField = context.textFieldContext();+ final textField = context.getTextField();await service.insertTextFilter(fieldId: textField.id,condition: TextFilterConditionPB.TextIsEmpty,@@ -105,7 +104,7 @@ void main() {test('filter rows with condition: text is not empty', () async {final context = await gridTest.createTestGrid();final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();await gridResponseFuture();await service.insertTextFilter(fieldId: textField.id,@@ -118,7 +117,7 @@ void main() {test('filter rows with condition: checkbox uncheck', () async {final context = await gridTest.createTestGrid();- final checkboxField = context.checkboxFieldContext();+ final checkboxField = context.getCheckboxField();final service = FilterBackendService(viewId: context.gridView.id);final gridController = DatabaseController(view: context.gridView,@@ -139,7 +138,7 @@ void main() {test('filter rows with condition: checkbox check', () async {final context = await gridTest.createTestGrid();- final checkboxField = context.checkboxFieldContext();+ final checkboxField = context.getCheckboxField();final service = FilterBackendService(viewId: context.gridView.id);final gridController = DatabaseController(view: context.gridView,diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dartindex a5aa0c9f58..f1c2441d84 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dart@@ -1,6 +1,8 @@+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';+import 'package:appflowy/plugins/database/domain/field_service.dart';import 'package:appflowy/plugins/database/domain/filter_service.dart';-import 'package:appflowy/plugins/database/grid/application/filter/filter_menu_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/text_filter.pb.dart';+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter_test/flutter_test.dart';import '../util.dart';@@ -11,58 +13,126 @@ void main() {gridTest = await AppFlowyGridTest.ensureInitialized();});- test('test filter menu after create a text filter)', () async {- final context = await gridTest.createTestGrid();- final menuBloc = DatabaseFilterMenuBloc(- viewId: context.gridView.id,- fieldController: context.fieldController,- )..add(const DatabaseFilterMenuEvent.initial());- await gridResponseFuture();- assert(menuBloc.state.creatableFields.length == 3);-- final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();- await service.insertTextFilter(- fieldId: textField.id,- condition: TextFilterConditionPB.TextIsEmpty,- content: "",- );- await gridResponseFuture();- assert(menuBloc.state.creatableFields.length == 3);- });+ group('filter editor bloc test:', () {+ test('create filter', () async {+ final context = await gridTest.createTestGrid();+ final filterBloc = FilterEditorBloc(+ viewId: context.gridView.id,+ fieldController: context.fieldController,+ );+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(0));+ expect(filterBloc.state.fields.length, equals(3));++ // through domain directly+ final textField = context.getTextField();+ final service = FilterBackendService(viewId: context.gridView.id);+ await service.insertTextFilter(+ fieldId: textField.id,+ condition: TextFilterConditionPB.TextIsEmpty,+ content: "",+ );+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(1));+ expect(filterBloc.state.fields.length, equals(3));++ // through bloc event+ final selectOptionField = context.getSelectOptionField();+ filterBloc.add(FilterEditorEvent.createFilter(selectOptionField));+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(2));+ expect(filterBloc.state.filters.first.fieldId, equals(textField.id));+ expect(filterBloc.state.filters[1].fieldId, equals(selectOptionField.id));++ final filter = filterBloc.state.filters.first as TextFilter;+ expect(filter.condition, equals(TextFilterConditionPB.TextIsEmpty));+ expect(filter.content, equals(""));+ final filter2 = filterBloc.state.filters[1] as SelectOptionFilter;+ expect(filter2.condition, equals(SelectOptionFilterConditionPB.OptionIs));+ expect(filter2.optionIds.length, equals(0));+ expect(filterBloc.state.fields.length, equals(3));+ });++ test('delete filter', () async {+ final context = await gridTest.createTestGrid();+ final filterBloc = FilterEditorBloc(+ viewId: context.gridView.id,+ fieldController: context.fieldController,+ );+ await gridResponseFuture();++ final textField = context.getTextField();+ filterBloc.add(FilterEditorEvent.createFilter(textField));+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(1));+ expect(filterBloc.state.fields.length, equals(3));++ final filter = filterBloc.state.filters.first;+ filterBloc.add(FilterEditorEvent.deleteFilter(filter.filterId));+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(0));+ expect(filterBloc.state.fields.length, equals(3));+ });++ test('update filter', () async {+ final context = await gridTest.createTestGrid();+ final filterBloc = FilterEditorBloc(+ viewId: context.gridView.id,+ fieldController: context.fieldController,+ );+ await gridResponseFuture();++ final service = FilterBackendService(viewId: context.gridView.id);+ final textField = context.getTextField();++ // Create filter+ await service.insertTextFilter(+ fieldId: textField.id,+ condition: TextFilterConditionPB.TextIsEmpty,+ content: "",+ );+ await gridResponseFuture();+ TextFilter filter = filterBloc.state.filters.first as TextFilter;+ expect(filter.condition, equals(TextFilterConditionPB.TextIsEmpty));++ final textFilter = context.fieldController.filters.first;+ // Update the existing filter+ await service.insertTextFilter(+ fieldId: textField.id,+ filterId: textFilter.filterId,+ condition: TextFilterConditionPB.TextIs,+ content: "ABC",+ );+ await gridResponseFuture();+ filter = filterBloc.state.filters.first as TextFilter;+ expect(filter.condition, equals(TextFilterConditionPB.TextIs));+ expect(filter.content, equals("ABC"));+ });++ test('update field', () async {+ final context = await gridTest.createTestGrid();+ final filterBloc = FilterEditorBloc(+ viewId: context.gridView.id,+ fieldController: context.fieldController,+ );+ await gridResponseFuture();++ final textField = context.getTextField();+ filterBloc.add(FilterEditorEvent.createFilter(textField));+ await gridResponseFuture();+ expect(filterBloc.state.filters.length, equals(1));++ expect(filterBloc.state.fields.length, equals(3));+ expect(filterBloc.state.fields.first.name, equals("Name"));- test('test filter menu after update existing text filter)', () async {- final context = await gridTest.createTestGrid();- final menuBloc = DatabaseFilterMenuBloc(- viewId: context.gridView.id,- fieldController: context.fieldController,- )..add(const DatabaseFilterMenuEvent.initial());- await gridResponseFuture();-- final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();-- // Create filter- await service.insertTextFilter(- fieldId: textField.id,- condition: TextFilterConditionPB.TextIsEmpty,- content: "",- );- await gridResponseFuture();-- final textFilter = context.fieldController.filterInfos.first;- // Update the existing filter- await service.insertTextFilter(- fieldId: textField.id,- filterId: textFilter.filter.id,- condition: TextFilterConditionPB.TextIs,- content: "ABC",- );- await gridResponseFuture();- assert(- menuBloc.state.filters.first.textFilter()!.condition ==- TextFilterConditionPB.TextIs,- );- assert(menuBloc.state.filters.first.textFilter()!.content == "ABC");+ // edit field+ await FieldBackendService(+ viewId: context.gridView.id,+ fieldId: textField.id,+ ).updateField(name: "New Name");+ await gridResponseFuture();+ expect(filterBloc.state.fields.length, equals(3));+ expect(filterBloc.state.fields.first.name, equals("New Name"));+ });});}diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dartindex 675ee8fc57..e6a8979ec0 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart@@ -20,7 +20,7 @@ void main() {await gridResponseFuture();// create a new filter- final checkboxField = context.checkboxFieldContext();+ final checkboxField = context.getCheckboxField();await service.insertCheckboxFilter(fieldId: checkboxField.id,condition: CheckboxFilterConditionPB.IsChecked,@@ -41,7 +41,7 @@ void main() {await gridResponseFuture();// create a new filter- final checkboxField = context.checkboxFieldContext();+ final checkboxField = context.getCheckboxField();await service.insertCheckboxFilter(fieldId: checkboxField.id,condition: CheckboxFilterConditionPB.IsUnChecked,diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dartindex 0af6b18092..78b4e234c6 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart@@ -15,7 +15,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();// create a new filterawait service.insertTextFilter(fieldId: textField.id,@@ -24,8 +24,8 @@ void main() {);await gridResponseFuture();assert(- context.fieldController.filterInfos.length == 1,- "expect 1 but receive ${context.fieldController.filterInfos.length}",+ context.fieldController.filters.length == 1,+ "expect 1 but receive ${context.fieldController.filters.length}",);assert(context.rowInfos.length == 1,@@ -33,10 +33,9 @@ void main() {);// delete the filter- final textFilter = context.fieldController.filterInfos.first;+ final textFilter = context.fieldController.filters.first;await service.deleteFilter(- fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,);await gridResponseFuture();assert(context.rowInfos.length == 3);@@ -46,7 +45,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();// create a new filterawait service.insertTextFilter(fieldId: textField.id,@@ -60,10 +59,9 @@ void main() {);// delete the filter- final textFilter = context.fieldController.filterInfos.first;+ final textFilter = context.fieldController.filters.first;await service.deleteFilter(- fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,);await gridResponseFuture();assert(context.rowInfos.length == 3);@@ -73,7 +71,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();// create a new filterawait service.insertTextFilter(fieldId: textField.id,@@ -82,8 +80,8 @@ void main() {);await gridResponseFuture();assert(- context.fieldController.filterInfos.length == 1,- "expect 1 but receive ${context.fieldController.filterInfos.length}",+ context.fieldController.filters.length == 1,+ "expect 1 but receive ${context.fieldController.filters.length}",);assert(context.rowInfos.length == 1,@@ -91,10 +89,10 @@ void main() {);// Update the existing filter- final textFilter = context.fieldController.filterInfos.first;+ final textFilter = context.fieldController.filters.first;await service.insertTextFilter(fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,condition: TextFilterConditionPB.TextIsNotEmpty,content: "",);@@ -103,8 +101,7 @@ void main() {// delete the filterawait service.deleteFilter(- fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,);await gridResponseFuture();assert(context.rowInfos.length == 3);@@ -114,7 +111,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final textField = context.textFieldContext();+ final textField = context.getTextField();// create a new filterawait service.insertTextFilter(fieldId: textField.id,@@ -128,10 +125,10 @@ void main() {);// Update the existing filter's content from 'A' to 'B'- final textFilter = context.fieldController.filterInfos.first;+ final textFilter = context.fieldController.filters.first;await service.insertTextFilter(fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,condition: TextFilterConditionPB.TextIs,content: "B",);@@ -141,7 +138,7 @@ void main() {// Update the existing filter's content from 'B' to 'b'await service.insertTextFilter(fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,condition: TextFilterConditionPB.TextIs,content: "b",);@@ -151,7 +148,7 @@ void main() {// Update the existing filter with content 'C'await service.insertTextFilter(fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,condition: TextFilterConditionPB.TextIs,content: "C",);@@ -160,8 +157,7 @@ void main() {// delete the filterawait service.deleteFilter(- fieldId: textField.id,- filterId: textFilter.filter.id,+ filterId: textFilter.filterId,);await gridResponseFuture();assert(context.rowInfos.length == 3);diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dartindex 28c267f570..a158ecfed5 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart@@ -38,19 +38,19 @@ class GridTestContext {return Future(() => editorBloc);}- FieldInfo singleSelectFieldContext() {+ FieldInfo getSelectOptionField() {final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.SingleSelect);return fieldInfo;}- FieldInfo textFieldContext() {+ FieldInfo getTextField() {final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.RichText);return fieldInfo;}- FieldInfo checkboxFieldContext() {+ FieldInfo getCheckboxField() {final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.Checkbox);return fieldInfo;diff --git a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rsindex b5e56dab77..a8649a03e7 100644--- a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs@@ -245,10 +245,6 @@ pub struct DeleteFilterPB {#[pb(index = 1)]#[validate(custom = "crate::entities::utils::validate_filter_id")]pub filter_id: String,-- #[pb(index = 2)]- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]- pub field_id: String,}impl TryFrom<InsertFilterPB> for FilterChangeset {@@ -297,7 +293,6 @@ impl From<DeleteFilterPB> for FilterChangeset {fn from(value: DeleteFilterPB) -> Self {Self::Delete {filter_id: value.filter_id,- field_id: value.field_id,}}}diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rsindex 55b524d059..21c7bb180b 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs@@ -200,10 +200,7 @@ impl FilterController {}}},- FilterChangeset::Delete {- filter_id,- field_id: _,- } => Self::delete_filter(&mut filters, &filter_id),+ FilterChangeset::Delete { filter_id } => Self::delete_filter(&mut filters, &filter_id),FilterChangeset::DeleteAllWithFieldId { field_id } => {let mut filter_ids = vec![];for filter in filters.iter() {diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rsindex 8277eeca87..535b374dc6 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs@@ -490,7 +490,6 @@ pub enum FilterChangeset {},Delete {filter_id: String,- field_id: String,},DeleteAllWithFieldId {field_id: String,diff --git a/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs b/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rsindex 67f5bc43c2..0b1f27af12 100644--- a/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs@@ -57,7 +57,6 @@ pub enum FilterScript {},DeleteFilter {filter_id: String,- field_id: String,changed: Option<FilterRowChanged>,},// CreateSimpleAdvancedFilter,@@ -269,17 +268,10 @@ impl DatabaseFilterTest {let filters = self.editor.get_all_filters(&self.view_id).await.items;assert_eq!(count, filters.len());},- FilterScript::DeleteFilter {- filter_id,- field_id,- changed,- } => {+ FilterScript::DeleteFilter { filter_id, changed } => {self.subscribe_view_changed().await;self.assert_future_changed(changed).await;- let params = FilterChangeset::Delete {- filter_id,- field_id,- };+ let params = FilterChangeset::Delete { filter_id };self.editor.modify_view_filters(&self.view_id, params)diff --git a/frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rs b/frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rsindex e59dce64a9..466dafc404 100644--- a/frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/filter_test/text_filter_test.rs@@ -51,7 +51,6 @@ async fn grid_filter_text_is_not_empty_test() {.run_scripts(vec![DeleteFilter {filter_id: filter.id,- field_id: filter.data.unwrap().field_id,changed: Some(FilterRowChanged {showing_num_of_rows: 1,hiding_num_of_rows: 0,@@ -245,7 +244,6 @@ async fn grid_filter_delete_test() {.run_scripts(vec![DeleteFilter {filter_id: filter.id,- field_id: filter.data.unwrap().field_id,changed: None,},AssertFilterCount { count: 0 },