Skip to content

Commit 5b07656

Browse files
appflowyappflowy
authored
Feat/database view (#1765)
* chore: rename flowy-database to flowy-sqlite * refactor: rename flowy-grid to flowy-database * refactor: rename grid to database * refactor: rename GridEvent to DatabaseEvent * refactor: rename grid_id to database_id * refactor: rename dart code
1 parent 5de3912 commit 5b07656

File tree

400 files changed

+2429
-2417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+2429
-2417
lines changed

‎frontend/app_flowy/lib/core/grid_notification.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ import 'dart:typed_data';
33
import 'package:appflowy_backend/protobuf/flowy-notification/protobuf.dart';
44
import 'package:dartz/dartz.dart';
55
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
6-
import 'package:appflowy_backend/protobuf/flowy-grid/notification.pb.dart';
6+
import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';
77
import 'package:appflowy_backend/rust_stream.dart';
88

99
import 'notification_helper.dart';
1010

11-
// GridPB
12-
typedef GridNotificationCallback = void Function(
13-
GridNotification, Either<Uint8List, FlowyError>);
11+
// DatabasePB
12+
typedef DatabaseNotificationCallback = void Function(
13+
DatabaseNotification, Either<Uint8List, FlowyError>);
1414

15-
class GridNotificationParser
16-
extends NotificationParser<GridNotification, FlowyError> {
17-
GridNotificationParser(
18-
{String? id, required GridNotificationCallback callback})
15+
class DatabaseNotificationParser
16+
extends NotificationParser<DatabaseNotification, FlowyError> {
17+
DatabaseNotificationParser(
18+
{String? id, required DatabaseNotificationCallback callback})
1919
: super(
2020
id: id,
2121
callback: callback,
22-
tyParser: (ty) => GridNotification.valueOf(ty),
22+
tyParser: (ty) => DatabaseNotification.valueOf(ty),
2323
errorParser: (bytes) => FlowyError.fromBuffer(bytes),
2424
);
2525
}
2626

27-
typedef GridNotificationHandler = Function(
28-
GridNotification ty, Either<Uint8List, FlowyError> result);
27+
typedef DatabaseNotificationHandler = Function(
28+
DatabaseNotification ty, Either<Uint8List, FlowyError> result);
2929

30-
class GridNotificationListener {
30+
class DatabaseNotificationListener {
3131
StreamSubscription<SubscribeObject>? _subscription;
32-
GridNotificationParser? _parser;
32+
DatabaseNotificationParser? _parser;
3333

34-
GridNotificationListener(
35-
{required String objectId, required GridNotificationHandler handler})
36-
: _parser = GridNotificationParser(id: objectId, callback: handler) {
34+
DatabaseNotificationListener(
35+
{required String objectId, required DatabaseNotificationHandler handler})
36+
: _parser = DatabaseNotificationParser(id: objectId, callback: handler) {
3737
_subscription =
3838
RustStreamReceiver.listen((observable) => _parser?.parse(observable));
3939
}

‎frontend/app_flowy/lib/plugins/board/application/board_bloc.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:equatable/equatable.dart';
1010
import 'package:appflowy_backend/log.dart';
1111
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
1212
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
13-
import 'package:appflowy_backend/protobuf/flowy-grid/protobuf.dart';
13+
import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';
1414
import 'package:flutter_bloc/flutter_bloc.dart';
1515
import 'package:freezed_annotation/freezed_annotation.dart';
1616

@@ -28,10 +28,10 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
2828

2929
GridFieldController get fieldController =>
3030
_gridDataController.fieldController;
31-
String get gridId => _gridDataController.gridId;
31+
String get databaseId => _gridDataController.viewId;
3232

3333
BoardBloc({required ViewPB view})
34-
: _rowService = MoveRowFFIService(gridId: view.id),
34+
: _rowService = MoveRowFFIService(viewId: view.id),
3535
_gridDataController = BoardDataController(view: view),
3636
super(BoardState.initial(view.id)) {
3737
boardController = AppFlowyBoardController(
@@ -116,7 +116,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
116116
emit(state.copyWith(editingRow: none()));
117117
});
118118
},
119-
didReceiveGridUpdate: (GridPB grid) {
119+
didReceiveGridUpdate: (DatabasePB grid) {
120120
emit(state.copyWith(grid: Some(grid)));
121121
},
122122
didReceiveError: (FlowyError error) {
@@ -218,7 +218,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
218218
},
219219
);
220220
final controller = GroupController(
221-
gridId: state.gridId,
221+
databaseId: state.databaseId,
222222
group: group,
223223
delegate: delegate,
224224
);
@@ -313,7 +313,7 @@ class BoardEvent with _$BoardEvent {
313313
const factory BoardEvent.endEditingRow(String rowId) = _EndEditRow;
314314
const factory BoardEvent.didReceiveError(FlowyError error) = _DidReceiveError;
315315
const factory BoardEvent.didReceiveGridUpdate(
316-
GridPB grid,
316+
DatabasePB grid,
317317
) = _DidReceiveGridUpdate;
318318
const factory BoardEvent.didReceiveGroups(List<GroupPB> groups) =
319319
_DidReceiveGroups;
@@ -322,17 +322,17 @@ class BoardEvent with _$BoardEvent {
322322
@freezed
323323
class BoardState with _$BoardState {
324324
const factory BoardState({
325-
required String gridId,
326-
required Option<GridPB> grid,
325+
required String databaseId,
326+
required Option<DatabasePB> grid,
327327
required List<String> groupIds,
328328
required Option<BoardEditingRow> editingRow,
329329
required GridLoadingState loadingState,
330330
required Option<FlowyError> noneOrError,
331331
}) = _BoardState;
332332

333-
factory BoardState.initial(String gridId) => BoardState(
333+
factory BoardState.initial(String databaseId) => BoardState(
334334
grid: none(),
335-
gridId: gridId,
335+
databaseId: databaseId,
336336
groupIds: [],
337337
editingRow: none(),
338338
noneOrError: none(),

‎frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
88
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
99
import 'dart:async';
1010
import 'package:dartz/dartz.dart';
11-
import 'package:appflowy_backend/protobuf/flowy-grid/protobuf.dart';
11+
import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';
1212

1313
import 'board_listener.dart';
1414

1515
typedef OnFieldsChanged = void Function(UnmodifiableListView<FieldInfo>);
16-
typedef OnGridChanged = void Function(GridPB);
16+
typedef OnGridChanged = void Function(DatabasePB);
1717
typedef DidLoadGroups = void Function(List<GroupPB>);
1818
typedef OnUpdatedGroup = void Function(List<GroupPB>);
1919
typedef OnDeletedGroup = void Function(List<String>);
@@ -27,11 +27,11 @@ typedef OnRowsChanged = void Function(
2727
typedef OnError = void Function(FlowyError);
2828

2929
class BoardDataController {
30-
final String gridId;
31-
final GridFFIService _gridFFIService;
30+
final String viewId;
31+
final DatabaseFFIService _databaseFFIService;
3232
final GridFieldController fieldController;
3333
final BoardListener _listener;
34-
late GridViewCache _viewCache;
34+
late DatabaseViewCache _viewCache;
3535

3636
OnFieldsChanged? _onFieldsChanged;
3737
OnGridChanged? _onGridChanged;
@@ -43,13 +43,13 @@ class BoardDataController {
4343
GridRowCache get rowCache => _viewCache.rowCache;
4444

4545
BoardDataController({required ViewPB view})
46-
: gridId = view.id,
46+
: viewId = view.id,
4747
_listener = BoardListener(view.id),
48-
_gridFFIService = GridFFIService(gridId: view.id),
49-
fieldController = GridFieldController(gridId: view.id) {
48+
_databaseFFIService = DatabaseFFIService(databaseId: view.id),
49+
fieldController = GridFieldController(databaseId: view.id) {
5050
//
51-
_viewCache = GridViewCache(
52-
gridId: view.id,
51+
_viewCache = DatabaseViewCache(
52+
databaseId: view.id,
5353
fieldController: fieldController,
5454
);
5555
_viewCache.addListener(onRowsChanged: (reason) {
@@ -107,7 +107,7 @@ class BoardDataController {
107107
}
108108

109109
Future<Either<Unit, FlowyError>> openGrid() async {
110-
final result = await _gridFFIService.openGrid();
110+
final result = await _databaseFFIService.openGrid();
111111
return result.fold(
112112
(grid) async {
113113
_onGridChanged?.call(grid);
@@ -128,17 +128,17 @@ class BoardDataController {
128128

129129
Future<Either<RowPB, FlowyError>> createBoardCard(String groupId,
130130
{String? startRowId}) {
131-
return _gridFFIService.createBoardCard(groupId, startRowId);
131+
return _databaseFFIService.createBoardCard(groupId, startRowId);
132132
}
133133

134134
Future<void> dispose() async {
135135
await _viewCache.dispose();
136-
await _gridFFIService.closeGrid();
136+
await _databaseFFIService.closeGrid();
137137
await fieldController.dispose();
138138
}
139139

140140
Future<void> _loadGroups() async {
141-
final result = await _gridFFIService.loadGroups();
141+
final result = await _databaseFFIService.loadGroups();
142142
return Future(
143143
() => result.fold(
144144
(groups) {

‎frontend/app_flowy/lib/plugins/board/application/board_listener.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import 'dart:typed_data';
33
import 'package:app_flowy/core/grid_notification.dart';
44
import 'package:flowy_infra/notifier.dart';
55
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
6-
import 'package:appflowy_backend/protobuf/flowy-grid/notification.pb.dart';
6+
import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';
77
import 'package:dartz/dartz.dart';
8-
import 'package:appflowy_backend/protobuf/flowy-grid/group.pb.dart';
9-
import 'package:appflowy_backend/protobuf/flowy-grid/group_changeset.pb.dart';
8+
import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';
9+
import 'package:appflowy_backend/protobuf/flowy-database/group_changeset.pb.dart';
1010

1111
typedef GroupUpdateValue = Either<GroupViewChangesetPB, FlowyError>;
1212
typedef GroupByNewFieldValue = Either<List<GroupPB>, FlowyError>;
@@ -16,7 +16,7 @@ class BoardListener {
1616
PublishNotifier<GroupUpdateValue>? _groupUpdateNotifier = PublishNotifier();
1717
PublishNotifier<GroupByNewFieldValue>? _groupByNewFieldNotifier =
1818
PublishNotifier();
19-
GridNotificationListener? _listener;
19+
DatabaseNotificationListener? _listener;
2020
BoardListener(this.viewId);
2121

2222
void start({
@@ -25,25 +25,25 @@ class BoardListener {
2525
}) {
2626
_groupUpdateNotifier?.addPublishListener(onBoardChanged);
2727
_groupByNewFieldNotifier?.addPublishListener(onGroupByNewField);
28-
_listener = GridNotificationListener(
28+
_listener = DatabaseNotificationListener(
2929
objectId: viewId,
3030
handler: _handler,
3131
);
3232
}
3333

3434
void _handler(
35-
GridNotification ty,
35+
DatabaseNotification ty,
3636
Either<Uint8List, FlowyError> result,
3737
) {
3838
switch (ty) {
39-
case GridNotification.DidUpdateGroupView:
39+
case DatabaseNotification.DidUpdateGroupView:
4040
result.fold(
4141
(payload) => _groupUpdateNotifier?.value =
4242
left(GroupViewChangesetPB.fromBuffer(payload)),
4343
(error) => _groupUpdateNotifier?.value = right(error),
4444
);
4545
break;
46-
case GridNotification.DidGroupByNewField:
46+
case DatabaseNotification.DidGroupByNewField:
4747
result.fold(
4848
(payload) => _groupByNewFieldNotifier?.value =
4949
left(GroupViewChangesetPB.fromBuffer(payload).newGroups),

‎frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';
22
import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';
3-
import 'package:appflowy_backend/protobuf/flowy-grid/date_type_option_entities.pb.dart';
3+
import 'package:appflowy_backend/protobuf/flowy-database/date_type_option_entities.pb.dart';
44
import 'package:flutter_bloc/flutter_bloc.dart';
55
import 'package:freezed_annotation/freezed_annotation.dart';
66
import 'dart:async';

‎frontend/app_flowy/lib/plugins/board/application/card/board_select_option_cell_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'dart:async';
2-
import 'package:appflowy_backend/protobuf/flowy-grid/select_type_option.pb.dart';
2+
import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:freezed_annotation/freezed_annotation.dart';
55
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';

‎frontend/app_flowy/lib/plugins/board/application/card/board_url_cell_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';
2-
import 'package:appflowy_backend/protobuf/flowy-grid/url_type_option_entities.pb.dart';
2+
import 'package:appflowy_backend/protobuf/flowy-database/url_type_option_entities.pb.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:freezed_annotation/freezed_annotation.dart';
55
import 'dart:async';

‎frontend/app_flowy/lib/plugins/board/application/card/card_bloc.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_servic
33
import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';
44
import 'package:app_flowy/plugins/grid/application/row/row_service.dart';
55
import 'package:equatable/equatable.dart';
6-
import 'package:appflowy_backend/protobuf/flowy-grid/row_entities.pb.dart';
6+
import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';
77
import 'package:flutter_bloc/flutter_bloc.dart';
88
import 'package:freezed_annotation/freezed_annotation.dart';
99
import 'dart:async';
@@ -18,11 +18,11 @@ class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {
1818

1919
BoardCardBloc({
2020
required this.groupFieldId,
21-
required String gridId,
21+
required String viewId,
2222
required CardDataController dataController,
2323
required bool isEditing,
2424
}) : _rowService = RowFFIService(
25-
gridId: gridId,
25+
databaseId: viewId,
2626
),
2727
_dataController = dataController,
2828
super(
@@ -60,7 +60,7 @@ class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {
6060

6161
RowInfo rowInfo() {
6262
return RowInfo(
63-
gridId: _rowService.gridId,
63+
databaseId: _rowService.databaseId,
6464
fields: UnmodifiableListView(
6565
state.cells.map((cell) => cell.identifier.fieldInfo).toList(),
6666
),

‎frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_servic
33
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_field_notifier.dart';
44
import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';
55
import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';
6-
import 'package:appflowy_backend/protobuf/flowy-grid/row_entities.pb.dart';
6+
import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';
77
import 'package:flutter/foundation.dart';
88

99
typedef OnCardChanged = void Function(GridCellMap, RowsChangedReason);

‎frontend/app_flowy/lib/plugins/board/application/group.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import 'package:appflowy_backend/protobuf/flowy-grid/field_entities.pb.dart';
1+
import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
22

33
class BoardGroupService {
4-
final String gridId;
4+
final String viewId;
55
FieldPB? groupField;
66

7-
BoardGroupService(this.gridId);
7+
BoardGroupService(this.viewId);
88

99
void setGroupField(FieldPB field) {
1010
groupField = field;

0 commit comments

Comments
 (0)