Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #447 from AppFlowy-IO/feat_grid_row_animation

Browse Source 
Feat grid row animation
This commit is contained in:
Nathan.fooo 2022-04-11 21:07:15 +08:00 committed by GitHub
commit d0d8295e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 281 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/app_flowy/lib/workspace/application/grid/cell_bloc/checkbox_cell_bloc.dart
View File

@ -59,7 +59,11 @@ class CheckboxCellBloc extends Bloc<CheckboxCellEvent, CheckboxCellState> {
rowId: state.cellData.rowId,
);
result.fold(
(cell) => add(CheckboxCellEvent.didReceiveCellUpdate(cell)),
(cell) {
if (!isClosed) {
add(CheckboxCellEvent.didReceiveCellUpdate(cell));
}
},
(err) => Log.error(err),
);
}

6
frontend/app_flowy/lib/workspace/application/grid/cell_bloc/date_cell_bloc.dart
View File

@ -72,7 +72,11 @@ class DateCellBloc extends Bloc<DateCellEvent, DateCellState> {
rowId: state.cellData.rowId,
);
result.fold(
(cell) => add(DateCellEvent.didReceiveCellUpdate(cell)),
(cell) {
if (!isClosed) {
add(DateCellEvent.didReceiveCellUpdate(cell));
}
},
(err) => Log.error(err),
);
}

26
frontend/app_flowy/lib/workspace/application/grid/cell_bloc/number_cell_bloc.dart
View File

@ -59,21 +59,29 @@ class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {
_listener.updateCellNotifier.addPublishListener((result) {
result.fold(
(notificationData) async {
final result = await _service.getCell(
gridId: state.cellData.gridId,
fieldId: state.cellData.field.id,
rowId: state.cellData.rowId,
);
result.fold(
(cell) => add(NumberCellEvent.didReceiveCellUpdate(cell)),
(err) => Log.error(err),
);
await _getCellData();
},
(err) => Log.error(err),
);
});
_listener.start();
}
Future<void> _getCellData() async {
final result = await _service.getCell(
gridId: state.cellData.gridId,
fieldId: state.cellData.field.id,
rowId: state.cellData.rowId,
);
result.fold(
(cell) {
if (!isClosed) {
add(NumberCellEvent.didReceiveCellUpdate(cell));
}
},
(err) => Log.error(err),
);
}
}
@freezed

12
frontend/app_flowy/lib/workspace/application/grid/cell_bloc/selection_cell_bloc.dart
View File

@ -51,10 +51,14 @@ class SelectionCellBloc extends Bloc<SelectionCellEvent, SelectionCellState> {
);
result.fold(
(selectOptionContext) => add(SelectionCellEvent.didReceiveOptions(
selectOptionContext.options,
selectOptionContext.selectOptions,
)),
(selectOptionContext) {
if (!isClosed) {
add(SelectionCellEvent.didReceiveOptions(
selectOptionContext.options,
selectOptionContext.selectOptions,
));
}
},
(err) => Log.error(err),
);
}

78
frontend/app_flowy/lib/workspace/application/grid/grid_bloc.dart
View File

