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: rename some pb structs
appflowy6aba34458307
diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dartindex 70a3b76300..cdf695dc7f 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart@@ -234,7 +234,7 @@ class IGridCellController<T, D> extends Equatable {return data;}- /// Return the FieldTypeOptionDataPB that can be parsed into corresponding class using the [parser].+ /// Return the TypeOptionPB that can be parsed into corresponding class using the [parser]./// [PD] is the type that the parser return.Future<Either<PD, FlowyError>>getFieldTypeOption<PD, P extends TypeOptionDataParser>(P parser) {@@ -329,7 +329,7 @@ class GridCellFieldNotifierImpl extends IGridCellFieldNotifier {@overridevoid onCellFieldChanged(void Function(FieldPB p1) callback) {- _onChangesetFn = (FieldChangesetPB changeset) {+ _onChangesetFn = (GridFieldChangesetPB changeset) {for (final updatedField in changeset.updatedFields) {callback(updatedField);}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dartindex a6a1ba43a9..daf404d497 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dart@@ -25,7 +25,7 @@ class GridCellDataLoader<T> {final fut = service.getCell(cellId: cellId);return fut.then((result) => result.fold(- (GridCellPB cell) {+ (CellPB cell) {try {return parser.parserData(cell.data);} catch (e, s) {diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dartindex 71927bae14..6824ee55aa 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dart@@ -29,10 +29,12 @@ class CellDataPersistence implements IGridCellDataPersistence<String> {@freezedclass CalendarData with _$CalendarData {- const factory CalendarData({required DateTime date, String? time}) = _CalendarData;+ const factory CalendarData({required DateTime date, String? time}) =+ _CalendarData;}-class DateCellDataPersistence implements IGridCellDataPersistence<CalendarData> {+class DateCellDataPersistence+ implements IGridCellDataPersistence<CalendarData> {final GridCellIdentifier cellId;DateCellDataPersistence({required this.cellId,@@ -40,7 +42,8 @@ class DateCellDataPersistence implements IGridCellDataPersistence<CalendarData>@overrideFuture<Option<FlowyError>> save(CalendarData data) {- var payload = DateChangesetPayloadPB.create()..cellIdentifier = _makeCellIdPayload(cellId);+ var payload = DateChangesetPB.create()+ ..cellIdentifier = _makeCellIdPayload(cellId);final date = (data.date.millisecondsSinceEpoch ~/ 1000).toString();payload.date = date;@@ -58,8 +61,8 @@ class DateCellDataPersistence implements IGridCellDataPersistence<CalendarData>}}-GridCellIdPB _makeCellIdPayload(GridCellIdentifier cellId) {- return GridCellIdPB.create()+CellPathPB _makeCellIdPayload(GridCellIdentifier cellId) {+ return CellPathPB.create()..gridId = cellId.gridId..fieldId = cellId.fieldId..rowId = cellId.rowId;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 759b7a1ed7..1e6cbaab11 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@@ -42,10 +42,10 @@ class CellService {return GridEventUpdateCell(payload).send();}- Future<Either<GridCellPB, FlowyError>> getCell({+ Future<Either<CellPB, FlowyError>> getCell({required GridCellIdentifier cellId,}) {- final payload = GridCellIdPB.create()+ final payload = CellPathPB.create()..gridId = cellId.gridId..fieldId = cellId.fieldId..rowId = cellId.rowId;diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dartindex 0a182fbe15..3bf8950b6c 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart@@ -21,11 +21,11 @@ class SelectOptionService {(result) {return result.fold((option) {- final cellIdentifier = GridCellIdPB.create()+ final cellIdentifier = CellPathPB.create()..gridId = gridId..fieldId = fieldId..rowId = rowId;- final payload = SelectOptionChangesetPayloadPB.create()+ final payload = SelectOptionChangesetPB.create()..insertOptions.add(option)..cellIdentifier = cellIdentifier;return GridEventUpdateSelectOption(payload).send();@@ -39,7 +39,7 @@ class SelectOptionService {Future<Either<Unit, FlowyError>> update({required SelectOptionPB option,}) {- final payload = SelectOptionChangesetPayloadPB.create()+ final payload = SelectOptionChangesetPB.create()..updateOptions.add(option)..cellIdentifier = _cellIdentifier();return GridEventUpdateSelectOption(payload).send();@@ -47,7 +47,7 @@ class SelectOptionService {Future<Either<Unit, FlowyError>> delete({required Iterable<SelectOptionPB> options}) {- final payload = SelectOptionChangesetPayloadPB.create()+ final payload = SelectOptionChangesetPB.create()..deleteOptions.addAll(options)..cellIdentifier = _cellIdentifier();@@ -55,7 +55,7 @@ class SelectOptionService {}Future<Either<SelectOptionCellDataPB, FlowyError>> getOptionContext() {- final payload = GridCellIdPB.create()+ final payload = CellPathPB.create()..gridId = gridId..fieldId = fieldId..rowId = rowId;@@ -65,7 +65,7 @@ class SelectOptionService {Future<Either<void, FlowyError>> select({required Iterable<String> optionIds}) {- final payload = SelectOptionCellChangesetPayloadPB.create()+ final payload = SelectOptionCellChangesetPB.create()..cellIdentifier = _cellIdentifier()..insertOptionIds.addAll(optionIds);return GridEventUpdateSelectOptionCell(payload).send();@@ -73,14 +73,14 @@ class SelectOptionService {Future<Either<void, FlowyError>> unSelect({required Iterable<String> optionIds}) {- final payload = SelectOptionCellChangesetPayloadPB.create()+ final payload = SelectOptionCellChangesetPB.create()..cellIdentifier = _cellIdentifier()..deleteOptionIds.addAll(optionIds);return GridEventUpdateSelectOptionCell(payload).send();}- GridCellIdPB _cellIdentifier() {- return GridCellIdPB.create()+ CellPathPB _cellIdentifier() {+ return CellPathPB.create()..gridId = gridId..fieldId = fieldId..rowId = rowId;diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dartindex fc2cfb1098..cd82ecf567 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dart@@ -18,7 +18,7 @@ class FieldActionSheetBloc),super(FieldActionSheetState.initial(- FieldTypeOptionDataPB.create()..field_2 = fieldCellContext.field,+ TypeOptionPB.create()..field_2 = fieldCellContext.field,),) {on<FieldActionSheetEvent>(@@ -85,12 +85,12 @@ class FieldActionSheetEvent with _$FieldActionSheetEvent {@freezedclass FieldActionSheetState with _$FieldActionSheetState {const factory FieldActionSheetState({- required FieldTypeOptionDataPB fieldTypeOptionData,+ required TypeOptionPB fieldTypeOptionData,required String errorText,required String fieldName,}) = _FieldActionSheetState;- factory FieldActionSheetState.initial(FieldTypeOptionDataPB data) =>+ factory FieldActionSheetState.initial(TypeOptionPB data) =>FieldActionSheetState(fieldTypeOptionData: data,errorText: '',diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dartindex 73127ed6df..b5cb8cd9bf 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart@@ -27,7 +27,7 @@ class _GridFieldNotifier extends ChangeNotifier {List<GridFieldContext> get fieldContexts => _fieldContexts;}-typedef OnChangeset = void Function(FieldChangesetPB);+typedef OnChangeset = void Function(GridFieldChangesetPB);typedef OnReceiveFields = void Function(List<GridFieldContext>);class GridFieldController {@@ -247,7 +247,7 @@ class GridRowFieldNotifierImpl extends IGridRowFieldNotifier {@overridevoid onRowFieldChanged(void Function(FieldPB) callback) {- _onChangesetFn = (FieldChangesetPB changeset) {+ _onChangesetFn = (GridFieldChangesetPB changeset) {for (final updatedField in changeset.updatedFields) {callback(updatedField);}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 e7487b6f02..f29186e55a 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@@ -36,7 +36,7 @@ class FieldService {double? width,List<int>? typeOptionData,}) {- var payload = FieldChangesetPayloadPB.create()+ var payload = FieldChangesetPB.create()..gridId = gridId..fieldId = fieldId;@@ -72,7 +72,7 @@ class FieldService {required String fieldId,required List<int> typeOptionData,}) {- var payload = UpdateFieldTypeOptionPayloadPB.create()+ var payload = TypeOptionChangesetPB.create()..gridId = gridId..fieldId = fieldId..typeOptionData = typeOptionData;@@ -96,10 +96,10 @@ class FieldService {return GridEventDuplicateField(payload).send();}- Future<Either<FieldTypeOptionDataPB, FlowyError>> getFieldTypeOptionData({+ Future<Either<TypeOptionPB, FlowyError>> getFieldTypeOptionData({required FieldType fieldType,}) {- final payload = FieldTypeOptionIdPB.create()+ final payload = TypeOptionPathPB.create()..gridId = gridId..fieldId = fieldId..fieldType = fieldType;diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dartindex 61d931e43e..0184dfca4b 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dart@@ -7,7 +7,7 @@ import 'dart:async';import 'dart:typed_data';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';-typedef UpdateFieldNotifiedValue = Either<FieldChangesetPB, FlowyError>;+typedef UpdateFieldNotifiedValue = Either<GridFieldChangesetPB, FlowyError>;class GridFieldsListener {final String gridId;@@ -30,7 +30,7 @@ class GridFieldsListener {case GridNotification.DidUpdateGridField:result.fold((payload) => updateFieldsNotifier?.value =- left(FieldChangesetPB.fromBuffer(payload)),+ left(GridFieldChangesetPB.fromBuffer(payload)),(error) => updateFieldsNotifier?.value = right(error),);break;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 f644f4d2a0..0c6586244a 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@@ -143,11 +143,11 @@ abstract class TypeOptionFieldDelegate {abstract class IFieldTypeOptionLoader {String get gridId;- Future<Either<FieldTypeOptionDataPB, FlowyError>> load();+ Future<Either<TypeOptionPB, FlowyError>> load();Future<Either<Unit, FlowyError>> switchToField(String fieldId, FieldType fieldType) {- final payload = EditFieldPayloadPB.create()+ final payload = EditFieldChangesetPB.create()..gridId = gridId..fieldId = fieldId..fieldType = fieldType;@@ -158,7 +158,7 @@ abstract class IFieldTypeOptionLoader {/// Uses when creating a new fieldclass NewFieldTypeOptionLoader extends IFieldTypeOptionLoader {- FieldTypeOptionDataPB? fieldTypeOption;+ TypeOptionPB? fieldTypeOption;@overridefinal String gridId;@@ -169,9 +169,9 @@ class NewFieldTypeOptionLoader extends IFieldTypeOptionLoader {/// Creates the field type option if the fieldTypeOption is null./// Otherwise, it loads the type option data from the backend.@override- Future<Either<FieldTypeOptionDataPB, FlowyError>> load() {+ Future<Either<TypeOptionPB, FlowyError>> load() {if (fieldTypeOption != null) {- final payload = FieldTypeOptionIdPB.create()+ final payload = TypeOptionPathPB.create()..gridId = gridId..fieldId = fieldTypeOption!.field_2.id..fieldType = fieldTypeOption!.field_2.fieldType;@@ -207,8 +207,8 @@ class FieldTypeOptionLoader extends IFieldTypeOptionLoader {});@override- Future<Either<FieldTypeOptionDataPB, FlowyError>> load() {- final payload = FieldTypeOptionIdPB.create()+ Future<Either<TypeOptionPB, FlowyError>> load() {+ final payload = TypeOptionPathPB.create()..gridId = gridId..fieldId = field.id..fieldType = field.fieldType;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 e52b9f33cd..621114045c 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@@ -12,7 +12,7 @@ import 'type_option_context.dart';class TypeOptionDataController {final String gridId;final IFieldTypeOptionLoader loader;- late FieldTypeOptionDataPB _data;+ late TypeOptionPB _data;final PublishNotifier<FieldPB> _fieldNotifier = PublishNotifier();/// Returns a [TypeOptionDataController] used to modify the specified@@ -27,7 +27,7 @@ class TypeOptionDataController {GridFieldContext? fieldContext,}) {if (fieldContext != null) {- _data = FieldTypeOptionDataPB.create()+ _data = TypeOptionPB.create()..gridId = gridId..field_2 = fieldContext.field;}diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_service.dartindex eac63c86ff..a903559093 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart@@ -44,7 +44,7 @@ class GridFFIService {Future<Either<RepeatedFieldPB, FlowyError>> getFields({required List<FieldIdPB> fieldIds}) {- final payload = QueryFieldPayloadPB.create()+ final payload = GetFieldPayloadPB.create()..gridId = gridId..fieldIds = RepeatedFieldIdPB(items: fieldIds);return GridEventGetFields(payload).send();diff --git a/frontend/app_flowy/lib/plugins/grid/application/prelude.dart b/frontend/app_flowy/lib/plugins/grid/application/prelude.dartindex 7585c55e49..3affd4f7ff 100644--- a/frontend/app_flowy/lib/plugins/grid/application/prelude.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/prelude.dart@@ -15,7 +15,7 @@ export 'field/type_option/date_bloc.dart';export 'field/type_option/number_bloc.dart';export 'field/type_option/single_select_type_option.dart';-// GridCellPB+// CellPBexport 'cell/text_cell_bloc.dart';export 'cell/number_cell_bloc.dart';export 'cell/select_option_cell_bloc.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 b050809bb5..ac0a65b637 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@@ -23,7 +23,7 @@ class SettingFFIService {final insertGroupPayload = InsertGroupPayloadPB.create()..fieldId = fieldId..fieldType = fieldType;- final payload = GridSettingChangesetPayloadPB.create()+ final payload = GridSettingChangesetPB.create()..gridId = viewId..insertGroup = insertGroupPayload;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dartindex 034cd39774..a9b6d4114e 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart@@ -17,8 +17,8 @@ import 'field_type_list.dart';import 'type_option/builder.dart';typedef UpdateFieldCallback = void Function(FieldPB, Uint8List);-typedef SwitchToFieldCallback- = Future<Either<FieldTypeOptionDataPB, FlowyError>> Function(+typedef SwitchToFieldCallback = Future<Either<TypeOptionPB, FlowyError>>+ Function(String fieldId,FieldType fieldType,);diff --git a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rsindex 3e1981eb7f..4b596719fe 100644--- a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs@@ -39,7 +39,7 @@ impl TryInto<CreateSelectOptionParams> for CreateSelectOptionPayloadPB {}#[derive(Debug, Clone, Default, ProtoBuf)]-pub struct GridCellIdPB {+pub struct CellPathPB {#[pb(index = 1)]pub grid_id: String,@@ -50,20 +50,20 @@ pub struct GridCellIdPB {pub row_id: String,}-pub struct GridCellIdParams {+pub struct CellPathParams {pub grid_id: String,pub field_id: String,pub row_id: String,}-impl TryInto<GridCellIdParams> for GridCellIdPB {+impl TryInto<CellPathParams> for CellPathPB {type Error = ErrorCode;- fn try_into(self) -> Result<GridCellIdParams, Self::Error> {+ fn try_into(self) -> Result<CellPathParams, Self::Error> {let grid_id = NotEmptyStr::parse(self.grid_id).map_err(|_| ErrorCode::GridIdIsEmpty)?;let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;let row_id = NotEmptyStr::parse(self.row_id).map_err(|_| ErrorCode::RowIdIsEmpty)?;- Ok(GridCellIdParams {+ Ok(CellPathParams {grid_id: grid_id.0,field_id: field_id.0,row_id: row_id.0,@@ -71,7 +71,7 @@ impl TryInto<GridCellIdParams> for GridCellIdPB {}}#[derive(Debug, Default, ProtoBuf)]-pub struct GridCellPB {+pub struct CellPB {#[pb(index = 1)]pub field_id: String,@@ -83,7 +83,7 @@ pub struct GridCellPB {pub field_type: Option<FieldType>,}-impl GridCellPB {+impl CellPB {pub fn new(field_id: &str, field_type: FieldType, data: Vec<u8>) -> Self {Self {field_id: field_id.to_owned(),@@ -104,11 +104,11 @@ impl GridCellPB {#[derive(Debug, Default, ProtoBuf)]pub struct RepeatedCellPB {#[pb(index = 1)]- pub items: Vec<GridCellPB>,+ pub items: Vec<CellPB>,}impl std::ops::Deref for RepeatedCellPB {- type Target = Vec<GridCellPB>;+ type Target = Vec<CellPB>;fn deref(&self) -> &Self::Target {&self.items}@@ -120,8 +120,8 @@ impl std::ops::DerefMut for RepeatedCellPB {}}-impl std::convert::From<Vec<GridCellPB>> for RepeatedCellPB {- fn from(items: Vec<GridCellPB>) -> Self {+impl std::convert::From<Vec<CellPB>> for RepeatedCellPB {+ fn from(items: Vec<CellPB>) -> Self {Self { items }}}diff --git a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rsindex 371c22fceb..a46d1f99f8 100644--- a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs@@ -84,7 +84,7 @@ impl std::convert::From<&Arc<FieldRevision>> for FieldIdPB {}}#[derive(Debug, Clone, Default, ProtoBuf)]-pub struct FieldChangesetPB {+pub struct GridFieldChangesetPB {#[pb(index = 1)]pub grid_id: String,@@ -98,7 +98,7 @@ pub struct FieldChangesetPB {pub updated_fields: Vec<FieldPB>,}-impl FieldChangesetPB {+impl GridFieldChangesetPB {pub fn insert(grid_id: &str, inserted_fields: Vec<IndexFieldPB>) -> Self {Self {grid_id: grid_id.to_owned(),@@ -145,18 +145,6 @@ impl IndexFieldPB {}}-#[derive(Debug, Default, ProtoBuf)]-pub struct GetEditFieldContextPayloadPB {- #[pb(index = 1)]- pub grid_id: String,-- #[pb(index = 2, one_of)]- pub field_id: Option<String>,-- #[pb(index = 3)]- pub field_type: FieldType,-}-#[derive(Debug, Default, ProtoBuf)]pub struct CreateFieldPayloadPB {#[pb(index = 1)]@@ -190,7 +178,7 @@ impl TryInto<CreateFieldParams> for CreateFieldPayloadPB {}#[derive(Debug, Default, ProtoBuf)]-pub struct EditFieldPayloadPB {+pub struct EditFieldChangesetPB {#[pb(index = 1)]pub grid_id: String,@@ -210,7 +198,7 @@ pub struct EditFieldParams {pub field_type: FieldType,}-impl TryInto<EditFieldParams> for EditFieldPayloadPB {+impl TryInto<EditFieldParams> for EditFieldChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<EditFieldParams, Self::Error> {@@ -225,7 +213,7 @@ impl TryInto<EditFieldParams> for EditFieldPayloadPB {}#[derive(Debug, Default, ProtoBuf)]-pub struct FieldTypeOptionIdPB {+pub struct TypeOptionPathPB {#[pb(index = 1)]pub grid_id: String,@@ -236,19 +224,19 @@ pub struct FieldTypeOptionIdPB {pub field_type: FieldType,}-pub struct FieldTypeOptionIdParams {+pub struct TypeOptionPathParams {pub grid_id: String,pub field_id: String,pub field_type: FieldType,}-impl TryInto<FieldTypeOptionIdParams> for FieldTypeOptionIdPB {+impl TryInto<TypeOptionPathParams> for TypeOptionPathPB {type Error = ErrorCode;- fn try_into(self) -> Result<FieldTypeOptionIdParams, Self::Error> {+ fn try_into(self) -> Result<TypeOptionPathParams, Self::Error> {let grid_id = NotEmptyStr::parse(self.grid_id).map_err(|_| ErrorCode::GridIdIsEmpty)?;let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;- Ok(FieldTypeOptionIdParams {+ Ok(TypeOptionPathParams {grid_id: grid_id.0,field_id: field_id.0,field_type: self.field_type,@@ -257,7 +245,7 @@ impl TryInto<FieldTypeOptionIdParams> for FieldTypeOptionIdPB {}#[derive(Debug, Default, ProtoBuf)]-pub struct FieldTypeOptionDataPB {+pub struct TypeOptionPB {#[pb(index = 1)]pub grid_id: String,@@ -320,35 +308,35 @@ impl std::convert::From<String> for RepeatedFieldIdPB {}}-/// [UpdateFieldTypeOptionPayloadPB] is used to update the type-option data.+/// [TypeOptionChangesetPB] is used to update the type-option data.#[derive(ProtoBuf, Default)]-pub struct UpdateFieldTypeOptionPayloadPB {+pub struct TypeOptionChangesetPB {#[pb(index = 1)]pub grid_id: String,#[pb(index = 2)]pub field_id: String,- /// Check out [FieldTypeOptionDataPB] for more details.+ /// Check out [TypeOptionPB] for more details.#[pb(index = 3)]pub type_option_data: Vec<u8>,}#[derive(Clone)]-pub struct UpdateFieldTypeOptionParams {+pub struct TypeOptionChangesetParams {pub grid_id: String,pub field_id: String,pub type_option_data: Vec<u8>,}-impl TryInto<UpdateFieldTypeOptionParams> for UpdateFieldTypeOptionPayloadPB {+impl TryInto<TypeOptionChangesetParams> for TypeOptionChangesetPB {type Error = ErrorCode;- fn try_into(self) -> Result<UpdateFieldTypeOptionParams, Self::Error> {+ fn try_into(self) -> Result<TypeOptionChangesetParams, Self::Error> {let grid_id = NotEmptyStr::parse(self.grid_id).map_err(|_| ErrorCode::GridIdIsEmpty)?;let _ = NotEmptyStr::parse(self.field_id.clone()).map_err(|_| ErrorCode::FieldIdIsEmpty)?;- Ok(UpdateFieldTypeOptionParams {+ Ok(TypeOptionChangesetParams {grid_id: grid_id.0,field_id: self.field_id,type_option_data: self.type_option_data,@@ -357,7 +345,7 @@ impl TryInto<UpdateFieldTypeOptionParams> for UpdateFieldTypeOptionPayloadPB {}#[derive(ProtoBuf, Default)]-pub struct QueryFieldPayloadPB {+pub struct GetFieldPayloadPB {#[pb(index = 1)]pub grid_id: String,@@ -365,31 +353,31 @@ pub struct QueryFieldPayloadPB {pub field_ids: RepeatedFieldIdPB,}-pub struct QueryFieldParams {+pub struct GetFieldParams {pub grid_id: String,pub field_ids: RepeatedFieldIdPB,}-impl TryInto<QueryFieldParams> for QueryFieldPayloadPB {+impl TryInto<GetFieldParams> for GetFieldPayloadPB {type Error = ErrorCode;- fn try_into(self) -> Result<QueryFieldParams, Self::Error> {+ fn try_into(self) -> Result<GetFieldParams, Self::Error> {let grid_id = NotEmptyStr::parse(self.grid_id).map_err(|_| ErrorCode::GridIdIsEmpty)?;- Ok(QueryFieldParams {+ Ok(GetFieldParams {grid_id: grid_id.0,field_ids: self.field_ids,})}}-/// [FieldChangesetPayloadPB] is used to modify the corresponding field. It defines which properties of+/// [FieldChangesetPB] is used to modify the corresponding field. It defines which properties of/// the field can be modified.////// Pass in None if you don't want to modify a property/// Pass in Some(Value) if you want to modify a property///#[derive(Debug, Clone, Default, ProtoBuf)]-pub struct FieldChangesetPayloadPB {+pub struct FieldChangesetPB {#[pb(index = 1)]pub field_id: String,@@ -418,7 +406,7 @@ pub struct FieldChangesetPayloadPB {pub type_option_data: Option<Vec<u8>>,}-impl TryInto<FieldChangesetParams> for FieldChangesetPayloadPB {+impl TryInto<FieldChangesetParams> for FieldChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<FieldChangesetParams, Self::Error> {diff --git a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rsindex e42907ed8b..89686c04c4 100644--- a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs+++ b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs@@ -76,7 +76,7 @@ impl std::convert::From<GridLayout> for LayoutRevision {}#[derive(Default, ProtoBuf)]-pub struct GridSettingChangesetPayloadPB {+pub struct GridSettingChangesetPB {#[pb(index = 1)]pub grid_id: String,@@ -96,7 +96,7 @@ pub struct GridSettingChangesetPayloadPB {pub delete_group: Option<DeleteGroupPayloadPB>,}-impl TryInto<GridSettingChangesetParams> for GridSettingChangesetPayloadPB {+impl TryInto<GridSettingChangesetParams> for GridSettingChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<GridSettingChangesetParams, Self::Error> {diff --git a/frontend/rust-lib/flowy-grid/src/event_handler.rs b/frontend/rust-lib/flowy-grid/src/event_handler.rsindex e3b5fbb037..537369b289 100644--- a/frontend/rust-lib/flowy-grid/src/event_handler.rs+++ b/frontend/rust-lib/flowy-grid/src/event_handler.rs@@ -3,8 +3,8 @@ use crate::manager::GridManager;use crate::services::cell::AnyCellData;use crate::services::field::{default_type_option_builder_from_type, select_type_option_from_field_rev, type_option_builder_from_json_str,- DateChangesetParams, DateChangesetPayloadPB, SelectOptionCellChangeset, SelectOptionCellChangesetParams,- SelectOptionCellChangesetPayloadPB, SelectOptionCellDataPB, SelectOptionChangeset, SelectOptionChangesetPayloadPB,+ DateChangesetPB, DateChangesetParams, SelectOptionCellChangeset, SelectOptionCellChangesetPB,+ SelectOptionCellChangesetParams, SelectOptionCellDataPB, SelectOptionChangeset, SelectOptionChangesetPB,SelectOptionPB,};use crate::services::row::{make_block_pbs, make_row_from_row_rev};@@ -37,7 +37,7 @@ pub(crate) async fn get_grid_setting_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_grid_setting_handler(- data: Data<GridSettingChangesetPayloadPB>,+ data: Data<GridSettingChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let params: GridSettingChangesetParams = data.into_inner().try_into()?;@@ -74,10 +74,10 @@ pub(crate) async fn get_grid_blocks_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_fields_handler(- data: Data<QueryFieldPayloadPB>,+ data: Data<GetFieldPayloadPB>,manager: AppData<Arc<GridManager>>,) -> DataResult<RepeatedFieldPB, FlowyError> {- let params: QueryFieldParams = data.into_inner().try_into()?;+ let params: GetFieldParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;let field_orders = params.field_ids@@ -92,7 +92,7 @@ pub(crate) async fn get_fields_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_field_handler(- data: Data<FieldChangesetPayloadPB>,+ data: Data<FieldChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let changeset: FieldChangesetParams = data.into_inner().try_into()?;@@ -103,10 +103,10 @@ pub(crate) async fn update_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_field_type_option_handler(- data: Data<UpdateFieldTypeOptionPayloadPB>,+ data: Data<TypeOptionChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {- let params: UpdateFieldTypeOptionParams = data.into_inner().try_into()?;+ let params: TypeOptionChangesetParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;let _ = editor.update_field_type_option(¶ms.grid_id, ¶ms.field_id, params.type_option_data)@@ -127,7 +127,7 @@ pub(crate) async fn delete_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn switch_to_field_handler(- data: Data<EditFieldPayloadPB>,+ data: Data<EditFieldChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let params: EditFieldParams = data.into_inner().try_into()?;@@ -165,17 +165,17 @@ pub(crate) async fn duplicate_field_handler(/// Return the FieldTypeOptionData if the Field exists otherwise return record not found error.#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_field_type_option_data_handler(- data: Data<FieldTypeOptionIdPB>,+ data: Data<TypeOptionPathPB>,manager: AppData<Arc<GridManager>>,-) -> DataResult<FieldTypeOptionDataPB, FlowyError> {- let params: FieldTypeOptionIdParams = data.into_inner().try_into()?;+) -> DataResult<TypeOptionPB, FlowyError> {+ let params: TypeOptionPathParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;match editor.get_field_rev(¶ms.field_id).await {None => Err(FlowyError::record_not_found()),Some(field_rev) => {let field_type = field_rev.ty.into();let type_option_data = get_type_option_data(&field_rev, &field_type).await?;- let data = FieldTypeOptionDataPB {+ let data = TypeOptionPB {grid_id: params.grid_id,field: field_rev.into(),type_option_data,@@ -190,7 +190,7 @@ pub(crate) async fn get_field_type_option_data_handler(pub(crate) async fn create_field_type_option_data_handler(data: Data<CreateFieldPayloadPB>,manager: AppData<Arc<GridManager>>,-) -> DataResult<FieldTypeOptionDataPB, FlowyError> {+) -> DataResult<TypeOptionPB, FlowyError> {let params: CreateFieldParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;let field_rev = editor@@ -199,7 +199,7 @@ pub(crate) async fn create_field_type_option_data_handler(let field_type: FieldType = field_rev.ty.into();let type_option_data = get_type_option_data(&field_rev, &field_type).await?;- data_result(FieldTypeOptionDataPB {+ data_result(TypeOptionPB {grid_id: params.grid_id,field: field_rev.into(),type_option_data,@@ -289,13 +289,13 @@ pub(crate) async fn create_table_row_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_cell_handler(- data: Data<GridCellIdPB>,+ data: Data<CellPathPB>,manager: AppData<Arc<GridManager>>,-) -> DataResult<GridCellPB, FlowyError> {- let params: GridCellIdParams = data.into_inner().try_into()?;+) -> DataResult<CellPB, FlowyError> {+ let params: CellPathParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;match editor.get_cell(¶ms).await {- None => data_result(GridCellPB::empty(¶ms.field_id)),+ None => data_result(CellPB::empty(¶ms.field_id)),Some(cell) => data_result(cell),}}@@ -330,7 +330,7 @@ pub(crate) async fn new_select_option_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_select_option_handler(- data: Data<SelectOptionChangesetPayloadPB>,+ data: Data<SelectOptionChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let changeset: SelectOptionChangeset = data.into_inner().try_into()?;@@ -387,10 +387,10 @@ pub(crate) async fn update_select_option_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_select_option_handler(- data: Data<GridCellIdPB>,+ data: Data<CellPathPB>,manager: AppData<Arc<GridManager>>,) -> DataResult<SelectOptionCellDataPB, FlowyError> {- let params: GridCellIdParams = data.into_inner().try_into()?;+ let params: CellPathParams = data.into_inner().try_into()?;let editor = manager.get_grid_editor(¶ms.grid_id).await?;match editor.get_field_rev(¶ms.field_id).await {None => {@@ -416,7 +416,7 @@ pub(crate) async fn get_select_option_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_select_option_cell_handler(- data: Data<SelectOptionCellChangesetPayloadPB>,+ data: Data<SelectOptionCellChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let params: SelectOptionCellChangesetParams = data.into_inner().try_into()?;@@ -427,7 +427,7 @@ pub(crate) async fn update_select_option_cell_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_date_cell_handler(- data: Data<DateChangesetPayloadPB>,+ data: Data<DateChangesetPB>,manager: AppData<Arc<GridManager>>,) -> Result<(), FlowyError> {let params: DateChangesetParams = data.into_inner().try_into()?;diff --git a/frontend/rust-lib/flowy-grid/src/event_map.rs b/frontend/rust-lib/flowy-grid/src/event_map.rsindex 09ce79496f..c407b19c2a 100644--- a/frontend/rust-lib/flowy-grid/src/event_map.rs+++ b/frontend/rust-lib/flowy-grid/src/event_map.rs@@ -74,22 +74,22 @@ pub enum GridEvent {/// [UpdateGridSetting] event is used to update the grid's settings.///- /// The event handler accepts [GridSettingChangesetPayloadPB] and return errors if failed to modify the grid's settings.- #[event(input = "GridSettingChangesetPayloadPB")]+ /// The event handler accepts [GridSettingChangesetPB] and return errors if failed to modify the grid's settings.+ #[event(input = "GridSettingChangesetPB")]UpdateGridSetting = 3,/// [GetFields] event is used to get the grid's settings.///- /// The event handler accepts a [QueryFieldPayloadPB] and returns a [RepeatedFieldPB]+ /// The event handler accepts a [GetFieldPayloadPB] and returns a [RepeatedFieldPB]/// if there are no errors.- #[event(input = "QueryFieldPayloadPB", output = "RepeatedFieldPB")]+ #[event(input = "GetFieldPayloadPB", output = "RepeatedFieldPB")]GetFields = 10,/// [UpdateField] event is used to update a field's attributes.///- /// The event handler accepts a [FieldChangesetPayloadPB] and returns errors if failed to modify the+ /// The event handler accepts a [FieldChangesetPB] and returns errors if failed to modify the/// field.- #[event(input = "FieldChangesetPayloadPB")]+ #[event(input = "FieldChangesetPB")]UpdateField = 11,/// [UpdateFieldTypeOption] event is used to update the field's type-option data. Certain field@@ -100,9 +100,9 @@ pub enum GridEvent {/// Check out [this](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid#fieldtype)/// for more information.///- /// The event handler accepts a [UpdateFieldTypeOptionPayloadPB] and returns errors if failed to modify the+ /// The event handler accepts a [TypeOptionChangesetPB] and returns errors if failed to modify the/// field.- #[event(input = "UpdateFieldTypeOptionPayloadPB")]+ #[event(input = "TypeOptionChangesetPB")]UpdateFieldTypeOption = 12,/// [DeleteField] event is used to delete a Field. [DeleteFieldPayloadPB] is the context that@@ -113,7 +113,7 @@ pub enum GridEvent {/// [SwitchToField] event is used to update the current Field's type./// It will insert a new FieldTypeOptionData if the new FieldType doesn't exist before, otherwise/// reuse the existing FieldTypeOptionData. You could check the [GridRevisionPad] for more details.- #[event(input = "EditFieldPayloadPB")]+ #[event(input = "EditFieldChangesetPB")]SwitchToField = 20,/// [DuplicateField] event is used to duplicate a Field. The duplicated field data is kind of@@ -130,17 +130,17 @@ pub enum GridEvent {#[event(input = "MoveFieldPayloadPB")]MoveField = 22,- /// [FieldTypeOptionIdPB] event is used to get the FieldTypeOption data for a specific field type.+ /// [TypeOptionPathPB] event is used to get the FieldTypeOption data for a specific field type.///- /// Check out the [FieldTypeOptionDataPB] for more details. If the [FieldTypeOptionData] does exist+ /// Check out the [TypeOptionPB] for more details. If the [FieldTypeOptionData] does exist/// for the target type, the [TypeOptionBuilder] will create the default data for that type.///- /// Return the [FieldTypeOptionDataPB] if there are no errors.- #[event(input = "FieldTypeOptionIdPB", output = "FieldTypeOptionDataPB")]+ /// Return the [TypeOptionPB] if there are no errors.+ #[event(input = "TypeOptionPathPB", output = "TypeOptionPB")]GetFieldTypeOption = 23,/// [CreateFieldTypeOption] event is used to create a new FieldTypeOptionData.- #[event(input = "CreateFieldPayloadPB", output = "FieldTypeOptionDataPB")]+ #[event(input = "CreateFieldPayloadPB", output = "TypeOptionPB")]CreateFieldTypeOption = 24,/// [NewSelectOption] event is used to create a new select option. Returns a [SelectOptionPB] if@@ -149,18 +149,18 @@ pub enum GridEvent {NewSelectOption = 30,/// [GetSelectOptionCellData] event is used to get the select option data for cell editing.- /// [GridCellIdPB] locate which cell data that will be read from. The return value, [SelectOptionCellDataPB]+ /// [CellPathPB] locate which cell data that will be read from. The return value, [SelectOptionCellDataPB]/// contains the available options and the currently selected options.- #[event(input = "GridCellIdPB", output = "SelectOptionCellDataPB")]+ #[event(input = "CellPathPB", output = "SelectOptionCellDataPB")]GetSelectOptionCellData = 31,/// [UpdateSelectOption] event is used to update a FieldTypeOptionData whose field_type is/// FieldType::SingleSelect or FieldType::MultiSelect.////// This event may trigger the GridNotification::DidUpdateCell event.- /// For example, GridNotification::DidUpdateCell will be triggered if the [SelectOptionChangesetPayloadPB]+ /// For example, GridNotification::DidUpdateCell will be triggered if the [SelectOptionChangesetPB]/// carries a change that updates the name of the option.- #[event(input = "SelectOptionChangesetPayloadPB")]+ #[event(input = "SelectOptionChangesetPB")]UpdateSelectOption = 32,#[event(input = "CreateTableRowPayloadPB", output = "RowPB")]@@ -180,7 +180,7 @@ pub enum GridEvent {#[event(input = "MoveRowPayloadPB")]MoveRow = 54,- #[event(input = "GridCellIdPB", output = "GridCellPB")]+ #[event(input = "CellPathPB", output = "CellPB")]GetCell = 70,/// [UpdateCell] event is used to update the cell content. The passed in data, [CellChangesetPB],@@ -196,16 +196,16 @@ pub enum GridEvent {#[event(input = "CellChangesetPB")]UpdateCell = 71,- /// [UpdateSelectOptionCell] event is used to update a select option cell's data. [SelectOptionCellChangesetPayloadPB]+ /// [UpdateSelectOptionCell] event is used to update a select option cell's data. [SelectOptionCellChangesetPB]/// contains options that will be deleted or inserted. It can be cast to [CellChangesetPB] that/// will be used by the `update_cell` function.- #[event(input = "SelectOptionCellChangesetPayloadPB")]+ #[event(input = "SelectOptionCellChangesetPB")]UpdateSelectOptionCell = 72,- /// [UpdateDateCell] event is used to update a date cell's data. [DateChangesetPayloadPB]+ /// [UpdateDateCell] event is used to update a date cell's data. [DateChangesetPB]/// contains the date and the time string. It can be cast to [CellChangesetPB] that/// will be used by the `update_cell` function.- #[event(input = "DateChangesetPayloadPB")]+ #[event(input = "DateChangesetPB")]UpdateDateCell = 80,#[event(input = "GridIdPB", output = "RepeatedGridGroupPB")]diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rsindex 5b73176796..db23faaa6e 100644--- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs+++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs@@ -1,5 +1,5 @@use crate::entities::CellChangesetPB;-use crate::entities::{GridCellIdPB, GridCellIdParams};+use crate::entities::{CellPathPB, CellPathParams};use crate::services::cell::{CellBytesParser, CellDataIsEmpty, FromCellChangeset, FromCellString};use bytes::Bytes;@@ -22,9 +22,9 @@ pub struct DateCellDataPB {}#[derive(Clone, Debug, Default, ProtoBuf)]-pub struct DateChangesetPayloadPB {+pub struct DateChangesetPB {#[pb(index = 1)]- pub cell_identifier: GridCellIdPB,+ pub cell_identifier: CellPathPB,#[pb(index = 2, one_of)]pub date: Option<String>,@@ -34,16 +34,16 @@ pub struct DateChangesetPayloadPB {}pub struct DateChangesetParams {- pub cell_identifier: GridCellIdParams,+ pub cell_identifier: CellPathParams,pub date: Option<String>,pub time: Option<String>,}-impl TryInto<DateChangesetParams> for DateChangesetPayloadPB {+impl TryInto<DateChangesetParams> for DateChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<DateChangesetParams, Self::Error> {- let cell_identifier: GridCellIdParams = self.cell_identifier.try_into()?;+ let cell_identifier: CellPathParams = self.cell_identifier.try_into()?;Ok(DateChangesetParams {cell_identifier,date: self.date,diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rsindex afc4a9c29e..b38973fe3f 100644--- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs+++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs@@ -1,5 +1,5 @@use crate::entities::parser::NotEmptyStr;-use crate::entities::{CellChangesetPB, FieldType, GridCellIdPB, GridCellIdParams};+use crate::entities::{CellChangesetPB, CellPathPB, CellPathParams, FieldType};use crate::services::cell::{CellBytes, CellBytesParser, CellData, CellDataIsEmpty, CellDisplayable, FromCellChangeset, FromCellString,};@@ -353,9 +353,9 @@ impl CellBytesParser for SelectOptionCellDataParser {}#[derive(Clone, Debug, Default, ProtoBuf)]-pub struct SelectOptionCellChangesetPayloadPB {+pub struct SelectOptionCellChangesetPB {#[pb(index = 1)]- pub cell_identifier: GridCellIdPB,+ pub cell_identifier: CellPathPB,#[pb(index = 2)]pub insert_option_ids: Vec<String>,@@ -365,7 +365,7 @@ pub struct SelectOptionCellChangesetPayloadPB {}pub struct SelectOptionCellChangesetParams {- pub cell_identifier: GridCellIdParams,+ pub cell_identifier: CellPathParams,pub insert_option_ids: Vec<String>,pub delete_option_ids: Vec<String>,}@@ -386,11 +386,11 @@ impl std::convert::From<SelectOptionCellChangesetParams> for CellChangesetPB {}}-impl TryInto<SelectOptionCellChangesetParams> for SelectOptionCellChangesetPayloadPB {+impl TryInto<SelectOptionCellChangesetParams> for SelectOptionCellChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<SelectOptionCellChangesetParams, Self::Error> {- let cell_identifier: GridCellIdParams = self.cell_identifier.try_into()?;+ let cell_identifier: CellPathParams = self.cell_identifier.try_into()?;let insert_option_ids = self.insert_option_ids.into_iter()@@ -485,12 +485,12 @@ pub struct SelectOptionCellDataPB {pub select_options: Vec<SelectOptionPB>,}-/// [SelectOptionChangesetPayloadPB] describes the changes of a FieldTypeOptionData. For the moment,+/// [SelectOptionChangesetPB] describes the changes of a FieldTypeOptionData. For the moment,/// it is used by [MultiSelectTypeOptionPB] and [SingleSelectTypeOptionPB].#[derive(Clone, Debug, Default, ProtoBuf)]-pub struct SelectOptionChangesetPayloadPB {+pub struct SelectOptionChangesetPB {#[pb(index = 1)]- pub cell_identifier: GridCellIdPB,+ pub cell_identifier: CellPathPB,#[pb(index = 2)]pub insert_options: Vec<SelectOptionPB>,@@ -503,13 +503,13 @@ pub struct SelectOptionChangesetPayloadPB {}pub struct SelectOptionChangeset {- pub cell_identifier: GridCellIdParams,+ pub cell_identifier: CellPathParams,pub insert_options: Vec<SelectOptionPB>,pub update_options: Vec<SelectOptionPB>,pub delete_options: Vec<SelectOptionPB>,}-impl TryInto<SelectOptionChangeset> for SelectOptionChangesetPayloadPB {+impl TryInto<SelectOptionChangeset> for SelectOptionChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<SelectOptionChangeset, Self::Error> {diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rsindex 0c77f04189..906710d562 100644--- a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs+++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs@@ -1,5 +1,5 @@use crate::dart_notification::{send_dart_notification, GridNotification};-use crate::entities::GridCellIdParams;+use crate::entities::CellPathParams;use crate::entities::*;use crate::manager::GridUser;use crate::services::block_manager::GridBlockManager;@@ -205,7 +205,7 @@ impl GridRevisionEditor {pub async fn delete_field(&self, field_id: &str) -> FlowyResult<()> {let _ = self.modify(|grid_pad| Ok(grid_pad.delete_field_rev(field_id)?)).await?;let field_order = FieldIdPB::from(field_id);- let notified_changeset = FieldChangesetPB::delete(&self.grid_id, vec![field_order]);+ let notified_changeset = GridFieldChangesetPB::delete(&self.grid_id, vec![field_order]);let _ = self.notify_did_update_grid(notified_changeset).await?;Ok(())}@@ -443,17 +443,17 @@ impl GridRevisionEditor {Ok(())}- pub async fn get_cell(&self, params: &GridCellIdParams) -> Option<GridCellPB> {+ pub async fn get_cell(&self, params: &CellPathParams) -> Option<CellPB> {let (field_type, cell_bytes) = self.decode_any_cell_data(params).await?;- Some(GridCellPB::new(¶ms.field_id, field_type, cell_bytes.to_vec()))+ Some(CellPB::new(¶ms.field_id, field_type, cell_bytes.to_vec()))}- pub async fn get_cell_bytes(&self, params: &GridCellIdParams) -> Option<CellBytes> {+ pub async fn get_cell_bytes(&self, params: &CellPathParams) -> Option<CellBytes> {let (_, cell_data) = self.decode_any_cell_data(params).await?;Some(cell_data)}- async fn decode_any_cell_data(&self, params: &GridCellIdParams) -> Option<(FieldType, CellBytes)> {+ async fn decode_any_cell_data(&self, params: &CellPathParams) -> Option<(FieldType, CellBytes)> {let field_rev = self.get_field_rev(¶ms.field_id).await?;let row_rev = self.block_manager.get_row_rev(¶ms.row_id).await.ok()??;let cell_rev = row_rev.cells.get(¶ms.field_id)?.clone();@@ -673,7 +673,7 @@ impl GridRevisionEditor {if let Some((index, field_rev)) = self.grid_pad.read().await.get_field_rev(&field_id) {let delete_field_order = FieldIdPB::from(field_id);let insert_field = IndexFieldPB::from_field_rev(field_rev, index);- let notified_changeset = FieldChangesetPB {+ let notified_changeset = GridFieldChangesetPB {grid_id: self.grid_id.clone(),inserted_fields: vec![insert_field],deleted_fields: vec![delete_field_order],@@ -775,7 +775,7 @@ impl GridRevisionEditor {async fn notify_did_insert_grid_field(&self, field_id: &str) -> FlowyResult<()> {if let Some((index, field_rev)) = self.grid_pad.read().await.get_field_rev(field_id) {let index_field = IndexFieldPB::from_field_rev(field_rev, index);- let notified_changeset = FieldChangesetPB::insert(&self.grid_id, vec![index_field]);+ let notified_changeset = GridFieldChangesetPB::insert(&self.grid_id, vec![index_field]);let _ = self.notify_did_update_grid(notified_changeset).await?;}Ok(())@@ -791,7 +791,7 @@ impl GridRevisionEditor {.map(|(index, field)| (index, field.clone())){let updated_field = FieldPB::from(field_rev);- let notified_changeset = FieldChangesetPB::update(&self.grid_id, vec![updated_field.clone()]);+ let notified_changeset = GridFieldChangesetPB::update(&self.grid_id, vec![updated_field.clone()]);let _ = self.notify_did_update_grid(notified_changeset).await?;send_dart_notification(field_id, GridNotification::DidUpdateField)@@ -802,7 +802,7 @@ impl GridRevisionEditor {Ok(())}- async fn notify_did_update_grid(&self, changeset: FieldChangesetPB) -> FlowyResult<()> {+ async fn notify_did_update_grid(&self, changeset: GridFieldChangesetPB) -> FlowyResult<()> {send_dart_notification(&self.grid_id, GridNotification::DidUpdateGridField).payload(changeset).send();diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rsindex fc388e7d97..703cf6889c 100644--- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs+++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs@@ -2,7 +2,7 @@ use crate::grid::block_test::script::RowScript::{AssertCell, CreateRow};use crate::grid::block_test::util::GridRowTestBuilder;use crate::grid::grid_editor::GridEditorTest;-use flowy_grid::entities::{CreateRowParams, FieldType, GridCellIdParams, GridLayout, RowPB};+use flowy_grid::entities::{CellPathParams, CreateRowParams, FieldType, GridLayout, RowPB};use flowy_grid::services::field::*;use grid_rev_model::{GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowChangeset, RowRevision};use std::collections::HashMap;@@ -113,7 +113,7 @@ impl GridRowTest {field_type,expected,} => {- let id = GridCellIdParams {+ let id = CellPathParams {grid_id: self.grid_id.clone(),field_id,row_id,@@ -158,7 +158,7 @@ impl GridRowTest {}}- async fn compare_cell_content(&self, cell_id: GridCellIdParams, field_type: FieldType, expected: String) {+ async fn compare_cell_content(&self, cell_id: CellPathParams, field_type: FieldType, expected: String) {match field_type {FieldType::RichText => {let cell_data = self