Skip to content

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.

Merge remote-tracking branch 'origin/main' into develop

Lucas.Xuc00934773571
diff --cc frontend/appflowy_flutter/lib/plugins/database_view/application/database_view_service.dart
index bc6dd6e699,7bb09dea50..2b11bd0eea
--- a/frontend/appflowy_flutter/lib/plugins/database_view/application/database_view_service.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_view_service.dart
@@@ -86,7 -87,8 +87,8 @@@ class DatabaseViewBackendService
}
Future<Either<LayoutSettingPB, FlowyError>> getLayoutSetting(
- DatabaseLayoutPB layoutType) {
- LayoutTypePB layoutType,
++ DatabaseLayoutPB layoutType,
+ ) {
final payload = DatabaseLayoutIdPB.create()
..viewId = viewId
..layout = layoutType;
diff --cc frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart
index 05526f5b62,317769f248..1f51a9b322
--- a/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart
@@@ -18,7 -18,7 +18,6 @@@ import 'package:freezed_annotation/free
import 'package:dartz/dartz.dart';
import 'dart:async';
import 'package:appflowy/util/either_extension.dart';
- import 'package:appflowy_backend/protobuf/flowy-document2/entities.pb.dart';
-
part 'doc_bloc.freezed.dart';
class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {
@@@ -52,10 -49,13 +51,12 @@@
emit(state.copyWith(isDeleted: false));
},
deletePermanently: (DeletePermanently value) async {
- final result = await _trashService
- .deleteViews([Tuple2(view.id, TrashType.TrashView)]);
+ final result = await _trashService.deleteViews([view.id]);
final newState = result.fold(
- (l) => state.copyWith(forceClose: true), (r) => state);
+ (l) => state.copyWith(forceClose: true),
+ (r) => state,
+ );
emit(newState);
},
restorePage: (RestorePage value) async {
@@@ -93,39 -94,6 +96,7 @@@
);
}
final result = await _documentService.openDocument(view: view);
- // test code
- final document = await _documentService.openDocumentV2(view: view);
- BlockPB? root;
- document.fold((l) {
- print('---------<open document v2>-----------');
- print('page id = ${l.pageId}');
- l.blocks.blocks.forEach((key, value) {
- print('-----<block begin>-----');
- print('block = $value');
- if (value.ty == 'page') {
- root = value;
- }
- print('-----<block end>-----');
- });
- print('---------<open document v2>-----------');
- }, (r) {});
- if (root != null) {
- await _documentService.applyAction(
- view: view,
- actions: [
- BlockActionPB(
- action: BlockActionTypePB.Insert,
- payload: BlockActionPayloadPB(
- block: BlockPB()
- ..id = 'id_0'
- ..ty = 'text'
- ..parentId = root!.id,
- ),
- ),
- ],
- );
- }
+
return result.fold(
(documentData) async {
await _initEditorState(documentData).whenComplete(() {
@@@ -164,14 -132,6 +135,12 @@@
);
}
+ void _listenOnDocChange() {
+ _docListener.start(
- didReceiveUpdate: () {
- print('---------<receive document update>-----------');
- },
++ didReceiveUpdate: () {},
+ );
+ }
+
Future<void> _initEditorState(DocumentDataPB documentData) async {
final document = Document.fromJson(jsonDecode(documentData.content));
final editorState = EditorState(document: document);
diff --cc frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart
index 3f8cb5b1ef,bf9bcf703d..dd060e5dca
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart
@@@ -7,9 -8,9 +7,9 @@@ import 'package:flowy_infra_ui/style_wi
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
--import 'insert_page_command.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:easy_localization/easy_localization.dart';
++import 'insert_page_command.dart';
EditorState? _editorState;
OverlayEntry? _linkToPageMenu;
diff --cc frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart
index f653fbfe11,03c48df67d..e64d0d2a2b
--- a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart
@@@ -17,29 -17,41 +17,40 @@@ class TrashBloc extends Bloc<TrashEvent
_listener = TrashListener(),
super(TrashState.init()) {
on<TrashEvent>((event, emit) async {
- await event.map(initial: (e) async {
- _listener.start(trashUpdated: _listenTrashUpdated);
- final result = await _service.readTrash();
- emit(result.fold(
- (object) => state.copyWith(
- objects: object.items, successOrFailure: left(unit)),
- (error) => state.copyWith(successOrFailure: right(error)),
- ));
- }, didReceiveTrash: (e) async {
- emit(state.copyWith(objects: e.trash));
- }, putback: (e) async {
- final result = await _service.putback(e.trashId);
- await _handleResult(result, emit);
- }, delete: (e) async {
- final result = await _service.deleteViews([e.trash.id]);
- await _handleResult(result, emit);
- }, deleteAll: (e) async {
- final result = await _service.deleteAll();
- await _handleResult(result, emit);
- }, restoreAll: (e) async {
- final result = await _service.restoreAll();
- await _handleResult(result, emit);
- });
+ await event.map(
+ initial: (e) async {
+ _listener.start(trashUpdated: _listenTrashUpdated);
+ final result = await _service.readTrash();
+ emit(
+ result.fold(
+ (object) => state.copyWith(
+ objects: object.items,
+ successOrFailure: left(unit),
+ ),
+ (error) => state.copyWith(successOrFailure: right(error)),
+ ),
+ );
+ },
+ didReceiveTrash: (e) async {
+ emit(state.copyWith(objects: e.trash));
+ },
+ putback: (e) async {
+ final result = await _service.putback(e.trashId);
+ await _handleResult(result, emit);
+ },
+ delete: (e) async {
- final result =
- await _service.deleteViews([Tuple2(e.trash.id, e.trash.ty)]);
++ final result = await _service.deleteViews([e.trash.id]);
+ await _handleResult(result, emit);
+ },
+ deleteAll: (e) async {
+ final result = await _service.deleteAll();
+ await _handleResult(result, emit);
+ },
+ restoreAll: (e) async {
+ final result = await _service.restoreAll();
+ await _handleResult(result, emit);
+ },
+ );
});
}
diff --cc frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart
index 6132d3870d,cfabc73f26..b1040360ee
--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart
@@@ -20,40 -21,48 +20,49 @@@ class AppBloc extends Bloc<AppEvent, Ap
final AppBackendService appService;
final AppListener appListener;
- AppBloc({required AppPB app})
+ AppBloc({required ViewPB view})
: appService = AppBackendService(),
- appListener = AppListener(appId: app.id),
- super(AppState.initial(app)) {
+ appListener = AppListener(viewId: view.id),
+ super(AppState.initial(view)) {
on<AppEvent>((event, emit) async {
- await event.map(initial: (e) async {
- _startListening();
- await _loadViews(emit);
- }, createView: (CreateView value) async {
- await _createView(value, emit);
- }, loadViews: (_) async {
- await _loadViews(emit);
- }, delete: (e) async {
- await _deleteApp(emit);
- }, deleteView: (deletedView) async {
- await _deleteView(emit, deletedView.viewId);
- }, rename: (e) async {
- await _renameView(e, emit);
- }, appDidUpdate: (e) async {
- final latestCreatedView = state.latestCreatedView;
- final views = e.app.belongings;
- AppState newState = state.copyWith(
- views: views,
- view: e.app,
- );
- if (latestCreatedView != null) {
- final index =
- views.indexWhere((element) => element.id == latestCreatedView.id);
- if (index == -1) {
- newState = newState.copyWith(latestCreatedView: null);
+ await event.map(
+ initial: (e) async {
+ _startListening();
+ await _loadViews(emit);
+ },
+ createView: (CreateView value) async {
+ await _createView(value, emit);
+ },
+ loadViews: (_) async {
+ await _loadViews(emit);
+ },
+ delete: (e) async {
+ await _deleteApp(emit);
+ },
+ deleteView: (deletedView) async {
+ await _deleteView(emit, deletedView.viewId);
+ },
+ rename: (e) async {
+ await _renameView(e, emit);
+ },
+ appDidUpdate: (e) async {
+ final latestCreatedView = state.latestCreatedView;
- final views = e.app.belongings.items;
++ final views = e.app.belongings;
+ AppState newState = state.copyWith(
+ views: views,
- app: e.app,
++ view: e.app,
+ );
+ if (latestCreatedView != null) {
+ final index = views
+ .indexWhere((element) => element.id == latestCreatedView.id);
+ if (index == -1) {
+ newState = newState.copyWith(latestCreatedView: null);
+ }
++ emit(newState);
}
- }
- emit(newState);
- });
+ emit(newState);
+ },
+ );
});
}
diff --cc frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart
index af3875b1ec,5c3f12bbda..8e003206c5
--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart
@@@ -5,13 -5,15 +5,14 @@@ import 'package:dartz/dartz.dart'
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';
import 'package:appflowy_backend/rust_stream.dart';
-typedef AppDidUpdateCallback = void Function(AppPB app);
+typedef AppDidUpdateCallback = void Function(ViewPB app);
typedef ViewsDidChangeCallback = void Function(
- Either<List<ViewPB>, FlowyError> viewsOrFailed);
+ Either<List<ViewPB>, FlowyError> viewsOrFailed,
+ );
class AppListener {
StreamSubscription<SubscribeObject>? _subscription;
@@@ -31,10 -33,11 +32,12 @@@
}
void _handleCallback(
- FolderNotification ty, Either<Uint8List, FlowyError> result) {
+ FolderNotification ty,
+ Either<Uint8List, FlowyError> result,
+ ) {
switch (ty) {
- case FolderNotification.DidUpdateApp:
+ case FolderNotification.DidUpdateView:
+ case FolderNotification.DidUpdateChildViews:
if (_updated != null) {
result.fold(
(payload) {
diff --cc frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart
index 5cc0e0439c,705ef93cc2..d0d6521761
--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart
@@@ -65,9 -72,11 +65,11 @@@ class AppBackendService
return FolderEventDeleteView(request).send();
}
- Future<Either<ViewPB, FlowyError>> updateApp(
- {required String appId, String? name}) {
- Future<Either<Unit, FlowyError>> updateApp({
++ Future<Either<ViewPB, FlowyError>> updateApp({
+ required String appId,
+ String? name,
+ }) {
- UpdateAppPayloadPB payload = UpdateAppPayloadPB.create()..appId = appId;
+ var payload = UpdateViewPayloadPB.create()..viewId = appId;
if (name != null) {
payload.name = name;
@@@ -89,9 -98,10 +91,10 @@@
return FolderEventMoveItem(payload).send();
}
- Future<List<Tuple2<AppPB, List<ViewPB>>>> fetchViews(
- ViewLayoutTypePB layoutType,
+ Future<List<Tuple2<ViewPB, List<ViewPB>>>> fetchViews(
- ViewLayoutPB layoutType) async {
++ ViewLayoutPB layoutType,
+ ) async {
- final result = <Tuple2<AppPB, List<ViewPB>>>[];
+ final result = <Tuple2<ViewPB, List<ViewPB>>>[];
return FolderEventReadCurrentWorkspace().send().then((value) async {
final workspaces = value.getLeftOrNull<WorkspaceSettingPB>();
if (workspaces != null) {
diff --cc frontend/appflowy_flutter/lib/workspace/application/doc/doc_listener.dart
index 9dbed39c6f,0000000000..ef04bec4aa
mode 100644,000000..100644
--- a/frontend/appflowy_flutter/lib/workspace/application/doc/doc_listener.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/doc/doc_listener.dart
@@@ -1,54 -1,0 +1,52 @@@
+import 'dart:async';
+import 'dart:typed_data';
+import 'package:appflowy/core/document_notification.dart';
+import 'package:dartz/dartz.dart';
+import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-document2/notification.pb.dart';
+import 'package:appflowy_backend/rust_stream.dart';
- import 'package:flowy_infra/notifier.dart';
+
+class DocumentListener {
+ DocumentListener({
+ required this.id,
+ });
+
+ final String id;
+
- final _didReceiveUpdate = PublishNotifier();
+ StreamSubscription<SubscribeObject>? _subscription;
+ DocumentNotificationParser? _parser;
+
+ Function()? didReceiveUpdate;
+
+ void start({
+ void Function()? didReceiveUpdate,
+ }) {
+ this.didReceiveUpdate = didReceiveUpdate;
+
+ _parser = DocumentNotificationParser(
+ id: id,
+ callback: _callback,
+ );
+ _subscription = RustStreamReceiver.listen(
+ (observable) => _parser?.parse(observable),
+ );
+ }
+
+ void _callback(
+ DocumentNotification ty,
+ Either<Uint8List, FlowyError> result,
+ ) {
+ switch (ty) {
+ case DocumentNotification.DidReceiveUpdate:
+ didReceiveUpdate?.call();
+ break;
+ default:
+ break;
+ }
+ }
+
+ Future<void> stop() async {
+ await _subscription?.cancel();
+ }
+}
diff --cc frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart
index 54c126b221,94415821f7..f5c0fcb47a
--- a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart
@@@ -38,35 -38,28 +38,39 @@@ class MenuBloc extends Bloc<MenuEvent,
emit(state.copyWith(plugin: e.plugin));
},
createApp: (_CreateApp event) async {
- await _performActionOnCreateApp(event, emit);
+ final result = await _workspaceService.createApp(
+ name: event.name,
+ desc: event.desc ?? "",
+ );
+ result.fold(
+ (app) => {},
+ (error) {
+ Log.error(error);
+ emit(state.copyWith(successOrFailure: right(error)));
+ },
+ );
},
didReceiveApps: (e) async {
- emit(e.appsOrFail.fold(
- (views) =>
- state.copyWith(views: views, successOrFailure: left(unit)),
- (err) => state.copyWith(successOrFailure: right(err)),
- ));
+ emit(
+ e.appsOrFail.fold(
- (apps) =>
- state.copyWith(apps: apps, successOrFailure: left(unit)),
++ (views) =>
++ state.copyWith(views: views, successOrFailure: left(unit)),
+ (err) => state.copyWith(successOrFailure: right(err)),
+ ),
+ );
},
moveApp: (_MoveApp value) {
- if (state.apps.length > value.fromIndex) {
- final app = state.apps[value.fromIndex];
+ if (state.views.length > value.fromIndex) {
+ final view = state.views[value.fromIndex];
_workspaceService.moveApp(
- appId: view.id,
- fromIndex: value.fromIndex,
- toIndex: value.toIndex);
- appId: app.id,
++ appId: view.id,
+ fromIndex: value.fromIndex,
+ toIndex: value.toIndex,
+ );
- final apps = List<AppPB>.from(state.apps);
+ final apps = List<ViewPB>.from(state.views);
++
apps.insert(value.toIndex, apps.removeAt(value.fromIndex));
- emit(state.copyWith(apps: apps));
+ emit(state.copyWith(views: apps));
}
},
);
@@@ -82,16 -75,35 +86,18 @@@
// ignore: unused_element
Future<void> _fetchApps(Emitter<MenuState> emit) async {
final appsOrFail = await _workspaceService.getApps();
- emit(appsOrFail.fold(
- (views) => state.copyWith(views: views),
- (error) {
- Log.error(error);
- return state.copyWith(successOrFailure: right(error));
- },
- ));
+ emit(
+ appsOrFail.fold(
- (apps) => state.copyWith(apps: apps),
++ (views) => state.copyWith(views: views),
+ (error) {
+ Log.error(error);
+ return state.copyWith(successOrFailure: right(error));
+ },
+ ),
+ );
}
- void _handleAppsOrFail(Either<List<AppPB>, FlowyError> appsOrFail) {
+ void _handleAppsOrFail(Either<List<ViewPB>, FlowyError> appsOrFail) {
appsOrFail.fold(
(apps) => add(MenuEvent.didReceiveApps(left(apps))),
(error) => add(MenuEvent.didReceiveApps(right(error))),
@@@ -106,7 -118,8 +112,8 @@@ class MenuEvent with _$MenuEvent
const factory MenuEvent.createApp(String name, {String? desc}) = _CreateApp;
const factory MenuEvent.moveApp(int fromIndex, int toIndex) = _MoveApp;
const factory MenuEvent.didReceiveApps(
- Either<List<ViewPB>, FlowyError> appsOrFail) = _ReceiveApps;
- Either<List<AppPB>, FlowyError> appsOrFail,
++ Either<List<ViewPB>, FlowyError> appsOrFail,
+ ) = _ReceiveApps;
}
@freezed
diff --cc frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart
index a3e075f84e,d08e15ec38..3ef88481ec
--- a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart
@@@ -20,15 -16,15 +20,17 @@@ class WorkspaceService
WorkspaceService({
required this.workspaceId,
});
- Future<Either<ViewPB, FlowyError>> createApp(
- {required String name, String? desc}) {
- Future<Either<AppPB, FlowyError>> createApp({
++ Future<Either<ViewPB, FlowyError>> createApp({
+ required String name,
+ String? desc,
+ }) {
- final payload = CreateAppPayloadPB.create()
+ final payload = CreateViewPayloadPB.create()
+ ..belongToId = workspaceId
..name = name
- ..workspaceId = workspaceId
- ..desc = desc ?? "";
- return FolderEventCreateApp(payload).send();
+ ..desc = desc ?? ""
+ ..layout = ViewLayoutPB.Document;
+
+ return FolderEventCreateView(payload).send();
}
Future<Either<WorkspacePB, FlowyError>> getWorkspace() {
diff --cc frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dart
index 6137a49d7f,555d8bd8df..a7bdfa6719
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dart
@@@ -78,23 -83,25 +83,25 @@@ class MenuAppHeader extends StatelessWi
expandableController.toggle();
}
},
- child: AppActionList(onSelected: (action) {
- switch (action) {
- case AppDisclosureAction.rename:
- NavigatorTextFieldDialog(
- title: LocaleKeys.menuAppHeader_renameDialog.tr(),
- value: context.read<AppBloc>().state.view.name,
- confirm: (newValue) {
- context.read<AppBloc>().add(AppEvent.rename(newValue));
- },
- ).show(context);
-
- break;
- case AppDisclosureAction.delete:
- context.read<AppBloc>().add(const AppEvent.delete());
- break;
- }
- }),
+ child: AppActionList(
+ onSelected: (action) {
+ switch (action) {
+ case AppDisclosureAction.rename:
+ NavigatorTextFieldDialog(
+ title: LocaleKeys.menuAppHeader_renameDialog.tr(),
- value: context.read<AppBloc>().state.app.name,
++ value: context.read<AppBloc>().state.view.name,
+ confirm: (newValue) {
+ context.read<AppBloc>().add(AppEvent.rename(newValue));
+ },
+ ).show(context);
+
+ break;
+ case AppDisclosureAction.delete:
+ context.read<AppBloc>().add(const AppEvent.delete());
+ break;
+ }
+ },
+ ),
),
);
}
diff --cc frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart
index 2d7d9babef,c25a99b2f2..9943428360
--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart
@@@ -18,11 -18,12 +18,12 @@@ Future<GridTestContext> createTestFilte
return result.fold(
(view) async {
final context = GridTestContext(
- view,
- DatabaseController(
- view: view,
- layoutType: DatabaseLayoutPB.Grid,
- ));
+ view,
+ DatabaseController(
+ view: view,
- layoutType: LayoutTypePB.Grid,
++ layoutType: DatabaseLayoutPB.Grid,
+ ),
+ );
final result = await context.gridController.open();
await editCells(context);
diff --cc frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dart
index 0129955344,352646d913..da3a569638
--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dart
@@@ -20,12 -20,12 +20,12 @@@ void main()
blocTest<GridBloc, GridState>(
"create a row",
build: () => GridBloc(
+ view: context.gridView,
+ databaseController: DatabaseController(
view: context.gridView,
- databaseController: DatabaseController(
- view: context.gridView,
- layoutType: DatabaseLayoutPB.Grid,
- ))
- ..add(const GridEvent.initial()),
- layoutType: LayoutTypePB.Grid,
++ layoutType: DatabaseLayoutPB.Grid,
+ ),
+ )..add(const GridEvent.initial()),
act: (bloc) => bloc.add(const GridEvent.createRow()),
wait: const Duration(milliseconds: 300),
verify: (bloc) {
@@@ -36,12 -36,12 +36,12 @@@
blocTest<GridBloc, GridState>(
"delete the last row",
build: () => GridBloc(
+ view: context.gridView,
+ databaseController: DatabaseController(
view: context.gridView,
- databaseController: DatabaseController(
- view: context.gridView,
- layoutType: DatabaseLayoutPB.Grid,
- ))
- ..add(const GridEvent.initial()),
- layoutType: LayoutTypePB.Grid,
++ layoutType: DatabaseLayoutPB.Grid,
+ ),
+ )..add(const GridEvent.initial()),
act: (bloc) async {
await gridResponseFuture();
bloc.add(GridEvent.deleteRow(bloc.state.rowInfos.last));
diff --cc frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart
index 79d0736ffd,fc3dba4446..f211804f9d
--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart
@@@ -175,11 -180,12 +180,12 @@@ class AppFlowyGridTest
return result.fold(
(view) async {
final context = GridTestContext(
- view,
- DatabaseController(
- view: view,
- layoutType: DatabaseLayoutPB.Grid,
- ));
+ view,
+ DatabaseController(
+ view: view,
- layoutType: LayoutTypePB.Grid,
++ layoutType: DatabaseLayoutPB.Grid,
+ ),
+ );
final result = await context.gridController.open();
result.fold((l) => null, (r) => throw Exception(r));
return context;
diff --cc frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dart
index 03db7f34b0,5eee2648b8..476557a4ea
--- a/frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dart
@@@ -15,20 -16,24 +15,24 @@@ class TrashTestContext
TrashTestContext(this.unitTest);
Future<void> initialize() async {
- app = await unitTest.createTestApp();
- appBloc = AppBloc(app: app)..add(const AppEvent.initial());
+ view = await unitTest.createTestApp();
+ appBloc = AppBloc(view: view)..add(const AppEvent.initial());
await blocResponseFuture();
- appBloc.add(AppEvent.createView(
- "Document 1",
- DocumentPluginBuilder(),
- ));
+ appBloc.add(
+ AppEvent.createView(
+ "Document 1",
+ DocumentPluginBuilder(),
+ ),
+ );
await blocResponseFuture();
- appBloc.add(AppEvent.createView(
- "Document 2",
- DocumentPluginBuilder(),
- ));
+ appBloc.add(
+ AppEvent.createView(
+ "Document 2",
+ DocumentPluginBuilder(),
+ ),
+ );
await blocResponseFuture();
appBloc.add(
diff --cc frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart
index 3009035607,bc67388fe4..0a913688ea
--- a/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart
@@@ -13,11 -13,13 +13,15 @@@ void main()
test('rename view test', () async {
final app = await testContext.createTestApp();
- final appBloc = AppBloc(app: app)..add(const AppEvent.initial());
++
+ final appBloc = AppBloc(view: app)..add(const AppEvent.initial());
- appBloc.add(AppEvent.createView(
- "Test document",
- DocumentPluginBuilder(),
- ));
+ appBloc.add(
+ AppEvent.createView(
+ "Test document",
+ DocumentPluginBuilder(),
+ ),
+ );
++
await blocResponseFuture();
final viewBloc = ViewBloc(view: appBloc.state.views.first)
@@@ -30,13 -32,15 +34,15 @@@
test('duplicate view test', () async {
final app = await testContext.createTestApp();
- final appBloc = AppBloc(app: app)..add(const AppEvent.initial());
+ final appBloc = AppBloc(view: app)..add(const AppEvent.initial());
await blocResponseFuture();
- appBloc.add(AppEvent.createView(
- "Test document",
- DocumentPluginBuilder(),
- ));
+ appBloc.add(
+ AppEvent.createView(
+ "Test document",
+ DocumentPluginBuilder(),
+ ),
+ );
await blocResponseFuture();
final viewBloc = ViewBloc(view: appBloc.state.views.first)
@@@ -51,13 -55,15 +57,15 @@@
test('delete view test', () async {
final app = await testContext.createTestApp();
- final appBloc = AppBloc(app: app)..add(const AppEvent.initial());
+ final appBloc = AppBloc(view: app)..add(const AppEvent.initial());
await blocResponseFuture();
- appBloc.add(AppEvent.createView(
- "Test document",
- DocumentPluginBuilder(),
- ));
+ appBloc.add(
+ AppEvent.createView(
+ "Test document",
+ DocumentPluginBuilder(),
+ ),
+ );
await blocResponseFuture();
expect(appBloc.state.views.length, 1);
diff --cc frontend/rust-lib/Cargo.lock
index 52d2692b1e,2052c1707c..f732e6312e
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@@ -487,86 -488,6 +487,89 @@@ dependencies =
"unicode-width",
]
+[[package]]
+name = "collab"
+version = "0.1.0"
- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#dd49b08fae2ad008844409c7ce6b8c754446955c"
++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#2493922c509a4d2862bc49a11f068917b0c5bb93"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "collab-persistence",
+ "lib0",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+ "y-sync",
+ "yrs",
+]
+
+[[package]]
+name = "collab-derive"
+version = "0.1.0"
- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#dd49b08fae2ad008844409c7ce6b8c754446955c"
++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#2493922c509a4d2862bc49a11f068917b0c5bb93"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 1.0.109",
+ "yrs",
+]
+
+[[package]]
+name = "collab-document"
+version = "0.1.0"
- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#dd49b08fae2ad008844409c7ce6b8c754446955c"
++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#2493922c509a4d2862bc49a11f068917b0c5bb93"
+dependencies = [
+ "anyhow",
+ "collab",
+ "collab-derive",
+ "collab-persistence",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "thiserror",
++ "tracing",
+]
+
+[[package]]
+name = "collab-folder"
+version = "0.1.0"
- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#dd49b08fae2ad008844409c7ce6b8c754446955c"
++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#2493922c509a4d2862bc49a11f068917b0c5bb93"
+dependencies = [
+ "anyhow",
+ "collab",
+ "collab-derive",
+ "collab-persistence",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "collab-persistence"
+version = "0.1.0"
- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#dd49b08fae2ad008844409c7ce6b8c754446955c"
++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?branch=main#2493922c509a4d2862bc49a11f068917b0c5bb93"
+dependencies = [
+ "bincode",
+ "chrono",
+ "lib0",
++ "parking_lot 0.12.1",
+ "serde",
+ "sled",
+ "smallvec",
+ "thiserror",
+ "tokio",
++ "tracing",
+ "yrs",
+]
+
[[package]]
name = "color-eyre"
version = "0.5.11"
diff --cc frontend/rust-lib/flowy-database/src/services/database/database_editor.rs
index 8d5775d239,84f5c26bf1..b2c908ee16
--- a/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs
+++ b/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs
@@@ -143,7 -143,7 +143,7 @@@ impl DatabaseEditor
/// * `field_id`: the id of the field
/// * `type_option_data`: the updated type-option data. The `type-option` data might be empty
/// if there is no type-option config for that field. For example, the `RichTextTypeOptionPB`.
-- ///
++ ///
pub async fn update_field_type_option(
&self,
view_id: &str,
@@@ -307,7 -307,7 +307,7 @@@
Ok(())
}
-- /// Switch the field with id to a new field type.
++ /// Switch the field with id to a new field type.
///
/// If the field type is not exist before, the default type-option data will be created.
/// Each field type has its corresponding data, aka, the type-option data. Check out [this](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid#fieldtype)
@@@ -888,15 -888,10 +888,9 @@@
Ok(())
}
- pub async fn duplicate_database<T: AsRef<str>>(
- &self,
- _view_id: T,
- ) -> FlowyResult<BuildDatabaseContext> {
+ pub async fn duplicate_database(&self, view_id: &str) -> FlowyResult<BuildDatabaseContext> {
let database_pad = self.database_pad.read().await;
- // let database_view_data = self
- // .database_views
- // .duplicate_database_view(view_id.as_ref())
- // .await?;
+ let database_view_data = self.database_views.duplicate_database_view(view_id).await?;
-
let original_blocks = database_pad.get_block_meta_revs();
let (duplicated_fields, duplicated_blocks) = database_pad.duplicate_database_block_meta().await;
diff --cc frontend/rust-lib/flowy-database/src/services/persistence/migration/database_view_migration.rs
index 2964db9392,1124795185..5394f250b5
--- a/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_view_migration.rs
+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_view_migration.rs
@@@ -33,7 -33,7 +33,7 @@@ pub(crate) async fn migrate_database_vi
migrated_databases: &Vec<MigratedDatabase>,
pool: Arc<ConnectionPool>,
) -> FlowyResult<()> {
-- if is_database_view_migrated(user_id) || migrated_databases.is_empty() {
++ if is_database_view_migrated(&user_id.to_string()) || migrated_databases.is_empty() {
return Ok(());
}
diff --cc frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs
index aba2449d83,7be1d5f27b..b109dc1604
--- a/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs
+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs
@@@ -35,7 -35,7 +35,7 @@@ impl DatabaseMigration
) -> FlowyResult<()> {
let pool = self.user.db_pool()?;
-- if !is_database_view_migrated(user_id) || !is_database_rev_migrated(user_id) {
++ if !is_database_view_migrated(&user_id.to_string()) || !is_database_rev_migrated(user_id) {
let migrated_databases = get_views_fn
.await
.into_iter()
diff --cc frontend/rust-lib/flowy-document2/src/event_handler.rs
index 0899bcc148,0000000000..cb7a93420e
mode 100644,000000..100644
--- a/frontend/rust-lib/flowy-document2/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-document2/src/event_handler.rs
@@@ -1,119 -1,0 +1,123 @@@
- use std::{sync::Arc};
++use std::sync::Arc;
+
+use crate::{
+ document::DocumentDataWrapper,
+ entities::{
- ApplyActionPayloadPBV2, BlockActionPB, BlockActionPayloadPB, BlockActionTypePB,
- BlockPB, CloseDocumentPayloadPBV2, DocumentDataPB2, OpenDocumentPayloadPBV2, CreateDocumentPayloadPBV2,
- BlockEventPB
++ ApplyActionPayloadPBV2, BlockActionPB, BlockActionPayloadPB, BlockActionTypePB, BlockEventPB,
++ BlockPB, CloseDocumentPayloadPBV2, CreateDocumentPayloadPBV2, DocumentDataPB2,
++ OpenDocumentPayloadPBV2,
+ },
+ manager::DocumentManager,
+};
+
+use collab_document::blocks::{
- json_str_to_hashmap, Block, BlockAction, BlockActionPayload, BlockActionType, BlockEvent
++ json_str_to_hashmap, Block, BlockAction, BlockActionPayload, BlockActionType, BlockEvent,
+};
+use flowy_error::{FlowyError, FlowyResult};
+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};
+pub(crate) async fn open_document_handler(
+ data: AFPluginData<OpenDocumentPayloadPBV2>,
+ manager: AFPluginState<Arc<DocumentManager>>,
+) -> DataResult<DocumentDataPB2, FlowyError> {
+ let context = data.into_inner();
+ let document = manager.open_document(context.document_id)?;
+ let document_data = document
+ .lock()
+ .get_document()
+ .map_err(|err| FlowyError::internal().context(err))?;
+ data_result_ok(DocumentDataPB2::from(DocumentDataWrapper(document_data)))
+}
+
+pub(crate) async fn create_document_handler(
+ data: AFPluginData<CreateDocumentPayloadPBV2>,
+ manager: AFPluginState<Arc<DocumentManager>>,
+) -> FlowyResult<()> {
+ let context = data.into_inner();
+ let data = DocumentDataWrapper::default();
+ manager.create_document(context.document_id, data)?;
+ Ok(())
+}
+
+pub(crate) async fn close_document_handler(
+ data: AFPluginData<CloseDocumentPayloadPBV2>,
+ manager: AFPluginState<Arc<DocumentManager>>,
+) -> FlowyResult<()> {
+ let context = data.into_inner();
+ manager.close_document(context.document_id)?;
+ Ok(())
+}
+
+pub(crate) async fn apply_action_handler(
+ data: AFPluginData<ApplyActionPayloadPBV2>,
+ manager: AFPluginState<Arc<DocumentManager>>,
+) -> FlowyResult<()> {
+ let context = data.into_inner();
+ let doc_id = context.document_id;
+ let actions = context
+ .actions
+ .into_iter()
+ .map(|action| action.into())
+ .collect();
+ let document = manager.open_document(doc_id)?;
+ document.lock().apply_action(actions);
+ Ok(())
+}
+
+impl From<BlockActionPB> for BlockAction {
+ fn from(pb: BlockActionPB) -> Self {
+ Self {
+ action: pb.action.into(),
+ payload: pb.payload.into(),
+ }
+ }
+}
+
+impl From<BlockActionTypePB> for BlockActionType {
+ fn from(pb: BlockActionTypePB) -> Self {
+ match pb {
+ BlockActionTypePB::Insert => Self::Insert,
+ BlockActionTypePB::Update => Self::Update,
+ BlockActionTypePB::Delete => Self::Delete,
+ BlockActionTypePB::Move => Self::Move,
+ }
+ }
+}
+
+impl From<BlockActionPayloadPB> for BlockActionPayload {
+ fn from(pb: BlockActionPayloadPB) -> Self {
+ Self {
+ block: pb.block.into(),
+ parent_id: pb.parent_id,
+ prev_id: pb.prev_id,
+ }
+ }
+}
+
+impl From<BlockPB> for Block {
+ fn from(pb: BlockPB) -> Self {
+ let data = json_str_to_hashmap(&pb.data).unwrap_or_default();
+ Self {
+ id: pb.id,
+ ty: pb.ty,
+ children: pb.children_id,
+ parent: pb.parent_id,
+ data,
+ external_id: None,
+ external_type: None,
+ }
+ }
+}
+
+impl From<BlockEvent> for BlockEventPB {
+ fn from(block_event: BlockEvent) -> Self {
- let delta = serde_json::to_value(&block_event.delta).unwrap();
++ // let delta = serde_json::to_value(&block_event.delta).unwrap();
++ // Self {
++ // path: block_event.path.into(),
++ // delta: delta.to_string(),
++ // }
+ Self {
- path: block_event.path.into(),
- delta: delta.to_string(),
++ path: vec![],
++ delta: "".to_string(),
+ }
+ }
+}
diff --cc frontend/rust-lib/flowy-document2/src/manager.rs
index d3cc4f0f98,0000000000..787c8cd7a1
mode 100644,000000..100644
--- a/frontend/rust-lib/flowy-document2/src/manager.rs
+++ b/frontend/rust-lib/flowy-document2/src/manager.rs
@@@ -1,94 -1,0 +1,104 @@@
+use std::{collections::HashMap, sync::Arc};
+
+use collab::{plugin_impl::disk::CollabDiskPlugin, preclude::CollabBuilder};
+use collab_persistence::CollabKV;
+use flowy_error::{FlowyError, FlowyResult};
+use parking_lot::RwLock;
+
+use crate::{
+ document::{Document, DocumentDataWrapper},
++ entities::{BlockEventPB, DocEventPB},
+ notification::{send_notification, DocumentNotification},
- entities::{DocEventPB, BlockEventPB},
+};
+
+pub trait DocumentUser: Send + Sync {
+ fn user_id(&self) -> Result<i64, FlowyError>;
+ fn token(&self) -> Result<String, FlowyError>; // unused now.
+ fn kv_db(&self) -> Result<Arc<CollabKV>, FlowyError>;
+}
+
+pub struct DocumentManager {
+ documents: Arc<RwLock<HashMap<String, Arc<Document>>>>,
+ user: Arc<dyn DocumentUser>,
+}
+
+// unsafe impl Send for DocumentManager {}
+// unsafe impl Sync for DocumentManager {}
+
+impl DocumentManager {
+ pub fn new(user: Arc<dyn DocumentUser>) -> Self {
+ Self {
+ documents: Default::default(),
+ user,
+ }
+ }
+
- pub fn create_document(&self, doc_id: String, data: DocumentDataWrapper) -> FlowyResult<Arc<Document>> {
++ pub fn create_document(
++ &self,
++ doc_id: String,
++ data: DocumentDataWrapper,
++ ) -> FlowyResult<Arc<Document>> {
+ self.get_document(doc_id, Some(data))
+ }
+
- fn get_document(&self, doc_id: String, data: Option<DocumentDataWrapper>) -> FlowyResult<Arc<Document>> {
++ fn get_document(
++ &self,
++ doc_id: String,
++ data: Option<DocumentDataWrapper>,
++ ) -> FlowyResult<Arc<Document>> {
+ let collab = self.get_collab_for_doc_id(&doc_id)?;
+ let document = Arc::new(Document::new(collab)?);
+ self.documents.write().insert(doc_id, document.clone());
+ if data.is_some() {
+ // Here use unwrap() is safe, because we have checked data.is_some() before.
- document.lock().create_with_data(data.unwrap().0).map_err(|err| FlowyError::internal().context(err))?;
++ // document
++ // .lock()
++ // .create_with_data(data.unwrap().0)
++ // .map_err(|err| FlowyError::internal().context(err))?;
+ }
+ Ok(document)
+ }
+
+ pub fn open_document(&self, doc_id: String) -> FlowyResult<Arc<Document>> {
+ if let Some(doc) = self.documents.read().get(&doc_id) {
+ return Ok(doc.clone());
+ }
+
+ let document = self.get_document(doc_id.clone(), None)?;
+ let clone_doc_id = doc_id.clone();
+ let _document_data = document
+ .lock()
+ .open(move |events, is_remote| {
+ println!("events: {:?}", events);
+ println!("is_remote: {:?}", is_remote);
+ send_notification(&clone_doc_id, DocumentNotification::DidReceiveUpdate)
- .payload(DocEventPB {
- events: events
- .iter()
- .map(|event| event.to_owned().into())
- .collect::<Vec<BlockEventPB>>(),
- is_remote: is_remote.to_owned(),
- })
- .send();
-
++ .payload(DocEventPB {
++ events: events
++ .iter()
++ .map(|event| event.to_owned().into())
++ .collect::<Vec<BlockEventPB>>(),
++ is_remote: is_remote.to_owned(),
++ })
++ .send();
+ })
+ .map_err(|err| FlowyError::internal().context(err))?;
+ Ok(document)
+ }
+
+ pub fn close_document(&self, doc_id: String) -> FlowyResult<()> {
+ self.documents.write().remove(&doc_id);
+ Ok(())
+ }
+
+ fn get_collab_for_doc_id(&self, doc_id: &str) -> Result<collab::preclude::Collab, FlowyError> {
+ let uid = self.user.user_id()?;
+ let kv_db = self.user.kv_db()?;
+ let mut collab = CollabBuilder::new(uid, doc_id).build();
+ let disk_plugin = Arc::new(
+ CollabDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
+ );
+ collab.add_plugin(disk_plugin);
+ collab.initial();
+ Ok(collab)
+ }
+}
diff --cc frontend/rust-lib/flowy-folder2/src/manager.rs
index cd4d8a6acf,0000000000..5382e6aa17
mode 100644,000000..100644
--- a/frontend/rust-lib/flowy-folder2/src/manager.rs
+++ b/frontend/rust-lib/flowy-folder2/src/manager.rs
@@@ -1,627 -1,0 +1,627 @@@
+use crate::entities::{
+ CreateViewParams, CreateWorkspaceParams, RepeatedTrashPB, RepeatedViewPB, RepeatedWorkspacePB,
+ UpdateViewParams, ViewPB,
+};
+use crate::notification::{
+ send_notification, send_workspace_notification, send_workspace_setting_notification,
+ FolderNotification,
+};
+use crate::user_default::{gen_workspace_id, DefaultFolderBuilder};
+use crate::view_ext::{
+ gen_view_id, view_from_create_view_params, ViewDataProcessor, ViewDataProcessorMap,
+};
+use collab::plugin_impl::disk::CollabDiskPlugin;
+use collab::preclude::CollabBuilder;
+use collab_folder::core::{
+ Folder as InnerFolder, FolderContext, TrashChange, TrashChangeReceiver, TrashInfo, TrashRecord,
+ View, ViewChange, ViewChangeReceiver, ViewLayout, Workspace,
+};
+use collab_persistence::CollabKV;
+use flowy_error::{FlowyError, FlowyResult};
+use lib_infra::util::timestamp;
+use parking_lot::Mutex;
+use std::collections::{HashMap, HashSet};
+use std::ops::Deref;
+use std::sync::Arc;
+use tracing::{event, Level};
+
+pub trait FolderUser: Send + Sync {
+ fn user_id(&self) -> Result<i64, FlowyError>;
+ fn token(&self) -> Result<String, FlowyError>;
+ fn kv_db(&self) -> Result<Arc<CollabKV>, FlowyError>;
+}
+
+pub struct Folder2Manager {
+ folder: Folder,
+ user: Arc<dyn FolderUser>,
+ view_processors: ViewDataProcessorMap,
+}
+
+unsafe impl Send for Folder2Manager {}
+unsafe impl Sync for Folder2Manager {}
+
+impl Folder2Manager {
+ pub async fn new(
+ user: Arc<dyn FolderUser>,
+ view_processors: ViewDataProcessorMap,
+ ) -> FlowyResult<Self> {
+ // let folder = make_user_folder(user.clone())?;
+ let folder = Folder::default();
+ let manager = Self {
+ user,
+ folder,
+ view_processors,
+ };
+
+ Ok(manager)
+ }
+
+ pub async fn get_current_workspace(&self) -> FlowyResult<Workspace> {
+ match self.with_folder(None, |folder| folder.get_current_workspace()) {
+ None => Err(FlowyError::record_not_found().context("Can not find the workspace")),
+ Some(workspace) => Ok(workspace),
+ }
+ }
+
+ pub async fn get_current_workspace_views(&self) -> FlowyResult<Vec<ViewPB>> {
+ let workspace_id = self
+ .folder
+ .lock()
+ .as_ref()
+ .map(|folder| folder.get_current_workspace_id());
+
+ if let Some(Some(workspace_id)) = workspace_id {
+ self.get_workspace_views(&workspace_id).await
+ } else {
+ Ok(vec![])
+ }
+ }
+
+ pub async fn get_workspace_views(&self, workspace_id: &str) -> FlowyResult<Vec<ViewPB>> {
+ let views = self.with_folder(vec![], |folder| {
+ get_workspace_view_pbs(workspace_id, folder)
+ });
+
+ Ok(views)
+ }
+
+ /// Called immediately after the application launched with the user sign in/sign up.
+ #[tracing::instrument(level = "trace", skip(self), err)]
+ pub async fn initialize(&self, user_id: i64) -> FlowyResult<()> {
+ if let Ok(uid) = self.user.user_id() {
+ let folder_id = FolderId::new(uid);
+ let mut collab = CollabBuilder::new(uid, folder_id).build();
+ if let Ok(kv_db) = self.user.kv_db() {
+ let disk_plugin = Arc::new(
+ CollabDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
+ );
+ collab.add_plugin(disk_plugin);
+ collab.initial();
+ }
+
+ let (view_tx, view_rx) = tokio::sync::broadcast::channel(100);
+ let (trash_tx, trash_rx) = tokio::sync::broadcast::channel(100);
+ let folder_context = FolderContext {
+ view_change_tx: Some(view_tx),
+ trash_change_tx: Some(trash_tx),
+ };
- *self.folder.lock() = Some(InnerFolder::create(collab, folder_context));
++ *self.folder.lock() = Some(InnerFolder::get_or_create(collab, folder_context));
+ listen_on_trash_change(trash_rx, self.folder.clone());
+ listen_on_view_change(view_rx, self.folder.clone());
+ }
+
+ Ok(())
+ }
+
+ pub async fn initialize_with_new_user(&self, user_id: i64, token: &str) -> FlowyResult<()> {
+ self.initialize(user_id).await?;
+ let (folder_data, workspace_pb) =
+ DefaultFolderBuilder::build(self.user.user_id()?, &self.view_processors).await;
+ self.with_folder((), |folder| {
+ folder.create_with_data(folder_data);
+ });
+
+ send_notification(token, FolderNotification::DidCreateWorkspace)
+ .payload(RepeatedWorkspacePB {
+ items: vec![workspace_pb],
+ })
+ .send();
+ Ok(())
+ }
+
+ /// Called when the current user logout
+ ///
+ pub async fn clear(&self, _user_id: i64) {
+ todo!()
+ }
+
+ pub async fn create_workspace(&self, params: CreateWorkspaceParams) -> FlowyResult<Workspace> {
+ let workspace = Workspace {
+ id: gen_workspace_id(),
+ name: params.name,
+ belongings: Default::default(),
+ created_at: timestamp(),
+ };
+
+ self.with_folder((), |folder| {
+ folder.workspaces.create_workspace(workspace.clone());
+ folder.set_current_workspace(&workspace.id);
+ });
+
+ let repeated_workspace = RepeatedWorkspacePB {
+ items: vec![workspace.clone().into()],
+ };
+ send_workspace_notification(FolderNotification::DidCreateWorkspace, repeated_workspace);
+ Ok(workspace)
+ }
+
+ pub async fn open_workspace(&self, workspace_id: &str) -> FlowyResult<Workspace> {
+ self.with_folder(Err(FlowyError::internal()), |folder| {
+ let workspace = folder
+ .workspaces
+ .get_workspace(workspace_id)
+ .ok_or_else(|| {
+ FlowyError::record_not_found().context("Can't open not existing workspace")
+ })?;
+ folder.set_current_workspace(workspace_id);
+ Ok::<Workspace, FlowyError>(workspace)
+ })
+ }
+
+ pub async fn get_workspace(&self, workspace_id: &str) -> Option<Workspace> {
+ self.with_folder(None, |folder| folder.workspaces.get_workspace(workspace_id))
+ }
+
+ fn with_folder<F, Output>(&self, default_value: Output, f: F) -> Output
+ where
+ F: FnOnce(&InnerFolder) -> Output,
+ {
+ let folder = self.folder.lock();
+ match &*folder {
+ None => default_value,
+ Some(folder) => f(folder),
+ }
+ }
+
+ pub async fn get_all_workspaces(&self) -> Vec<Workspace> {
+ self.with_folder(vec![], |folder| folder.workspaces.get_all_workspaces())
+ }
+
+ pub async fn create_view_with_params(&self, params: CreateViewParams) -> FlowyResult<View> {
+ let view_layout: ViewLayout = params.layout.clone().into();
+ let processor = self.get_data_processor(&view_layout)?;
+ let user_id = self.user.user_id()?;
+ let ext = params.ext.clone();
+ match params.initial_data.is_empty() {
+ true => {
+ tracing::trace!("Create view with build-in data");
+ processor
+ .create_view_with_build_in_data(
+ user_id,
+ &params.view_id,
+ &params.name,
+ view_layout.clone(),
+ ext,
+ )
+ .await?;
+ },
+ false => {
+ tracing::trace!("Create view with view data");
+ processor
+ .create_view_with_custom_data(
+ user_id,
+ &params.view_id,
+ &params.name,
+ params.initial_data.clone(),
+ view_layout.clone(),
+ ext,
+ )
+ .await?;
+ },
+ }
+ let view = view_from_create_view_params(params, view_layout);
+ self.with_folder((), |folder| {
+ folder.insert_view(view.clone());
+ });
+
+ notify_parent_view_did_change(self.folder.clone(), vec![view.bid.clone()]);
+ Ok(view)
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub(crate) async fn close_view(&self, view_id: &str) -> Result<(), FlowyError> {
+ let view = self
+ .with_folder(None, |folder| folder.views.get_view(view_id))
+ .ok_or_else(|| {
+ FlowyError::record_not_found().context("Can't find the view when closing the view")
+ })?;
+ let processor = self.get_data_processor(&view.layout)?;
+ processor.close_view(view_id).await?;
+ Ok(())
+ }
+
+ pub async fn create_view_data(
+ &self,
+ view_id: &str,
+ name: &str,
+ view_layout: ViewLayout,
+ data: Vec<u8>,
+ ) -> FlowyResult<()> {
+ let user_id = self.user.user_id()?;
+ let processor = self.get_data_processor(&view_layout)?;
+ processor
+ .create_view_with_custom_data(
+ user_id,
+ view_id,
+ name,
+ data,
+ view_layout,
+ HashMap::default(),
+ )
+ .await?;
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "debug", skip(self, view_id), err)]
+ pub async fn get_view(&self, view_id: &str) -> FlowyResult<ViewPB> {
+ let view_id = view_id.to_string();
+ let folder = self.folder.lock();
+ let folder = folder.as_ref().ok_or_else(folder_not_init_error)?;
+ let trash_ids = folder
+ .trash
+ .get_all_trash()
+ .into_iter()
+ .map(|trash| trash.id)
+ .collect::<Vec<String>>();
+
+ if trash_ids.contains(&view_id) {
+ return Err(FlowyError::record_not_found());
+ }
+
+ match folder.views.get_view(&view_id) {
+ None => Err(FlowyError::record_not_found()),
+ Some(mut view) => {
+ view.belongings.retain(|b| !trash_ids.contains(&b.id));
+ let mut view_pb: ViewPB = view.into();
+ view_pb.belongings = folder
+ .views
+ .get_views_belong_to(&view_pb.id)
+ .into_iter()
+ .filter(|view| !trash_ids.contains(&view.id))
+ .map(|view| view.into())
+ .collect::<Vec<ViewPB>>();
+ Ok(view_pb)
+ },
+ }
+ }
+
+ #[tracing::instrument(level = "debug", skip(self, view_id), err)]
+ pub async fn delete_view(&self, view_id: &str) -> FlowyResult<()> {
+ self.with_folder((), |folder| folder.views.delete_views(vec![view_id]));
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn move_view_to_trash(&self, view_id: &str) -> FlowyResult<()> {
+ self.with_folder((), |folder| {
+ folder.trash.add_trash(vec![TrashRecord {
+ id: view_id.to_string(),
+ created_at: timestamp(),
+ }]);
+
+ if let Some(view) = folder.get_current_view() {
+ if view == view_id {
+ folder.set_current_view("");
+ }
+ }
+ });
+
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn move_view(&self, view_id: &str, from: usize, to: usize) -> FlowyResult<()> {
+ let view = self.with_folder(None, |folder| {
+ folder.move_view(view_id, from as u32, to as u32)
+ });
+
+ match view {
+ None => tracing::error!("Couldn't find the view. It should not be empty"),
+ Some(view) => {
+ notify_parent_view_did_change(self.folder.clone(), vec![view.bid]);
+ },
+ }
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "debug", skip(self, bid), err)]
+ pub async fn get_views_belong_to(&self, bid: &str) -> FlowyResult<Vec<View>> {
+ let views = self.with_folder(vec![], |folder| folder.views.get_views_belong_to(bid));
+ Ok(views)
+ }
+
+ #[tracing::instrument(level = "trace", skip(self), err)]
+ pub async fn update_view_with_params(&self, params: UpdateViewParams) -> FlowyResult<View> {
+ let view = self
+ .folder
+ .lock()
+ .as_ref()
+ .ok_or_else(folder_not_init_error)?
+ .views
+ .update_view(&params.view_id, |update| {
+ update
+ .set_name_if_not_none(params.name)
+ .set_desc_if_not_none(params.desc)
+ .done()
+ });
+
+ match view {
+ None => Err(FlowyError::record_not_found()),
+ Some(view) => {
+ let view_pb: ViewPB = view.clone().into();
+ send_notification(&view.id, FolderNotification::DidUpdateView)
+ .payload(view_pb)
+ .send();
+
+ notify_parent_view_did_change(self.folder.clone(), vec![view.bid.clone()]);
+ Ok(view)
+ },
+ }
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub(crate) async fn duplicate_view(&self, view_id: &str) -> Result<(), FlowyError> {
+ let view = self
+ .with_folder(None, |folder| folder.views.get_view(view_id))
+ .ok_or_else(|| FlowyError::record_not_found().context("Can't duplicate the view"))?;
+
+ let processor = self.get_data_processor(&view.layout)?;
+ let view_data = processor.get_view_data(&view.id).await?;
+ let mut ext = HashMap::new();
+ if let Some(database_id) = view.database_id {
+ ext.insert("database_id".to_string(), database_id);
+ }
+ let duplicate_params = CreateViewParams {
+ belong_to_id: view.bid.clone(),
+ name: format!("{} (copy)", &view.name),
+ desc: view.desc,
+ layout: view.layout.into(),
+ initial_data: view_data.to_vec(),
+ view_id: gen_view_id(),
+ ext,
+ };
+
+ let _ = self.create_view_with_params(duplicate_params).await?;
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "trace", skip(self), err)]
+ pub(crate) async fn set_current_view(&self, view_id: &str) -> Result<(), FlowyError> {
+ let folder = self.folder.lock();
+ let folder = folder.as_ref().ok_or_else(folder_not_init_error)?;
+ folder.set_current_view(view_id);
+
+ let workspace = folder.get_current_workspace();
+ let view = folder
+ .get_current_view()
+ .and_then(|view_id| folder.views.get_view(&view_id));
+ send_workspace_setting_notification(workspace, view);
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn get_current_view(&self) -> Option<ViewPB> {
+ let view_id = self.with_folder(None, |folder| folder.get_current_view())?;
+ self.get_view(&view_id).await.ok()
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn get_all_trash(&self) -> Vec<TrashInfo> {
+ self.with_folder(vec![], |folder| folder.trash.get_all_trash())
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn restore_all_trash(&self) {
+ self.with_folder((), |folder| {
+ folder.trash.clear();
+ });
+
+ send_notification("trash", FolderNotification::DidUpdateTrash)
+ .payload(RepeatedTrashPB { items: vec![] })
+ .send();
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn restore_trash(&self, trash_id: &str) {
+ self.with_folder((), |folder| {
+ folder.trash.delete_trash(vec![trash_id]);
+ });
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn delete_trash(&self, trash_id: &str) {
+ self.with_folder((), |folder| {
+ folder.trash.delete_trash(vec![trash_id]);
+ folder.views.delete_views(vec![trash_id]);
+ })
+ }
+
+ #[tracing::instrument(level = "trace", skip(self))]
+ pub(crate) async fn delete_all_trash(&self) {
+ self.with_folder((), |folder| {
+ let trash = folder.trash.get_all_trash();
+ folder.trash.clear();
+ folder.views.delete_views(trash);
+ });
+
+ send_notification("trash", FolderNotification::DidUpdateTrash)
+ .payload(RepeatedTrashPB { items: vec![] })
+ .send();
+ }
+
+ fn get_data_processor(
+ &self,
+ view_layout: &ViewLayout,
+ ) -> FlowyResult<Arc<dyn ViewDataProcessor + Send + Sync>> {
+ match self.view_processors.get(view_layout) {
+ None => Err(FlowyError::internal().context(format!(
+ "Get data processor failed. Unknown layout type: {:?}",
+ view_layout
+ ))),
+ Some(processor) => Ok(processor.clone()),
+ }
+ }
+}
+
+/// Listen on the [ViewChange] after create/delete/update events happened
+fn listen_on_view_change(mut rx: ViewChangeReceiver, folder: Folder) {
+ tokio::spawn(async move {
+ while let Ok(value) = rx.recv().await {
+ match value {
+ ViewChange::DidCreateView { view } => {
+ notify_parent_view_did_change(folder.clone(), vec![view.bid]);
+ },
+ ViewChange::DidDeleteView { views: _ } => {},
+ ViewChange::DidUpdate { view } => {
+ notify_parent_view_did_change(folder.clone(), vec![view.bid]);
+ },
+ };
+ }
+ });
+}
+
+/// Listen on the [TrashChange]s and notify the frontend some views were changed.
+fn listen_on_trash_change(mut rx: TrashChangeReceiver, folder: Folder) {
+ tokio::spawn(async move {
+ while let Ok(value) = rx.recv().await {
+ let mut unique_ids = HashSet::new();
+ tracing::trace!("Did receive trash change: {:?}", value);
+ let ids = match value {
+ TrashChange::DidCreateTrash { ids } => ids,
+ TrashChange::DidDeleteTrash { ids } => ids,
+ };
+
+ if let Some(folder) = folder.lock().as_ref() {
+ let views = folder.views.get_views(&ids);
+ for view in views {
+ unique_ids.insert(view.bid);
+ }
+
+ let repeated_trash: RepeatedTrashPB = folder.trash.get_all_trash().into();
+ send_notification("trash", FolderNotification::DidUpdateTrash)
+ .payload(repeated_trash)
+ .send();
+ }
+
+ let parent_view_ids = unique_ids.into_iter().collect();
+ notify_parent_view_did_change(folder.clone(), parent_view_ids);
+ }
+ });
+}
+
+fn get_workspace_view_pbs(workspace_id: &str, folder: &InnerFolder) -> Vec<ViewPB> {
+ let trash_ids = folder
+ .trash
+ .get_all_trash()
+ .into_iter()
+ .map(|trash| trash.id)
+ .collect::<Vec<String>>();
+
+ let mut views = folder.get_workspace_views(workspace_id);
+ views.retain(|view| !trash_ids.contains(&view.id));
+
+ views
+ .into_iter()
+ .map(|view| {
+ let mut parent_view: ViewPB = view.into();
+
+ // Get child views
+ parent_view.belongings = folder
+ .views
+ .get_views_belong_to(&parent_view.id)
+ .into_iter()
+ .map(|view| view.into())
+ .collect();
+ parent_view
+ })
+ .collect()
+}
+
+#[tracing::instrument(level = "debug", skip(folder, parent_view_ids))]
+fn notify_parent_view_did_change<T: AsRef<str>>(
+ folder: Folder,
+ parent_view_ids: Vec<T>,
+) -> Option<()> {
+ let folder = folder.lock();
+ let folder = folder.as_ref()?;
+ let workspace_id = folder.get_current_workspace_id()?;
+ let trash_ids = folder
+ .trash
+ .get_all_trash()
+ .into_iter()
+ .map(|trash| trash.id)
+ .collect::<Vec<String>>();
+
+ for parent_view_id in parent_view_ids {
+ let parent_view_id = parent_view_id.as_ref();
+
+ // if the view's bid is equal to workspace id. Then it will fetch the current
+ // workspace views. Because the the workspace is not a view stored in the views map.
+ if parent_view_id == workspace_id {
+ let repeated_view: RepeatedViewPB = get_workspace_view_pbs(&workspace_id, folder).into();
+ send_notification(&workspace_id, FolderNotification::DidUpdateWorkspaceViews)
+ .payload(repeated_view)
+ .send();
+ } else {
+ // Parent view can contain a list of child views. Currently, only get the first level
+ // child views.
+ let parent_view = folder.views.get_view(parent_view_id)?;
+ let mut child_views = folder.views.get_views_belong_to(parent_view_id);
+ child_views.retain(|view| !trash_ids.contains(&view.id));
+ event!(Level::DEBUG, child_views_count = child_views.len());
+
+ // Post the notification
+ let mut parent_view_pb: ViewPB = parent_view.into();
+ parent_view_pb.belongings = child_views
+ .into_iter()
+ .map(|child_view| child_view.into())
+ .collect::<Vec<ViewPB>>();
+ send_notification(parent_view_id, FolderNotification::DidUpdateChildViews)
+ .payload(parent_view_pb)
+ .send();
+ }
+ }
+
+ None
+}
+
+fn folder_not_init_error() -> FlowyError {
+ FlowyError::internal().context("Folder not initialized")
+}
+
+#[derive(Clone)]
+pub struct FolderId(String);
+impl FolderId {
+ pub fn new(uid: i64) -> Self {
+ Self(format!("{}:folder", uid))
+ }
+}
+
+impl AsRef<str> for FolderId {
+ fn as_ref(&self) -> &str {
+ &self.0
+ }
+}
+#[derive(Clone, Default)]
+pub struct Folder(Arc<Mutex<Option<InnerFolder>>>);
+
+impl Deref for Folder {
+ type Target = Arc<Mutex<Option<InnerFolder>>>;
+ fn deref(&self) -> &Self::Target {
+ &self.0
+ }
+}
+
+unsafe impl Sync for Folder {}
+
+unsafe impl Send for Folder {}
diff --cc frontend/scripts/makefile/tests.toml
index 30831ec2b6,1ab206ea8a..d82b04d0a0
--- a/frontend/scripts/makefile/tests.toml
+++ b/frontend/scripts/makefile/tests.toml
@@@ -1,16 -1,7 +1,16 @@@
+#RUST_LOG="debug" flutter test -j, --concurrency=1 'path to the file' --name 'test case name'
+[tasks.flutter_test]
+description = "Run flutter test with single case in single file. Input: cargo make flutter_test 'path to the file' --name 'test case name'"
+script = '''
+cd appflowy_flutter
+RUST_LOG="debug" flutter test -j, --concurrency=1 "${@}"
+'''
+script_runner = "@shell"
+
[tasks.dart_unit_test]
script = '''
- cargo make --profile test-macos run_dart_unit_test
+ cargo make --profile test-macos-$(uname -m) run_dart_unit_test
'''
script_runner = "@shell"