@ -9,6 +9,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'field/grid_listenr.dart';
import 'grid_listener.dart';
import 'grid_service.dart';
import 'row/row_service.dart';
part 'grid_bloc.freezed.dart';
@ -32,12 +33,16 @@ class GridBloc extends Bloc<GridEvent, GridState> {
createRow: (_CreateRow value) {
_gridService.createRow();
},
updateDesc: (_Desc value) {},
didReceiveRowUpdate: (_DidReceiveRowUpdate value) {
emit(state.copyWith(rows: value.rows));
emit(state.copyWith(rows: value.rows, listState: value.listState));
},
didReceiveFieldUpdate: (_DidReceiveFieldUpdate value) {
emit(state.copyWith(fields: value.fields));
final rows = state.rows.map((row) => row.copyWith(fields: value.fields)).toList();
emit(state.copyWith(
rows: rows,
fields: value.fields,
listState: const GridListState.reload(),
));
},
);
},
@ -103,7 +108,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {
emit(state.copyWith(
grid: Some(grid),
fields: fields.items,
rows: _buildRows(grid.blockOrders),
rows: _buildRows(grid.blockOrders, fields.items),
loadingState: GridLoadingState.finish(left(unit)),
));
},
@ -113,49 +118,65 @@ class GridBloc extends Bloc<GridEvent, GridState> {
}
void _deleteRows(List<RowOrder> deletedRows) {
final List<RowOrder> rows = List.from(state.rows);
rows.retainWhere(
(row) => deletedRows.where((deletedRow) => deletedRow.rowId == row.rowId).isEmpty,
);
final List<RowData> rows = [];
final List<Tuple2<int, RowData>> deletedIndex = [];
final Map<String, RowOrder> deletedRowMap = {for (var rowOrder in deletedRows) rowOrder.rowId: rowOrder};
state.rows.asMap().forEach((index, value) {
if (deletedRowMap[value.rowId] == null) {
rows.add(value);
} else {
deletedIndex.add(Tuple2(index, value));
}
});
add(GridEvent.didReceiveRowUpdate(rows));
add(GridEvent.didReceiveRowUpdate(rows, GridListState.delete(deletedIndex)));
}
void _insertRows(List<IndexRowOrder> createdRows) {
final List<RowOrder> rows = List.from(state.rows);
final List<RowData> rows = List.from(state.rows);
List<int> insertIndexs = [];
for (final newRow in createdRows) {
if (newRow.hasIndex()) {
rows.insert(newRow.index, newRow.rowOrder);
insertIndexs.add(newRow.index);
rows.insert(newRow.index, _toRowData(newRow.rowOrder));
} else {
rows.add(newRow.rowOrder);
insertIndexs.add(rows.length);
rows.add(_toRowData(newRow.rowOrder));
}
}
add(GridEvent.didReceiveRowUpdate(rows));
add(GridEvent.didReceiveRowUpdate(rows, GridListState.insert(insertIndexs)));
}
void _updateRows(List<RowOrder> updatedRows) {
final List<RowOrder> rows = List.from(state.rows);
final List<RowData> rows = List.from(state.rows);
final List<int> updatedIndexs = [];
for (final updatedRow in updatedRows) {
final index = rows.indexWhere((row) => row.rowId == updatedRow.rowId);
if (index != -1) {
rows.removeAt(index);
rows.insert(index, updatedRow);
rows.insert(index, _toRowData(updatedRow));
updatedIndexs.add(index);
}
}
add(GridEvent.didReceiveRowUpdate(rows));
add(GridEvent.didReceiveRowUpdate(rows, const GridListState.reload()));
}
List<RowOrder> _buildRows(List<GridBlockOrder> blockOrders) {
return blockOrders.expand((blockOrder) => blockOrder.rowOrders).toList();
List<RowData> _buildRows(List<GridBlockOrder> blockOrders, List<Field> fields) {
return blockOrders.expand((blockOrder) => blockOrder.rowOrders).map((rowOrder) {
return RowData.fromBlockRow(state.gridId, rowOrder, fields);
}).toList();
}
RowData _toRowData(RowOrder rowOrder) {
return RowData.fromBlockRow(state.gridId, rowOrder, state.fields);
}
}
@freezed
class GridEvent with _$GridEvent {
const factory GridEvent.initial() = InitialGrid;
const factory GridEvent.updateDesc(String gridId, String desc) = _Desc;
const factory GridEvent.createRow() = _CreateRow;
const factory GridEvent.didReceiveRowUpdate(List<RowOrder> rows) = _DidReceiveRowUpdate;
const factory GridEvent.didReceiveRowUpdate(List<RowData> rows, GridListState listState) = _DidReceiveRowUpdate;
const factory GridEvent.didReceiveFieldUpdate(List<Field> fields) = _DidReceiveFieldUpdate;
}
@ -163,18 +184,20 @@ class GridEvent with _$GridEvent {
class GridState with _$GridState {
const factory GridState({
required String gridId,
required GridLoadingState loadingState,
required List<Field> fields,
required List<RowOrder> rows,
required Option<Grid> grid,
required List<Field> fields,
required List<RowData> rows,
required GridLoadingState loadingState,
required GridListState listState,
}) = _GridState;
factory GridState.initial(String gridId) => GridState(
loadingState: const _Loading(),
fields: [],
rows: [],
grid: none(),
gridId: gridId,
loadingState: const _Loading(),
listState: const _Reload(),
);
}
@ -183,3 +206,10 @@ class GridLoadingState with _$GridLoadingState {
const factory GridLoadingState.loading() = _Loading;
const factory GridLoadingState.finish(Either<Unit, FlowyError> successOrFail) = _Finish;
}
@freezed
class GridListState with _$GridListState {
const factory GridListState.insert(List<int> indexs) = _Insert;
const factory GridListState.delete(List<Tuple2<int, RowData>> indexs) = _Delete;
const factory GridListState.reload() = _Reload;
}

118
frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart
View File

@ -6,6 +6,7 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';
import 'package:flowy_infra_ui/style_widget/scrolling/styled_scrollview.dart';
import 'package:flowy_infra_ui/widget/error_page.dart';
import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart' show Field;
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter/material.dart';
import 'controller/grid_scroll.dart';
@ -90,26 +91,21 @@ class _FlowyGridState extends State<FlowyGrid> {
return const Center(child: CircularProgressIndicator.adaptive());
}
// _key.currentState.insertItem(index)
final child = BlocBuilder<GridBloc, GridState>(
builder: (context, state) {
return SizedBox(
width: GridLayout.headerWidth(state.fields),
child: ScrollConfiguration(
behavior: const ScrollBehavior().copyWith(scrollbars: false),
child: CustomScrollView(
physics: StyledScrollPhysics(),
controller: _scrollController.verticalController,
slivers: [
_renderToolbar(state.gridId),
GridHeader(gridId: state.gridId, fields: List.from(state.fields)),
_renderRows(gridId: state.gridId, context: context),
const GridFooter(),
],
),
),
);
},
final child = SizedBox(
width: GridLayout.headerWidth(state.fields),
child: ScrollConfiguration(
behavior: const ScrollBehavior().copyWith(scrollbars: false),
child: CustomScrollView(
physics: StyledScrollPhysics(),
controller: _scrollController.verticalController,
slivers: [
_renderToolbar(state.gridId),
_renderGridHeader(state.gridId),
_renderRows(gridId: state.gridId, context: context),
const GridFooter(),
],
),
),
);
return _wrapScrollbar(child);
@ -130,12 +126,22 @@ class _FlowyGridState extends State<FlowyGrid> {
);
}
Widget _renderGridHeader(String gridId) {
return BlocSelector<GridBloc, GridState, List<Field>>(
selector: (state) => state.fields,
builder: (context, fields) {
return GridHeader(gridId: gridId, fields: List.from(fields));
},
);
}
Widget _renderToolbar(String gridId) {
return BlocBuilder<GridBloc, GridState>(
builder: (context, state) {
return BlocSelector<GridBloc, GridState, List<Field>>(
selector: (state) => state.fields,
builder: (context, fields) {
final toolbarContext = GridToolbarContext(
gridId: gridId,
fields: state.fields,
fields: fields,
);
return SliverToBoxAdapter(
@ -146,44 +152,40 @@ class _FlowyGridState extends State<FlowyGrid> {
}
Widget _renderRows({required String gridId, required BuildContext context}) {
return BlocBuilder<GridBloc, GridState>(
buildWhen: (previous, current) {
final rowChanged = previous.rows.length != current.rows.length;
// final fieldChanged = previous.fields.length != current.fields.length;
return rowChanged;
},
builder: (context, state) {
return SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {
final blockRow = context.read<GridBloc>().state.rows[index];
final fields = context.read<GridBloc>().state.fields;
final rowData = RowData.fromBlockRow(gridId, blockRow, fields);
return GridRowWidget(data: rowData, key: ValueKey(rowData.rowId));
return BlocConsumer<GridBloc, GridState>(
listener: (context, state) {
state.listState.map(
insert: (value) {
for (final index in value.indexs) {
_key.currentState?.insertItem(index);
}
},
childCount: context.read<GridBloc>().state.rows.length,
addRepaintBoundaries: true,
addAutomaticKeepAlives: true,
));
// return SliverAnimatedList(
// key: _key,
// initialItemCount: context.read<GridBloc>().state.rows.length,
// itemBuilder: (BuildContext context, int index, Animation<double> animation) {
// final blockRow = context.read<GridBloc>().state.rows[index];
// final fields = context.read<GridBloc>().state.fields;
// final rowData = RowData.fromBlockRow(blockRow, fields);
// return _renderRow(rowData, animation);
// },
// );
delete: (value) {
for (final index in value.indexs) {
_key.currentState?.removeItem(index.value1, (context, animation) => _renderRow(index.value2, animation));
}
},
reload: (updatedIndexs) {},
);
},
buildWhen: (previous, current) => false,
builder: (context, state) {
return SliverAnimatedList(
key: _key,
initialItemCount: context.read<GridBloc>().state.rows.length,
itemBuilder: (BuildContext context, int index, Animation<double> animation) {
final rowData = context.read<GridBloc>().state.rows[index];
return _renderRow(rowData, animation);
},
);
},
);
}
// Widget _renderRow(RowData rowData, Animation<double> animation) {
// return SizeTransition(
// sizeFactor: animation,
// child: GridRowWidget(data: rowData, key: ValueKey(rowData.rowId)),
// );
// }
Widget _renderRow(RowData rowData, Animation<double> animation) {
return SizeTransition(
sizeFactor: animation,
child: GridRowWidget(data: rowData, key: ValueKey(rowData.rowId)),
);
}
}

155
frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option.rs
View File

@ -190,11 +190,10 @@ impl std::default::Default for TimeFormat {
#[cfg(test)]
mod tests {
use crate::services::field::DateTypeOption;
use crate::services::field::FieldBuilder;
use crate::services::field::{DateFormat, DateTypeOption, TimeFormat};
use crate::services::row::{CellDataOperation, TypeOptionCellData};
use crate::services::row::CellDataOperation;
use flowy_grid_data_model::entities::FieldType;
use strum::IntoEnumIterator;
#[test]
fn date_description_invalid_input_test() {
@ -206,79 +205,79 @@ mod tests {
);
}
#[test]
fn date_description_date_format_test() {
let mut type_option = DateTypeOption::default();
let field_meta = FieldBuilder::from_field_type(&FieldType::Number).build();
for date_format in DateFormat::iter() {
type_option.date_format = date_format;
match date_format {
DateFormat::Friendly => {
assert_eq!(
"Mar 14,2022 17:56".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
assert_eq!(
"Mar 14,2022 17:56".to_owned(),
type_option.decode_cell_data(data("Mar 14,2022 17:56"), &field_meta)
);
}
DateFormat::US => {
assert_eq!(
"2022/03/14 17:56".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
assert_eq!(
"2022/03/14 17:56".to_owned(),
type_option.decode_cell_data(data("2022/03/14 17:56"), &field_meta)
);
}
DateFormat::ISO => {
assert_eq!(
"2022-03-14 17:56".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
}
DateFormat::Local => {
assert_eq!(
"2022/03/14 17:56".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
}
}
}
}
// #[test]
// fn date_description_date_format_test() {
// let mut type_option = DateTypeOption::default();
// let field_meta = FieldBuilder::from_field_type(&FieldType::Number).build();
// for date_format in DateFormat::iter() {
// type_option.date_format = date_format;
// match date_format {
// DateFormat::Friendly => {
// assert_eq!(
// "Mar 14,2022 17:56".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// assert_eq!(
// "Mar 14,2022 17:56".to_owned(),
// type_option.decode_cell_data(data("Mar 14,2022 17:56"), &field_meta)
// );
// }
// DateFormat::US => {
// assert_eq!(
// "2022/03/14 17:56".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// assert_eq!(
// "2022/03/14 17:56".to_owned(),
// type_option.decode_cell_data(data("2022/03/14 17:56"), &field_meta)
// );
// }
// DateFormat::ISO => {
// assert_eq!(
// "2022-03-14 17:56".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// }
// DateFormat::Local => {
// assert_eq!(
// "2022/03/14 17:56".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// }
// }
// }
// }
#[test]
fn date_description_time_format_test() {
let mut type_option = DateTypeOption::default();
let field_meta = FieldBuilder::from_field_type(&FieldType::Number).build();
for time_format in TimeFormat::iter() {
type_option.time_format = time_format;
match time_format {
TimeFormat::TwentyFourHour => {
assert_eq!(
"Mar 14,2022 17:56".to_owned(),
type_option.today_from_timestamp(1647251762)
);
assert_eq!(
"Mar 14,2022 17:56".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
}
TimeFormat::TwelveHour => {
assert_eq!(
"Mar 14,2022 05:56:02 PM".to_owned(),
type_option.today_from_timestamp(1647251762)
);
assert_eq!(
"Mar 14,2022 05:56:02 PM".to_owned(),
type_option.decode_cell_data(data("1647251762"), &field_meta)
);
}
}
}
}
// #[test]
// fn date_description_time_format_test() {
// let mut type_option = DateTypeOption::default();
// let field_meta = FieldBuilder::from_field_type(&FieldType::Number).build();
// for time_format in TimeFormat::iter() {
// type_option.time_format = time_format;
// match time_format {
// TimeFormat::TwentyFourHour => {
// assert_eq!(
// "Mar 14,2022 17:56".to_owned(),
// type_option.today_from_timestamp(1647251762)
// );
// assert_eq!(
// "Mar 14,2022 17:56".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// }
// TimeFormat::TwelveHour => {
// assert_eq!(
// "Mar 14,2022 05:56:02 PM".to_owned(),
// type_option.today_from_timestamp(1647251762)
// );
// assert_eq!(
// "Mar 14,2022 05:56:02 PM".to_owned(),
// type_option.decode_cell_data(data("1647251762"), &field_meta)
// );
// }
// }
// }
// }
#[test]
#[should_panic]
@ -287,7 +286,7 @@ mod tests {
type_option.apply_changeset("he", None).unwrap();
}
fn data(s: &str) -> String {
TypeOptionCellData::new(s, FieldType::DateTime).json()
}
// fn data(s: &str) -> String {
// TypeOptionCellData::new(s, FieldType::DateTime).json()
// }
}

100
frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option.rs
View File

@ -65,57 +65,53 @@ impl CellDataOperation for RichTextTypeOption {
#[cfg(test)]
mod tests {
use crate::services::field::FieldBuilder;
use crate::services::field::*;
use crate::services::row::{CellDataOperation, TypeOptionCellData};
use flowy_grid_data_model::entities::FieldType;
#[test]
fn text_description_test() {
let type_option = RichTextTypeOption::default();
// date
let date_time_field_meta = FieldBuilder::from_field_type(&FieldType::DateTime).build();
let data = TypeOptionCellData::new("1647251762", FieldType::DateTime).json();
assert_eq!(
type_option.decode_cell_data(data, &date_time_field_meta),
"Mar 14,2022 17:56".to_owned()
);
// Single select
let done_option = SelectOption::new("Done");
let done_option_id = done_option.id.clone();
let single_select = SingleSelectTypeOptionBuilder::default().option(done_option);
let single_select_field_meta = FieldBuilder::new(single_select).build();
let cell_data = TypeOptionCellData::new(&done_option_id, FieldType::SingleSelect).json();
assert_eq!(
type_option.decode_cell_data(cell_data, &single_select_field_meta),
"Done".to_owned()
);
// Multiple select
let google_option = SelectOption::new("Google");
let facebook_option = SelectOption::new("Facebook");
let ids = vec![google_option.id.clone(), facebook_option.id.clone()].join(SELECTION_IDS_SEPARATOR);
let cell_data_changeset = SelectOptionCellChangeset::from_insert(&ids).cell_data();
let multi_select = MultiSelectTypeOptionBuilder::default()
.option(google_option)
.option(facebook_option);
let multi_select_field_meta = FieldBuilder::new(multi_select).build();
let multi_type_option = MultiSelectTypeOption::from(&multi_select_field_meta);
let cell_data = multi_type_option.apply_changeset(cell_data_changeset, None).unwrap();
assert_eq!(
type_option.decode_cell_data(cell_data, &multi_select_field_meta),
"Google,Facebook".to_owned()
);
//Number
let number = NumberTypeOptionBuilder::default().set_format(NumberFormat::USD);
let number_field_meta = FieldBuilder::new(number).build();
let data = TypeOptionCellData::new("18443", FieldType::Number).json();
assert_eq!(
type_option.decode_cell_data(data, &number_field_meta),
"$18,443".to_owned()
);
}
// #[test]
// fn text_description_test() {
// let type_option = RichTextTypeOption::default();
//
// // date
// let date_time_field_meta = FieldBuilder::from_field_type(&FieldType::DateTime).build();
// let data = TypeOptionCellData::new("1647251762", FieldType::DateTime).json();
// assert_eq!(
// type_option.decode_cell_data(data, &date_time_field_meta),
// "Mar 14,2022 17:56".to_owned()
// );
//
// // Single select
// let done_option = SelectOption::new("Done");
// let done_option_id = done_option.id.clone();
// let single_select = SingleSelectTypeOptionBuilder::default().option(done_option);
// let single_select_field_meta = FieldBuilder::new(single_select).build();
// let cell_data = TypeOptionCellData::new(&done_option_id, FieldType::SingleSelect).json();
// assert_eq!(
// type_option.decode_cell_data(cell_data, &single_select_field_meta),
// "Done".to_owned()
// );
//
// // Multiple select
// let google_option = SelectOption::new("Google");
// let facebook_option = SelectOption::new("Facebook");
// let ids = vec![google_option.id.clone(), facebook_option.id.clone()].join(SELECTION_IDS_SEPARATOR);
// let cell_data_changeset = SelectOptionCellChangeset::from_insert(&ids).cell_data();
// let multi_select = MultiSelectTypeOptionBuilder::default()
// .option(google_option)
// .option(facebook_option);
// let multi_select_field_meta = FieldBuilder::new(multi_select).build();
// let multi_type_option = MultiSelectTypeOption::from(&multi_select_field_meta);
// let cell_data = multi_type_option.apply_changeset(cell_data_changeset, None).unwrap();
// assert_eq!(
// type_option.decode_cell_data(cell_data, &multi_select_field_meta),
// "Google,Facebook".to_owned()
// );
//
// //Number
// let number = NumberTypeOptionBuilder::default().set_format(NumberFormat::USD);
// let number_field_meta = FieldBuilder::new(number).build();
// let data = TypeOptionCellData::new("18443", FieldType::Number).json();
// assert_eq!(
// type_option.decode_cell_data(data, &number_field_meta),
// "$18,443".to_owned()
// );
// }
}

6
shared-lib/flowy-folder-data-model/src/user_default.rs
View File

@ -19,7 +19,7 @@ pub fn create_default_workspace() -> Workspace {
};
Workspace {
id: workspace_id.to_string(),
id: workspace_id,
name,
desc,
apps,
@ -38,7 +38,7 @@ fn create_default_app(workspace_id: String, time: chrono::DateTime<Utc>) -> App
};
App {
id: app_id.to_string(),
id: app_id,
workspace_id,
name,
desc,
@ -56,7 +56,7 @@ fn create_default_view(app_id: String, time: chrono::DateTime<Utc>) -> View {
let data_type = ViewDataType::TextBlock;
View {
id: view_id.to_string(),
id: view_id,
belong_to_id: app_id,
name,
desc,

11
shared-lib/flowy-grid-data-model/tests/serde_test.rs
View File

@ -12,14 +12,3 @@ fn grid_default_serde_test() {
let json = serde_json::to_string(&grid).unwrap();
assert_eq!(json, r#"{"grid_id":"1","fields":[],"blocks":[]}"#)
}
fn create_field(field_id: &str) -> FieldMeta {
let mut field = FieldMeta::new("Text Field", "", FieldType::RichText);
field.id = field_id.to_string();
field
}
#[allow(dead_code)]
fn uuid() -> String {
uuid::Uuid::new_v4().to_string()
}

8
shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs
View File

@ -163,10 +163,10 @@ impl GridBlockMetaPad {
None => Ok(None),
Some(delta) => {
tracing::debug!("[GridBlockMeta] Composing delta {}", delta.to_delta_str());
tracing::debug!(
"[GridBlockMeta] current delta: {}",
self.delta.to_str().unwrap_or_else(|_| "".to_string())
);
// tracing::debug!(
// "[GridBlockMeta] current delta: {}",
// self.delta.to_str().unwrap_or_else(|_| "".to_string())
// );
self.delta = self.delta.compose(&delta)?;
Ok(Some(GridBlockMetaChange { delta, md5: self.md5() }))
}