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
chore: fix bugs when switch group field
appflowy4f8e012d543e
diff --git a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart b/frontend/app_flowy/lib/plugins/board/application/board_bloc.dartindex b78bc86661..26dd15038a 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart+++ b/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart@@ -1,6 +1,6 @@import 'dart:async';import 'package:app_flowy/plugins/grid/application/block/block_cache.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:appflowy_board/appflowy_board.dart';@@ -204,16 +204,20 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {}},didLoadGroups: (groups) {+ if (isClosed) return;initializeGroups(groups);add(BoardEvent.didReceiveGroups(groups));},onDeletedGroup: (groupIds) {+ if (isClosed) return;//},onInsertedGroup: (insertedGroups) {+ if (isClosed) return;//},onUpdatedGroup: (updatedGroups) {+ if (isClosed) return;for (final group in updatedGroups) {final columnController =boardController.getColumnController(group.groupId);@@ -224,6 +228,8 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {Log.error(err);},onResetGroups: (groups) {+ if (isClosed) return;+initializeGroups(groups);add(BoardEvent.didReceiveGroups(groups));},diff --git a/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart b/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dartindex 5435db2c3a..923bb4ef8c 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart+++ b/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart@@ -1,7 +1,7 @@import 'dart:collection';import 'package:app_flowy/plugins/grid/application/block/block_cache.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart b/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dartindex dd1f77a9d1..a19d7b64a8 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart+++ b/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart@@ -1,5 +1,5 @@import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart b/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dartindex 377b0dae50..0e7cf6c153 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart+++ b/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart@@ -1,7 +1,7 @@import 'package:app_flowy/plugins/board/presentation/card/card_cell_builder.dart';import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_field_notifier.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';import 'package:flutter/foundation.dart';diff --git a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dartindex f52237ad49..d6c5dca609 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart@@ -5,7 +5,7 @@ import 'dart:collection';import 'package:app_flowy/generated/locale_keys.g.dart';import 'package:app_flowy/plugins/board/application/card/card_data_controller.dart';import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart';@@ -82,8 +82,7 @@ class _BoardContentState extends State<BoardContent> {return BlocListener<BoardBloc, BoardState>(listener: (context, state) => _handleEditState(state, context),child: BlocBuilder<BoardBloc, BoardState>(- buildWhen: (previous, current) =>- previous.groupIds.length != current.groupIds.length,+ buildWhen: (previous, current) => previous.groupIds != current.groupIds,builder: (context, state) {final theme = context.read<AppTheme>();return Container(@@ -95,6 +94,7 @@ class _BoardContentState extends State<BoardContent> {const _ToolbarBlocAdaptor(),Expanded(child: AFBoard(+ key: UniqueKey(),scrollManager: scrollManager,scrollController: scrollController,dataController: context.read<BoardBloc>().boardController,diff --git a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dartindex a270f50951..86beac6830 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart@@ -1,6 +1,6 @@import 'package:app_flowy/generated/locale_keys.g.dart';import 'package:app_flowy/plugins/board/application/toolbar/board_setting_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_group.dart';import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_property.dart';diff --git a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dartindex bf8d2e3443..8bc4dcb0c7 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dart b/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dartindex 35ed334cee..b39226f0be 100644--- a/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dart@@ -2,7 +2,7 @@ import 'dart:async';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';-import '../field/field_cache.dart';+import '../field/field_controller.dart';import '../row/row_cache.dart';import 'block_listener.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dartindex 360df60b4e..b0fbee15cd 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart@@ -16,7 +16,7 @@ import 'package:app_flowy/plugins/grid/application/cell/cell_listener.dart';import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'dart:convert' show utf8;-import '../../field/field_cache.dart';+import '../../field/field_controller.dart';import '../../field/type_option/type_option_context.dart';import 'cell_field_notifier.dart';part 'cell_service.freezed.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dartindex ae840e9e54..e44e15a2fa 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_cache.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_cache.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dartindex da12afff97..e9bda8eef5 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_cache.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart@@ -2,10 +2,12 @@ import 'dart:collection';import 'package:app_flowy/plugins/grid/application/field/grid_listener.dart';import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:app_flowy/plugins/grid/application/setting/setting_listener.dart';+import 'package:app_flowy/plugins/grid/application/setting/setting_service.dart';import 'package:dartz/dartz.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';+import 'package:flowy_sdk/protobuf/flowy-grid/setting_entities.pb.dart';import 'package:flutter/foundation.dart';import '../row/row_cache.dart';@@ -35,11 +37,17 @@ class GridFieldController {final Map<OnChangeset, OnChangeset> _changesetCallbackMap = {};_GridFieldNotifier? _fieldNotifier = _GridFieldNotifier();+ List<String> _groupFieldIds = [];final GridFFIService _gridFFIService;+ final SettingFFIService _settingFFIService;++ List<GridFieldContext> get fieldContexts =>+ [..._fieldNotifier?.fieldContexts ?? []];GridFieldController({required this.gridId}): _fieldListener = GridFieldsListener(gridId: gridId),_gridFFIService = GridFFIService(gridId: gridId),+ _settingFFIService = SettingFFIService(viewId: gridId),_settingListener = SettingListener(gridId: gridId) {//Listen on field's changes_fieldListener.start(onFieldsChanged: (result) {@@ -59,24 +67,38 @@ class GridFieldController {//Listen on setting changes_settingListener.start(onSettingUpdated: (result) {result.fold(- (setting) {- final List<String> groupFieldIds = setting.groupConfigurations.items- .map((item) => item.groupFieldId)- .toList();- bool isChanged = false;- if (_fieldNotifier != null) {- for (var field in _fieldNotifier!.fieldContexts) {- if (groupFieldIds.contains(field.id)) {- field._isGroupField = true;- isChanged = true;- }- }- if (isChanged) _fieldNotifier?.notify();- }- },+ (setting) => _updateFieldsWhenSettingChanged(setting),(r) => Log.error(r),);});++ _settingFFIService.getSetting().then((result) {+ result.fold(+ (setting) => _updateFieldsWhenSettingChanged(setting),+ (err) => Log.error(err),+ );+ });+ }++ void _updateFieldsWhenSettingChanged(GridSettingPB setting) {+ _groupFieldIds = setting.groupConfigurations.items+ .map((item) => item.groupFieldId)+ .toList();++ _updateFieldContexts();+ }++ void _updateFieldContexts() {+ if (_fieldNotifier != null) {+ for (var field in _fieldNotifier!.fieldContexts) {+ if (_groupFieldIds.contains(field.id)) {+ field._isGroupField = true;+ } else {+ field._isGroupField = false;+ }+ }+ _fieldNotifier?.notify();+ }}Future<void> dispose() async {@@ -85,9 +107,6 @@ class GridFieldController {_fieldNotifier = null;}- List<GridFieldContext> get fieldContexts =>- [..._fieldNotifier?.fieldContexts ?? []];-Future<Either<Unit, FlowyError>> loadFields({required List<FieldIdPB> fieldIds}) async {final result = await _gridFFIService.getFields(fieldIds: fieldIds);@@ -97,6 +116,7 @@ class GridFieldController {_fieldNotifier?.fieldContexts = newFields.items.map((field) => GridFieldContext(field: field)).toList();+ _updateFieldContexts();return left(unit);},(err) => right(err),diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dartindex 5466a8de08..28676d62c1 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart@@ -6,7 +6,6 @@ import 'package:flowy_sdk/protobuf/flowy-grid/grid_entities.pb.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'field_cache.dart';part 'field_service.freezed.dart';/// FieldService consists of lots of event functions. We define the events in the backend(Rust),diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dartindex 192c4f86f0..632e333911 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dart@@ -1,4 +1,3 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/checkbox_type_option.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dartindex 6f757be71d..65bd057ac5 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flowy_infra/notifier.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dartindex 139b08251e..0aceab8ccf 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dart@@ -7,7 +7,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'block/block_cache.dart';-import 'field/field_cache.dart';+import 'field/field_controller.dart';import 'grid_data_controller.dart';import 'row/row_cache.dart';import 'dart:collection';diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dartindex 6caf699641..a8e1a27c39 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart@@ -8,7 +8,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/grid_entities.pb.dart';import 'dart:async';import 'package:dartz/dartz.dart';import 'block/block_cache.dart';-import 'field/field_cache.dart';+import 'field/field_controller.dart';import 'prelude.dart';import 'row/row_cache.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dartindex b7e1ade527..c6c9b1fa5b 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart@@ -4,7 +4,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'field/field_cache.dart';+import 'field/field_controller.dart';part 'grid_header_bloc.freezed.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dartindex c5676616b3..5e14c2e445 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart@@ -1,6 +1,6 @@import 'dart:collection';import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:equatable/equatable.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dartindex d1e8eaa1bf..6e25742974 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart@@ -1,6 +1,6 @@import 'dart:collection';import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dartindex 5ed0f24965..e5fc6161bb 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dart@@ -2,7 +2,7 @@ import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_field_import 'package:flutter/material.dart';import '../../presentation/widgets/cell/cell_builder.dart';import '../cell/cell_service/cell_service.dart';-import '../field/field_cache.dart';+import '../field/field_controller.dart';import 'row_cache.dart';typedef OnRowChanged = void Function(GridCellMap, RowsChangedReason);diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dartindex b960a2c2f0..8b58d5ea0c 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dart@@ -1,45 +1,37 @@-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';-import 'package:flowy_sdk/log.dart';+import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import '../field/field_cache.dart';-import 'setting_controller.dart';+import '../field/field_controller.dart';+import 'setting_service.dart';part 'group_bloc.freezed.dart';class GridGroupBloc extends Bloc<GridGroupEvent, GridGroupState> {final GridFieldController _fieldController;- final SettingController _settingController;+ final SettingFFIService _settingFFIService;Function(List<GridFieldContext>)? _onFieldsFn;GridGroupBloc({required String viewId, required GridFieldController fieldController}): _fieldController = fieldController,- _settingController = SettingController(viewId: viewId),+ _settingFFIService = SettingFFIService(viewId: viewId),super(GridGroupState.initial(viewId, fieldController.fieldContexts)) {on<GridGroupEvent>((event, emit) async {- await event.map(- initial: (_Initial value) {+ event.when(+ initial: () {_startListening();},- setFieldVisibility: (_SetFieldVisibility value) async {- final fieldService =- FieldService(gridId: viewId, fieldId: value.fieldId);- final result =- await fieldService.updateField(visibility: value.visibility);- result.fold(- (l) => null,- (err) => Log.error(err),- );- },- didReceiveFieldUpdate: (_DidReceiveFieldUpdate value) {- emit(state.copyWith(fieldContexts: value.fields));+ didReceiveFieldUpdate: (fieldContexts) {+ emit(state.copyWith(fieldContexts: fieldContexts));},- moveField: (_MoveField value) {- //+ setGroupByField: (String fieldId, FieldType fieldType) {+ _settingFFIService.groupByField(+ fieldId: fieldId,+ fieldType: fieldType,+ );},);},@@ -56,28 +48,24 @@ class GridGroupBloc extends Bloc<GridGroupEvent, GridGroupState> {}void _startListening() {- _onFieldsFn = (fields) => add(GridGroupEvent.didReceiveFieldUpdate(fields));+ _onFieldsFn = (fieldContexts) =>+ add(GridGroupEvent.didReceiveFieldUpdate(fieldContexts));_fieldController.addListener(onFields: _onFieldsFn,listenWhen: () => !isClosed,);-- _settingController.startListeing(- onSettingUpdated: (setting) {},- onError: (err) {},- );}}@freezedclass GridGroupEvent with _$GridGroupEvent {const factory GridGroupEvent.initial() = _Initial;- const factory GridGroupEvent.setFieldVisibility(- String fieldId, bool visibility) = _SetFieldVisibility;+ const factory GridGroupEvent.setGroupByField(+ String fieldId,+ FieldType fieldType,+ ) = _GroupByField;const factory GridGroupEvent.didReceiveFieldUpdate(List<GridFieldContext> fields) = _DidReceiveFieldUpdate;- const factory GridGroupEvent.moveField(int fromIndex, int toIndex) =- _MoveField;}@freezeddiff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dartindex 2e268aff84..c54f16ae12 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart@@ -4,7 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import '../field/field_cache.dart';+import '../field/field_controller.dart';part 'property_bloc.freezed.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dartindex 8d3774ec1c..b050809bb5 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dart@@ -1,7 +1,9 @@import 'package:dartz/dartz.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';+import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/grid_entities.pb.dart';+import 'package:flowy_sdk/protobuf/flowy-grid/group.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/setting_entities.pb.dart';class SettingFFIService {@@ -13,4 +15,18 @@ class SettingFFIService {final payload = GridIdPB.create()..value = viewId;return GridEventGetGridSetting(payload).send();}++ Future<Either<Unit, FlowyError>> groupByField({+ required String fieldId,+ required FieldType fieldType,+ }) {+ final insertGroupPayload = InsertGroupPayloadPB.create()+ ..fieldId = fieldId+ ..fieldType = fieldType;+ final payload = GridSettingChangesetPayloadPB.create()+ ..gridId = viewId+ ..insertGroup = insertGroupPayload;++ return GridEventUpdateGridSetting(payload).send();+ }}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart b/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dartindex e8d251c04f..be9d2fe4e3 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dart b/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dartindex 5d09200b33..72b1eb643d 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'sizes.dart';class GridLayout {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dartindex fd5f087c40..c1de0eca31 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart@@ -1,4 +1,3 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';import 'package:app_flowy/plugins/grid/application/field/field_cell_bloc.dart';import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dartindex fd0a0c2863..05c1faec08 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart@@ -1,5 +1,5 @@import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/plugins/grid/application/prelude.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dartindex bce95edb96..cfa2f9291f 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_data_controller.dart';import 'package:flowy_sdk/protobuf/flowy-grid/checkbox_type_option.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dartindex 1fbe1bfb84..266be35a36 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart@@ -215,7 +215,7 @@ class _RowDetailCell extends StatelessWidget {SizedBox(width: 150,child: FieldCellButton(- field: cellId.fieldContext.fieldContext,+ field: cellId.fieldContext.field,onTap: () => _showFieldEditor(context),),),@@ -233,7 +233,7 @@ class _RowDetailCell extends StatelessWidget {fieldName: cellId.fieldContext.name,typeOptionLoader: FieldTypeOptionLoader(gridId: cellId.gridId,- field: cellId.fieldContext.fieldContext,+ field: cellId.fieldContext.field,),).show(context);}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dartindex 3550c1274c..0a82eef4bb 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dart@@ -1,8 +1,9 @@-import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';@@ -29,10 +30,10 @@ class GridGroupList extends StatelessWidget {)..add(const GridGroupEvent.initial()),child: BlocBuilder<GridGroupBloc, GridGroupState>(builder: (context, state) {- final cells = state.fieldContexts.map((field) {+ final cells = state.fieldContexts.map((fieldContext) {return _GridGroupCell(- fieldContext: field,- key: ValueKey(field.id),+ fieldContext: fieldContext,+ key: ValueKey(fieldContext.id),);}).toList();@@ -51,7 +52,22 @@ class GridGroupList extends StatelessWidget {);}- void show(BuildContext context) {}+ void show(BuildContext context) {+ FlowyOverlay.of(context).insertWithAnchor(+ widget: OverlayContainer(+ constraints: BoxConstraints.loose(const Size(260, 400)),+ child: this,+ ),+ identifier: identifier(),+ anchorContext: context,+ anchorDirection: AnchorDirection.bottomRight,+ style: FlowyOverlayStyle(blur: false),+ );+ }++ static String identifier() {+ return (GridGroupList).toString();+ }}class _GridGroupCell extends StatelessWidget {@@ -61,23 +77,34 @@ class _GridGroupCell extends StatelessWidget {@overrideWidget build(BuildContext context) {- final theme = context.watch<AppTheme>();-- // final checkmark = field.visibility- // ? svgWidget('home/show', color: theme.iconColor)- // : svgWidget('home/hide', color: theme.iconColor);+ final theme = context.read<AppTheme>();- // Padding(- // padding: const EdgeInsets.only(right: 6),- // child: svgWidget("grid/checkmark"),- // ),+ Widget? rightIcon;+ if (fieldContext.isGroupField) {+ rightIcon = Padding(+ padding: const EdgeInsets.all(2.0),+ child: svgWidget("grid/checkmark"),+ );+ }- return FlowyButton(- text: FlowyText.medium(fieldContext.name, fontSize: 12),- hoverColor: theme.hover,- leftIcon:- svgWidget(fieldContext.fieldType.iconName(), color: theme.iconColor),- onTap: () {},+ return SizedBox(+ height: GridSize.typeOptionItemHeight,+ child: FlowyButton(+ text: FlowyText.medium(fieldContext.name, fontSize: 12),+ hoverColor: theme.hover,+ leftIcon: svgWidget(fieldContext.fieldType.iconName(),+ color: theme.iconColor),+ rightIcon: rightIcon,+ onTap: () {+ context.read<GridGroupBloc>().add(+ GridGroupEvent.setGroupByField(+ fieldContext.id,+ fieldContext.fieldType,+ ),+ );+ FlowyOverlay.of(context).remove(GridGroupList.identifier());+ },+ ),);}}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dartindex e57ff26bcb..f5acbcba2a 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart@@ -13,7 +13,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';-import '../../../application/field/field_cache.dart';+import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';import '../header/field_editor.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dartindex 4bbcd66fe2..c793d7eef1 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart@@ -11,7 +11,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:app_flowy/generated/locale_keys.g.dart';-import '../../../application/field/field_cache.dart';+import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';import 'grid_property.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dartindex 56c6947430..61ea099f56 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart@@ -5,7 +5,7 @@ import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../../application/field/field_cache.dart';+import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';import 'grid_setting.dart';diff --git a/frontend/app_flowy/lib/startup/deps_resolver.dart b/frontend/app_flowy/lib/startup/deps_resolver.dartindex cd73c3fbbc..cd3cc00ec6 100644--- a/frontend/app_flowy/lib/startup/deps_resolver.dart+++ b/frontend/app_flowy/lib/startup/deps_resolver.dart@@ -21,7 +21,7 @@ import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:get_it/get_it.dart';-import '../plugins/grid/application/field/field_cache.dart';+import '../plugins/grid/application/field/field_controller.dart';class DependencyResolver {static Future<void> resolve(GetIt getIt) async {diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dartindex 4c20161691..47e74b37f5 100644--- a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart+++ b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart@@ -91,6 +91,7 @@ class AFBoardDataController extends ChangeNotifiervoid clear() {_columnDatas.clear();+ _columnControllers.clear();notifyListeners();}diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rsindex f8588944e7..c6737e8e76 100644--- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs@@ -78,7 +78,7 @@ pub struct DeleteFilterParams {}#[derive(ProtoBuf, Debug, Default, Clone)]-pub struct CreateGridFilterPayloadPB {+pub struct InsertFilterPayloadPB {#[pb(index = 1)]pub field_id: String,@@ -92,7 +92,7 @@ pub struct CreateGridFilterPayloadPB {pub content: Option<String>,}-impl CreateGridFilterPayloadPB {+impl InsertFilterPayloadPB {#[allow(dead_code)]pub fn new<T: Into<i32>>(field_rev: &FieldRevision, condition: T, content: Option<String>) -> Self {Self {@@ -104,10 +104,10 @@ impl CreateGridFilterPayloadPB {}}-impl TryInto<CreateFilterParams> for CreateGridFilterPayloadPB {+impl TryInto<InsertFilterParams> for InsertFilterPayloadPB {type Error = ErrorCode;- fn try_into(self) -> Result<CreateFilterParams, Self::Error> {+ fn try_into(self) -> Result<InsertFilterParams, Self::Error> {let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?.0;@@ -130,7 +130,7 @@ impl TryInto<CreateFilterParams> for CreateGridFilterPayloadPB {}}- Ok(CreateFilterParams {+ Ok(InsertFilterParams {field_id,field_type_rev: self.field_type.into(),condition,@@ -139,7 +139,7 @@ impl TryInto<CreateFilterParams> for CreateGridFilterPayloadPB {}}-pub struct CreateFilterParams {+pub struct InsertFilterParams {pub field_id: String,pub field_type_rev: FieldTypeRevision,pub condition: u8,diff --git a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rsindex 3ed53080ef..de6f920341 100644--- a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs@@ -130,7 +130,7 @@ impl std::convert::From<Vec<Arc<GroupConfigurationRevision>>> for RepeatedGridGr}#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]-pub struct CreateGridGroupPayloadPB {+pub struct InsertGroupPayloadPB {#[pb(index = 1)]pub field_id: String,@@ -138,22 +138,22 @@ pub struct CreateGridGroupPayloadPB {pub field_type: FieldType,}-impl TryInto<CreatGroupParams> for CreateGridGroupPayloadPB {+impl TryInto<InsertGroupParams> for InsertGroupPayloadPB {type Error = ErrorCode;- fn try_into(self) -> Result<CreatGroupParams, Self::Error> {+ fn try_into(self) -> Result<InsertGroupParams, Self::Error> {let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?.0;- Ok(CreatGroupParams {+ Ok(InsertGroupParams {field_id,field_type_rev: self.field_type.into(),})}}-pub struct CreatGroupParams {+pub struct InsertGroupParams {pub field_id: String,pub field_type_rev: FieldTypeRevision,}diff --git a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rsindex 47efc11861..bbf5af831f 100644--- a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs@@ -1,13 +1,12 @@use crate::entities::{- CreatGroupParams, CreateFilterParams, CreateGridFilterPayloadPB, CreateGridGroupPayloadPB, DeleteFilterParams,- DeleteFilterPayloadPB, DeleteGroupParams, DeleteGroupPayloadPB, RepeatedGridFilterConfigurationPB,+ DeleteFilterParams, DeleteFilterPayloadPB, DeleteGroupParams, DeleteGroupPayloadPB, InsertFilterParams,+ InsertFilterPayloadPB, InsertGroupParams, InsertGroupPayloadPB, RepeatedGridFilterConfigurationPB,RepeatedGridGroupConfigurationPB,};use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_error::ErrorCode;use flowy_grid_data_model::parser::NotEmptyStr;use flowy_grid_data_model::revision::LayoutRevision;-use std::collections::HashMap;use std::convert::TryInto;use strum::IntoEnumIterator;use strum_macros::EnumIter;@@ -85,13 +84,13 @@ pub struct GridSettingChangesetPayloadPB {pub layout_type: GridLayout,#[pb(index = 3, one_of)]- pub insert_filter: Option<CreateGridFilterPayloadPB>,+ pub insert_filter: Option<InsertFilterPayloadPB>,#[pb(index = 4, one_of)]pub delete_filter: Option<DeleteFilterPayloadPB>,#[pb(index = 5, one_of)]- pub insert_group: Option<CreateGridGroupPayloadPB>,+ pub insert_group: Option<InsertGroupPayloadPB>,#[pb(index = 6, one_of)]pub delete_group: Option<DeleteGroupPayloadPB>,@@ -102,7 +101,7 @@ impl TryInto<GridSettingChangesetParams> for GridSettingChangesetPayloadPB {fn try_into(self) -> Result<GridSettingChangesetParams, Self::Error> {let view_id = NotEmptyStr::parse(self.grid_id)- .map_err(|_| ErrorCode::FieldIdIsEmpty)?+ .map_err(|_| ErrorCode::ViewIdInvalid)?.0;let insert_filter = match self.insert_filter {@@ -139,9 +138,9 @@ impl TryInto<GridSettingChangesetParams> for GridSettingChangesetPayloadPB {pub struct GridSettingChangesetParams {pub grid_id: String,pub layout_type: LayoutRevision,- pub insert_filter: Option<CreateFilterParams>,+ pub insert_filter: Option<InsertFilterParams>,pub delete_filter: Option<DeleteFilterParams>,- pub insert_group: Option<CreatGroupParams>,+ pub insert_group: Option<InsertGroupParams>,pub delete_group: Option<DeleteGroupParams>,}diff --git a/frontend/rust-lib/flowy-grid/src/event_handler.rs b/frontend/rust-lib/flowy-grid/src/event_handler.rsindex 8a04b2ea30..c9b6cf4662 100644--- a/frontend/rust-lib/flowy-grid/src/event_handler.rs+++ b/frontend/rust-lib/flowy-grid/src/event_handler.rs@@ -35,6 +35,32 @@ pub(crate) async fn get_grid_setting_handler(data_result(grid_setting)}+#[tracing::instrument(level = "trace", skip(data, manager), err)]+pub(crate) async fn update_grid_setting_handler(+ data: Data<GridSettingChangesetPayloadPB>,+ manager: AppData<Arc<GridManager>>,+) -> Result<(), FlowyError> {+ let params: GridSettingChangesetParams = data.into_inner().try_into()?;++ let editor = manager.get_grid_editor(¶ms.grid_id)?;+ if let Some(insert_params) = params.insert_group {+ let _ = editor.create_group(insert_params).await?;+ }++ if let Some(delete_params) = params.delete_group {+ let _ = editor.delete_group(delete_params).await?;+ }++ if let Some(create_filter) = params.insert_filter {+ let _ = editor.create_filter(create_filter).await?;+ }++ if let Some(delete_filter) = params.delete_filter {+ let _ = editor.delete_filter(delete_filter).await?;+ }+ Ok(())+}+#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn get_grid_blocks_handler(data: Data<QueryBlocksPayloadPB>,diff --git a/frontend/rust-lib/flowy-grid/src/event_map.rs b/frontend/rust-lib/flowy-grid/src/event_map.rsindex a78bcb5ed3..e0a5ffcf1b 100644--- a/frontend/rust-lib/flowy-grid/src/event_map.rs+++ b/frontend/rust-lib/flowy-grid/src/event_map.rs@@ -11,7 +11,7 @@ pub fn create(grid_manager: Arc<GridManager>) -> Module {.event(GridEvent::GetGrid, get_grid_handler).event(GridEvent::GetGridBlocks, get_grid_blocks_handler).event(GridEvent::GetGridSetting, get_grid_setting_handler)- // .event(GridEvent::UpdateGridSetting, update_grid_setting_handler)+ .event(GridEvent::UpdateGridSetting, update_grid_setting_handler)// Field.event(GridEvent::GetFields, get_fields_handler).event(GridEvent::UpdateField, update_field_handler)@@ -75,8 +75,8 @@ pub enum GridEvent {/// [UpdateGridSetting] event is used to update the grid's settings.///- /// The event handler accepts [GridIdPB] and return errors if failed to modify the grid's settings.- #[event(input = "GridIdPB", input = "GridSettingChangesetPayloadPB")]+ /// The event handler accepts [GridSettingChangesetPayloadPB] and return errors if failed to modify the grid's settings.+ #[event(input = "GridSettingChangesetPayloadPB")]UpdateGridSetting = 3,/// [GetFields] event is used to get the grid's settings.@@ -225,4 +225,7 @@ pub enum GridEvent {#[event(input = "MoveGroupRowPayloadPB")]MoveGroupRow = 112,++ #[event(input = "MoveGroupRowPayloadPB")]+ GroupByField = 113,}diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rsindex 2f72f48d33..320d41cbff 100644--- a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs+++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs@@ -211,7 +211,7 @@ impl GridRevisionEditor {Ok(())}- pub async fn group_field(&self, field_id: &str) -> FlowyResult<()> {+ pub async fn group_by_field(&self, field_id: &str) -> FlowyResult<()> {let _ = self.view_manager.group_by_field(field_id).await?;Ok(())}@@ -536,8 +536,16 @@ impl GridRevisionEditor {self.view_manager.get_filters().await}- pub async fn update_filter(&self, params: CreateFilterParams) -> FlowyResult<()> {- let _ = self.view_manager.update_filter(params).await?;+ pub async fn create_group(&self, params: InsertGroupParams) -> FlowyResult<()> {+ self.view_manager.insert_or_update_group(params).await+ }++ pub async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {+ self.view_manager.delete_group(params).await+ }++ pub async fn create_filter(&self, params: InsertFilterParams) -> FlowyResult<()> {+ let _ = self.view_manager.insert_or_update_filter(params).await?;Ok(())}diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rsindex 71d2fb372a..ab8e8bd41f 100644--- a/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs+++ b/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs@@ -1,14 +1,15 @@use crate::dart_notification::{send_dart_notification, GridNotification};use crate::entities::{- CreateFilterParams, CreateRowParams, DeleteFilterParams, GridFilterConfigurationPB, GridGroupConfigurationPB,- GridLayout, GridLayoutPB, GridSettingPB, GroupChangesetPB, GroupPB, GroupViewChangesetPB, InsertedGroupPB,- InsertedRowPB, MoveGroupParams, RepeatedGridFilterConfigurationPB, RepeatedGridGroupConfigurationPB, RowPB,+ CreateRowParams, DeleteFilterParams, DeleteGroupParams, GridFilterConfigurationPB, GridGroupConfigurationPB,+ GridLayout, GridLayoutPB, GridSettingPB, GroupChangesetPB, GroupPB, GroupViewChangesetPB, InsertFilterParams,+ InsertGroupParams, InsertedGroupPB, InsertedRowPB, MoveGroupParams, RepeatedGridFilterConfigurationPB,+ RepeatedGridGroupConfigurationPB, RowPB,};use crate::services::grid_editor_task::GridServiceTaskScheduler;use crate::services::grid_view_manager::{GridViewFieldDelegate, GridViewRowDelegate};use crate::services::group::{- find_group_field, make_group_controller, GroupConfigurationReader, GroupConfigurationWriter, GroupController,- MoveGroupRowContext,+ default_group_configuration, find_group_field, make_group_controller, GroupConfigurationReader,+ GroupConfigurationWriter, GroupController, MoveGroupRowContext,};use flowy_error::{FlowyError, FlowyResult};use flowy_grid_data_model::revision::{@@ -19,7 +20,6 @@ use flowy_revision::{RevisionCloudService, RevisionManager, RevisionObjectBuildeuse flowy_sync::client_grid::{GridViewRevisionChangeset, GridViewRevisionPad};use flowy_sync::entities::revision::Revision;use lib_infra::future::{wrap_future, AFFuture, FutureResult};-use std::collections::HashMap;use std::future::Future;use std::sync::Arc;use tokio::sync::RwLock;@@ -210,15 +210,40 @@ impl GridViewRevisionEditor {}}- pub(crate) async fn insert_filter(&self, insert_filter: CreateFilterParams) -> FlowyResult<()> {+ pub(crate) async fn insert_group(&self, params: InsertGroupParams) -> FlowyResult<()> {+ if let Some(field_rev) = self.field_delegate.get_field_rev(¶ms.field_id).await {+ let _ = self+ .modify(|pad| {+ let configuration = default_group_configuration(&field_rev);+ let changeset = pad.insert_group(¶ms.field_id, ¶ms.field_type_rev, configuration)?;+ Ok(changeset)+ })+ .await?;+ }+ if self.group_controller.read().await.field_id() != params.field_id {+ let _ = self.group_by_field(¶ms.field_id).await?;+ self.notify_did_update_setting().await;+ }+ Ok(())+ }++ pub(crate) async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {+ self.modify(|pad| {+ let changeset = pad.delete_filter(¶ms.field_id, ¶ms.field_type_rev, ¶ms.group_id)?;+ Ok(changeset)+ })+ .await+ }++ pub(crate) async fn insert_filter(&self, params: InsertFilterParams) -> FlowyResult<()> {self.modify(|pad| {let filter_rev = FilterConfigurationRevision {id: gen_grid_filter_id(),- field_id: insert_filter.field_id.clone(),- condition: insert_filter.condition,- content: insert_filter.content,+ field_id: params.field_id.clone(),+ condition: params.condition,+ content: params.content,};- let changeset = pad.insert_filter(&insert_filter.field_id, &insert_filter.field_type_rev, filter_rev)?;+ let changeset = pad.insert_filter(¶ms.field_id, ¶ms.field_type_rev, filter_rev)?;Ok(changeset)}).await@@ -279,6 +304,13 @@ impl GridViewRevisionEditor {Ok(())}+ async fn notify_did_update_setting(&self) {+ let setting = self.get_setting().await;+ send_dart_notification(&self.view_id, GridNotification::DidUpdateGridSetting)+ .payload(setting)+ .send();+ }+pub async fn notify_did_update_group(&self, changeset: GroupChangesetPB) {send_dart_notification(&changeset.group_id, GridNotification::DidUpdateGroup).payload(changeset)diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs b/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rsindex 460be37a44..b1041a818c 100644--- a/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs+++ b/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs@@ -1,6 +1,6 @@use crate::entities::{- CreateFilterParams, CreateRowParams, DeleteFilterParams, GridFilterConfigurationPB, GridSettingPB, MoveGroupParams,- RepeatedGridGroupPB, RowPB,+ CreateRowParams, DeleteFilterParams, DeleteGroupParams, GridFilterConfigurationPB, GridSettingPB,+ InsertFilterParams, InsertGroupParams, MoveGroupParams, RepeatedGridGroupPB, RowPB,};use crate::manager::GridUser;use crate::services::grid_editor_task::GridServiceTaskScheduler;@@ -110,14 +110,14 @@ impl GridViewManager {Ok(view_editor.get_filters().await)}- pub(crate) async fn update_filter(&self, insert_filter: CreateFilterParams) -> FlowyResult<()> {+ pub(crate) async fn insert_or_update_filter(&self, params: InsertFilterParams) -> FlowyResult<()> {let view_editor = self.get_default_view_editor().await?;- view_editor.insert_filter(insert_filter).await+ view_editor.insert_filter(params).await}- pub(crate) async fn delete_filter(&self, delete_filter: DeleteFilterParams) -> FlowyResult<()> {+ pub(crate) async fn delete_filter(&self, params: DeleteFilterParams) -> FlowyResult<()> {let view_editor = self.get_default_view_editor().await?;- view_editor.delete_filter(delete_filter).await+ view_editor.delete_filter(params).await}pub(crate) async fn load_groups(&self) -> FlowyResult<RepeatedGridGroupPB> {@@ -126,6 +126,16 @@ impl GridViewManager {Ok(RepeatedGridGroupPB { items: groups })}+ pub(crate) async fn insert_or_update_group(&self, params: InsertGroupParams) -> FlowyResult<()> {+ let view_editor = self.get_default_view_editor().await?;+ view_editor.insert_group(params).await+ }++ pub(crate) async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {+ let view_editor = self.get_default_view_editor().await?;+ view_editor.delete_group(params).await+ }+pub(crate) async fn move_group(&self, params: MoveGroupParams) -> FlowyResult<()> {let view_editor = self.get_default_view_editor().await?;let _ = view_editor.move_group(params).await?;diff --git a/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs b/frontend/rust-lib/flowy-grid/src/services/group/configuration.rsindex 196f619290..c110d01ad4 100644--- a/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs+++ b/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs@@ -133,6 +133,7 @@ where}}+ #[tracing::instrument(level = "debug", skip(self, generated_groups), err)]pub(crate) fn init_groups(&mut self,generated_groups: Vec<GeneratedGroup>,@@ -316,7 +317,8 @@ wherefn merge_groups(old_groups: &[GroupRevision], new_groups: Vec<GroupRevision>) -> MergeGroupResult {let mut merge_result = MergeGroupResult::new();if old_groups.is_empty() {- merge_result.all_group_revs = new_groups;+ merge_result.all_group_revs = new_groups.clone();+ merge_result.new_group_revs = new_groups;return merge_result;}diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller.rsindex d2784f0e77..54d001d4a7 100644--- a/frontend/rust-lib/flowy-grid/src/services/group/controller.rs+++ b/frontend/rust-lib/flowy-grid/src/services/group/controller.rs@@ -89,7 +89,7 @@ wherelet field_type_rev = field_rev.ty;let type_option = field_rev.get_type_option::<T>(field_type_rev);let groups = G::generate_groups(&field_rev.id, &configuration, &type_option);- let _ = configuration.init_groups(groups, false)?;+ let _ = configuration.init_groups(groups, true)?;Ok(Self {field_id: field_rev.id.clone(),diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rsindex 4ce5523404..938bdd127e 100644--- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs+++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs@@ -16,7 +16,7 @@ impl DefaultGroupController {let group = Group::new(DEFAULT_GROUP_CONTROLLER.to_owned(),field_rev.id.clone(),- "Oops".to_owned(),+ "".to_owned(),"".to_owned(),);Self {diff --git a/frontend/rust-lib/flowy-grid/src/services/setting/setting_builder.rs b/frontend/rust-lib/flowy-grid/src/services/setting/setting_builder.rsindex 16ee630cc7..2bf8f1bbeb 100644--- a/frontend/rust-lib/flowy-grid/src/services/setting/setting_builder.rs+++ b/frontend/rust-lib/flowy-grid/src/services/setting/setting_builder.rs@@ -1,4 +1,4 @@-use crate::entities::{CreateFilterParams, DeleteFilterParams, GridLayout, GridSettingChangesetParams};+use crate::entities::{DeleteFilterParams, GridLayout, GridSettingChangesetParams, InsertFilterParams};pub struct GridSettingChangesetBuilder {params: GridSettingChangesetParams,@@ -17,7 +17,7 @@ impl GridSettingChangesetBuilder {Self { params }}- pub fn insert_filter(mut self, params: CreateFilterParams) -> Self {+ pub fn insert_filter(mut self, params: InsertFilterParams) -> Self {self.params.insert_filter = Some(params);self}diff --git a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rsindex a1f0b8a0c6..0eff7edaa4 100644--- a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs+++ b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs@@ -3,14 +3,14 @@#![allow(dead_code)]#![allow(unused_imports)]-use flowy_grid::entities::{CreateFilterParams, CreateGridFilterPayloadPB, DeleteFilterParams, GridLayout, GridSettingChangesetParams, GridSettingPB};+use flowy_grid::entities::{InsertFilterParams, InsertFilterPayloadPB, DeleteFilterParams, GridLayout, GridSettingChangesetParams, GridSettingPB};use flowy_grid::services::setting::GridSettingChangesetBuilder;use flowy_grid_data_model::revision::{FieldRevision, FieldTypeRevision};use crate::grid::grid_editor::GridEditorTest;pub enum FilterScript {InsertGridTableFilter {- payload: CreateGridFilterPayloadPB,+ payload: InsertFilterPayloadPB,},AssertTableFilterCount {count: i32,@@ -47,8 +47,8 @@ impl GridFilterTest {match script {FilterScript::InsertGridTableFilter { payload } => {- let params: CreateFilterParams = payload.try_into().unwrap();- let _ = self.editor.update_filter(params).await.unwrap();+ let params: InsertFilterParams = payload.try_into().unwrap();+ let _ = self.editor.create_filter(params).await.unwrap();}FilterScript::AssertTableFilterCount { count } => {let filters = self.editor.get_grid_filter().await.unwrap();diff --git a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rsindex 3e45a4053d..5868e16c2d 100644--- a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs+++ b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs@@ -1,13 +1,13 @@use crate::grid::filter_test::script::FilterScript::*;use crate::grid::filter_test::script::*;-use flowy_grid::entities::{CreateGridFilterPayloadPB, FieldType, TextFilterCondition};+use flowy_grid::entities::{FieldType, InsertFilterPayloadPB, TextFilterCondition};use flowy_grid_data_model::revision::FieldRevision;#[tokio::test]async fn grid_filter_create_test() {let mut test = GridFilterTest::new().await;let field_rev = test.get_field_rev(FieldType::RichText);- let payload = CreateGridFilterPayloadPB::new(field_rev, TextFilterCondition::TextIsEmpty, Some("abc".to_owned()));+ let payload = InsertFilterPayloadPB::new(field_rev, TextFilterCondition::TextIsEmpty, Some("abc".to_owned()));let scripts = vec![InsertGridTableFilter { payload }, AssertTableFilterCount { count: 1 }];test.run_scripts(scripts).await;}@@ -19,7 +19,7 @@ async fn grid_filter_invalid_condition_panic_test() {let field_rev = test.get_field_rev(FieldType::RichText).clone();// 100 is not a valid condition, so this test should be panic.- let payload = CreateGridFilterPayloadPB::new(&field_rev, 100, Some("".to_owned()));+ let payload = InsertFilterPayloadPB::new(&field_rev, 100, Some("".to_owned()));let scripts = vec![InsertGridTableFilter { payload }];test.run_scripts(scripts).await;}@@ -46,6 +46,6 @@ async fn grid_filter_delete_test() {#[tokio::test]async fn grid_filter_get_rows_test() {}-fn create_filter(field_rev: &FieldRevision, condition: TextFilterCondition, s: &str) -> CreateGridFilterPayloadPB {- CreateGridFilterPayloadPB::new(field_rev, condition, Some(s.to_owned()))+fn create_filter(field_rev: &FieldRevision, condition: TextFilterCondition, s: &str) -> InsertFilterPayloadPB {+ InsertFilterPayloadPB::new(field_rev, condition, Some(s.to_owned()))}diff --git a/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rsindex 373eabdc88..ce6044c39e 100644--- a/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs+++ b/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs@@ -188,7 +188,7 @@ impl GridGroupTest {.await;}GroupScript::GroupByField { field_id } => {- self.editor.group_field(&field_id).await.unwrap();+ self.editor.group_by_field(&field_id).await.unwrap();}}}diff --git a/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs b/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rsindex e836834265..45989f5b1c 100644--- a/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs+++ b/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs@@ -61,12 +61,12 @@ impl GridViewRevisionPad {&mut self,field_id: &str,field_type: &FieldTypeRevision,- group_rev: GroupConfigurationRevision,+ group_configuration_rev: GroupConfigurationRevision,) -> CollaborateResult<Option<GridViewRevisionChangeset>> {self.modify(|view| {// Only save one groupview.groups.clear();- view.groups.add_object(field_id, field_type, group_rev);+ view.groups.add_object(field_id, field_type, group_configuration_rev);Ok(Some(()))})}