Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
refactor: folder with yrs
Nathan.foooe1c8135f5d49
diff --git a/frontend/appflowy_flutter/lib/core/folder_notification.dart b/frontend/appflowy_flutter/lib/core/folder_notification.dartindex 4d147da88e..571561bbaa 100644--- a/frontend/appflowy_flutter/lib/core/folder_notification.dart+++ b/frontend/appflowy_flutter/lib/core/folder_notification.dart@@ -3,7 +3,7 @@ import 'dart:typed_data';import 'package:appflowy_backend/protobuf/flowy-notification/protobuf.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';import 'package:appflowy_backend/rust_stream.dart';import 'notification_helper.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dartindex 6cdbc964e4..dfff5279a2 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart@@ -9,7 +9,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/group_changeset.pb.dartimport 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:collection/collection.dart';import 'dart:async';import 'package:dartz/dartz.dart';diff --git 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.dartindex 5ecaad6ef3..44896c0883 100644--- 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@@ -5,7 +5,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.darimport 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dartindex 61911b5318..d91cd68558 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart@@ -6,7 +6,7 @@ import 'package:dartz/dartz.dart';import 'package:equatable/equatable.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dartindex fe1702873a..c6d2922cb2 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dart@@ -3,7 +3,7 @@ import 'package:appflowy/plugins/util.dart';import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dartindex 24c30a0cd3..095ffab019 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart@@ -7,7 +7,7 @@ import 'package:appflowy/plugins/database_view/application/field/field_controlleimport 'package:appflowy/plugins/database_view/application/row/row_cache.dart';import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';import 'package:appflowy/plugins/database_view/widgets/row/row_detail.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';import 'package:appflowy_board/appflowy_board.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dartindex f0cfb43b48..147e7531cc 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart@@ -3,7 +3,7 @@ import 'package:appflowy/plugins/database_view/application/field/field_controlleimport 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:calendar_view/calendar_view.dart';import 'package:dartz/dartz.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dartindex 1ddfb7a64f..9e29fc8d06 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dart@@ -3,7 +3,7 @@ import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';import '../../util.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dartindex 988654a8ec..943af77ce4 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database_view/calendar/application/calendar_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:calendar_view/calendar_view.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dartindex 7d73ab9b4a..01082746e3 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart@@ -4,7 +4,7 @@ import 'package:appflowy/plugins/database_view/application/row/row_service.dart'import 'package:dartz/dartz.dart';import 'package:equatable/equatable.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dartindex ba4bc2f628..213e74ebe2 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dart@@ -4,7 +4,7 @@ import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';import 'presentation/grid_page.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dartindex 2b8f9a060c..2971542529 100755--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart@@ -8,7 +8,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/style_widget/text.dart';import 'package:flowy_infra_ui/widget/error_page.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:flutter/material.dart';import 'package:linked_scroll_controller/linked_scroll_controller.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dartindex ae47a120ca..b1eae868d7 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart@@ -8,9 +8,8 @@ import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pbserver.dart';import 'package:appflowy_editor/appflowy_editor.dart'show EditorState, Document, Transaction, Node;-import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/log.dart';import 'package:flutter/foundation.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -49,8 +48,7 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {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);diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart b/frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dartindex 6597dfc3f1..88f4ead686 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart@@ -1,7 +1,7 @@import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dartindex ddb4fe915d..abd53da58c 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dart@@ -5,7 +5,7 @@ import 'package:appflowy/plugins/document/presentation/plugins/parsers/divider_nimport 'package:appflowy/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart';import 'package:appflowy/plugins/document/presentation/plugins/parsers/code_block_node_parser.dart';import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/share_service.dart b/frontend/appflowy_flutter/lib/plugins/document/application/share_service.dartindex cf07dc0054..b2939244b5 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/share_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/share_service.dart@@ -3,7 +3,7 @@ import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-document/protobuf.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';class ShareService {Future<Either<ExportDataPB, FlowyError>> export(diff --git a/frontend/appflowy_flutter/lib/plugins/document/document.dart b/frontend/appflowy_flutter/lib/plugins/document/document.dartindex 30a9aa688d..1a61742870 100644--- a/frontend/appflowy_flutter/lib/plugins/document/document.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/document.dart@@ -10,7 +10,7 @@ import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart b/frontend/appflowy_flutter/lib/plugins/document/document_page.dartindex 8c87000722..b2c44f41f2 100644--- a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart@@ -1,5 +1,5 @@import 'package:appflowy/plugins/document/presentation/plugins/board/board_view_menu_item.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy/plugins/document/presentation/plugins/board/board_node_widget.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dartindex 0df834c355..a80be87b9d 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart@@ -3,7 +3,7 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:dartz/dartz.dart' as dartz;import 'package:flowy_infra_ui/style_widget/text.dart';@@ -59,7 +59,7 @@ class _BuiltInPageWidgetState extends State<BuiltInPageWidget> {child: CircularProgressIndicator(),);},- future: AppBackendService().getView(appID, gridID),+ future: AppBackendService().getChildView(appID, gridID),);}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dartindex 8d4afd917e..cb286d69ae 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dart@@ -1,14 +1,13 @@import 'package:appflowy/plugins/document/presentation/plugins/board/board_node_widget.dart';import 'package:appflowy/plugins/document/presentation/plugins/grid/grid_node_widget.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-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';const String kAppID = 'app_id';const String kViewID = 'view_id';extension InsertPage on EditorState {- void insertPage(AppPB appPB, ViewPB viewPB) {+ void insertPage(ViewPB appPB, ViewPB viewPB) {final selection = service.selectionService.currentSelection.value;final textNodes =service.selectionService.currentSelectedNodes.whereType<TextNode>();diff --git 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.dartindex 46c8298b49..4a5c879fbf 100644--- 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@@ -1,6 +1,5 @@import 'package:appflowy/workspace/application/app/app_service.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-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:dartz/dartz.dart' as dartz;import 'package:flowy_infra/image.dart';@@ -50,8 +49,8 @@ void showLinkToPageMenu(editorState: editorState,layoutType: pageType,hintText: hintText,- onSelected: (appPB, viewPB) {- editorState.insertPage(appPB, viewPB);+ onSelected: (viewPB, childViewPB) {+ editorState.insertPage(viewPB, childViewPB);},),),@@ -85,7 +84,7 @@ class LinkToPageMenu extends StatefulWidget {final EditorState editorState;final ViewLayoutTypePB layoutType;final String hintText;- final void Function(AppPB appPB, ViewPB viewPB) onSelected;+ final void Function(ViewPB view, ViewPB childView) onSelected;@overrideState<LinkToPageMenu> createState() => _LinkToPageMenuState();@@ -118,11 +117,11 @@ class _LinkToPageMenuState extends State<LinkToPageMenu> {}Widget _buildListWidget(BuildContext context) {- return FutureBuilder<List<dartz.Tuple2<AppPB, List<ViewPB>>>>(+ return FutureBuilder<List<dartz.Tuple2<ViewPB, List<ViewPB>>>>(builder: (context, snapshot) {if (snapshot.hasData &&snapshot.connectionState == ConnectionState.done) {- final apps = snapshot.data;+ final views = snapshot.data;final children = <Widget>[Padding(padding: const EdgeInsets.symmetric(vertical: 4),@@ -133,18 +132,18 @@ class _LinkToPageMenuState extends State<LinkToPageMenu> {),),];- if (apps != null && apps.isNotEmpty) {- for (final app in apps) {- if (app.value2.isNotEmpty) {+ if (views != null && views.isNotEmpty) {+ for (final view in views) {+ if (view.value2.isNotEmpty) {children.add(Padding(padding: const EdgeInsets.symmetric(vertical: 4),child: FlowyText.regular(- app.value1.name,+ view.value1.name,),),);- for (final value in app.value2) {+ for (final value in view.value2) {children.add(FlowyButton(leftIcon: svgWidget(@@ -152,7 +151,7 @@ class _LinkToPageMenuState extends State<LinkToPageMenu> {color: Theme.of(context).iconTheme.color,),text: FlowyText.regular(value.name),- onTap: () => widget.onSelected(app.value1, value),+ onTap: () => widget.onSelected(view.value1, value),),);}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dartindex c81d394f7d..90bd0d68ec 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_view_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_view_menu_item.dartindex b25fe52679..40f3c9ce86 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_view_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_view_menu_item.dart@@ -1,4 +1,4 @@-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/application/prelude.dart';@@ -42,15 +42,14 @@ SelectionMenuItem boardViewMenuItem(DocumentBloc documentBloc) =>return;}- final app =- (await service.readApp(appId: result.appId)).getLeftOrNull();+ final app = (await service.getView(result.viewId)).getLeftOrNull();// We should show an error dialog.if (app == null) {return;}- final view =- (await service.getView(result.appId, result.id)).getLeftOrNull();+ final view = (await service.getChildView(result.viewId, result.id))+ .getLeftOrNull();// As this.if (view == null) {return;diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dartindex b79162027b..aaf976274e 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_view_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_view_menu_item.dartindex 2dc030d547..a3fa5fd8af 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_view_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_view_menu_item.dart@@ -2,7 +2,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/application/doc_bloc.dart';import 'package:appflowy/plugins/document/presentation/plugins/base/insert_page_command.dart';import 'package:appflowy/workspace/application/app/app_service.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -41,15 +41,14 @@ SelectionMenuItem gridViewMenuItem(DocumentBloc documentBloc) =>return;}- final app =- (await service.readApp(appId: result.appId)).getLeftOrNull();+ final app = (await service.getView(result.viewId)).getLeftOrNull();// We should show an error dialog.if (app == null) {return;}- final view =- (await service.getView(result.appId, result.id)).getLeftOrNull();+ final view = (await service.getChildView(result.viewId, result.id))+ .getLeftOrNull();// As this.if (view == null) {return;diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dartindex 84e9b179cb..ffdd9a5f23 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dart@@ -13,7 +13,7 @@ import 'package:file_picker/file_picker.dart';import 'package:flowy_infra_ui/widget/rounded_button.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dartindex 2a744817e4..f653fbfe11 100644--- a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart@@ -1,6 +1,6 @@import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/trash.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -31,8 +31,7 @@ class TrashBloc extends Bloc<TrashEvent, TrashState> {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();diff --git a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dartindex 5df20b27e9..bca3bd3f74 100644--- a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dart@@ -3,9 +3,9 @@ import 'dart:typed_data';import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/trash.pb.dart';import 'package:appflowy_backend/rust_stream.dart';typedef TrashUpdatedCallback = void Function(@@ -19,7 +19,10 @@ class TrashListener {void start({TrashUpdatedCallback? trashUpdated}) {_trashUpdated = trashUpdated;- _parser = FolderNotificationParser(callback: _observableCallback);+ _parser = FolderNotificationParser(+ id: "trash",+ callback: _observableCallback,+ );_subscription =RustStreamReceiver.listen((observable) => _parser?.parse(observable));}diff --git a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dartindex 5b2e350435..29fb9f13c1 100644--- a/frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dart@@ -2,7 +2,7 @@ import 'dart:async';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/trash.pb.dart';class TrashService {Future<Either<RepeatedTrashPB, FlowyError>> readTrash() {@@ -15,12 +15,9 @@ class TrashService {return FolderEventPutbackTrash(id).send();}- Future<Either<Unit, FlowyError>> deleteViews(- List<Tuple2<String, TrashType>> trashList) {- final items = trashList.map((trash) {- return TrashIdPB.create()- ..id = trash.value1- ..ty = trash.value2;+ Future<Either<Unit, FlowyError>> deleteViews(List<String> trash) {+ final items = trash.map((trash) {+ return TrashIdPB.create()..id = trash;});final ids = RepeatedTrashIdPB(items: items);diff --git a/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dartindex a46cca2a3b..01f33edbfd 100644--- a/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart@@ -2,7 +2,7 @@ import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/trash.pb.dart';import 'package:flutter/material.dart';import 'package:intl/intl.dart';import 'package:fixnum/fixnum.dart' as $fixnum;diff --git a/frontend/appflowy_flutter/lib/plugins/util.dart b/frontend/appflowy_flutter/lib/plugins/util.dartindex f689511c44..f128b3ad99 100644--- a/frontend/appflowy_flutter/lib/plugins/util.dart+++ b/frontend/appflowy_flutter/lib/plugins/util.dart@@ -2,7 +2,7 @@ import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/application/view/view_listener.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';class ViewPluginNotifier extends PluginNotifier<Option<DeletedViewPB>> {diff --git a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart b/frontend/appflowy_flutter/lib/startup/deps_resolver.dartindex b8e219125e..8e0f4cbbc0 100644--- a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart+++ b/frontend/appflowy_flutter/lib/startup/deps_resolver.dart@@ -8,7 +8,6 @@ import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy/util/file_picker/file_picker_impl.dart';import 'package:appflowy/util/file_picker/file_picker_service.dart';-import 'package:appflowy/workspace/application/app/prelude.dart';import 'package:appflowy/plugins/document/application/prelude.dart';import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';import 'package:appflowy/workspace/application/user/prelude.dart';@@ -22,8 +21,7 @@ import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/plugins/trash/application/prelude.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/home/menu/menu.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-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:get_it/get_it.dart';@@ -122,11 +120,6 @@ void _resolveFolderDeps(GetIt getIt) {(user, _) => SettingsUserViewBloc(user),);- // AppPB- getIt.registerFactoryParam<AppBloc, AppPB, void>(- (app, _) => AppBloc(app: app),- );-// trashgetIt.registerLazySingleton<TrashService>(() => TrashService());getIt.registerLazySingleton<TrashListener>(() => TrashListener());diff --git a/frontend/appflowy_flutter/lib/startup/plugin/plugin.dart b/frontend/appflowy_flutter/lib/startup/plugin/plugin.dartindex 2a50dda5e0..87b0ef7c4b 100644--- a/frontend/appflowy_flutter/lib/startup/plugin/plugin.dart+++ b/frontend/appflowy_flutter/lib/startup/plugin/plugin.dart@@ -3,7 +3,7 @@ library flowy_plugin;import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/widgets.dart';export "./src/sandbox.dart";diff --git a/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dartindex 9507e9fd0c..994e018f21 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart@@ -36,10 +36,10 @@ Future<Directory> appFlowyDocumentDirectory() async {switch (integrationEnv()) {case IntegrationMode.develop:Directory documentsDir = await getApplicationDocumentsDirectory();- return Directory(path.join(documentsDir.path, 'flowy_dev')).create();+ return Directory(path.join(documentsDir.path, 'data_dev')).create();case IntegrationMode.release:Directory documentsDir = await getApplicationDocumentsDirectory();- return Directory(path.join(documentsDir.path, 'flowy')).create();+ return Directory(path.join(documentsDir.path, 'data')).create();case IntegrationMode.test:return Directory(path.join(Directory.current.path, '.sandbox'));}diff --git a/frontend/appflowy_flutter/lib/user/application/user_listener.dart b/frontend/appflowy_flutter/lib/user/application/user_listener.dartindex 8dc182a48b..b9bda5e042 100644--- a/frontend/appflowy_flutter/lib/user/application/user_listener.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_listener.dart@@ -2,12 +2,12 @@ import 'dart:async';import 'package:appflowy/core/folder_notification.dart';import 'package:appflowy/core/user_notification.dart';import 'package:dartz/dartz.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'dart:typed_data';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-notification/protobuf.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/notification.pb.dart'as user;@@ -119,13 +119,6 @@ class UserWorkspaceListener {) {switch (ty) {case FolderNotification.DidCreateWorkspace:- case FolderNotification.DidDeleteWorkspace:- result.fold(- (payload) => _workspacesChangedNotifier?.value =- left(RepeatedWorkspacePB.fromBuffer(payload).items),- (error) => _workspacesChangedNotifier?.value = right(error),- );- break;case FolderNotification.DidUpdateWorkspaceSetting:result.fold((payload) => _settingChangedNotifier?.value =diff --git a/frontend/appflowy_flutter/lib/user/application/user_service.dart b/frontend/appflowy_flutter/lib/user/application/user_service.dartindex 295c1c4f01..7edf49a4ee 100644--- a/frontend/appflowy_flutter/lib/user/application/user_service.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_service.dart@@ -3,15 +3,16 @@ import 'dart:async';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';+import 'package:fixnum/fixnum.dart';class UserBackendService {UserBackendService({required this.userId,});- final String userId;+ final Int64 userId;static Future<Either<UserProfilePB, FlowyError>> getCurrentUserProfile() {return UserEventGetUserProfile().send();diff --git a/frontend/appflowy_flutter/lib/user/presentation/router.dart b/frontend/appflowy_flutter/lib/user/presentation/router.dartindex 665b261b66..8e08a0ce11 100644--- a/frontend/appflowy_flutter/lib/user/presentation/router.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/router.dart@@ -10,7 +10,7 @@ import 'package:flowy_infra/time/duration.dart';import 'package:flowy_infra_ui/widget/route/animation.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';import 'package:flutter/material.dart';class AuthRouter {diff --git a/frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dartindex 84f9fa441f..3aefed7c6c 100644--- a/frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dart@@ -6,7 +6,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flutter/material.dart';import 'package:url_launcher/url_launcher.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dartindex 5e21d4c69d..78c23b2521 100644--- a/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dart@@ -5,7 +5,7 @@ import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/widget/error_page.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dartindex df9d203974..6132d3870d 100644--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart@@ -7,8 +7,7 @@ import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:expandable/expandable.dart';import 'package:appflowy_backend/log.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-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -21,10 +20,10 @@ class AppBloc extends Bloc<AppEvent, AppState> {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();@@ -41,10 +40,10 @@ class AppBloc extends Bloc<AppEvent, AppState> {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 =@@ -70,7 +69,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {Future<void> _renameView(Rename e, Emitter<AppState> emit) async {final result =- await appService.updateApp(appId: state.app.id, name: e.newName);+ await appService.updateApp(appId: state.view.id, name: e.newName);result.fold((l) => emit(state.copyWith(successOrFailure: left(unit))),(error) => emit(state.copyWith(successOrFailure: right(error))),@@ -79,7 +78,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {// Delete the current appFuture<void> _deleteApp(Emitter<AppState> emit) async {- final result = await appService.delete(appId: state.app.id);+ final result = await appService.delete(viewId: state.view.id);result.fold((unit) => emit(state.copyWith(successOrFailure: left(unit))),(error) => emit(state.copyWith(successOrFailure: right(error))),@@ -96,7 +95,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {Future<void> _createView(CreateView value, Emitter<AppState> emit) async {final result = await appService.createView(- appId: state.app.id,+ appId: state.view.id,name: value.name,desc: value.desc ?? "",layoutType: value.pluginBuilder.layoutType!,@@ -122,7 +121,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {}Future<void> _loadViews(Emitter<AppState> emit) async {- final viewsOrFailed = await appService.getViews(appId: state.app.id);+ final viewsOrFailed = await appService.getViews(viewId: state.view.id);viewsOrFailed.fold((views) => emit(state.copyWith(views: views)),(error) {@@ -150,34 +149,34 @@ class AppEvent with _$AppEvent {const factory AppEvent.delete() = DeleteApp;const factory AppEvent.deleteView(String viewId) = DeleteView;const factory AppEvent.rename(String newName) = Rename;- const factory AppEvent.appDidUpdate(AppPB app) = AppDidUpdate;+ const factory AppEvent.appDidUpdate(ViewPB app) = AppDidUpdate;}@freezedclass AppState with _$AppState {const factory AppState({- required AppPB app,+ required ViewPB view,required List<ViewPB> views,ViewPB? latestCreatedView,required Either<Unit, FlowyError> successOrFailure,}) = _AppState;- factory AppState.initial(AppPB app) => AppState(- app: app,- views: app.belongings.items,+ factory AppState.initial(ViewPB view) => AppState(+ view: view,+ views: view.belongings,successOrFailure: left(unit),);}class AppViewDataContext extends ChangeNotifier {- final String appId;+ final String viewId;final ValueNotifier<List<ViewPB>> _viewsNotifier = ValueNotifier([]);final ValueNotifier<ViewPB?> _selectedViewNotifier = ValueNotifier(null);VoidCallback? _menuSharedStateListener;ExpandableController expandController =ExpandableController(initialExpanded: false);- AppViewDataContext({required this.appId}) {+ AppViewDataContext({required this.viewId}) {_setLatestView(getIt<MenuSharedState>().latestOpenView);_menuSharedStateListener =getIt<MenuSharedState>().addLatestViewListener((view) {diff --git a/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dartindex 1186068c75..af3875b1ec 100644--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart@@ -5,12 +5,11 @@ 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);@@ -18,15 +17,15 @@ class AppListener {StreamSubscription<SubscribeObject>? _subscription;AppDidUpdateCallback? _updated;FolderNotificationParser? _parser;- String appId;+ String viewId;AppListener({- required this.appId,+ required this.viewId,});void start({AppDidUpdateCallback? onAppUpdated}) {_updated = onAppUpdated;- _parser = FolderNotificationParser(id: appId, callback: _handleCallback);+ _parser = FolderNotificationParser(id: viewId, callback: _handleCallback);_subscription =RustStreamReceiver.listen((observable) => _parser?.parse(observable));}@@ -34,11 +33,12 @@ class AppListener {void _handleCallback(FolderNotification ty, Either<Uint8List, FlowyError> result) {switch (ty) {- case FolderNotification.DidUpdateApp:+ case FolderNotification.DidUpdateView:+ case FolderNotification.DidUpdateChildViews:if (_updated != null) {result.fold((payload) {- final app = AppPB.fromBuffer(payload);+ final app = ViewPB.fromBuffer(payload);_updated!(app);},(error) => Log.error(error),diff --git a/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dartindex c54d2ad602..110c906afb 100644--- a/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart@@ -1,20 +1,13 @@import 'dart:async';import 'dart:convert';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.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-folder2/view.pb.dart';class AppBackendService {- Future<Either<AppPB, FlowyError>> readApp({required String appId}) {- final payload = AppIdPB.create()..value = appId;-- return FolderEventReadApp(payload).send();- }-Future<Either<ViewPB, FlowyError>> createView({required String appId,required String name,@@ -51,20 +44,20 @@ class AppBackendService {return FolderEventCreateView(payload).send();}- Future<Either<List<ViewPB>, FlowyError>> getViews({required String appId}) {- final payload = AppIdPB.create()..value = appId;+ Future<Either<List<ViewPB>, FlowyError>> getViews({required String viewId}) {+ final payload = ViewIdPB.create()..value = viewId;- return FolderEventReadApp(payload).send().then((result) {+ return FolderEventReadView(payload).send().then((result) {return result.fold(- (app) => left(app.belongings.items),+ (app) => left(app.belongings),(error) => right(error),);});}- Future<Either<Unit, FlowyError>> delete({required String appId}) {- final request = AppIdPB.create()..value = appId;- return FolderEventDeleteApp(request).send();+ Future<Either<Unit, FlowyError>> delete({required String viewId}) {+ final request = RepeatedViewIdPB.create()..items.add(viewId);+ return FolderEventDeleteView(request).send();}Future<Either<Unit, FlowyError>> deleteView({required String viewId}) {@@ -72,14 +65,14 @@ class AppBackendService {return FolderEventDeleteView(request).send();}- 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;}- return FolderEventUpdateApp(payload).send();+ return FolderEventUpdateView(payload).send();}Future<Either<Unit, FlowyError>> moveView({@@ -96,22 +89,22 @@ class AppBackendService {return FolderEventMoveItem(payload).send();}- Future<List<Tuple2<AppPB, List<ViewPB>>>> fetchViews(+ Future<List<Tuple2<ViewPB, List<ViewPB>>>> fetchViews(ViewLayoutTypePB 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) {- final apps = workspaces.workspace.apps.items;- for (var app in apps) {- final views = await getViews(appId: app.id).then(+ final views = workspaces.workspace.views;+ for (var view in views) {+ final childViews = await getViews(viewId: view.id).then((value) => value.getLeftOrNull<List<ViewPB>>()?.where((e) => e.layout == layoutType).toList(),);- if (views != null && views.isNotEmpty) {- result.add(Tuple2(app, views));+ if (childViews != null && childViews.isNotEmpty) {+ result.add(Tuple2(view, childViews));}}}@@ -120,14 +113,21 @@ class AppBackendService {}Future<Either<ViewPB, FlowyError>> getView(- String appID,String viewID,) async {- final payload = AppIdPB.create()..value = appID;- return FolderEventReadApp(payload).send().then((result) {+ final payload = ViewIdPB.create()..value = viewID;+ return FolderEventReadView(payload).send();+ }++ Future<Either<ViewPB, FlowyError>> getChildView(+ String viewID,+ String childViewID,+ ) async {+ final payload = ViewIdPB.create()..value = viewID;+ return FolderEventReadView(payload).send().then((result) {return result.fold((app) => left(- app.belongings.items.firstWhere((e) => e.id == viewID),+ app.belongings.firstWhere((e) => e.id == childViewID),),(error) => right(error),);diff --git a/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dartindex 9163710b96..53b7328122 100644--- a/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart@@ -3,8 +3,8 @@ import 'package:flowy_infra/time/duration.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/code.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart'+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart'show WorkspaceSettingPB;import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/home/home_service.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_service.dartindex 51c57ca576..dd1c19b2b7 100644--- a/frontend/appflowy_flutter/lib/workspace/application/home/home_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_service.dart@@ -1,14 +1,14 @@import 'dart:async';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';class HomeService {- Future<Either<AppPB, FlowyError>> readApp({required String appId}) {- final payload = AppIdPB.create()..value = appId;+ Future<Either<ViewPB, FlowyError>> readApp({required String appId}) {+ final payload = ViewIdPB.create()..value = appId;- return FolderEventReadApp(payload).send();+ return FolderEventReadView(payload).send();}}diff --git a/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dartindex 44e8518760..d24ca6f8a4 100644--- a/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart@@ -1,7 +1,7 @@import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/workspace/application/appearance.dart';import 'package:appflowy/workspace/application/edit_panel/edit_context.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart'+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart'show WorkspaceSettingPB;import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:dartz/dartz.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dartindex c687938652..54c126b221 100644--- a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart@@ -2,11 +2,11 @@ import 'dart:async';import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/application/workspace/workspace_listener.dart';import 'package:appflowy/workspace/application/workspace/workspace_service.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -38,24 +38,35 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {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(- (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: 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));}},);@@ -68,24 +79,11 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {return super.close();}- Future<void> _performActionOnCreateApp(- _CreateApp event, Emitter<MenuState> emit) async {- final result = await _workspaceService.createApp(- name: event.name, desc: event.desc ?? "");- result.fold(- (app) => {},- (error) {- Log.error(error);- emit(state.copyWith(successOrFailure: right(error)));- },- );- }-// ignore: unused_elementFuture<void> _fetchApps(Emitter<MenuState> emit) async {final appsOrFail = await _workspaceService.getApps();emit(appsOrFail.fold(- (apps) => state.copyWith(apps: apps),+ (views) => state.copyWith(views: views),(error) {Log.error(error);return state.copyWith(successOrFailure: right(error));@@ -93,7 +91,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {));}- 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))),@@ -108,19 +106,19 @@ 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<AppPB>, FlowyError> appsOrFail) = _ReceiveApps;+ Either<List<ViewPB>, FlowyError> appsOrFail) = _ReceiveApps;}@freezedclass MenuState with _$MenuState {const factory MenuState({- required List<AppPB> apps,+ required List<ViewPB> views,required Either<Unit, FlowyError> successOrFailure,required Plugin plugin,}) = _MenuState;factory MenuState.initial(WorkspacePB workspace) => MenuState(- apps: workspace.apps.items,+ views: workspace.views,successOrFailure: left(unit),plugin: makePlugin(pluginType: PluginType.blank),);diff --git a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dartindex f12627dca9..d6bb398d9c 100644--- a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dart@@ -1,7 +1,7 @@import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dartindex fdf82a91a2..2f275f1fef 100644--- a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dart@@ -3,7 +3,7 @@ import 'dart:async';import 'package:appflowy/workspace/application/app/app_bloc.dart';import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dartindex 04be1f61bf..5e75f744b5 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dart@@ -1,26 +1,26 @@-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';class SettingsFileExportState {SettingsFileExportState({- required this.apps,+ required this.views,}) {initialize();}- List<AppPB> apps;+ List<ViewPB> views;List<bool> expanded = [];List<bool> selectedApps = [];List<List<bool>> selectedItems = [];SettingsFileExportState copyWith({- List<AppPB>? apps,+ List<ViewPB>? views,List<bool>? expanded,List<bool>? selectedApps,List<List<bool>>? selectedItems,}) {final state = SettingsFileExportState(- apps: apps ?? this.apps,+ views: views ?? this.views,);state.expanded = expanded ?? this.expanded;state.selectedApps = selectedApps ?? this.selectedApps;@@ -29,17 +29,17 @@ class SettingsFileExportState {}void initialize() {- expanded = apps.map((e) => true).toList();- selectedApps = apps.map((e) => true).toList();+ expanded = views.map((e) => true).toList();+ selectedApps = views.map((e) => true).toList();selectedItems =- apps.map((e) => e.belongings.items.map((e) => true).toList()).toList();+ views.map((e) => e.belongings.map((e) => true).toList()).toList();}}class SettingsFileExporterCubit extends Cubit<SettingsFileExportState> {SettingsFileExporterCubit({- required List<AppPB> apps,- }) : super(SettingsFileExportState(apps: apps));+ required List<ViewPB> views,+ }) : super(SettingsFileExportState(views: views));void selectOrDeselectItem(int outerIndex, int innerIndex) {final selectedItems = state.selectedItems;@@ -55,7 +55,7 @@ class SettingsFileExporterCubit extends Cubit<SettingsFileExportState> {}Map<String, List<String>> fetchSelectedPages() {- final apps = state.apps;+ final apps = state.views;final selectedItems = state.selectedItems;Map<String, List<String>> result = {};for (var i = 0; i < selectedItems.length; i++) {@@ -63,7 +63,7 @@ class SettingsFileExporterCubit extends Cubit<SettingsFileExportState> {final ids = <String>[];for (var j = 0; j < selectedItem.length; j++) {if (selectedItem[j]) {- ids.add(apps[i].belongings.items[j].id);+ ids.add(apps[i].belongings[j].id);}}if (ids.isNotEmpty) {diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dartindex 1951fd0a88..05bd1ca178 100644--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart@@ -1,7 +1,7 @@import 'package:appflowy/workspace/application/view/view_listener.dart';import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:dartz/dartz.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dartindex 200ce23686..29173d7f0f 100644--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart@@ -1,6 +1,6 @@import 'package:appflowy/startup/plugin/plugin.dart';import 'package:flowy_infra/image.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';enum FlowyPlugin {diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dartindex 1af4a8e57b..38de59e4cc 100644--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dart@@ -3,9 +3,9 @@ import 'dart:typed_data';import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';import 'package:appflowy_backend/rust_stream.dart';import 'package:flowy_infra/notifier.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dartindex 7524a39e2c..7facfcec3f 100644--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart@@ -1,7 +1,7 @@import 'dart:async';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';class ViewService {diff --git a/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dartindex aef0464cee..8700297a84 100644--- a/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dart@@ -1,7 +1,7 @@import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dartindex 73019c34e1..4346d1f226 100644--- a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dart@@ -1,16 +1,16 @@import 'dart:async';import 'dart:typed_data';import 'package:appflowy/core/folder_notification.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/notification.pb.dart';-typedef AppListNotifyValue = Either<List<AppPB>, FlowyError>;+typedef AppListNotifyValue = Either<List<ViewPB>, FlowyError>;typedef WorkspaceNotifyValue = Either<WorkspacePB, FlowyError>;class WorkspaceListener {@@ -55,10 +55,10 @@ class WorkspaceListener {(error) => _workspaceUpdatedNotifier?.value = right(error),);break;- case FolderNotification.DidUpdateWorkspaceApps:+ case FolderNotification.DidUpdateWorkspaceViews:result.fold((payload) => _appsChangedNotifier?.value =- left(RepeatedAppPB.fromBuffer(payload).items),+ left(RepeatedViewPB.fromBuffer(payload).items),(error) => _appsChangedNotifier?.value = right(error),);break;diff --git a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dartindex 425154f353..533b839fc6 100644--- a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart@@ -4,10 +4,14 @@ import 'package:dartz/dartz.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/dispatch/dispatch.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'- show MoveFolderItemPayloadPB, MoveFolderItemType;-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart'+ show+ CreateViewPayloadPB,+ MoveFolderItemPayloadPB,+ MoveFolderItemType,+ ViewLayoutTypePB,+ ViewPB;+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy/generated/locale_keys.g.dart';@@ -16,13 +20,15 @@ class WorkspaceService {WorkspaceService({required this.workspaceId,});- 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 = ViewLayoutTypePB.Document;++ return FolderEventCreateView(payload).send();}Future<Either<WorkspacePB, FlowyError>> getWorkspace() {@@ -44,7 +50,7 @@ class WorkspaceService {});}- Future<Either<List<AppPB>, FlowyError>> getApps() {+ Future<Either<List<ViewPB>, FlowyError>> getApps() {final payload = WorkspaceIdPB.create()..value = workspaceId;return FolderEventReadWorkspaceApps(payload).send().then((result) {return result.fold(diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dartindex 57ca5182aa..02dce780a9 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dart@@ -10,7 +10,7 @@ import 'package:appflowy/workspace/presentation/home/hotkeys.dart';import 'package:appflowy/workspace/presentation/widgets/edit_panel/panel_animation.dart';import 'package:appflowy/workspace/presentation/widgets/float_bubble/question_bubble.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;import 'package:flowy_infra_ui/style_widget/container.dart';@@ -263,8 +263,8 @@ class HomeScreenStackAdaptor extends HomeStackDelegate {final homeService = HomeService();homeService.readApp(appId: view.appId).then((result) {result.fold(- (appPB) {- final List<ViewPB> views = appPB.belongings.items;+ (parentView) {+ final List<ViewPB> views = parentView.belongings;if (views.isNotEmpty) {var lastView = views.last;if (index != null && index != 0 && views.length > index - 1) {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dartindex e73577d818..1511965942 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dart@@ -5,7 +5,7 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/workspace/presentation/home/home_sizes.dart';import 'package:appflowy/workspace/presentation/home/navigation.dart';import 'package:appflowy/workspace/presentation/home/toast.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flowy_infra_ui/style_widget/extension.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';diff --git 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.dartindex c2161066c9..6137a49d7f 100644--- 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@@ -2,12 +2,12 @@ import 'dart:convert';import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:expandable/expandable.dart';import 'package:flowy_infra/icon_data.dart';import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:appflowy/workspace/application/app/app_bloc.dart';@@ -19,7 +19,7 @@ import '../menu_app.dart';import 'add_button.dart';class MenuAppHeader extends StatelessWidget {- final AppPB app;+ final ViewPB app;const MenuAppHeader(this.app, {Key? key,@@ -83,7 +83,7 @@ class MenuAppHeader extends StatelessWidget {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));},@@ -166,8 +166,8 @@ class AppActionList extends StatelessWidget {onSecondaryTap: () {controller.show();},- child: BlocSelector<AppBloc, AppState, AppPB>(- selector: (state) => state.app,+ child: BlocSelector<AppBloc, AppState, ViewPB>(+ selector: (state) => state.view,builder: (context, app) => FlowyText.medium(app.name,overflow: TextOverflow.ellipsis,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dartindex 653f67fa5a..cf48af34fe 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dart@@ -1,6 +1,6 @@import 'package:appflowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:expandable/expandable.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:appflowy/startup/startup.dart';@@ -9,8 +9,8 @@ import 'package:provider/provider.dart';import 'section/section.dart';class MenuApp extends StatefulWidget {- final AppPB app;- const MenuApp(this.app, {Key? key}) : super(key: key);+ final ViewPB view;+ const MenuApp(this.view, {Key? key}) : super(key: key);@overrideState<MenuApp> createState() => _MenuAppState();@@ -21,7 +21,7 @@ class _MenuAppState extends State<MenuApp> {@overridevoid initState() {- viewDataContext = AppViewDataContext(appId: widget.app.id);+ viewDataContext = AppViewDataContext(viewId: widget.view.id);super.initState();}@@ -31,7 +31,7 @@ class _MenuAppState extends State<MenuApp> {providers: [BlocProvider<AppBloc>(create: (context) {- final appBloc = getIt<AppBloc>(param1: widget.app);+ final appBloc = AppBloc(view: widget.view);appBloc.add(const AppEvent.initial());return appBloc;},@@ -86,7 +86,7 @@ class _MenuAppState extends State<MenuApp> {iconPadding: EdgeInsets.zero,hasIcon: false,),- header: MenuAppHeader(widget.app),+ header: MenuAppHeader(widget.view),expanded: ViewSection(appViewData: viewDataContext),collapsed: const SizedBox(),),diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dartindex e6d328d797..bbe1e607f6 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dart@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dartindex 11cfa05042..b0be6b6be2 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart@@ -8,8 +8,8 @@ import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';import 'package:appflowy/workspace/application/menu/menu_bloc.dart';import 'package:appflowy/workspace/presentation/home/home_sizes.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;import 'package:easy_localization/easy_localization.dart';@@ -112,7 +112,7 @@ class HomeMenu extends StatelessWidget {child: ScrollConfiguration(behavior: const ScrollBehavior().copyWith(scrollbars: false),child: BlocSelector<MenuBloc, MenuState, List<Widget>>(- selector: (state) => state.apps+ selector: (state) => state.views.map((app) => MenuApp(app, key: ValueKey(app.id))).toList(),builder: (context, menuItems) {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dartindex 2b075d16fc..9d490d1b69 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart@@ -6,7 +6,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -73,9 +73,9 @@ class _FileExporterWidgetState extends State<FileExporterWidget> {snapshot.connectionState == ConnectionState.done) {final workspaces = snapshot.data?.getLeftOrNull<WorkspaceSettingPB>();if (workspaces != null) {- final apps = workspaces.workspace.apps.items;+ final views = workspaces.workspace.views;return BlocProvider<SettingsFileExporterCubit>(- create: (_) => SettingsFileExporterCubit(apps: apps),+ create: (_) => SettingsFileExporterCubit(views: views),child: const _ExpandedList(),);}@@ -118,7 +118,7 @@ class _ExpandedListState extends State<_ExpandedList> {}List<Widget> _buildChildren(BuildContext context) {- final apps = context.read<SettingsFileExporterCubit>().state.apps;+ final apps = context.read<SettingsFileExporterCubit>().state.views;List<Widget> children = [];for (var i = 0; i < apps.length; i++) {children.add(_buildExpandedItem(context, i));@@ -128,14 +128,14 @@ class _ExpandedListState extends State<_ExpandedList> {Widget _buildExpandedItem(BuildContext context, int index) {final state = context.read<SettingsFileExporterCubit>().state;- final apps = state.apps;+ final apps = state.views;final expanded = state.expanded;final selectedItems = state.selectedItems;final isExpaned = expanded[index] == true;List<Widget> expandedChildren = [];if (isExpaned) {for (var i = 0; i < selectedItems[index].length; i++) {- final name = apps[index].belongings.items[i].name;+ final name = apps[index].belongings[i].name;final checkbox = CheckboxListTile(value: selectedItems[index][i],onChanged: (value) {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dartindex e697262492..5bf6052516 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dart@@ -1,7 +1,7 @@import 'package:appflowy/workspace/application/view/view_listener.dart';import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter/material.dart';class ViewLeftBarItem extends StatefulWidget {diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dartindex 6e2829659e..a32fce93a9 100644--- a/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart+++ b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart@@ -15,7 +15,7 @@ import 'dart:typed_data';import 'package:appflowy_backend/ffi.dart' as ffi;import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';import 'package:appflowy_backend/protobuf/dart-ffi/protobuf.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-document/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';@@ -25,7 +25,7 @@ import 'dart:convert' show utf8;import '../protobuf/flowy-net/event_map.pb.dart';import 'error.dart';-part 'dart_event/flowy-folder/dart_event.dart';+part 'dart_event/flowy-folder2/dart_event.dart';part 'dart_event/flowy-net/dart_event.dart';part 'dart_event/flowy-user/dart_event.dart';part 'dart_event/flowy-database/dart_event.dart';diff --git a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dartindex 668338bfb5..3ffe8cbf5b 100644--- a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart@@ -11,7 +11,7 @@ import 'package:appflowy/plugins/database_view/application/database_controller.dimport 'package:appflowy/plugins/database_view/grid/application/row/row_bloc.dart';import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pbenum.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import '../../util.dart';diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dartindex af85cc8bf2..32a1c4f1ce 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart@@ -13,7 +13,7 @@ import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:dartz/dartz.dart';diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dartindex 69ef8eb1e4..878bf71d23 100644--- a/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dart@@ -15,30 +15,30 @@ void main() {test('rename app test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(const AppEvent.rename('Hello world'));await blocResponseFuture();- assert(bloc.state.app.name == 'Hello world');+ expect(bloc.state.view.name, 'Hello world');});test('delete app test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(const AppEvent.delete());await blocResponseFuture();final apps = await testContext.loadApps();- assert(apps.where((element) => element.id == app.id).isEmpty);+ expect(apps.where((element) => element.id == app.id).isEmpty, true);});test('create documents in order', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("1", DocumentPluginBuilder()));@@ -55,7 +55,7 @@ void main() {test('reorder documents test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("1", DocumentPluginBuilder()));@@ -66,7 +66,7 @@ void main() {await blocResponseFuture();assert(bloc.state.views.length == 3);- final appViewData = AppViewDataContext(appId: app.id);+ final appViewData = AppViewDataContext(viewId: app.id);appViewData.views = bloc.state.views;final viewSectionBloc = ViewSectionBloc(@@ -84,7 +84,7 @@ void main() {test('open latest view test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();assert(bloc.state.latestCreatedView == null,@@ -108,7 +108,7 @@ void main() {test('open latest documents test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("document 1", DocumentPluginBuilder()));@@ -135,7 +135,7 @@ void main() {test('open latest document test', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("document 1", DocumentPluginBuilder()));diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dartindex 978f168df6..f0862643ce 100644--- a/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dart@@ -3,7 +3,7 @@ import 'package:appflowy/plugins/database_view/board/board.dart';import 'package:appflowy/plugins/database_view/grid/grid.dart';import 'package:appflowy/plugins/document/document.dart';import 'package:appflowy/workspace/application/app/app_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';@@ -15,7 +15,7 @@ void main() {test('create a document', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("Test document", DocumentPluginBuilder()));@@ -28,7 +28,7 @@ void main() {test('create a grid', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("Test grid", GridPluginBuilder()));@@ -41,7 +41,7 @@ void main() {test('create a kanban', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("Test board", BoardPluginBuilder()));@@ -54,7 +54,7 @@ void main() {test('create a calendar', () async {final app = await testContext.createTestApp();- final bloc = AppBloc(app: app)..add(const AppEvent.initial());+ final bloc = AppBloc(view: app)..add(const AppEvent.initial());await blocResponseFuture();bloc.add(AppEvent.createView("Test calendar", CalendarPluginBuilder()));diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dartindex ef42b59fc0..3f79d9dc20 100644--- a/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dart@@ -37,7 +37,7 @@ void main() {await blocResponseFuture();final app = await testContext.createTestApp();- final appBloc = AppBloc(app: app)..add(const AppEvent.initial());+ final appBloc = AppBloc(view: app)..add(const AppEvent.initial());assert(appBloc.state.latestCreatedView == null);appBloc.add(AppEvent.createView("New document", DocumentPluginBuilder()));diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dartindex 252cbc9f4f..2f0e94f346 100644--- a/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart@@ -16,7 +16,7 @@ void main() {)..add(const MenuEvent.initial());await blocResponseFuture();- assert(menuBloc.state.apps.length == 1);+ assert(menuBloc.state.views.length == 1);});test('reorder apps', () async {@@ -35,8 +35,8 @@ void main() {menuBloc.add(const MenuEvent.moveApp(1, 3));await blocResponseFuture();- assert(menuBloc.state.apps[1].name == 'App 2');- assert(menuBloc.state.apps[2].name == 'App 3');- assert(menuBloc.state.apps[3].name == 'App 1');+ assert(menuBloc.state.views[1].name == 'App 2');+ assert(menuBloc.state.views[2].name == 'App 3');+ assert(menuBloc.state.views[3].name == 'App 1');});}diff --git 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.dartindex da7d0159d3..03db7f34b0 100644--- 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@@ -1,14 +1,13 @@import 'package:appflowy/plugins/document/document.dart';import 'package:appflowy/plugins/trash/application/trash_bloc.dart';import 'package:appflowy/workspace/application/app/app_bloc.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-folder2/view.pb.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';class TrashTestContext {- late AppPB app;+ late ViewPB view;late AppBloc appBloc;late List<ViewPB> allViews;final AppFlowyUnitTest unitTest;@@ -16,8 +15,8 @@ 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(@@ -40,7 +39,7 @@ class TrashTestContext {);await blocResponseFuture();- allViews = [...appBloc.state.app.belongings.items];+ allViews = [...appBloc.state.view.belongings];assert(allViews.length == 3, 'but receive ${allViews.length}');}}@@ -65,17 +64,17 @@ void main() {await blocResponseFuture(millisecond: 200);// delete a view- final deletedView = context.appBloc.state.app.belongings.items[0];+ final deletedView = context.appBloc.state.view.belongings[0];context.appBloc.add(AppEvent.deleteView(deletedView.id));await blocResponseFuture();- assert(context.appBloc.state.app.belongings.items.length == 2);+ assert(context.appBloc.state.view.belongings.length == 2);assert(trashBloc.state.objects.length == 1);assert(trashBloc.state.objects.first.id == deletedView.id);// put backtrashBloc.add(TrashEvent.putback(deletedView.id));await blocResponseFuture();- assert(context.appBloc.state.app.belongings.items.length == 3);+ assert(context.appBloc.state.view.belongings.length == 3);assert(trashBloc.state.objects.isEmpty);// delete all viewsdiff --git 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.dartindex cc4c5ec832..3009035607 100644--- 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,7 +13,7 @@ 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(),@@ -30,7 +30,7 @@ void main() {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(@@ -51,7 +51,7 @@ void main() {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(diff --git a/frontend/appflowy_flutter/test/util.dart b/frontend/appflowy_flutter/test/util.dartindex 93340ddb72..f31d90b84e 100644--- a/frontend/appflowy_flutter/test/util.dart+++ b/frontend/appflowy_flutter/test/util.dart@@ -3,10 +3,10 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/auth_service.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy/workspace/application/workspace/workspace_service.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -81,7 +81,7 @@ class AppFlowyUnitTest {workspaceService = WorkspaceService(workspaceId: currentWorkspace.id);}- Future<AppPB> createTestApp() async {+ Future<ViewPB> createTestApp() async {final result = await workspaceService.createApp(name: "Test App");return result.fold((app) => app,@@ -89,7 +89,7 @@ class AppFlowyUnitTest {);}- Future<List<AppPB>> loadApps() async {+ Future<List<ViewPB>> loadApps() async {final result = await workspaceService.getApps();return result.fold(diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 406589203c..4d56fe6426 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -72,9 +72,9 @@ dependencies = [[[package]]name = "anyhow"-version = "1.0.68"+version = "1.0.70"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"[[package]]name = "appflowy_tauri"@@ -123,7 +123,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -134,7 +134,7 @@ checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -274,7 +274,7 @@ dependencies = ["borsh-schema-derive-internal","proc-macro-crate 0.1.5","proc-macro2",- "syn",+ "syn 1.0.109",][[package]]@@ -285,7 +285,7 @@ checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -296,7 +296,7 @@ checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -354,7 +354,7 @@ checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -460,9 +460,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"[[package]]name = "chrono"-version = "0.4.23"+version = "0.4.24"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"dependencies = ["iana-time-zone","js-sys",@@ -517,7 +517,7 @@ dependencies = ["proc-macro-error","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -561,6 +561,70 @@ dependencies = ["unicode-width",]+[[package]]+name = "collab"+version = "0.1.0"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+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?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+dependencies = [+ "proc-macro2",+ "quote",+ "serde_json",+ "syn 1.0.109",+ "yrs",+]++[[package]]+name = "collab-folder"+version = "0.1.0"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+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?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+dependencies = [+ "bincode",+ "chrono",+ "lib0",+ "serde",+ "sled",+ "smallvec",+ "thiserror",+ "tokio",+ "yrs",+]+[[package]]name = "color_quant"version = "1.1.0"@@ -736,7 +800,7 @@ dependencies = ["proc-macro2","quote","smallvec",- "syn",+ "syn 1.0.109",][[package]]@@ -746,7 +810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"dependencies = ["quote",- "syn",+ "syn 1.0.109",][[package]]@@ -756,7 +820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"dependencies = ["quote",- "syn",+ "syn 1.0.109",][[package]]@@ -789,7 +853,7 @@ dependencies = ["proc-macro2","quote","scratch",- "syn",+ "syn 1.0.109",][[package]]@@ -806,7 +870,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -830,7 +894,7 @@ dependencies = ["proc-macro2","quote","strsim",- "syn",+ "syn 1.0.109",][[package]]@@ -841,7 +905,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"dependencies = ["darling_core","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -854,7 +918,7 @@ dependencies = ["hashbrown","lock_api","once_cell",- "parking_lot_core",+ "parking_lot_core 0.9.6",][[package]]@@ -877,7 +941,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -890,7 +954,7 @@ dependencies = ["proc-macro2","quote","rustc_version 0.4.0",- "syn",+ "syn 1.0.109",][[package]]@@ -918,7 +982,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1133,7 +1197,7 @@ version = "0.1.0"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1160,7 +1224,7 @@ dependencies = ["folder-model","lib-infra","lib-ot",- "parking_lot",+ "parking_lot 0.12.1","revision-model","serde","serde_json",@@ -1178,7 +1242,7 @@ dependencies = ["futures-util","lib-infra","lib-ws",- "parking_lot",+ "parking_lot 0.12.1","serde","serde_repr","thiserror",@@ -1204,7 +1268,7 @@ dependencies = ["serde","serde_json","similar",- "syn",+ "syn 1.0.109","tera","toml","walkdir",@@ -1215,12 +1279,14 @@ name = "flowy-core"version = "0.1.0"dependencies = ["bytes",+ "collab-persistence","database-model","flowy-client-ws","flowy-database","flowy-document","flowy-error","flowy-folder",+ "flowy-folder2","flowy-net","flowy-revision","flowy-sqlite",@@ -1231,7 +1297,7 @@ dependencies = ["lib-infra","lib-log","lib-ws",- "parking_lot",+ "parking_lot 0.12.1","revision-model","serde","serde_json",@@ -1271,7 +1337,7 @@ dependencies = ["lib-infra","lib-ot","nanoid",- "parking_lot",+ "parking_lot 0.12.1","protobuf","rayon","regex",@@ -1299,7 +1365,7 @@ dependencies = ["proc-macro2","quote","serde_json",- "syn",+ "syn 1.0.109","walkdir",]@@ -1388,7 +1454,7 @@ dependencies = ["lib-infra","lib-ot","log",- "parking_lot",+ "parking_lot 0.12.1","pin-project","protobuf","revision-model",@@ -1402,6 +1468,33 @@ dependencies = ["ws-model",]+[[package]]+name = "flowy-folder2"+version = "0.1.0"+dependencies = [+ "bytes",+ "chrono",+ "collab",+ "collab-folder",+ "collab-persistence",+ "flowy-codegen",+ "flowy-derive",+ "flowy-document",+ "flowy-error",+ "flowy-notification",+ "lazy_static",+ "lib-dispatch",+ "lib-infra",+ "nanoid",+ "parking_lot 0.12.1",+ "protobuf",+ "strum",+ "strum_macros",+ "tokio",+ "tracing",+ "unicode-segmentation",+]+[[package]]name = "flowy-net"version = "0.1.0"@@ -1419,7 +1512,7 @@ dependencies = ["flowy-derive","flowy-document","flowy-error",- "flowy-folder",+ "flowy-folder2","flowy-server-sync","flowy-sync","flowy-user",@@ -1431,7 +1524,7 @@ dependencies = ["lib-infra","lib-ws","nanoid",- "parking_lot",+ "parking_lot 0.12.1","protobuf","reqwest","revision-model",@@ -1536,7 +1629,7 @@ dependencies = ["folder-model","lib-infra","lib-ot",- "parking_lot",+ "parking_lot 0.12.1","revision-model","serde","strum",@@ -1562,6 +1655,7 @@ name = "flowy-user"version = "0.1.0"dependencies = ["bytes",+ "collab-persistence","diesel","diesel_derives","flowy-codegen",@@ -1574,7 +1668,7 @@ dependencies = ["lib-infra","log","once_cell",- "parking_lot",+ "parking_lot 0.12.1","protobuf","serde","serde_json",@@ -1625,6 +1719,16 @@ dependencies = ["percent-encoding",]+[[package]]+name = "fs2"+version = "0.4.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"+dependencies = [+ "libc",+ "winapi",+]+[[package]]name = "futf"version = "0.1.5"@@ -1691,7 +1795,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1845,8 +1949,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"dependencies = ["cfg-if",+ "js-sys","libc","wasi 0.9.0+wasi-snapshot-preview1",+ "wasm-bindgen",][[package]]@@ -1928,7 +2034,7 @@ dependencies = ["proc-macro-error","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2034,7 +2140,7 @@ dependencies = ["proc-macro-error","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2100,7 +2206,7 @@ dependencies = ["markup5ever","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2527,7 +2633,7 @@ dependencies = ["futures-util","lib-infra","log",- "parking_lot",+ "parking_lot 0.12.1","pin-project","protobuf","serde",@@ -2540,6 +2646,17 @@ dependencies = ["url",]+[[package]]+name = "lib0"+version = "0.16.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "daf23122cb1c970b77ea6030eac5e328669415b65d2ab245c99bfb110f9d62dc"+dependencies = [+ "serde",+ "serde_json",+ "thiserror",+]+[[package]]name = "libc"version = "0.2.139"@@ -2716,7 +2833,7 @@ dependencies = ["migrations_internals","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2892,7 +3009,7 @@ dependencies = ["proc-macro-crate 1.2.1","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2977,7 +3094,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3040,6 +3157,17 @@ dependencies = ["system-deps 6.0.3",]+[[package]]+name = "parking_lot"+version = "0.11.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"+dependencies = [+ "instant",+ "lock_api",+ "parking_lot_core 0.8.6",+]+[[package]]name = "parking_lot"version = "0.12.1"@@ -3047,7 +3175,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"dependencies = ["lock_api",- "parking_lot_core",+ "parking_lot_core 0.9.6",+]++[[package]]+name = "parking_lot_core"+version = "0.8.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"+dependencies = [+ "cfg-if",+ "instant",+ "libc",+ "redox_syscall 0.2.16",+ "smallvec",+ "winapi",][[package]]@@ -3120,7 +3262,7 @@ dependencies = ["pest_meta","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3226,7 +3368,7 @@ dependencies = ["proc-macro-hack","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3240,7 +3382,7 @@ dependencies = ["proc-macro-hack","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3288,7 +3430,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3376,7 +3518,7 @@ dependencies = ["proc-macro-error-attr","proc-macro2","quote",- "syn",+ "syn 1.0.109","version_check",]@@ -3399,9 +3541,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"[[package]]name = "proc-macro2"-version = "1.0.51"+version = "1.0.56"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"dependencies = ["unicode-ident",]@@ -3510,14 +3652,14 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]name = "quote"-version = "1.0.23"+version = "1.0.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"dependencies = ["proc-macro2",]@@ -3529,7 +3671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"dependencies = ["log",- "parking_lot",+ "parking_lot 0.12.1","scheduled-thread-pool",]@@ -3784,7 +3926,7 @@ checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3891,7 +4033,7 @@ version = "0.2.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"dependencies = [- "parking_lot",+ "parking_lot 0.12.1",][[package]]@@ -3990,9 +4132,9 @@ dependencies = [[[package]]name = "serde"-version = "1.0.152"+version = "1.0.159"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"dependencies = ["serde_derive",]@@ -4010,20 +4152,20 @@ dependencies = [[[package]]name = "serde_derive"-version = "1.0.152"+version = "1.0.159"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"dependencies = ["proc-macro2","quote",- "syn",+ "syn 2.0.13",][[package]]name = "serde_json"-version = "1.0.91"+version = "1.0.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"dependencies = ["itoa 1.0.5","ryu",@@ -4038,7 +4180,7 @@ checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4072,7 +4214,7 @@ dependencies = ["darling","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4094,7 +4236,7 @@ checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4170,6 +4312,22 @@ dependencies = ["autocfg",]+[[package]]+name = "sled"+version = "0.34.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"+dependencies = [+ "crc32fast",+ "crossbeam-epoch",+ "crossbeam-utils",+ "fs2",+ "fxhash",+ "libc",+ "log",+ "parking_lot 0.11.2",+]+[[package]]name = "slug"version = "0.1.4"@@ -4179,6 +4337,15 @@ dependencies = ["deunicode",]+[[package]]+name = "smallstr"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1e922794d168678729ffc7e07182721a14219c65814e66e91b839a272fe5ae4f"+dependencies = [+ "smallvec",+]+[[package]]name = "smallvec"version = "1.10.0"@@ -4252,7 +4419,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"dependencies = ["new_debug_unreachable","once_cell",- "parking_lot",+ "parking_lot 0.12.1","phf_shared 0.10.0","precomputed-hash","serde",@@ -4291,7 +4458,7 @@ dependencies = ["heck 0.3.3","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4305,6 +4472,17 @@ dependencies = ["unicode-ident",]+[[package]]+name = "syn"+version = "2.0.13"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"+dependencies = [+ "proc-macro2",+ "quote",+ "unicode-ident",+]+[[package]]name = "system-deps"version = "5.0.0"@@ -4364,7 +4542,7 @@ dependencies = ["ndk-sys","objc","once_cell",- "parking_lot",+ "parking_lot 0.12.1","paste","png","raw-window-handle",@@ -4486,7 +4664,7 @@ dependencies = ["heck 0.4.0","proc-macro2","quote",- "syn",+ "syn 1.0.109","tauri-codegen","tauri-utils",]@@ -4633,22 +4811,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"[[package]]name = "thiserror"-version = "1.0.38"+version = "1.0.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"dependencies = ["thiserror-impl",][[package]]name = "thiserror-impl"-version = "1.0.38"+version = "1.0.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"dependencies = ["proc-macro2","quote",- "syn",+ "syn 2.0.13",][[package]]@@ -4736,7 +4914,7 @@ dependencies = ["memchr","mio","num_cpus",- "parking_lot",+ "parking_lot 0.12.1","pin-project-lite","signal-hook-registry","socket2",@@ -4752,7 +4930,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4839,7 +5017,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -5220,7 +5398,7 @@ dependencies = ["once_cell","proc-macro2","quote",- "syn",+ "syn 1.0.109","wasm-bindgen-shared",]@@ -5254,7 +5432,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109","wasm-bindgen-backend","wasm-bindgen-shared",]@@ -5342,7 +5520,7 @@ checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -5432,7 +5610,7 @@ version = "0.39.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"dependencies = [- "syn",+ "syn 1.0.109","windows-tokens",]@@ -5662,6 +5840,17 @@ version = "0.8.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"+[[package]]+name = "y-sync"+version = "0.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e77a143afe4dde83bc987ad3119228d0f107053a3da131a00738cb2d7f496641"+dependencies = [+ "lib0",+ "thiserror",+ "yrs",+]+[[package]]name = "yaml-rust"version = "0.4.5"@@ -5670,3 +5859,17 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"dependencies = ["linked-hash-map",]++[[package]]+name = "yrs"+version = "0.16.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4c2aef2bf89b4f7c003f9c73f1c8097427ca32e1d006443f3f607f11e79a797b"+dependencies = [+ "atomic_refcell",+ "lib0",+ "rand 0.7.3",+ "smallstr",+ "smallvec",+ "thiserror",+]diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 04fccca1aa..b99aa67948 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -31,3 +31,10 @@ default = ["custom-protocol"]# this feature is used used for production builds where `devPath` points to the filesystem# DO NOT remove thiscustom-protocol = ["tauri/custom-protocol"]++[patch.crates-io]+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }++diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.tsindex 21be5aa783..6cb486e35b 100644--- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts@@ -2,8 +2,8 @@ import { currentUserActions } from '../../stores/reducers/current-user/slice';import { useAppDispatch, useAppSelector } from '../../stores/store';import { UserProfilePB } from '../../../services/backend/events/flowy-user';import { AuthBackendService, UserBackendService } from '../../stores/effects/user/user_bd_svc';-import { FolderEventReadCurrentWorkspace } from '../../../services/backend/events/flowy-folder';-import { WorkspaceSettingPB } from '../../../services/backend/models/flowy-folder/workspace';+import { FolderEventReadCurrentWorkspace } from '../../../services/backend/events/flowy-folder2';+import { WorkspaceSettingPB } from '../../../services/backend/models/flowy-folder2/workspace';import { Log } from '../../utils/log';export const useAuth = () => {diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.tsindex 5c61a933ac..1d94beaf92 100644--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts@@ -39,8 +39,8 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {void appObserver.subscribe({onAppChanged: (change) => {if (change.ok) {- const app: AppPB = change.val;- const updatedPages: IPage[] = app.belongings.items.map((view) => ({+ const views = change.val;+ const updatedPages: IPage[] = views.items.map((view) => ({id: view.id,folderId: view.app_id,pageType: view.layout,diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.hooks.tsindex 5c1efcbc53..59d1231a7e 100644--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.hooks.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.hooks.ts@@ -6,11 +6,11 @@ import { UserBackendService } from '../../stores/effects/user/user_bd_svc';import { useError } from '../error/Error.hooks';export const useWorkspace = () => {- const appDispatch = useAppDispatch();const currentUser = useAppSelector((state) => state.currentUser);- const error = useError();- const userBackendService: UserBackendService = new UserBackendService(currentUser.id || '');+ const appDispatch = useAppDispatch();+ const error = useError();+ const userBackendService: UserBackendService = new UserBackendService(currentUser.id || 0);const loadWorkspaceItems = async () => {try {@@ -20,11 +20,11 @@ export const useWorkspace = () => {appDispatch(foldersActions.clearFolders());appDispatch(pagesActions.clearPages());- const apps = workspace.apps.items;+ const apps = workspace.views;for (const app of apps) {appDispatch(foldersActions.addFolder({ id: app.id, title: app.name }));- const views = app.belongings.items;+ const views = app.belongings;for (const view of views) {appDispatch(pagesActions.addPage({ folderId: app.id, id: view.id, pageType: view.layout, title: view.name }));}diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/tests/DatabaseTestHelper.ts b/frontend/appflowy_tauri/src/appflowy_app/components/tests/DatabaseTestHelper.tsindex 7ab6cdd5ce..548ff6816b 100644--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/DatabaseTestHelper.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/components/tests/DatabaseTestHelper.ts@@ -5,7 +5,7 @@ import {ViewPB,WorkspaceSettingPB,} from '../../../services/backend';-import { FolderEventReadCurrentWorkspace } from '../../../services/backend/events/flowy-folder';+import { FolderEventReadCurrentWorkspace } from '../../../services/backend/events/flowy-folder2';import { AppBackendService } from '../../stores/effects/folder/app/app_bd_svc';import { DatabaseController } from '../../stores/effects/database/database_controller';import { RowInfo } from '../../stores/effects/database/row/row_cache';@@ -31,7 +31,7 @@ import { SelectOptionBackendService } from '../../stores/effects/database/cell/s// Do not use it production code. Just for testingexport async function createTestDatabaseView(layout: ViewLayoutTypePB): Promise<ViewPB> {const workspaceSetting: WorkspaceSettingPB = await FolderEventReadCurrentWorkspace().then((result) => result.unwrap());- const app = workspaceSetting.workspace.apps.items[0];+ const app = workspaceSetting.workspace.views[0];const appService = new AppBackendService(app.id);return await appService.createView({ name: 'New Grid', layoutType: layout });}diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/tests/DocumentTestHelper.ts b/frontend/appflowy_tauri/src/appflowy_app/components/tests/DocumentTestHelper.tsindex f05220df94..67ababa3b5 100644--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/DocumentTestHelper.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/components/tests/DocumentTestHelper.ts@@ -1,10 +1,10 @@-import { ViewLayoutTypePB, WorkspaceSettingPB } from '../../../services/backend';-import { FolderEventReadCurrentWorkspace } from '../../../services/backend/events/flowy-folder';-import { AppBackendService } from '../../stores/effects/folder/app/app_bd_svc';+import { ViewLayoutTypePB, WorkspaceSettingPB } from '@/services/backend';+import { FolderEventReadCurrentWorkspace } from '@/services/backend/events/flowy-folder2';+import { AppBackendService } from '$app/stores/effects/folder/app/app_bd_svc';export async function createTestDocument() {const workspaceSetting: WorkspaceSettingPB = await FolderEventReadCurrentWorkspace().then((result) => result.unwrap());- const app = workspaceSetting.workspace.apps.items[0];+ const app = workspaceSetting.workspace.views[0];const appService = new AppBackendService(app.id);return await appService.createView({ name: 'New Document', layoutType: ViewLayoutTypePB.Document });}diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestApiButton.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestApiButton.tsxdeleted file mode 100644index 161e94d596..0000000000--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestApiButton.tsx+++ /dev/null@@ -1,129 +0,0 @@-import { SignInPayloadPB } from '../../../services/backend/models/flowy-user/index';-import { nanoid } from 'nanoid';-import { UserNotificationListener } from '../user/application/notifications';-import {- ColorStylePB,- CreateAppPayloadPB,- CreateWorkspacePayloadPB,- FolderEventCreateApp,- FolderEventCreateWorkspace,- FolderEventOpenWorkspace,- WorkspaceIdPB,-} from '../../../services/backend/events/flowy-folder';-import { useEffect, useState } from 'react';-import * as dependency_1 from '../../../services/backend/models/flowy-folder/app';-import { UserEventGetUserSetting, UserEventSignIn } from '../../../services/backend/events/flowy-user';--const TestApiButton = () => {- const [workspaceId, setWorkspaceId] = useState('');- const [appId, setAppId] = useState('');-- useEffect(() => {- if (!workspaceId?.length) return;- void (async () => {- const openWorkspaceResult = await FolderEventOpenWorkspace(- WorkspaceIdPB.fromObject({- value: workspaceId,- })- );-- if (openWorkspaceResult.ok) {- const pb = openWorkspaceResult.val;- console.log(pb.toObject());- } else {- throw new Error('open workspace error');- }-- const createAppResult = await FolderEventCreateApp(- CreateAppPayloadPB.fromObject({- name: 'APP_1',- desc: 'Application One',- color_style: ColorStylePB.fromObject({ theme_color: 'light' }),- workspace_id: workspaceId,- })- );- if (createAppResult.ok) {- const pb = createAppResult.val;- const obj = pb.toObject();- console.log(obj);- } else {- throw new Error('create app error');- }- })();- }, [workspaceId]);-- async function sendSignInEvent() {- const make_payload = () =>- SignInPayloadPB.fromObject({- email: nanoid(4) + '@gmail.com',- password: 'A!@123abc',- name: 'abc',- });-- const listener = new UserNotificationListener({- onUserSignIn: (userProfile) => {- console.log(userProfile);- },- onProfileUpdate: (userProfile) => {- console.log(userProfile);- // stop listening the changes- void listener.stop();- },- });-- await listener.start();-- const signInResult = await UserEventSignIn(make_payload());- if (signInResult.ok) {- const pb = signInResult.val;- console.log(pb.toObject());- } else {- throw new Error('sign in error');- }-- const getSettingsResult = await UserEventGetUserSetting();- if (getSettingsResult.ok) {- const pb = getSettingsResult.val;- console.log(pb.toObject());- } else {- throw new Error('get user settings error');- }-- const createWorkspaceResult = await FolderEventCreateWorkspace(- CreateWorkspacePayloadPB.fromObject({- name: 'WS_1',- desc: 'Workspace One',- })- );-- if (createWorkspaceResult.ok) {- const pb = createWorkspaceResult.val;- console.log(pb.toObject());- const workspace: {- id?: string;- name?: string;- desc?: string;- apps?: ReturnType<typeof dependency_1.RepeatedAppPB.prototype.toObject>;- modified_time?: number;- create_time?: number;- } = pb.toObject();- setWorkspaceId(workspace?.id || '');- } else {- throw new Error('create workspace error');- }-- /**/- }-- return (- <>- <div>- <button className='rounded-md bg-gray-300 p-4' type='button' onClick={() => sendSignInEvent()}>- Sign in and create sample data- </button>- </div>- </>- );-};--export default TestApiButton;diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.tsindex bce7783ddc..8b41f96f1c 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts@@ -23,7 +23,7 @@ import {CreateRowPayloadPB,ViewIdPB,} from '@/services/backend';-import { FolderEventCloseView } from '@/services/backend/events/flowy-folder';+import { FolderEventCloseView } from '@/services/backend/events/flowy-folder2';/// A service that wraps the backend serviceexport class DatabaseBackendService {diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.tsindex 095abcaa5b..c582b1f7d2 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts@@ -8,7 +8,7 @@ import {} from '@/services/backend';import { DocumentEventApplyEdit, DocumentEventGetDocument } from '@/services/backend/events/flowy-document';import { Result } from 'ts-results';-import { FolderEventCloseView } from '@/services/backend/events/flowy-folder';+import { FolderEventCloseView } from '@/services/backend/events/flowy-folder2';export class DocumentBackendService {constructor(public readonly viewId: string) {}diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.tsindex 47c27c741d..53cd18680b 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts@@ -1,21 +1,20 @@import {FolderEventCreateView,- FolderEventDeleteApp,FolderEventDeleteView,FolderEventMoveItem,- FolderEventReadApp,- FolderEventUpdateApp,+ FolderEventReadView,+ FolderEventUpdateView,ViewLayoutTypePB,-} from '@/services/backend/events/flowy-folder';+} from '@/services/backend/events/flowy-folder2';import {- AppIdPB,- UpdateAppPayloadPB,CreateViewPayloadPB,RepeatedViewIdPB,ViewPB,MoveFolderItemPayloadPB,MoveFolderItemType,FlowyError,+ ViewIdPB,+ UpdateViewPayloadPB,} from '@/services/backend';import { None, Result, Some } from 'ts-results';@@ -23,8 +22,8 @@ export class AppBackendService {constructor(public readonly appId: string) {}getApp = () => {- const payload = AppIdPB.fromObject({ value: this.appId });- return FolderEventReadApp(payload);+ const payload = ViewIdPB.fromObject({ value: this.appId });+ return FolderEventReadView(payload);};createView = async (params: {@@ -54,9 +53,9 @@ export class AppBackendService {};getAllViews = (): Promise<Result<ViewPB[], FlowyError>> => {- const payload = AppIdPB.fromObject({ value: this.appId });- return FolderEventReadApp(payload).then((result) => {- return result.map((app) => app.belongings.items);+ const payload = ViewIdPB.fromObject({ value: this.appId });+ return FolderEventReadView(payload).then((result) => {+ return result.map((app) => app.belongings);});};@@ -75,16 +74,16 @@ export class AppBackendService {};update = async (params: { name: string }) => {- const payload = UpdateAppPayloadPB.fromObject({ app_id: this.appId, name: params.name });- const result = await FolderEventUpdateApp(payload);+ const payload = UpdateViewPayloadPB.fromObject({ view_id: this.appId, name: params.name });+ const result = await FolderEventUpdateView(payload);if (!result.ok) {throw new Error(result.val.msg);}};delete = async () => {- const payload = AppIdPB.fromObject({ value: this.appId });- const result = await FolderEventDeleteApp(payload);+ const payload = RepeatedViewIdPB.fromObject({ items: [this.appId] });+ const result = await FolderEventDeleteView(payload);if (!result.ok) {throw new Error(result.val.msg);}diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.tsindex 6440cb37c0..d46ffdef6f 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts@@ -1,12 +1,12 @@import { Ok, Result } from 'ts-results';-import { AppPB, FlowyError, FolderNotification } from '@/services/backend';+import { AppPB, FlowyError, FolderNotification, RepeatedViewPB } from '@/services/backend';import { ChangeNotifier } from '$app/utils/change_notifier';import { FolderNotificationObserver } from '../notifications/observer';-export type AppUpdateNotifyCallback = (value: Result<AppPB, FlowyError>) => void;+export type AppUpdateNotifyCallback = (value: Result<RepeatedViewPB, FlowyError>) => void;export class AppObserver {- _appNotifier = new ChangeNotifier<Result<AppPB, FlowyError>>();+ _appNotifier = new ChangeNotifier<Result<RepeatedViewPB, FlowyError>>();_listener?: FolderNotificationObserver;constructor(public readonly appId: string) {}@@ -17,9 +17,9 @@ export class AppObserver {viewId: this.appId,parserHandler: (notification, result) => {switch (notification) {- case FolderNotification.DidUpdateWorkspaceApps:+ case FolderNotification.DidUpdateWorkspaceViews:if (result.ok) {- this._appNotifier?.notify(Ok(AppPB.deserializeBinary(result.val)));+ this._appNotifier?.notify(Ok(RepeatedViewPB.deserializeBinary(result.val)));} else {this._appNotifier?.notify(result);}diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.tsindex f3fbd99829..ec98fb08ce 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts@@ -3,7 +3,7 @@ import {FolderEventDeleteView,FolderEventDuplicateView,FolderEventUpdateView,-} from '@/services/backend/events/flowy-folder';+} from '@/services/backend/events/flowy-folder2';export class ViewBackendService {constructor(public readonly viewId: string) {}diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.tsindex fec8269cc6..8dcfce6930 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts@@ -1,24 +1,31 @@import { Err, Ok } from 'ts-results';import {- FolderEventCreateApp,+ FolderEventCreateView,FolderEventMoveItem,FolderEventReadWorkspaceApps,FolderEventReadWorkspaces,-} from '@/services/backend/events/flowy-folder';-import { CreateAppPayloadPB, WorkspaceIdPB, FlowyError, MoveFolderItemPayloadPB } from '@/services/backend';+} from '@/services/backend/events/flowy-folder2';+import {+ CreateViewPayloadPB,+ FlowyError,+ MoveFolderItemPayloadPB,+ ViewLayoutTypePB,+ WorkspaceIdPB,+} from '@/services/backend';import assert from 'assert';export class WorkspaceBackendService {constructor(public readonly workspaceId: string) {}createApp = async (params: { name: string; desc?: string }) => {- const payload = CreateAppPayloadPB.fromObject({- workspace_id: this.workspaceId,+ const payload = CreateViewPayloadPB.fromObject({+ belong_to_id: this.workspaceId,name: params.name,desc: params.desc || '',+ layout: ViewLayoutTypePB.Document,});- const result = await FolderEventCreateApp(payload);+ const result = await FolderEventCreateView(payload);if (result.ok) {return result.val;} else {diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.tsindex 0b9efdab5a..e668fa06a1 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts@@ -1,9 +1,17 @@import { Ok, Result } from 'ts-results';-import { AppPB, FolderNotification, RepeatedAppPB, WorkspacePB, FlowyError } from '@/services/backend';+import {+ AppPB,+ FolderNotification,+ RepeatedAppPB,+ WorkspacePB,+ FlowyError,+ RepeatedViewPB,+ ViewPB,+} from '@/services/backend';import { ChangeNotifier } from '$app/utils/change_notifier';import { FolderNotificationObserver } from '../notifications/observer';-export type AppListNotifyValue = Result<AppPB[], FlowyError>;+export type AppListNotifyValue = Result<ViewPB[], FlowyError>;export type AppListNotifyCallback = (value: AppListNotifyValue) => void;export type WorkspaceNotifyValue = Result<WorkspacePB, FlowyError>;export type WorkspaceNotifyCallback = (value: WorkspaceNotifyValue) => void;@@ -33,9 +41,9 @@ export class WorkspaceObserver {this.workspaceNotifier?.notify(result);}break;- case FolderNotification.DidUpdateWorkspaceApps:+ case FolderNotification.DidUpdateWorkspaceViews:if (result.ok) {- this.appListNotifier?.notify(Ok(RepeatedAppPB.deserializeBinary(result.val).items));+ this.appListNotifier?.notify(Ok(RepeatedViewPB.deserializeBinary(result.val).items));} else {this.appListNotifier?.notify(result);}diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.tsindex 2e80f34e54..7c9e50d3fc 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts@@ -21,10 +21,10 @@ import {FolderEventOpenWorkspace,FolderEventReadCurrentWorkspace,FolderEventReadWorkspaces,-} from '@/services/backend/events/flowy-folder';+} from '@/services/backend/events/flowy-folder2';export class UserBackendService {- constructor(public readonly userId: string) {}+ constructor(public readonly userId: number) {}getUserProfile = () => {return UserEventGetUserProfile();diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.tsindex 4b5fbcb5ea..be68ddf6c9 100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts@@ -1,9 +1,9 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit';import { nanoid } from 'nanoid';-import { WorkspaceSettingPB } from '@/services/backend/models/flowy-folder/workspace';+import { WorkspaceSettingPB } from '@/services/backend/models/flowy-folder2/workspace';export interface ICurrentUser {- id?: string;+ id?: number;displayName?: string;email?: string;token?: string;diff --git a/frontend/appflowy_tauri/src/services/backend/index.ts b/frontend/appflowy_tauri/src/services/backend/index.tsindex d9b08aff40..af708e6c22 100644--- a/frontend/appflowy_tauri/src/services/backend/index.ts+++ b/frontend/appflowy_tauri/src/services/backend/index.ts@@ -1,6 +1,6 @@export * from "./models/flowy-user";export * from "./models/flowy-document";export * from "./models/flowy-database";-export * from "./models/flowy-folder";+export * from "./models/flowy-folder2";export * from "./models/flowy-net";export * from "./models/flowy-error";diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 2052c1707c..3127146c89 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -67,9 +67,9 @@ dependencies = [[[package]]name = "anyhow"-version = "1.0.68"+version = "1.0.70"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"[[package]]name = "arrayvec"@@ -102,7 +102,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -113,7 +113,7 @@ checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -298,7 +298,7 @@ dependencies = ["borsh-schema-derive-internal","proc-macro-crate","proc-macro2",- "syn",+ "syn 1.0.109",][[package]]@@ -309,7 +309,7 @@ checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -320,7 +320,7 @@ checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -369,7 +369,7 @@ checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -407,9 +407,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"[[package]]name = "chrono"-version = "0.4.23"+version = "0.4.24"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"dependencies = ["iana-time-zone","js-sys",@@ -475,7 +475,7 @@ dependencies = ["proc-macro-error","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -488,6 +488,70 @@ dependencies = ["unicode-width",]+[[package]]+name = "collab"+version = "0.1.0"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+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?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+dependencies = [+ "proc-macro2",+ "quote",+ "serde_json",+ "syn 1.0.109",+ "yrs",+]++[[package]]+name = "collab-folder"+version = "0.1.0"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+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?rev=f25ce7f#f25ce7f71ef3f0a2a35260ebdf74d75534bfad45"+dependencies = [+ "bincode",+ "chrono",+ "lib0",+ "serde",+ "sled",+ "smallvec",+ "thiserror",+ "tokio",+ "yrs",+]+[[package]]name = "color-eyre"version = "0.5.11"@@ -739,7 +803,7 @@ dependencies = ["proc-macro2","quote","scratch",- "syn",+ "syn 1.0.109",][[package]]@@ -756,7 +820,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -813,7 +877,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -826,7 +890,7 @@ dependencies = ["proc-macro2","quote","rustc_version",- "syn",+ "syn 1.0.109",][[package]]@@ -854,7 +918,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1022,7 +1086,7 @@ version = "0.1.0"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1093,7 +1157,7 @@ dependencies = ["serde","serde_json","similar",- "syn",+ "syn 1.0.109","tera","toml","walkdir",@@ -1104,6 +1168,7 @@ name = "flowy-core"version = "0.1.0"dependencies = ["bytes",+ "collab-persistence","console-subscriber","database-model","flowy-client-ws",@@ -1111,6 +1176,7 @@ dependencies = ["flowy-document","flowy-error","flowy-folder",+ "flowy-folder2","flowy-net","flowy-revision","flowy-sqlite",@@ -1192,7 +1258,7 @@ dependencies = ["proc-macro2","quote","serde_json",- "syn",+ "syn 1.0.109","tokio","trybuild","walkdir",@@ -1307,6 +1373,35 @@ dependencies = ["ws-model",]+[[package]]+name = "flowy-folder2"+version = "0.1.0"+dependencies = [+ "bytes",+ "chrono",+ "collab",+ "collab-folder",+ "collab-persistence",+ "flowy-codegen",+ "flowy-derive",+ "flowy-document",+ "flowy-error",+ "flowy-folder2",+ "flowy-notification",+ "flowy-test",+ "lazy_static",+ "lib-dispatch",+ "lib-infra",+ "nanoid",+ "parking_lot 0.12.1",+ "protobuf",+ "strum",+ "strum_macros",+ "tokio",+ "tracing",+ "unicode-segmentation",+]+[[package]]name = "flowy-net"version = "0.1.0"@@ -1324,7 +1419,7 @@ dependencies = ["flowy-derive","flowy-document","flowy-error",- "flowy-folder",+ "flowy-folder2","flowy-server-sync","flowy-sync","flowy-user",@@ -1478,7 +1573,7 @@ dependencies = ["flowy-client-sync","flowy-core","flowy-document",- "flowy-folder",+ "flowy-folder2","flowy-net","flowy-user","futures",@@ -1503,6 +1598,7 @@ name = "flowy-user"version = "0.1.0"dependencies = ["bytes",+ "collab-persistence","diesel","diesel_derives","flowy-codegen",@@ -1568,6 +1664,16 @@ dependencies = ["percent-encoding",]+[[package]]+name = "fs2"+version = "0.4.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"+dependencies = [+ "libc",+ "winapi",+]+[[package]]name = "futures"version = "0.3.26"@@ -1624,7 +1730,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -1657,6 +1763,15 @@ dependencies = ["slab",]+[[package]]+name = "fxhash"+version = "0.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"+dependencies = [+ "byteorder",+]+[[package]]name = "generic-array"version = "0.14.6"@@ -1684,8 +1799,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"dependencies = ["cfg-if",+ "js-sys","libc","wasi 0.9.0+wasi-snapshot-preview1",+ "wasm-bindgen",][[package]]@@ -2166,6 +2283,17 @@ dependencies = ["url",]+[[package]]+name = "lib0"+version = "0.16.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3994538ae0215990b1c3df6dc45bb5afad77abce3a6ba3335512c5f5d9bfb1d4"+dependencies = [+ "serde",+ "serde_json",+ "thiserror",+]+[[package]]name = "libc"version = "0.2.139"@@ -2285,7 +2413,7 @@ dependencies = ["migrations_internals","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2448,7 +2576,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2589,7 +2717,7 @@ dependencies = ["pest_meta","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2664,7 +2792,7 @@ dependencies = ["proc-macro-hack","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2703,7 +2831,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2776,7 +2904,7 @@ dependencies = ["proc-macro-error-attr","proc-macro2","quote",- "syn",+ "syn 1.0.109","version_check",]@@ -2799,9 +2927,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"[[package]]name = "proc-macro2"-version = "1.0.49"+version = "1.0.53"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"+checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"dependencies = ["unicode-ident",]@@ -2826,7 +2954,7 @@ dependencies = ["itertools","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2942,7 +3070,7 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -2964,14 +3092,14 @@ checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]name = "quote"-version = "1.0.23"+version = "1.0.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"dependencies = ["proc-macro2",]@@ -3218,7 +3346,7 @@ checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3362,9 +3490,9 @@ checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"[[package]]name = "serde"-version = "1.0.152"+version = "1.0.158"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"+checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"dependencies = ["serde_derive",]@@ -3392,20 +3520,20 @@ dependencies = [[[package]]name = "serde_derive"-version = "1.0.152"+version = "1.0.158"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"+checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"dependencies = ["proc-macro2","quote",- "syn",+ "syn 2.0.8",][[package]]name = "serde_json"-version = "1.0.91"+version = "1.0.94"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"+checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"dependencies = ["itoa 1.0.5","ryu",@@ -3420,7 +3548,7 @@ checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3454,7 +3582,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3520,6 +3648,22 @@ dependencies = ["autocfg",]+[[package]]+name = "sled"+version = "0.34.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"+dependencies = [+ "crc32fast",+ "crossbeam-epoch",+ "crossbeam-utils",+ "fs2",+ "fxhash",+ "libc",+ "log",+ "parking_lot 0.11.2",+]+[[package]]name = "slug"version = "0.1.4"@@ -3529,6 +3673,15 @@ dependencies = ["deunicode",]+[[package]]+name = "smallstr"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1e922794d168678729ffc7e07182721a14219c65814e66e91b839a272fe5ae4f"+dependencies = [+ "smallvec",+]+[[package]]name = "smallvec"version = "1.10.0"@@ -3566,7 +3719,7 @@ dependencies = ["heck","proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3580,6 +3733,17 @@ dependencies = ["unicode-ident",]+[[package]]+name = "syn"+version = "2.0.8"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"+dependencies = [+ "proc-macro2",+ "quote",+ "unicode-ident",+]+[[package]]name = "sync_wrapper"version = "0.1.2"@@ -3652,22 +3816,22 @@ dependencies = [[[package]]name = "thiserror"-version = "1.0.38"+version = "1.0.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"dependencies = ["thiserror-impl",][[package]]name = "thiserror-impl"-version = "1.0.38"+version = "1.0.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"dependencies = ["proc-macro2","quote",- "syn",+ "syn 2.0.8",][[package]]@@ -3765,7 +3929,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -3940,7 +4104,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109",][[package]]@@ -4306,7 +4470,7 @@ dependencies = ["once_cell","proc-macro2","quote",- "syn",+ "syn 1.0.109","wasm-bindgen-shared",]@@ -4340,7 +4504,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"dependencies = ["proc-macro2","quote",- "syn",+ "syn 1.0.109","wasm-bindgen-backend","wasm-bindgen-shared",]@@ -4504,6 +4668,17 @@ dependencies = ["serde_repr",]+[[package]]+name = "y-sync"+version = "0.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e77a143afe4dde83bc987ad3119228d0f107053a3da131a00738cb2d7f496641"+dependencies = [+ "lib0",+ "thiserror",+ "yrs",+]+[[package]]name = "yaml-rust"version = "0.4.5"@@ -4512,3 +4687,17 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"dependencies = ["linked-hash-map",]++[[package]]+name = "yrs"+version = "0.16.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7b2b23ac465bed6c0ffbb9fbd80ec808bd89b37b823a420b16917d1806d76d75"+dependencies = [+ "atomic_refcell",+ "lib0",+ "rand 0.7.3",+ "smallstr",+ "smallvec",+ "thiserror",+]diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 83a5e25bc0..a941760c75 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -8,7 +8,8 @@ members = ["flowy-user","flowy-test","flowy-sqlite",- "flowy-folder",+# "flowy-folder",+ "flowy-folder2","flowy-notification","flowy-document","flowy-error",@@ -34,4 +35,10 @@ opt-level = 3#strip = "debuginfo"## For from-scratch builds, incremental adds an extra dependency-tracking overhead. It also significantly increases## the amount of IO and the size of ./target, which make caching less effective.-incremental = false\ No newline at end of file+incremental = false+++[patch.crates-io]+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f25ce7f" }diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex 591f459963..608b145b2a 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -11,6 +11,7 @@ lib-log = { path = "../lib-log" }flowy-user = { path = "../flowy-user" }flowy-net = { path = "../flowy-net" }flowy-folder = { path = "../flowy-folder" }+flowy-folder2 = { path = "../flowy-folder2" }flowy-database = { path = "../flowy-database" }database-model = { path = "../../../shared-lib/database-model" }user-model = { path = "../../../shared-lib/user-model" }@@ -20,6 +21,7 @@ flowy-document = { path = "../flowy-document" }flowy-revision = { path = "../flowy-revision" }flowy-error = { path = "../flowy-error", features = ["adaptor_ws"] }flowy-task = { path = "../flowy-task" }+collab-persistence = { version = "0.1.0" }tracing = { version = "0.1", features = ["log"] }futures-core = { version = "0.3", default-features = false }@@ -45,6 +47,7 @@ dart = ["flowy-user/dart","flowy-net/dart","flowy-folder/dart",+ "flowy-folder2/dart","flowy-database/dart","flowy-document/dart",]@@ -52,6 +55,7 @@ ts = ["flowy-user/ts","flowy-net/ts","flowy-folder/ts",+ "flowy-folder2/ts","flowy-database/ts","flowy-document/ts",]diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rsindex b08b99769e..90b0d34ff7 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs@@ -61,7 +61,7 @@ impl DocumentUser for BlockUserImpl {Ok(doc_dir)}- fn user_id(&self) -> Result<String, FlowyError> {+ fn user_id(&self) -> Result<i64, FlowyError> {self.0.user_id()}diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rsnew file mode 100644index 0000000000..e8d61e932a--- /dev/null+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs@@ -0,0 +1,258 @@+use bytes::Bytes;+use collab_persistence::CollabKV;+use database_model::BuildDatabaseContext;+use flowy_database::entities::LayoutTypePB;+use flowy_database::manager::{create_new_database, link_existing_database, DatabaseManager};+use flowy_database::util::{make_default_board, make_default_calendar, make_default_grid};+use flowy_document::editor::make_transaction_from_document_content;+use flowy_document::DocumentManager;+use flowy_error::FlowyError;++use flowy_folder2::manager::{Folder2Manager, FolderUser};+use flowy_folder2::view_ext::{ViewDataProcessor, ViewDataProcessorMap};+use flowy_folder2::ViewLayout;+use flowy_user::services::UserSession;+use lib_infra::future::FutureResult;+use revision_model::Revision;+use std::collections::HashMap;+use std::convert::TryFrom;+use std::sync::Arc;++pub struct Folder2DepsResolver();+impl Folder2DepsResolver {+ pub async fn resolve(+ user_session: Arc<UserSession>,+ document_manager: &Arc<DocumentManager>,+ database_manager: &Arc<DatabaseManager>,+ ) -> Arc<Folder2Manager> {+ let user: Arc<dyn FolderUser> = Arc::new(FolderUserImpl(user_session.clone()));++ let view_data_processor =+ make_view_data_processor(document_manager.clone(), database_manager.clone());+ Arc::new(+ Folder2Manager::new(user.clone(), view_data_processor)+ .await+ .unwrap(),+ )+ }+}++fn make_view_data_processor(+ document_manager: Arc<DocumentManager>,+ database_manager: Arc<DatabaseManager>,+) -> ViewDataProcessorMap {+ let mut map: HashMap<ViewLayout, Arc<dyn ViewDataProcessor + Send + Sync>> = HashMap::new();++ let document_processor = Arc::new(DocumentViewDataProcessor(document_manager));+ map.insert(ViewLayout::Document, document_processor);++ let database_processor = Arc::new(DatabaseViewDataProcessor(database_manager));+ map.insert(ViewLayout::Board, database_processor.clone());+ map.insert(ViewLayout::Grid, database_processor.clone());+ map.insert(ViewLayout::Calendar, database_processor);+ Arc::new(map)+}++struct FolderUserImpl(Arc<UserSession>);+impl FolderUser for FolderUserImpl {+ fn user_id(&self) -> Result<i64, FlowyError> {+ self+ .0+ .user_id()+ .map_err(|e| FlowyError::internal().context(e))+ }++ fn token(&self) -> Result<String, FlowyError> {+ self+ .0+ .token()+ .map_err(|e| FlowyError::internal().context(e))+ }++ fn kv_db(&self) -> Result<Arc<CollabKV>, FlowyError> {+ self.0.get_kv_db()+ }+}++struct DocumentViewDataProcessor(Arc<DocumentManager>);+impl ViewDataProcessor for DocumentViewDataProcessor {+ fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {+ let manager = self.0.clone();+ let view_id = view_id.to_string();+ FutureResult::new(async move {+ manager.close_document_editor(view_id).await?;+ Ok(())+ })+ }++ fn get_view_data(&self, view_id: &str) -> FutureResult<Bytes, FlowyError> {+ let manager = self.0.clone();+ let view_id = view_id.to_string();+ FutureResult::new(async move {+ let editor = manager.open_document_editor(view_id).await?;+ let document_data = Bytes::from(editor.duplicate().await?);+ Ok(document_data)+ })+ }++ fn create_view_with_build_in_data(+ &self,+ _user_id: i64,+ view_id: &str,+ _name: &str,+ layout: ViewLayout,+ _ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {+ debug_assert_eq!(layout, ViewLayout::Document);+ let view_id = view_id.to_string();+ let manager = self.0.clone();+ let document_content = self.0.initial_document_content();+ FutureResult::new(async move {+ let delta_data = Bytes::from(document_content);+ let revision = Revision::initial_revision(&view_id, delta_data);+ manager.create_document(view_id, vec![revision]).await?;+ Ok(())+ })+ }++ fn create_view_with_custom_data(+ &self,+ _user_id: i64,+ view_id: &str,+ _name: &str,+ data: Vec<u8>,+ layout: ViewLayout,+ _ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {+ debug_assert_eq!(layout, ViewLayout::Document);+ let view_data = match String::from_utf8(data) {+ Ok(content) => match make_transaction_from_document_content(&content) {+ Ok(transaction) => transaction.to_bytes().unwrap_or_else(|_| vec![]),+ Err(_) => vec![],+ },+ Err(_) => vec![],+ };++ let revision = Revision::initial_revision(view_id, Bytes::from(view_data));+ let view_id = view_id.to_string();+ let manager = self.0.clone();++ FutureResult::new(async move {+ manager.create_document(view_id, vec![revision]).await?;+ Ok(())+ })+ }+}++struct DatabaseViewDataProcessor(Arc<DatabaseManager>);+impl ViewDataProcessor for DatabaseViewDataProcessor {+ fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {+ let database_manager = self.0.clone();+ let view_id = view_id.to_string();+ FutureResult::new(async move {+ database_manager.close_database_view(view_id).await?;+ Ok(())+ })+ }++ fn get_view_data(&self, view_id: &str) -> FutureResult<Bytes, FlowyError> {+ let database_manager = self.0.clone();+ let view_id = view_id.to_owned();+ FutureResult::new(async move {+ let editor = database_manager.open_database_view(&view_id).await?;+ let delta_bytes = editor.duplicate_database(&view_id).await?;+ Ok(delta_bytes.into())+ })+ }++ /// Create a database view with build-in data.+ /// If the ext contains the {"database_id": "xx"}, then it will link to+ /// the existing database. The data of the database will be shared within+ /// these references views.+ fn create_view_with_build_in_data(+ &self,+ _user_id: i64,+ view_id: &str,+ name: &str,+ layout: ViewLayout,+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {+ let view_id = view_id.to_string();+ let name = name.to_string();+ let database_manager = self.0.clone();+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {+ None => {+ let (build_context, layout) = match layout {+ ViewLayout::Grid => (make_default_grid(), LayoutTypePB::Grid),+ ViewLayout::Board => (make_default_board(), LayoutTypePB::Board),+ ViewLayout::Calendar => (make_default_calendar(), LayoutTypePB::Calendar),+ ViewLayout::Document => {+ return FutureResult::new(async move {+ Err(FlowyError::internal().context(format!("Can't handle {:?} layout type", layout)))+ });+ },+ };+ FutureResult::new(async move {+ create_new_database(&view_id, name, layout, database_manager, build_context).await+ })+ },+ Some(database_id) => {+ let layout = layout_type_from_view_layout(layout);+ FutureResult::new(async move {+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await+ })+ },+ }+ }++ /// Create a database view with custom data.+ /// If the ext contains the {"database_id": "xx"}, then it will link+ /// to the existing database. The data of the database will be shared+ /// within these references views.+ fn create_view_with_custom_data(+ &self,+ _user_id: i64,+ view_id: &str,+ name: &str,+ data: Vec<u8>,+ layout: ViewLayout,+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {+ let view_id = view_id.to_string();+ let database_manager = self.0.clone();+ let layout = layout_type_from_view_layout(layout);+ let name = name.to_string();+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {+ None => FutureResult::new(async move {+ let bytes = Bytes::from(data);+ let build_context = BuildDatabaseContext::try_from(bytes)?;+ let _ = create_new_database(&view_id, name, layout, database_manager, build_context).await;+ Ok(())+ }),+ Some(database_id) => FutureResult::new(async move {+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await+ }),+ }+ }+}++#[derive(Debug, serde::Deserialize)]+struct DatabaseExtParams {+ database_id: String,+}++impl DatabaseExtParams {+ pub fn from_map(map: HashMap<String, String>) -> Option<Self> {+ let value = serde_json::to_value(map).ok()?;+ serde_json::from_value::<Self>(value).ok()+ }+}++pub fn layout_type_from_view_layout(layout: ViewLayout) -> LayoutTypePB {+ match layout {+ ViewLayout::Grid => LayoutTypePB::Grid,+ ViewLayout::Board => LayoutTypePB::Board,+ ViewLayout::Calendar => LayoutTypePB::Calendar,+ ViewLayout::Document => LayoutTypePB::Grid,+ }+}diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rsindex 63fdf4bcad..77f07ebde3 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs@@ -46,7 +46,7 @@ impl DatabaseDBConnection for DatabaseDBConnectionImpl {struct GridUserImpl(Arc<UserSession>);impl DatabaseUser for GridUserImpl {- fn user_id(&self) -> Result<String, FlowyError> {+ fn user_id(&self) -> Result<i64, FlowyError> {self.0.user_id()}diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rsindex 6a270e4376..9620e97ff3 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs@@ -1,10 +1,10 @@mod document_deps;-mod folder_deps;+mod folder2_deps;mod grid_deps;mod user_deps;mod util;pub use document_deps::*;-pub use folder_deps::*;+pub use folder2_deps::*;pub use grid_deps::*;pub use user_deps::*;diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex c37efabad7..f614315b33 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -1,13 +1,15 @@mod deps_resolve;pub mod module;use crate::deps_resolve::*;+use flowy_client_ws::{listen_on_websocket, FlowyWebSocketConnect, NetworkType};+use flowy_database::entities::LayoutTypePB;use flowy_database::manager::DatabaseManager;use flowy_document::entities::DocumentVersionPB;use flowy_document::{DocumentConfig, DocumentManager};use flowy_error::FlowyResult;-use flowy_folder::entities::{ViewDataFormatPB, ViewLayoutTypePB};-use flowy_folder::{errors::FlowyError, manager::FolderManager};+use flowy_folder::errors::FlowyError;+use flowy_folder2::manager::Folder2Manager;pub use flowy_net::get_client_server_configuration;use flowy_net::local_server::LocalServer;use flowy_net::ClientServerConfiguration;@@ -16,8 +18,6 @@ use flowy_user::event_map::UserStatusCallback;use flowy_user::services::{UserSession, UserSessionConfig};use lib_dispatch::prelude::*;use lib_dispatch::runtime::tokio_default_runtime;--use flowy_database::entities::LayoutTypePB;use lib_infra::future::{to_fut, Fut};use module::make_plugins;pub use module::*;@@ -89,6 +89,8 @@ fn create_log_filter(level: String, with_crates: Vec<String>) -> String {.collect::<Vec<String>>();filters.push(format!("flowy_core={}", level));filters.push(format!("flowy_folder={}", level));+ filters.push(format!("flowy_folder2={}", level));+ filters.push(format!("collab_folder={}", level));filters.push(format!("flowy_user={}", level));filters.push(format!("flowy_document={}", level));filters.push(format!("flowy_database={}", level));@@ -106,7 +108,7 @@ fn create_log_filter(level: String, with_crates: Vec<String>) -> String {filters.push(format!("dart_ffi={}", "info"));filters.push(format!("flowy_sqlite={}", "info"));- filters.push(format!("flowy_net={}", "info"));+ filters.push(format!("flowy_net={}", level));#[cfg(feature = "profiling")]filters.push(format!("tokio={}", level));@@ -122,7 +124,7 @@ pub struct AppFlowyCore {pub config: AppFlowyCoreConfig,pub user_session: Arc<UserSession>,pub document_manager: Arc<DocumentManager>,- pub folder_manager: Arc<FolderManager>,+ pub folder_manager: Arc<Folder2Manager>,pub database_manager: Arc<DatabaseManager>,pub event_dispatcher: Arc<AFPluginDispatcher>,pub ws_conn: Arc<FlowyWebSocketConnect>,@@ -162,15 +164,9 @@ impl AppFlowyCore {).await;- let folder_manager = FolderDepsResolver::resolve(- local_server.clone(),- user_session.clone(),- &config.server_config,- &ws_conn,- &document_manager,- &database_manager,- )- .await;+ let folder_manager =+ Folder2DepsResolver::resolve(user_session.clone(), &document_manager, &database_manager)+ .await;if let Some(local_server) = local_server.as_ref() {local_server.run();@@ -232,11 +228,11 @@ impl AppFlowyCore {fn _start_listening(event_dispatcher: &AFPluginDispatcher,ws_conn: &Arc<FlowyWebSocketConnect>,- folder_manager: &Arc<FolderManager>,+ folder_manager: &Arc<Folder2Manager>,) {let subscribe_network_type = ws_conn.subscribe_network_ty();let folder_manager = folder_manager.clone();- let cloned_folder_manager = folder_manager;+ let _cloned_folder_manager = folder_manager;let ws_conn = ws_conn.clone();event_dispatcher.spawn(async move {@@ -244,7 +240,7 @@ fn _start_listening(});event_dispatcher.spawn(async move {- _listen_network_status(subscribe_network_type, cloned_folder_manager).await;+ _listen_network_status(subscribe_network_type).await;});}@@ -263,10 +259,7 @@ fn mk_local_server(}}-async fn _listen_network_status(- mut subscribe: broadcast::Receiver<NetworkType>,- _core: Arc<FolderManager>,-) {+async fn _listen_network_status(mut subscribe: broadcast::Receiver<NetworkType>) {while let Ok(_new_type) = subscribe.recv().await {// core.network_state_changed(new_type);}@@ -301,41 +294,33 @@ fn mk_user_session(struct UserStatusListener {document_manager: Arc<DocumentManager>,- folder_manager: Arc<FolderManager>,+ folder_manager: Arc<Folder2Manager>,database_manager: Arc<DatabaseManager>,ws_conn: Arc<FlowyWebSocketConnect>,+ #[allow(dead_code)]config: AppFlowyCoreConfig,}impl UserStatusListener {- async fn did_sign_in(&self, token: &str, user_id: &str) -> FlowyResult<()> {- self.folder_manager.initialize(user_id, token).await?;+ async fn did_sign_in(&self, token: &str, user_id: i64) -> FlowyResult<()> {+ self.folder_manager.initialize(user_id).await?;self.document_manager.initialize(user_id).await?;-let cloned_folder_manager = self.folder_manager.clone();let get_views_fn = to_fut(async move {cloned_folder_manager- .get_current_workspace()+ .get_current_workspace_views().await- .map(|workspace| {- workspace- .apps- .items- .into_iter()- .flat_map(|app| app.belongings.items)- .flat_map(|view| match view.layout {- ViewLayoutTypePB::Grid | ViewLayoutTypePB::Board | ViewLayoutTypePB::Calendar => {- Some((- view.id,- view.name,- layout_type_from_view_layout(view.layout),- ))- },- _ => None,- })- .collect::<Vec<(String, String, LayoutTypePB)>>()- }).unwrap_or_default()+ .into_iter()+ .filter(|view| view.layout.is_database())+ .map(|view| {+ (+ view.id,+ view.name,+ layout_type_from_view_layout(view.layout),+ )+ })+ .collect::<Vec<(String, String, LayoutTypePB)>>()});self.database_manager@@ -349,32 +334,28 @@ impl UserStatusListener {}async fn did_sign_up(&self, user_profile: &UserProfile) -> FlowyResult<()> {- let view_data_type = match self.config.document.version {- DocumentVersionPB::V0 => ViewDataFormatPB::DeltaFormat,- DocumentVersionPB::V1 => ViewDataFormatPB::NodeFormat,- };self.folder_manager- .initialize_with_new_user(&user_profile.id, &user_profile.token, view_data_type)+ .initialize_with_new_user(user_profile.id, &user_profile.token).await?;self.document_manager- .initialize_with_new_user(&user_profile.id, &user_profile.token)+ .initialize_with_new_user(user_profile.id, &user_profile.token).await?;self.database_manager- .initialize_with_new_user(&user_profile.id, &user_profile.token)+ .initialize_with_new_user(user_profile.id, &user_profile.token).await?;self.ws_conn- .start(user_profile.token.clone(), user_profile.id.clone())+ .start(user_profile.token.clone(), user_profile.id).await?;Ok(())}- async fn did_expired(&self, _token: &str, user_id: &str) -> FlowyResult<()> {+ async fn did_expired(&self, _token: &str, user_id: i64) -> FlowyResult<()> {self.folder_manager.clear(user_id).await;self.ws_conn.stop().await;Ok(())@@ -386,11 +367,11 @@ struct UserStatusCallbackImpl {}impl UserStatusCallback for UserStatusCallbackImpl {- fn did_sign_in(&self, token: &str, user_id: &str) -> Fut<FlowyResult<()>> {+ fn did_sign_in(&self, token: &str, user_id: i64) -> Fut<FlowyResult<()>> {let listener = self.listener.clone();let token = token.to_owned();let user_id = user_id.to_owned();- to_fut(async move { listener.did_sign_in(&token, &user_id).await })+ to_fut(async move { listener.did_sign_in(&token, user_id).await })}fn did_sign_up(&self, user_profile: &UserProfile) -> Fut<FlowyResult<()>> {@@ -399,10 +380,15 @@ impl UserStatusCallback for UserStatusCallbackImpl {to_fut(async move { listener.did_sign_up(&user_profile).await })}- fn did_expired(&self, token: &str, user_id: &str) -> Fut<FlowyResult<()>> {+ fn did_expired(&self, token: &str, user_id: i64) -> Fut<FlowyResult<()>> {let listener = self.listener.clone();let token = token.to_owned();let user_id = user_id.to_owned();- to_fut(async move { listener.did_expired(&token, &user_id).await })+ to_fut(async move { listener.did_expired(&token, user_id).await })+ }++ fn will_migrated(&self, _token: &str, _old_user_id: &str, _user_id: i64) -> Fut<FlowyResult<()>> {+ // Read the folder data+ todo!()}}diff --git a/frontend/rust-lib/flowy-core/src/module.rs b/frontend/rust-lib/flowy-core/src/module.rsindex d9a3d117bc..41cad63a3c 100644--- a/frontend/rust-lib/flowy-core/src/module.rs+++ b/frontend/rust-lib/flowy-core/src/module.rs@@ -1,20 +1,21 @@use flowy_client_ws::FlowyWebSocketConnect;use flowy_database::manager::DatabaseManager;use flowy_document::DocumentManager;-use flowy_folder::manager::FolderManager;++use flowy_folder2::manager::Folder2Manager;use flowy_user::services::UserSession;use lib_dispatch::prelude::AFPlugin;use std::sync::Arc;pub fn make_plugins(ws_conn: &Arc<FlowyWebSocketConnect>,- folder_manager: &Arc<FolderManager>,+ folder_manager: &Arc<Folder2Manager>,grid_manager: &Arc<DatabaseManager>,user_session: &Arc<UserSession>,document_manager: &Arc<DocumentManager>,) -> Vec<AFPlugin> {let user_plugin = flowy_user::event_map::init(user_session.clone());- let folder_plugin = flowy_folder::event_map::init(folder_manager.clone());+ let folder_plugin = flowy_folder2::event_map::init(folder_manager.clone());let network_plugin = flowy_net::event_map::init(ws_conn.clone());let grid_plugin = flowy_database::event_map::init(grid_manager.clone());let document_plugin = flowy_document::event_map::init(document_manager.clone());diff --git a/frontend/rust-lib/flowy-database/src/manager.rs b/frontend/rust-lib/flowy-database/src/manager.rsindex f4b30de956..860f748fbb 100644--- a/frontend/rust-lib/flowy-database/src/manager.rs+++ b/frontend/rust-lib/flowy-database/src/manager.rs@@ -35,7 +35,7 @@ use std::sync::Arc;use tokio::sync::RwLock;pub trait DatabaseUser: Send + Sync {- fn user_id(&self) -> Result<String, FlowyError>;+ fn user_id(&self) -> Result<i64, FlowyError>;fn token(&self) -> Result<String, FlowyError>;fn db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError>;}@@ -75,13 +75,13 @@ impl DatabaseManager {}}- pub async fn initialize_with_new_user(&self, _user_id: &str, _token: &str) -> FlowyResult<()> {+ pub async fn initialize_with_new_user(&self, _user_id: i64, _token: &str) -> FlowyResult<()> {Ok(())}pub async fn initialize(&self,- user_id: &str,+ user_id: i64,_token: &str,get_views_fn: Fut<Vec<(String, String, LayoutTypePB)>>,) -> FlowyResult<()> {@@ -114,9 +114,8 @@ impl DatabaseManager {revisions: Vec<Revision>,) -> FlowyResult<()> {let view_id = view_id.as_ref();- let user_id = self.database_user.user_id()?;let pool = self.database_user.db_pool()?;- let rev_manager = make_database_view_rev_manager(&user_id, pool, view_id).await?;+ let rev_manager = make_database_view_rev_manager(pool, view_id).await?;rev_manager.reset_object(revisions).await?;Ok(())}@@ -210,10 +209,8 @@ impl DatabaseManager {) -> FlowyResult<Arc<DatabaseEditor>> {let user = self.database_user.clone();let create_view_editor = |database_editor: Arc<DatabaseEditor>| async move {- let user_id = user.user_id()?;let (view_pad, view_rev_manager) = make_database_view_revision_pad(view_id, user).await?;DatabaseViewEditor::from_pad(- &user_id,database_editor.database_view_data.clone(),database_editor.cell_data_cache.clone(),view_rev_manager,@@ -275,7 +272,6 @@ impl DatabaseManager {.initialize::<DatabaseRevisionSerde>(Some(cloud)).await?,));- let user_id = user.user_id()?;let database_editor = DatabaseEditor::new(&database_id,user,@@ -288,7 +284,6 @@ impl DatabaseManager {.await?;let base_view_editor = DatabaseViewEditor::from_pad(- &user_id,database_editor.database_view_data.clone(),database_editor.cell_data_cache.clone(),base_view_rev_manager,@@ -306,13 +301,10 @@ impl DatabaseManager {database_id: &str,pool: Arc<ConnectionPool>,) -> FlowyResult<RevisionManager<Arc<ConnectionPool>>> {- let user_id = self.database_user.user_id()?;-// Create revision persistence- let disk_cache = SQLiteDatabaseRevisionPersistence::new(&user_id, pool.clone());+ let disk_cache = SQLiteDatabaseRevisionPersistence::new(pool.clone());let configuration = RevisionPersistenceConfiguration::new(6, false);- let rev_persistence =- RevisionPersistence::new(&user_id, database_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(database_id, disk_cache, configuration);// Create snapshot persistenceconst DATABASE_SP_PREFIX: &str = "grid";@@ -322,7 +314,6 @@ impl DatabaseManager {let rev_compress = DatabaseRevisionMergeable();let rev_manager = RevisionManager::new(- &user_id,database_id,rev_persistence,rev_compress,diff --git a/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs b/frontend/rust-lib/flowy-database/src/services/database/block_editor.rsindex ffcadf1e2f..2df275a135 100644--- a/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs@@ -20,8 +20,6 @@ use std::sync::Arc;use tokio::sync::RwLock;pub struct DatabaseBlockEditor {- #[allow(dead_code)]- user_id: String,pub block_id: String,pad: Arc<RwLock<DatabaseBlockRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,@@ -29,7 +27,6 @@ pub struct DatabaseBlockEditor {impl DatabaseBlockEditor {pub async fn new(- user_id: &str,token: &str,block_id: &str,mut rev_manager: RevisionManager<Arc<ConnectionPool>>,@@ -42,10 +39,8 @@ impl DatabaseBlockEditor {.await?;let pad = Arc::new(RwLock::new(block_revision_pad));let rev_manager = Arc::new(rev_manager);- let user_id = user_id.to_owned();let block_id = block_id.to_owned();Ok(Self {- user_id,block_id,pad,rev_manager,diff --git a/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs b/frontend/rust-lib/flowy-database/src/services/database/block_manager.rsindex 9d91ff7fd9..d98979c5ef 100644--- a/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs@@ -322,22 +322,19 @@ async fn make_database_block_editor() -> FlowyResult<DatabaseBlockEditor> {tracing::trace!("Open block:{} editor", block_id);let token = user.token()?;- let user_id = user.user_id()?;let rev_manager = make_database_block_rev_manager(user, block_id)?;- DatabaseBlockEditor::new(&user_id, &token, block_id, rev_manager).await+ DatabaseBlockEditor::new(&token, block_id, rev_manager).await}pub fn make_database_block_rev_manager(user: &Arc<dyn DatabaseUser>,block_id: &str,) -> FlowyResult<RevisionManager<Arc<ConnectionPool>>> {- let user_id = user.user_id()?;-// Create revision persistencelet pool = user.db_pool()?;- let disk_cache = SQLiteDatabaseBlockRevisionPersistence::new(&user_id, pool.clone());+ let disk_cache = SQLiteDatabaseBlockRevisionPersistence::new(pool.clone());let configuration = RevisionPersistenceConfiguration::new(4, false);- let rev_persistence = RevisionPersistence::new(&user_id, block_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(block_id, disk_cache, configuration);// Create snapshot persistenceconst DATABASE_BLOCK_SP_PREFIX: &str = "grid_block";@@ -347,7 +344,6 @@ pub fn make_database_block_rev_manager(let rev_compress = DatabaseBlockRevisionMergeable();let rev_manager = RevisionManager::new(- &user_id,block_id,rev_persistence,rev_compress,diff --git a/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database/src/services/database/database_editor.rsindex b0ca679bdd..8d5775d239 100644--- a/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs@@ -888,11 +888,14 @@ impl DatabaseEditor {Ok(())}- pub async fn duplicate_database(&self, _view_id: &str) -> FlowyResult<BuildDatabaseContext> {+ pub async fn duplicate_database<T: AsRef<str>>(+ &self,+ _view_id: T,+ ) -> FlowyResult<BuildDatabaseContext> {let database_pad = self.database_pad.read().await;// let database_view_data = self// .database_views- // .duplicate_database_view_setting(view_id)+ // .duplicate_database_view(view_id.as_ref())// .await?;let original_blocks = database_pad.get_block_meta_revs();let (duplicated_fields, duplicated_blocks) = database_pad.duplicate_database_block_meta().await;diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs b/frontend/rust-lib/flowy-database/src/services/database_view/editor.rsindex 1d5449bd27..f2ed34e31e 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs@@ -76,7 +76,6 @@ pub trait DatabaseViewData: Send + Sync + 'static {}pub struct DatabaseViewEditor {- user_id: String,pub view_id: String,pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,@@ -95,7 +94,6 @@ impl Drop for DatabaseViewEditor {impl DatabaseViewEditor {pub async fn from_pad(- user_id: &str,delegate: Arc<dyn DatabaseViewData>,cell_data_cache: AtomicCellDataCache,rev_manager: RevisionManager<Arc<ConnectionPool>>,@@ -108,7 +106,6 @@ impl DatabaseViewEditor {let view_rev_pad = Arc::new(RwLock::new(view_rev_pad));let rev_manager = Arc::new(rev_manager);let group_controller = new_group_controller(- user_id.to_owned(),view_id.clone(),view_rev_pad.clone(),rev_manager.clone(),@@ -116,7 +113,6 @@ impl DatabaseViewEditor {).await?;- let user_id = user_id.to_owned();let group_controller = Arc::new(RwLock::new(group_controller));let filter_controller = make_filter_controller(&view_id,@@ -138,7 +134,6 @@ impl DatabaseViewEditor {.await;Ok(Self {pad: view_rev_pad,- user_id,view_id,rev_manager,delegate,@@ -151,7 +146,6 @@ impl DatabaseViewEditor {#[tracing::instrument(level = "trace", skip_all, err)]pub async fn new(- user_id: &str,token: &str,view_id: String,delegate: Arc<dyn DatabaseViewData>,@@ -176,14 +170,7 @@ impl DatabaseViewEditor {},};- Self::from_pad(- user_id,- delegate,- cell_data_cache,- rev_manager,- view_rev_pad,- )- .await+ Self::from_pad(delegate, cell_data_cache, rev_manager, view_rev_pad).await}#[tracing::instrument(name = "close database view editor", level = "trace", skip_all)]@@ -795,7 +782,6 @@ impl DatabaseViewEditor {view_editor_delegate: self.delegate.clone(),};let new_group_controller = new_group_controller_with_field_rev(- self.user_id.clone(),self.view_id.clone(),self.pad.clone(),self.rev_manager.clone(),@@ -973,7 +959,7 @@ impl DatabaseViewEditor {match f(&mut write_guard)? {None => {},Some(change) => {- apply_change(&self.user_id, self.rev_manager.clone(), change).await?;+ apply_change(self.rev_manager.clone(), change).await?;},}Ok(())@@ -1066,7 +1052,6 @@ pub(crate) async fn get_cells_for_field_in_rows(}async fn new_group_controller(- user_id: String,view_id: String,view_rev_pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,@@ -1092,7 +1077,6 @@ async fn new_group_controller(.unwrap_or_else(|| find_grouping_field(&field_revs, &layout).unwrap());new_group_controller_with_field_rev(- user_id,view_id,view_rev_pad,rev_manager,@@ -1106,7 +1090,6 @@ async fn new_group_controller(/// Returns a [GroupController]///async fn new_group_controller_with_field_rev(- user_id: String,view_id: String,view_rev_pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,@@ -1115,7 +1098,6 @@ async fn new_group_controller_with_field_rev(configuration_reader: GroupConfigurationReaderImpl,) -> FlowyResult<Box<dyn GroupController>> {let configuration_writer = GroupConfigurationWriterImpl {- user_id,rev_manager,view_pad: view_rev_pad,};diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rsindex 993b5835e3..9307e4d954 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs@@ -313,15 +313,12 @@ impl DatabaseViews {}async fn make_view_editor(&self, view_id: &str) -> FlowyResult<DatabaseViewEditor> {- let user_id = self.user.user_id()?;let pool = self.user.db_pool()?;- let rev_manager = make_database_view_rev_manager(&user_id, pool, view_id).await?;- let user_id = self.user.user_id()?;+ let rev_manager = make_database_view_rev_manager(pool, view_id).await?;let token = self.user.token()?;let view_id = view_id.to_owned();DatabaseViewEditor::new(- &user_id,&token,view_id,self.delegate.clone(),@@ -340,9 +337,8 @@ pub async fn make_database_view_revision_pad(DatabaseViewRevisionPad,RevisionManager<Arc<ConnectionPool>>,)> {- let user_id = user.user_id()?;let pool = user.db_pool()?;- let mut rev_manager = make_database_view_rev_manager(&user_id, pool, view_id).await?;+ let mut rev_manager = make_database_view_rev_manager(pool, view_id).await?;let view_rev_pad = rev_manager.initialize::<DatabaseViewRevisionSerde>(None).await?;@@ -350,14 +346,13 @@ pub async fn make_database_view_revision_pad(}pub async fn make_database_view_rev_manager(- user_id: &str,pool: Arc<ConnectionPool>,view_id: &str,) -> FlowyResult<RevisionManager<Arc<ConnectionPool>>> {// Create revision persistence- let disk_cache = SQLiteDatabaseViewRevisionPersistence::new(user_id, pool.clone());+ let disk_cache = SQLiteDatabaseViewRevisionPersistence::new(pool.clone());let configuration = RevisionPersistenceConfiguration::new(2, false);- let rev_persistence = RevisionPersistence::new(user_id, view_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(view_id, disk_cache, configuration);// Create snapshot persistenceconst DATABASE_VIEW_SP_PREFIX: &str = "grid_view";@@ -367,7 +362,6 @@ pub async fn make_database_view_rev_manager(let rev_compress = DatabaseViewRevisionMergeable();Ok(RevisionManager::new(- user_id,view_id,rev_persistence,rev_compress,diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs b/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rsindex 4efcfc4c8a..e9372646a7 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs@@ -97,7 +97,6 @@ impl GroupConfigurationReader for GroupConfigurationReaderImpl {}pub(crate) struct GroupConfigurationWriterImpl {- pub(crate) user_id: String,pub(crate) rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,pub(crate) view_pad: Arc<RwLock<DatabaseViewRevisionPad>>,}@@ -109,7 +108,6 @@ impl GroupConfigurationWriter for GroupConfigurationWriterImpl {field_type: FieldTypeRevision,group_configuration: GroupConfigurationRevision,) -> Fut<FlowyResult<()>> {- let user_id = self.user_id.clone();let rev_manager = self.rev_manager.clone();let view_pad = self.view_pad.clone();let field_id = field_id.to_owned();@@ -121,7 +119,7 @@ impl GroupConfigurationWriter for GroupConfigurationWriterImpl {.insert_or_update_group_configuration(&field_id, &field_type, group_configuration)?;if let Some(changeset) = changeset {- apply_change(&user_id, rev_manager, changeset).await?;+ apply_change(rev_manager, changeset).await?;}Ok(())})@@ -129,7 +127,6 @@ impl GroupConfigurationWriter for GroupConfigurationWriterImpl {}pub(crate) async fn apply_change(- _user_id: &str,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,change: DatabaseViewRevisionChangeset,) -> FlowyResult<()> {diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_migration.rs b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_migration.rsindex 2c351e7327..754d397bcb 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_migration.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_migration.rs@@ -17,13 +17,13 @@ use revision_model::Revision;use std::sync::Arc;const V1_MIGRATION: &str = "DATABASE_V1_MIGRATION";-pub fn is_database_rev_migrated(user_id: &str) -> bool {- let key = migration_flag_key(&user_id, V1_MIGRATION);+pub fn is_database_rev_migrated(user_id: i64) -> bool {+ let key = migration_flag_key(user_id, V1_MIGRATION);KV::get_bool(&key)}pub(crate) async fn migration_database_rev_struct(- user_id: &str,+ user_id: i64,databases: &Vec<MigratedDatabase>,pool: Arc<ConnectionPool>,) -> FlowyResult<()> {@@ -35,16 +35,16 @@ pub(crate) async fn migration_database_rev_struct(let object = DatabaseRevisionResettable {database_id: database.view_id.clone(),};- let disk_cache = SQLiteDatabaseRevisionPersistence::new(&user_id, pool.clone());- let reset = RevisionStructReset::new(&user_id, object, Arc::new(disk_cache));+ let disk_cache = SQLiteDatabaseRevisionPersistence::new(pool.clone());+ let reset = RevisionStructReset::new(object, Arc::new(disk_cache));reset.run().await?;}- let key = migration_flag_key(&user_id, V1_MIGRATION);+ let key = migration_flag_key(user_id, V1_MIGRATION);KV::set_bool(&key, true);Ok(())}-fn migration_flag_key(user_id: &str, version: &str) -> String {+fn migration_flag_key(user_id: i64, version: &str) -> String {md5(format!("{}{}", user_id, version,))}diff --git 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.rsindex 5479a34649..2964db9392 100644--- 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@@ -22,13 +22,13 @@ use std::sync::Arc;const DATABASE_VIEW_MIGRATE: &str = "database_view_migrate";-pub fn is_database_view_migrated(user_id: &str) -> bool {+pub fn is_database_view_migrated(user_id: i64) -> bool {let key = md5(format!("{}{}", user_id, DATABASE_VIEW_MIGRATE));KV::get_bool(&key)}pub(crate) async fn migrate_database_view(- user_id: &str,+ user_id: i64,database_refs: Arc<DatabaseRefs>,migrated_databases: &Vec<MigratedDatabase>,pool: Arc<ConnectionPool>,@@ -77,8 +77,7 @@ pub(crate) async fn migrate_database_view(let database_view_ops = make_database_view_operations(&database_view_rev);let database_view_bytes = database_view_ops.json_bytes();let revision = Revision::initial_revision(&database_view_id, database_view_bytes);- let rev_manager =- make_database_view_rev_manager(user_id, pool.clone(), &database_view_id).await?;+ let rev_manager = make_database_view_rev_manager(pool.clone(), &database_view_id).await?;rev_manager.reset_object(vec![revision]).await?;}@@ -87,8 +86,8 @@ pub(crate) async fn migrate_database_view(let object = DatabaseViewRevisionResettable {database_view_id: database.view_id.clone(),};- let disk_cache = SQLiteDatabaseViewRevisionPersistence::new(user_id, pool.clone());- let reset = RevisionStructReset::new(user_id, object, Arc::new(disk_cache));+ let disk_cache = SQLiteDatabaseViewRevisionPersistence::new(pool.clone());+ let reset = RevisionStructReset::new(object, Arc::new(disk_cache));reset.run().await?;}diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs b/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rsindex 7be1d5f27b..b0719c928c 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs@@ -30,7 +30,7 @@ impl DatabaseMigration {pub async fn run(&self,- user_id: &str,+ user_id: i64,get_views_fn: Fut<Vec<(String, String, LayoutTypePB)>>,) -> FlowyResult<()> {let pool = self.user.db_pool()?;diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rsindex fadaec2ff9..12b11d459f 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rs@@ -13,7 +13,6 @@ use revision_model::{Revision, RevisionRange};use std::sync::Arc;pub struct SQLiteDatabaseBlockRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}@@ -36,7 +35,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseBlockRevisionPersirev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = DatabaseBlockMetaRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DatabaseBlockMetaRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -46,8 +45,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseBlockRevisionPersirange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- DatabaseBlockMetaRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = DatabaseBlockMetaRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -88,11 +86,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseBlockRevisionPersi}impl SQLiteDatabaseBlockRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -143,7 +138,6 @@ impl DatabaseBlockMetaRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -159,14 +153,13 @@ impl DatabaseBlockMetaRevisionSql {.load::<GridBlockRevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -180,7 +173,7 @@ impl DatabaseBlockMetaRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -239,7 +232,7 @@ impl std::default::Default for GridBlockRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: GridBlockRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: GridBlockRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.object_id,diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rsindex 7a84e02f32..e555327396 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rs@@ -13,7 +13,6 @@ use revision_model::{Revision, RevisionRange};use std::sync::Arc;pub struct SQLiteDatabaseRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}@@ -36,7 +35,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistencrev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = DatabaseRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DatabaseRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -46,8 +45,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistencrange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- DatabaseRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = DatabaseRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -88,11 +86,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistenc}impl SQLiteDatabaseRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -142,7 +137,6 @@ impl DatabaseRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -158,14 +152,13 @@ impl DatabaseRevisionSql {.load::<DatabaseRevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -179,7 +172,7 @@ impl DatabaseRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -239,7 +232,7 @@ impl std::default::Default for DatabaseRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: DatabaseRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: DatabaseRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.object_id,diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rsindex d6f4340f7e..6e19d1cbd4 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rs@@ -13,16 +13,12 @@ use revision_model::{Revision, RevisionRange};use std::sync::Arc;pub struct SQLiteDatabaseViewRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}impl SQLiteDatabaseViewRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -45,7 +41,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseViewRevisionPersisrev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = DatabaseViewRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DatabaseViewRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -55,8 +51,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseViewRevisionPersisrange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- DatabaseViewRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = DatabaseViewRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -142,7 +137,6 @@ impl DatabaseViewRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -158,14 +152,13 @@ impl DatabaseViewRevisionSql {.load::<DatabaseViewRevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -179,7 +172,7 @@ impl DatabaseViewRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -239,7 +232,7 @@ impl std::default::Default for DatabaseViewRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: DatabaseViewRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: DatabaseViewRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.object_id,diff --git a/frontend/rust-lib/flowy-database/tests/database/database_editor.rs b/frontend/rust-lib/flowy-database/tests/database/database_editor.rsindex f3d0635531..ff0ebf925e 100644--- a/frontend/rust-lib/flowy-database/tests/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database/tests/database/database_editor.rs@@ -60,16 +60,16 @@ impl DatabaseEditorTest {let editor = sdk.database_manager- .open_database_view(&test.view.id)+ .open_database_view(&test.child_view.id).await.unwrap();let field_revs = editor.get_field_revs(None).await.unwrap();let block_meta_revs = editor.get_block_meta_revs().await.unwrap();- let row_pbs = editor.get_all_row_revs(&test.view.id).await.unwrap();+ let row_pbs = editor.get_all_row_revs(&test.child_view.id).await.unwrap();assert_eq!(block_meta_revs.len(), 1);- let view_id = test.view.id;- let app_id = test.app.id;+ let view_id = test.child_view.id;+ let app_id = test.parent_view.id;Self {sdk,app_id,diff --git a/frontend/rust-lib/flowy-document/src/manager.rs b/frontend/rust-lib/flowy-document/src/manager.rsindex d63b7173df..060819f120 100644--- a/frontend/rust-lib/flowy-document/src/manager.rs+++ b/frontend/rust-lib/flowy-document/src/manager.rs@@ -31,7 +31,7 @@ use ws_model::ws_revision::ServerRevisionWSData;pub trait DocumentUser: Send + Sync {fn user_dir(&self) -> Result<String, FlowyError>;- fn user_id(&self) -> Result<String, FlowyError>;+ fn user_id(&self) -> Result<i64, FlowyError>;fn token(&self) -> Result<String, FlowyError>;}@@ -113,13 +113,13 @@ impl DocumentManager {/// Called immediately after the application launched with the user sign in/sign up.#[tracing::instrument(level = "trace", skip_all, err)]- pub async fn initialize(&self, user_id: &str) -> FlowyResult<()> {+ pub async fn initialize(&self, user_id: i64) -> FlowyResult<()> {self.persistence.initialize(user_id)?;listen_ws_state_changed(self.rev_web_socket.clone(), self.editor_map.clone());Ok(())}- pub async fn initialize_with_new_user(&self, _user_id: &str, _token: &str) -> FlowyResult<()> {+ pub async fn initialize_with_new_user(&self, _user_id: i64, _token: &str) -> FlowyResult<()> {Ok(())}@@ -283,13 +283,11 @@ impl DocumentManager {doc_id: &str,pool: Arc<ConnectionPool>,) -> Result<RevisionManager<Arc<ConnectionPool>>, FlowyError> {- let user_id = self.user.user_id()?;- let disk_cache = SQLiteDocumentRevisionPersistence::new(&user_id, pool.clone());+ let disk_cache = SQLiteDocumentRevisionPersistence::new(pool.clone());let configuration = RevisionPersistenceConfiguration::new(200, true);- let rev_persistence = RevisionPersistence::new(&user_id, doc_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(doc_id, disk_cache, configuration);let snapshot_persistence = SQLiteDocumentRevisionSnapshotPersistence::new(doc_id, pool);Ok(RevisionManager::new(- &user_id,doc_id,rev_persistence,DocumentRevisionMergeable(),@@ -302,12 +300,10 @@ impl DocumentManager {doc_id: &str,pool: Arc<ConnectionPool>,) -> Result<RevisionManager<Arc<ConnectionPool>>, FlowyError> {- let user_id = self.user.user_id()?;- let disk_cache = SQLiteDeltaDocumentRevisionPersistence::new(&user_id, pool);+ let disk_cache = SQLiteDeltaDocumentRevisionPersistence::new(pool);let configuration = RevisionPersistenceConfiguration::new(100, true);- let rev_persistence = RevisionPersistence::new(&user_id, doc_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(doc_id, disk_cache, configuration);Ok(RevisionManager::new(- &user_id,doc_id,rev_persistence,DeltaDocumentRevisionMergeable(),diff --git a/frontend/rust-lib/flowy-document/src/old_editor/editor.rs b/frontend/rust-lib/flowy-document/src/old_editor/editor.rsindex 998d7f4bd3..59082cbca3 100644--- a/frontend/rust-lib/flowy-document/src/old_editor/editor.rs+++ b/frontend/rust-lib/flowy-document/src/old_editor/editor.rs@@ -57,7 +57,6 @@ impl DeltaDocumentEditor {#[cfg(feature = "sync")]let ws_manager = crate::old_editor::web_socket::make_document_ws_manager(doc_id.clone(),- user_id.clone(),edit_cmd_tx.clone(),rev_manager.clone(),rev_web_socket,diff --git a/frontend/rust-lib/flowy-document/src/old_editor/web_socket.rs b/frontend/rust-lib/flowy-document/src/old_editor/web_socket.rsindex c3a682ebc9..bd1c3fa7c6 100644--- a/frontend/rust-lib/flowy-document/src/old_editor/web_socket.rs+++ b/frontend/rust-lib/flowy-document/src/old_editor/web_socket.rs@@ -45,19 +45,14 @@ pub type DocumentConflictController =#[allow(dead_code)]pub(crate) async fn make_document_ws_manager(doc_id: String,- user_id: String,edit_cmd_tx: EditorCommandSender,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,rev_web_socket: Arc<dyn RevisionWebSocket>,) -> Arc<RevisionWebSocketManager> {let ws_data_provider = Arc::new(WSDataProvider::new(&doc_id, Arc::new(rev_manager.clone())));let resolver = Arc::new(DocumentConflictResolver { edit_cmd_tx });- let conflict_controller = DocumentConflictController::new(- &user_id,- resolver,- Arc::new(ws_data_provider.clone()),- rev_manager,- );+ let conflict_controller =+ DocumentConflictController::new(resolver, Arc::new(ws_data_provider.clone()), rev_manager);let ws_data_stream = Arc::new(DocumentRevisionWSDataStream::new(conflict_controller));let ws_data_sink = Arc::new(DocumentWSDataSink(ws_data_provider));let ping_duration = Duration::from_millis(TEXT_BLOCK_SYNC_INTERVAL_IN_MILLIS);@@ -69,16 +64,12 @@ pub(crate) async fn make_document_ws_manager(ws_data_stream,ping_duration,));- listen_document_ws_state(&user_id, &doc_id, ws_manager.scribe_state());+ listen_document_ws_state(&doc_id, ws_manager.scribe_state());ws_manager}#[allow(dead_code)]-fn listen_document_ws_state(- _user_id: &str,- _doc_id: &str,- mut subscriber: broadcast::Receiver<WSConnectState>,-) {+fn listen_document_ws_state(_doc_id: &str, mut subscriber: broadcast::Receiver<WSConnectState>) {tokio::spawn(async move {while let Ok(state) = subscriber.recv().await {match state {diff --git a/frontend/rust-lib/flowy-document/src/services/migration.rs b/frontend/rust-lib/flowy-document/src/services/migration.rsindex 2ea9bea1dc..abc49fea82 100644--- a/frontend/rust-lib/flowy-document/src/services/migration.rs+++ b/frontend/rust-lib/flowy-document/src/services/migration.rs@@ -12,26 +12,26 @@ use std::sync::Arc;const V1_MIGRATION: &str = "DOCUMENT_V1_MIGRATION";pub(crate) struct DocumentMigration {- user_id: String,+ user_id: i64,database: Arc<dyn DocumentDatabase>,}impl DocumentMigration {- pub fn new(user_id: &str, database: Arc<dyn DocumentDatabase>) -> Self {+ pub fn new(user_id: i64, database: Arc<dyn DocumentDatabase>) -> Self {let user_id = user_id.to_owned();Self { user_id, database }}pub fn run_v1_migration(&self) -> FlowyResult<()> {- let key = migration_flag_key(&self.user_id, V1_MIGRATION);+ let key = migration_flag_key(self.user_id, V1_MIGRATION);if KV::get_bool(&key) {return Ok(());}let pool = self.database.db_pool()?;let conn = &*pool.get()?;- let disk_cache = SQLiteDocumentRevisionPersistence::new(&self.user_id, pool);- let documents = DeltaRevisionSql::read_all_documents(&self.user_id, conn)?;+ let disk_cache = SQLiteDocumentRevisionPersistence::new(pool);+ let documents = DeltaRevisionSql::read_all_documents(conn)?;tracing::debug!("[Migration]: try migrate {} documents", documents.len());for revisions in documents {if revisions.is_empty() {@@ -71,6 +71,6 @@ impl DocumentMigration {Ok(())}}-fn migration_flag_key(user_id: &str, version: &str) -> String {+fn migration_flag_key(user_id: i64, version: &str) -> String {md5(format!("{}{}", user_id, version,))}diff --git a/frontend/rust-lib/flowy-document/src/services/persistence/mod.rs b/frontend/rust-lib/flowy-document/src/services/persistence/mod.rsindex a48b838193..e985c47480 100644--- a/frontend/rust-lib/flowy-document/src/services/persistence/mod.rs+++ b/frontend/rust-lib/flowy-document/src/services/persistence/mod.rs@@ -16,7 +16,7 @@ impl DocumentPersistence {}#[tracing::instrument(level = "trace", skip_all, err)]- pub fn initialize(&self, user_id: &str) -> FlowyResult<()> {+ pub fn initialize(&self, user_id: i64) -> FlowyResult<()> {let migration = DocumentMigration::new(user_id, self.database.clone());if let Err(e) = migration.run_v1_migration() {tracing::error!("[Document Migration]: run v1 migration failed: {:?}", e);diff --git a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rsindex ded4fbd160..ab59cf10c0 100644--- a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs+++ b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs@@ -14,7 +14,6 @@ use std::collections::HashMap;use std::sync::Arc;pub struct SQLiteDeltaDocumentRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}@@ -37,7 +36,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersirev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = DeltaRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DeltaRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -47,8 +46,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersirange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- DeltaRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = DeltaRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -89,11 +87,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersi}impl SQLiteDeltaDocumentRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -143,7 +138,6 @@ impl DeltaRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -157,14 +151,13 @@ impl DeltaRevisionSql {let rows = sql.order(dsl::rev_id.asc()).load::<RevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -178,7 +171,7 @@ impl DeltaRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -205,10 +198,7 @@ impl DeltaRevisionSql {Ok(())}- pub fn read_all_documents(- user_id: &str,- conn: &SqliteConnection,- ) -> Result<Vec<Vec<Revision>>, FlowyError> {+ pub fn read_all_documents(conn: &SqliteConnection) -> Result<Vec<Vec<Revision>>, FlowyError> {let rev_tables = dsl::rev_table.order(dsl::rev_id.asc()).load::<RevisionTable>(conn)?;@@ -224,7 +214,7 @@ impl DeltaRevisionSql {let revisions = rev_tables.into_iter().map(|table| {- let record = mk_revision_record_from_table(user_id, table);+ let record = mk_revision_record_from_table(table);record.revision}).collect::<Vec<_>>();@@ -263,7 +253,7 @@ impl std::default::Default for TextRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: RevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: RevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.doc_id,diff --git a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rsindex 569fada510..bab2ca95b7 100644--- a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs+++ b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs@@ -13,7 +13,6 @@ use revision_model::{Revision, RevisionRange};use std::sync::Arc;pub struct SQLiteDocumentRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}@@ -36,7 +35,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistencrev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = DocumentRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DocumentRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -46,8 +45,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistencrange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- DocumentRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = DocumentRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -88,11 +86,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistenc}impl SQLiteDocumentRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -141,7 +136,6 @@ impl DocumentRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -157,14 +151,13 @@ impl DocumentRevisionSql {.load::<DocumentRevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -178,7 +171,7 @@ impl DocumentRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -233,7 +226,7 @@ impl std::default::Default for DocumentRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: DocumentRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: DocumentRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.document_id,diff --git a/frontend/rust-lib/flowy-document/tests/new_document/script.rs b/frontend/rust-lib/flowy-document/tests/new_document/script.rsindex d3ae48d64b..26736f5b23 100644--- a/frontend/rust-lib/flowy-document/tests/new_document/script.rs+++ b/frontend/rust-lib/flowy-document/tests/new_document/script.rs@@ -48,7 +48,7 @@ impl DocumentEditorTest {let test = ViewTest::new_document_view(&sdk).await;let document_editor = sdk.document_manager- .open_document_editor(&test.view.id)+ .open_document_editor(&test.child_view.id).await.unwrap();let editor = match document_editordiff --git a/frontend/rust-lib/flowy-document/tests/old_document/script.rs b/frontend/rust-lib/flowy-document/tests/old_document/script.rsindex 49f94e019d..0fd94aa8b8 100644--- a/frontend/rust-lib/flowy-document/tests/old_document/script.rs+++ b/frontend/rust-lib/flowy-document/tests/old_document/script.rs@@ -51,7 +51,6 @@ impl DeltaDocumentEditorTest {async fn run_script(&mut self, script: EditorScript) {let rev_manager = self.editor.rev_manager();let cache = rev_manager.revision_cache().await;- let _user_id = self.sdk.user_session.user_id().unwrap();match script {EditorScript::InsertText(s, offset) => {diff --git a/frontend/rust-lib/flowy-folder/build.rs b/frontend/rust-lib/flowy-folder/build.rsindex 06388d2a02..d17034a7e8 100644--- a/frontend/rust-lib/flowy-folder/build.rs+++ b/frontend/rust-lib/flowy-folder/build.rs@@ -2,9 +2,9 @@ fn main() {let crate_name = env!("CARGO_PKG_NAME");flowy_codegen::protobuf_file::gen(crate_name);- #[cfg(feature = "dart")]- flowy_codegen::dart_event::gen(crate_name);-- #[cfg(feature = "ts")]- flowy_codegen::ts_event::gen(crate_name);+ // #[cfg(feature = "dart")]+ // flowy_codegen::dart_event::gen(crate_name);+ //+ // #[cfg(feature = "ts")]+ // flowy_codegen::ts_event::gen(crate_name);}diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex 088688ee26..2b7a76fe2e 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -1,6 +1,10 @@use crate::entities::view::ViewDataFormatPB;use crate::entities::{ViewLayoutTypePB, ViewPB, WorkspacePB};use crate::services::folder_editor::FolderRevisionMergeable;+use crate::services::persistence::rev_sqlite::{+ SQLiteFolderRevisionPersistence, SQLiteFolderRevisionSnapshotPersistence,+};+use crate::services::{clear_current_workspace, get_current_workspace};use crate::{entities::workspace::RepeatedWorkspacePB,errors::FlowyResult,@@ -12,6 +16,7 @@ use crate::{},};use bytes::Bytes;+use flowy_client_sync::client_folder::FolderPad;use flowy_document::editor::initial_read_me;use flowy_error::FlowyError;use flowy_revision::{@@ -20,12 +25,6 @@ use flowy_revision::{use folder_model::user_default;use lazy_static::lazy_static;use lib_infra::future::FutureResult;--use crate::services::persistence::rev_sqlite::{- SQLiteFolderRevisionPersistence, SQLiteFolderRevisionSnapshotPersistence,-};-use crate::services::{clear_current_workspace, get_current_workspace};-use flowy_client_sync::client_folder::FolderPad;use std::convert::TryFrom;use std::{collections::HashMap, fmt::Formatter, sync::Arc};use tokio::sync::RwLock as TokioRwLock;@@ -84,10 +83,7 @@ impl FolderManager {if let Ok(user_id) = user.user_id() {// Reset the flag if the folder manager gets initialized, otherwise,// the folder_editor will not be initialized after flutter hot reload.- INIT_FOLDER_FLAG- .write()- .await- .insert(user_id.to_owned(), false);+ INIT_FOLDER_FLAG.write().await.insert(user_id, false);}let folder_editor = Arc::new(TokioRwLock::new(None));@@ -176,9 +172,9 @@ impl FolderManager {let pool = self.persistence.db_pool()?;let object_id = folder_id.as_ref();- let disk_cache = SQLiteFolderRevisionPersistence::new(user_id, pool.clone());+ let disk_cache = SQLiteFolderRevisionPersistence::new(pool.clone());let configuration = RevisionPersistenceConfiguration::new(200, false);- let rev_persistence = RevisionPersistence::new(user_id, object_id, disk_cache, configuration);+ let rev_persistence = RevisionPersistence::new(object_id, disk_cache, configuration);let rev_compactor = FolderRevisionMergeable();const FOLDER_SP_PREFIX: &str = "folder";@@ -186,21 +182,14 @@ impl FolderManager {let snapshot_persistence =SQLiteFolderRevisionSnapshotPersistence::new(&snapshot_object_id, pool);let rev_manager = RevisionManager::new(- user_id,folder_id.as_ref(),rev_persistence,rev_compactor,snapshot_persistence,);- let folder_editor = FolderEditor::new(- user_id,- &folder_id,- token,- rev_manager,- self.web_socket.clone(),- )- .await?;+ let folder_editor =+ FolderEditor::new(&folder_id, token, rev_manager, self.web_socket.clone()).await?;*self.folder_editor.write().await = Some(Arc::new(folder_editor));self.app_controller.initialize()?;diff --git a/frontend/rust-lib/flowy-folder/src/services/folder_editor.rs b/frontend/rust-lib/flowy-folder/src/services/folder_editor.rsindex eeb322d762..e52742c665 100644--- a/frontend/rust-lib/flowy-folder/src/services/folder_editor.rs+++ b/frontend/rust-lib/flowy-folder/src/services/folder_editor.rs@@ -17,8 +17,6 @@ use std::sync::Arc;use ws_model::ws_revision::ServerRevisionWSData;pub struct FolderEditor {- #[allow(dead_code)]- user_id: String,#[allow(dead_code)]folder_id: FolderId,pub(crate) folder: Arc<RwLock<FolderPad>>,@@ -30,7 +28,6 @@ pub struct FolderEditor {impl FolderEditor {#[allow(unused_variables)]pub async fn new(- user_id: &str,folder_id: &FolderId,token: &str,mut rev_manager: RevisionManager<Arc<ConnectionPool>>,@@ -48,7 +45,6 @@ impl FolderEditor {#[cfg(feature = "sync")]let ws_manager = crate::services::web_socket::make_folder_ws_manager(- user_id,folder_id.as_ref(),rev_manager.clone(),web_socket,@@ -56,10 +52,8 @@ impl FolderEditor {).await;- let user_id = user_id.to_owned();let folder_id = folder_id.to_owned();Ok(Self {- user_id,folder_id,folder,rev_manager,@@ -108,7 +102,7 @@ impl FolderEditor {}}-struct FolderRevisionSerde();+pub struct FolderRevisionSerde();impl RevisionObjectDeserializer for FolderRevisionSerde {type Output = FolderPad;diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rsindex 7498e8dbec..a56495532b 100644--- a/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs@@ -112,8 +112,8 @@ impl FolderMigration {};let pool = self.database.db_pool()?;- let disk_cache = SQLiteFolderRevisionPersistence::new(&self.user_id, pool);- let reset = RevisionStructReset::new(&self.user_id, object, Arc::new(disk_cache));+ let disk_cache = SQLiteFolderRevisionPersistence::new(pool);+ let reset = RevisionStructReset::new(object, Arc::new(disk_cache));reset.run().await}}diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rsindex d46ec12951..9b03d00e01 100644--- a/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs@@ -144,8 +144,8 @@ impl FolderPersistence {}pub fn make_folder_revision_disk_cache(- user_id: &str,+ _user_id: &str,pool: Arc<ConnectionPool>,) -> Arc<dyn RevisionDiskCache<Arc<ConnectionPool>, Error = FlowyError>> {- Arc::new(SQLiteFolderRevisionPersistence::new(user_id, pool))+ Arc::new(SQLiteFolderRevisionPersistence::new(pool))}diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rsindex de32507c4e..79a693eb1d 100644--- a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs@@ -13,7 +13,6 @@ use revision_model::{Revision, RevisionRange};use std::sync::Arc;pub struct SQLiteFolderRevisionPersistence {- user_id: String,pub(crate) pool: Arc<ConnectionPool>,}@@ -36,7 +35,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistencerev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = FolderRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = FolderRevisionSql::read(object_id, rev_ids, &conn)?;Ok(records)}@@ -46,8 +45,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistencerange: &RevisionRange,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- let revisions =- FolderRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ let revisions = FolderRevisionSql::read_with_range(object_id, range.clone(), conn)?;Ok(revisions)}@@ -88,11 +86,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistence}impl SQLiteFolderRevisionPersistence {- pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {- Self {- user_id: user_id.to_owned(),- pool,- }+ pub fn new(pool: Arc<ConnectionPool>) -> Self {+ Self { pool }}}@@ -145,7 +140,6 @@ impl FolderRevisionSql {}fn read(- user_id: &str,object_id: &str,rev_ids: Option<Vec<i64>>,conn: &SqliteConnection,@@ -159,14 +153,13 @@ impl FolderRevisionSql {let rows = sql.order(dsl::rev_id.asc()).load::<RevisionTable>(conn)?;let records = rows.into_iter()- .map(|row| mk_revision_record_from_table(user_id, row))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(records)}fn read_with_range(- user_id: &str,object_id: &str,range: RevisionRange,conn: &SqliteConnection,@@ -180,7 +173,7 @@ impl FolderRevisionSql {let revisions = rev_tables.into_iter()- .map(|table| mk_revision_record_from_table(user_id, table))+ .map(mk_revision_record_from_table).collect::<Vec<_>>();Ok(revisions)}@@ -241,7 +234,7 @@ impl std::default::Default for TextRevisionState {}}-fn mk_revision_record_from_table(_user_id: &str, table: RevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(table: RevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.doc_id,diff --git a/frontend/rust-lib/flowy-folder/src/services/web_socket.rs b/frontend/rust-lib/flowy-folder/src/services/web_socket.rsindex 6a4eb4a463..0337fa0a57 100644--- a/frontend/rust-lib/flowy-folder/src/services/web_socket.rs+++ b/frontend/rust-lib/flowy-folder/src/services/web_socket.rs@@ -39,7 +39,6 @@ pub type FolderConflictController =#[allow(dead_code)]pub(crate) async fn make_folder_ws_manager(- user_id: &str,folder_id: &str,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,web_socket: Arc<dyn RevisionWebSocket>,@@ -50,12 +49,8 @@ pub(crate) async fn make_folder_ws_manager(Arc::new(rev_manager.clone()),));let resolver = Arc::new(FolderConflictResolver { folder_pad });- let conflict_controller = FolderConflictController::new(- user_id,- resolver,- Arc::new(ws_data_provider.clone()),- rev_manager,- );+ let conflict_controller =+ FolderConflictController::new(resolver, Arc::new(ws_data_provider.clone()), rev_manager);let ws_data_stream = Arc::new(FolderRevisionWSDataStream::new(conflict_controller));let ws_data_sink = Arc::new(FolderWSDataSink(ws_data_provider));let ping_duration = Duration::from_millis(FOLDER_SYNC_INTERVAL_IN_MILLIS);diff --git a/frontend/rust-lib/flowy-folder/tests/workspace/main.rs b/frontend/rust-lib/flowy-folder/tests/workspace/main.rsindex ff48b349e1..7a47dda24d 100644--- a/frontend/rust-lib/flowy-folder/tests/workspace/main.rs+++ b/frontend/rust-lib/flowy-folder/tests/workspace/main.rs@@ -1,2 +1,2 @@-mod folder_test;-mod script;+// mod folder_test;+// mod script;diff --git a/frontend/rust-lib/flowy-folder2/Cargo.toml b/frontend/rust-lib/flowy-folder2/Cargo.tomlnew file mode 100644index 0000000000..f12f3d3613--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/Cargo.toml@@ -0,0 +1,41 @@+[package]+name = "flowy-folder2"+version = "0.1.0"+edition = "2021"++# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html++[dependencies]+collab = { version = "0.1.0" }+collab-folder = { version = "0.1.0" }+collab-persistence = { version = "0.1.0" }++flowy-derive = { path = "../flowy-derive" }+flowy-notification = { path = "../flowy-notification" }+parking_lot = "0.12.1"+unicode-segmentation = "1.10"+tracing = { version = "0.1", features = ["log"] }+flowy-error = { path = "../flowy-error", features = ["adaptor_dispatch"]}+lib-dispatch = { path = "../lib-dispatch" }+bytes = { version = "1.4" }+lib-infra = { path = "../../../shared-lib/lib-infra" }+tokio = { version = "1.26", features = ["full"] }+nanoid = "0.4.0"+lazy_static = "1.4.0"+chrono = { version = "0.4.24"}+strum = "0.21"+strum_macros = "0.21"+protobuf = {version = "2.28.0"}+flowy-document = { path = "../flowy-document" }++[dev-dependencies]+flowy-folder2 = { path = "../flowy-folder2"}+flowy-test = { path = "../flowy-test" }++[build-dependencies]+flowy-codegen = { path = "../flowy-codegen"}++[features]+dart = ["flowy-codegen/dart", "flowy-notification/dart"]+ts = ["flowy-codegen/ts", "flowy-notification/ts"]+test_helper = []\ No newline at end of filediff --git a/frontend/rust-lib/flowy-folder2/Flowy.toml b/frontend/rust-lib/flowy-folder2/Flowy.tomlnew file mode 100644index 0000000000..0ae861cf30--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/Flowy.toml@@ -0,0 +1,3 @@+# Check out the FlowyConfig (located in flowy_toml.rs) for more details.+proto_input = ["src/entities", "src/event_map.rs", "src/notification.rs"]+event_files = ["src/event_map.rs"]\ No newline at end of filediff --git a/frontend/rust-lib/flowy-folder2/build.rs b/frontend/rust-lib/flowy-folder2/build.rsnew file mode 100644index 0000000000..06388d2a02--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/build.rs@@ -0,0 +1,10 @@+fn main() {+ let crate_name = env!("CARGO_PKG_NAME");+ flowy_codegen::protobuf_file::gen(crate_name);++ #[cfg(feature = "dart")]+ flowy_codegen::dart_event::gen(crate_name);++ #[cfg(feature = "ts")]+ flowy_codegen::ts_event::gen(crate_name);+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/app.rs b/frontend/rust-lib/flowy-folder2/src/entities/app.rsnew file mode 100644index 0000000000..ffff29eab4--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/app.rs@@ -0,0 +1,183 @@+use crate::entities::parser::app::{AppColorStyle, AppIdentify, AppName};+use crate::entities::parser::workspace::WorkspaceIdentify;+use crate::entities::RepeatedViewPB;++use flowy_derive::ProtoBuf;+use flowy_error::ErrorCode;+use std::convert::TryInto;++#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]+pub struct AppPB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub workspace_id: String,++ #[pb(index = 3)]+ pub name: String,++ #[pb(index = 4)]+ pub belongings: RepeatedViewPB,++ #[pb(index = 5)]+ pub create_time: i64,+}++#[derive(Eq, PartialEq, Debug, Default, ProtoBuf, Clone)]+pub struct RepeatedAppPB {+ #[pb(index = 1)]+ pub items: Vec<AppPB>,+}++#[derive(ProtoBuf, Default)]+pub struct CreateAppPayloadPB {+ #[pb(index = 1)]+ pub workspace_id: String,++ #[pb(index = 2)]+ pub name: String,++ #[pb(index = 3)]+ pub desc: String,++ #[pb(index = 4)]+ pub color_style: ColorStylePB,+}++#[derive(ProtoBuf, Default, Debug, Clone)]+pub struct ColorStylePB {+ #[pb(index = 1)]+ pub theme_color: String,+}++#[derive(Debug)]+pub struct CreateAppParams {+ pub workspace_id: String,+ pub name: String,+ pub desc: String,+ pub color_style: ColorStylePB,+}++impl TryInto<CreateAppParams> for CreateAppPayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<CreateAppParams, Self::Error> {+ let name = AppName::parse(self.name)?;+ let id = WorkspaceIdentify::parse(self.workspace_id)?;+ let color_style = AppColorStyle::parse(self.color_style.theme_color.clone())?;++ Ok(CreateAppParams {+ workspace_id: id.0,+ name: name.0,+ desc: self.desc,+ color_style: color_style.into(),+ })+ }+}++impl std::convert::From<AppColorStyle> for ColorStylePB {+ fn from(data: AppColorStyle) -> Self {+ ColorStylePB {+ theme_color: data.theme_color,+ }+ }+}++#[derive(ProtoBuf, Default, Clone, Debug)]+pub struct AppIdPB {+ #[pb(index = 1)]+ pub value: String,+}++impl AppIdPB {+ pub fn new(app_id: &str) -> Self {+ Self {+ value: app_id.to_string(),+ }+ }+}++#[derive(ProtoBuf, Default)]+pub struct UpdateAppPayloadPB {+ #[pb(index = 1)]+ pub app_id: String,++ #[pb(index = 2, one_of)]+ pub name: Option<String>,++ #[pb(index = 3, one_of)]+ pub desc: Option<String>,++ #[pb(index = 4, one_of)]+ pub color_style: Option<ColorStylePB>,++ #[pb(index = 5, one_of)]+ pub is_trash: Option<bool>,+}++#[derive(Debug, Clone)]+pub struct UpdateAppParams {+ pub app_id: String,++ pub name: Option<String>,++ pub desc: Option<String>,++ pub color_style: Option<ColorStylePB>,++ pub is_trash: Option<bool>,+}++impl UpdateAppParams {+ pub fn new(app_id: &str) -> Self {+ Self {+ app_id: app_id.to_string(),+ name: None,+ desc: None,+ color_style: None,+ is_trash: None,+ }+ }++ pub fn name(mut self, name: &str) -> Self {+ self.name = Some(name.to_string());+ self+ }++ pub fn desc(mut self, desc: &str) -> Self {+ self.desc = Some(desc.to_string());+ self+ }++ pub fn trash(mut self) -> Self {+ self.is_trash = Some(true);+ self+ }+}++impl TryInto<UpdateAppParams> for UpdateAppPayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<UpdateAppParams, Self::Error> {+ let app_id = AppIdentify::parse(self.app_id)?.0;++ let name = match self.name {+ None => None,+ Some(name) => Some(AppName::parse(name)?.0),+ };++ let color_style = match self.color_style {+ None => None,+ Some(color_style) => Some(AppColorStyle::parse(color_style.theme_color)?.into()),+ };++ Ok(UpdateAppParams {+ app_id,+ name,+ desc: self.desc,+ color_style,+ is_trash: self.is_trash,+ })+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/mod.rsnew file mode 100644index 0000000000..d5370f0786--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/mod.rs@@ -0,0 +1,10 @@+pub mod app;+mod parser;+pub mod trash;+pub mod view;+pub mod workspace;++pub use app::*;+pub use trash::*;+pub use view::*;+pub use workspace::*;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_color_style.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_color_style.rsnew file mode 100644index 0000000000..b98b809f3d--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_color_style.rs@@ -0,0 +1,13 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct AppColorStyle {+ pub theme_color: String,+}++impl AppColorStyle {+ pub fn parse(theme_color: String) -> Result<AppColorStyle, ErrorCode> {+ // TODO: verify the color style format+ Ok(AppColorStyle { theme_color })+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_desc.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_desc.rsnew file mode 100644index 0000000000..24cc2dcab8--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_desc.rs@@ -0,0 +1,20 @@+use unicode_segmentation::UnicodeSegmentation;+#[derive(Debug)]+pub struct AppDesc(pub String);++impl AppDesc {+ #[allow(dead_code)]+ pub fn parse(s: String) -> Result<AppDesc, String> {+ if s.graphemes(true).count() > 1024 {+ return Err("Workspace description too long".to_string());+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for AppDesc {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_id.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_id.rsnew file mode 100644index 0000000000..2311001089--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_id.rs@@ -0,0 +1,20 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct AppIdentify(pub String);++impl AppIdentify {+ pub fn parse(s: String) -> Result<AppIdentify, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::AppIdInvalid);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for AppIdentify {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_name.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_name.rsnew file mode 100644index 0000000000..f14670c650--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/app_name.rs@@ -0,0 +1,20 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct AppName(pub String);++impl AppName {+ pub fn parse(s: String) -> Result<AppName, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::AppNameInvalid);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for AppName {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/app/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/mod.rsnew file mode 100644index 0000000000..fcf6f4bd3f--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/app/mod.rs@@ -0,0 +1,9 @@+mod app_color_style;+mod app_desc;+mod app_id;+mod app_name;++pub use app_color_style::*;+pub use app_desc::*;+pub use app_id::*;+pub use app_name::*;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/mod.rsnew file mode 100644index 0000000000..3ee0f4b591--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/mod.rs@@ -0,0 +1,4 @@+pub mod app;+pub mod trash;+pub mod view;+pub mod workspace;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/mod.rsnew file mode 100644index 0000000000..ddb6a3b91e--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/mod.rs@@ -0,0 +1,3 @@+mod trash_id;++pub use trash_id::*;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/trash_id.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/trash_id.rsnew file mode 100644index 0000000000..3b6a4c4f6d--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/trash/trash_id.rs@@ -0,0 +1,34 @@+#[derive(Debug)]+pub struct TrashIdentify(pub String);++impl TrashIdentify {+ #[allow(dead_code)]+ pub fn parse(s: String) -> Result<TrashIdentify, String> {+ if s.trim().is_empty() {+ return Err("Trash id can not be empty or whitespace".to_string());+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for TrashIdentify {+ fn as_ref(&self) -> &str {+ &self.0+ }+}++#[derive(Debug)]+pub struct TrashIds(pub Vec<String>);++impl TrashIds {+ #[allow(dead_code)]+ pub fn parse(ids: Vec<String>) -> Result<TrashIds, String> {+ let mut trash_ids = vec![];+ for id in ids {+ let id = TrashIdentify::parse(id)?;+ trash_ids.push(id.0);+ }+ Ok(Self(trash_ids))+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/view/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/mod.rsnew file mode 100644index 0000000000..399cc44c45--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/mod.rs@@ -0,0 +1,9 @@+mod view_desc;+mod view_id;+mod view_name;+mod view_thumbnail;++pub use view_desc::*;+pub use view_id::*;+pub use view_name::*;+pub use view_thumbnail::*;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_desc.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_desc.rsnew file mode 100644index 0000000000..f88eb6ebff--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_desc.rs@@ -0,0 +1,21 @@+use flowy_error::ErrorCode;+use unicode_segmentation::UnicodeSegmentation;++#[derive(Debug)]+pub struct ViewDesc(pub String);++impl ViewDesc {+ pub fn parse(s: String) -> Result<ViewDesc, ErrorCode> {+ if s.graphemes(true).count() > 1000 {+ return Err(ErrorCode::ViewDescTooLong);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for ViewDesc {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_id.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_id.rsnew file mode 100644index 0000000000..c19d9d0ac0--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_id.rs@@ -0,0 +1,20 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct ViewIdentify(pub String);++impl ViewIdentify {+ pub fn parse(s: String) -> Result<ViewIdentify, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::ViewIdIsInvalid);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for ViewIdentify {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_name.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_name.rsnew file mode 100644index 0000000000..df1861e820--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_name.rs@@ -0,0 +1,25 @@+use flowy_error::ErrorCode;+use unicode_segmentation::UnicodeSegmentation;++#[derive(Debug)]+pub struct ViewName(pub String);++impl ViewName {+ pub fn parse(s: String) -> Result<ViewName, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::ViewNameInvalid);+ }++ if s.graphemes(true).count() > 256 {+ return Err(ErrorCode::ViewNameTooLong);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for ViewName {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_thumbnail.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_thumbnail.rsnew file mode 100644index 0000000000..c538da8212--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/view/view_thumbnail.rs@@ -0,0 +1,21 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct ViewThumbnail(pub String);++impl ViewThumbnail {+ pub fn parse(s: String) -> Result<ViewThumbnail, ErrorCode> {+ // if s.trim().is_empty() {+ // return Err(format!("View thumbnail can not be empty or whitespace"));+ // }+ // TODO: verify the thumbnail url is valid or not++ Ok(Self(s))+ }+}++impl AsRef<str> for ViewThumbnail {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/mod.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/mod.rsnew file mode 100644index 0000000000..876ba10858--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/mod.rs@@ -0,0 +1,7 @@+mod workspace_desc;+mod workspace_id;+mod workspace_name;++pub use workspace_desc::*;+pub use workspace_id::*;+pub use workspace_name::*;diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_desc.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_desc.rsnew file mode 100644index 0000000000..f523592b86--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_desc.rs@@ -0,0 +1,21 @@+use flowy_error::ErrorCode;+use unicode_segmentation::UnicodeSegmentation;++#[derive(Debug)]+pub struct WorkspaceDesc(pub String);++impl WorkspaceDesc {+ pub fn parse(s: String) -> Result<WorkspaceDesc, ErrorCode> {+ if s.graphemes(true).count() > 1024 {+ return Err(ErrorCode::WorkspaceNameTooLong);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for WorkspaceDesc {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_id.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_id.rsnew file mode 100644index 0000000000..b3ce24c6c9--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_id.rs@@ -0,0 +1,20 @@+use flowy_error::ErrorCode;++#[derive(Debug)]+pub struct WorkspaceIdentify(pub String);++impl WorkspaceIdentify {+ pub fn parse(s: String) -> Result<WorkspaceIdentify, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::WorkspaceIdInvalid);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for WorkspaceIdentify {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_name.rs b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_name.rsnew file mode 100644index 0000000000..95e292668a--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/parser/workspace/workspace_name.rs@@ -0,0 +1,25 @@+use flowy_error::ErrorCode;+use unicode_segmentation::UnicodeSegmentation;++#[derive(Debug)]+pub struct WorkspaceName(pub String);++impl WorkspaceName {+ pub fn parse(s: String) -> Result<WorkspaceName, ErrorCode> {+ if s.trim().is_empty() {+ return Err(ErrorCode::WorkspaceNameInvalid);+ }++ if s.graphemes(true).count() > 256 {+ return Err(ErrorCode::WorkspaceNameTooLong);+ }++ Ok(Self(s))+ }+}++impl AsRef<str> for WorkspaceName {+ fn as_ref(&self) -> &str {+ &self.0+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/trash.rs b/frontend/rust-lib/flowy-folder2/src/entities/trash.rsnew file mode 100644index 0000000000..b1158dbe07--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/trash.rs@@ -0,0 +1,73 @@+use collab_folder::core::TrashInfo;+use flowy_derive::ProtoBuf;++#[derive(Eq, PartialEq, ProtoBuf, Default, Debug, Clone)]+pub struct TrashPB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub name: String,++ #[pb(index = 3)]+ pub modified_time: i64,++ #[pb(index = 4)]+ pub create_time: i64,+}++impl std::convert::From<TrashInfo> for TrashPB {+ fn from(trash_info: TrashInfo) -> Self {+ TrashPB {+ id: trash_info.id,+ name: trash_info.name,+ modified_time: trash_info.created_at,+ create_time: trash_info.created_at,+ }+ }+}++impl std::convert::From<TrashPB> for TrashInfo {+ fn from(trash: TrashPB) -> Self {+ TrashInfo {+ id: trash.id,+ name: trash.name,+ created_at: trash.create_time,+ }+ }+}+#[derive(PartialEq, Eq, Debug, Default, ProtoBuf, Clone)]+pub struct RepeatedTrashPB {+ #[pb(index = 1)]+ pub items: Vec<TrashPB>,+}++impl std::convert::From<Vec<TrashInfo>> for RepeatedTrashPB {+ fn from(trash_revs: Vec<TrashInfo>) -> Self {+ let items: Vec<TrashPB> = trash_revs+ .into_iter()+ .map(|trash_rev| trash_rev.into())+ .collect();+ RepeatedTrashPB { items }+ }+}++#[derive(PartialEq, Eq, ProtoBuf, Default, Debug, Clone)]+pub struct TrashIdPB {+ #[pb(index = 1)]+ pub id: String,+}++impl std::convert::From<&TrashInfo> for TrashIdPB {+ fn from(trash_info: &TrashInfo) -> Self {+ TrashIdPB {+ id: trash_info.id.clone(),+ }+ }+}++#[derive(PartialEq, Eq, ProtoBuf, Default, Debug, Clone)]+pub struct RepeatedTrashIdPB {+ #[pb(index = 1)]+ pub items: Vec<TrashIdPB>,+}diff --git a/frontend/rust-lib/flowy-folder2/src/entities/view.rs b/frontend/rust-lib/flowy-folder2/src/entities/view.rsnew file mode 100644index 0000000000..f952fd65e5--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/view.rs@@ -0,0 +1,349 @@+use crate::entities::parser::{+ app::AppIdentify,+ view::{ViewDesc, ViewIdentify, ViewName, ViewThumbnail},+};+use crate::view_ext::gen_view_id;+use collab_folder::core::{View, ViewLayout};+use flowy_derive::{ProtoBuf, ProtoBuf_Enum};+use flowy_error::ErrorCode;+use std::collections::HashMap;+use std::convert::TryInto;+use std::ops::{Deref, DerefMut};++#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]+pub struct ViewPB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub app_id: String,++ #[pb(index = 3)]+ pub name: String,++ #[pb(index = 4)]+ pub create_time: i64,++ #[pb(index = 5)]+ pub belongings: Vec<ViewPB>,++ #[pb(index = 6)]+ pub layout: ViewLayoutTypePB,+}++impl std::convert::From<View> for ViewPB {+ fn from(view: View) -> Self {+ ViewPB {+ id: view.id,+ app_id: view.bid,+ name: view.name,+ create_time: view.created_at,+ belongings: Default::default(),+ layout: view.layout.into(),+ }+ }+}++#[derive(Eq, PartialEq, Hash, Debug, ProtoBuf_Enum, Clone)]+pub enum ViewLayoutTypePB {+ Document = 0,+ Grid = 3,+ Board = 4,+ Calendar = 5,+}++impl std::default::Default for ViewLayoutTypePB {+ fn default() -> Self {+ ViewLayoutTypePB::Grid+ }+}++impl std::convert::From<ViewLayout> for ViewLayoutTypePB {+ fn from(rev: ViewLayout) -> Self {+ match rev {+ ViewLayout::Grid => ViewLayoutTypePB::Grid,+ ViewLayout::Board => ViewLayoutTypePB::Board,+ ViewLayout::Document => ViewLayoutTypePB::Document,+ ViewLayout::Calendar => ViewLayoutTypePB::Calendar,+ }+ }+}++#[derive(Eq, PartialEq, Debug, Default, ProtoBuf, Clone)]+pub struct RepeatedViewPB {+ #[pb(index = 1)]+ pub items: Vec<ViewPB>,+}++impl std::convert::From<Vec<View>> for RepeatedViewPB {+ fn from(views: Vec<View>) -> Self {+ let items = views+ .into_iter()+ .map(|value| value.into())+ .collect::<Vec<ViewPB>>();+ RepeatedViewPB { items }+ }+}++impl Deref for RepeatedViewPB {+ type Target = Vec<ViewPB>;++ fn deref(&self) -> &Self::Target {+ &self.items+ }+}++impl DerefMut for RepeatedViewPB {+ fn deref_mut(&mut self) -> &mut Self::Target {+ &mut self.items+ }+}++#[derive(Default, ProtoBuf)]+pub struct RepeatedViewIdPB {+ #[pb(index = 1)]+ pub items: Vec<String>,+}++#[derive(Default, ProtoBuf)]+pub struct CreateViewPayloadPB {+ #[pb(index = 1)]+ pub belong_to_id: String,++ #[pb(index = 2)]+ pub name: String,++ #[pb(index = 3)]+ pub desc: String,++ #[pb(index = 4, one_of)]+ pub thumbnail: Option<String>,++ #[pb(index = 5)]+ pub layout: ViewLayoutTypePB,++ #[pb(index = 6)]+ pub initial_data: Vec<u8>,++ #[pb(index = 7)]+ pub ext: HashMap<String, String>,+}++#[derive(Debug, Clone)]+pub struct CreateViewParams {+ pub belong_to_id: String,+ pub name: String,+ pub desc: String,+ pub layout: ViewLayoutTypePB,+ pub view_id: String,+ pub initial_data: Vec<u8>,+ pub ext: HashMap<String, String>,+}++impl TryInto<CreateViewParams> for CreateViewPayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<CreateViewParams, Self::Error> {+ let name = ViewName::parse(self.name)?.0;+ let belong_to_id = AppIdentify::parse(self.belong_to_id)?.0;+ let view_id = gen_view_id();++ Ok(CreateViewParams {+ belong_to_id,+ name,+ desc: self.desc,+ layout: self.layout,+ view_id,+ initial_data: self.initial_data,+ ext: self.ext,+ })+ }+}++#[derive(Default, ProtoBuf, Clone, Debug)]+pub struct ViewIdPB {+ #[pb(index = 1)]+ pub value: String,+}++impl std::convert::From<&str> for ViewIdPB {+ fn from(value: &str) -> Self {+ ViewIdPB {+ value: value.to_string(),+ }+ }+}++#[derive(Default, ProtoBuf, Clone, Debug)]+pub struct DeletedViewPB {+ #[pb(index = 1)]+ pub view_id: String,++ #[pb(index = 2, one_of)]+ pub index: Option<i32>,+}++impl std::ops::Deref for ViewIdPB {+ type Target = str;++ fn deref(&self) -> &Self::Target {+ &self.value+ }+}++#[derive(Default, ProtoBuf)]+pub struct UpdateViewPayloadPB {+ #[pb(index = 1)]+ pub view_id: String,++ #[pb(index = 2, one_of)]+ pub name: Option<String>,++ #[pb(index = 3, one_of)]+ pub desc: Option<String>,++ #[pb(index = 4, one_of)]+ pub thumbnail: Option<String>,+}++#[derive(Clone, Debug)]+pub struct UpdateViewParams {+ pub view_id: String,+ pub name: Option<String>,+ pub desc: Option<String>,+ pub thumbnail: Option<String>,+}++impl TryInto<UpdateViewParams> for UpdateViewPayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<UpdateViewParams, Self::Error> {+ let view_id = ViewIdentify::parse(self.view_id)?.0;++ let name = match self.name {+ None => None,+ Some(name) => Some(ViewName::parse(name)?.0),+ };++ let desc = match self.desc {+ None => None,+ Some(desc) => Some(ViewDesc::parse(desc)?.0),+ };++ let thumbnail = match self.thumbnail {+ None => None,+ Some(thumbnail) => Some(ViewThumbnail::parse(thumbnail)?.0),+ };++ Ok(UpdateViewParams {+ view_id,+ name,+ desc,+ thumbnail,+ })+ }+}++#[derive(ProtoBuf_Enum)]+pub enum MoveFolderItemType {+ MoveApp = 0,+ MoveView = 1,+}++impl std::default::Default for MoveFolderItemType {+ fn default() -> Self {+ MoveFolderItemType::MoveApp+ }+}++#[derive(Default, ProtoBuf)]+pub struct MoveFolderItemPayloadPB {+ #[pb(index = 1)]+ pub item_id: String,++ #[pb(index = 2)]+ pub from: i32,++ #[pb(index = 3)]+ pub to: i32,++ #[pb(index = 4)]+ pub ty: MoveFolderItemType,+}++pub struct MoveViewParams {+ pub item_id: String,+ pub from: usize,+ pub to: usize,+ pub ty: MoveFolderItemType,+}++impl TryInto<MoveViewParams> for MoveFolderItemPayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<MoveViewParams, Self::Error> {+ let view_id = ViewIdentify::parse(self.item_id)?.0;+ Ok(MoveViewParams {+ item_id: view_id,+ from: self.from as usize,+ to: self.to as usize,+ ty: self.ty,+ })+ }+}++// impl<'de> Deserialize<'de> for ViewDataType {+// fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>+// where+// D: Deserializer<'de>,+// {+// struct ViewTypeVisitor();+//+// impl<'de> Visitor<'de> for ViewTypeVisitor {+// type Value = ViewDataType;+// fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {+// formatter.write_str("RichText, PlainText")+// }+//+// fn visit_u8<E>(self, v: u8) -> Result<Self::Value, E>+// where+// E: de::Error,+// {+// let data_type;+// match v {+// 0 => {+// data_type = ViewDataType::RichText;+// }+// 1 => {+// data_type = ViewDataType::PlainText;+// }+// _ => {+// return Err(de::Error::invalid_value(Unexpected::Unsigned(v as u64), &self));+// }+// }+// Ok(data_type)+// }+//+// fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>+// where+// E: de::Error,+// {+// let data_type;+// match s {+// "Doc" | "RichText" => {+// // Rename ViewDataType::Doc to ViewDataType::RichText, So we need to migrate the ViewType manually.+// data_type = ViewDataType::RichText;+// }+// "PlainText" => {+// data_type = ViewDataType::PlainText;+// }+// unknown => {+// return Err(de::Error::invalid_value(Unexpected::Str(unknown), &self));+// }+// }+// Ok(data_type)+// }+// }+// deserializer.deserialize_any(ViewTypeVisitor())+// }+// }diff --git a/frontend/rust-lib/flowy-folder2/src/entities/workspace.rs b/frontend/rust-lib/flowy-folder2/src/entities/workspace.rsnew file mode 100644index 0000000000..f0c027377e--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/entities/workspace.rs@@ -0,0 +1,141 @@+use crate::{+ entities::parser::workspace::{WorkspaceDesc, WorkspaceIdentify, WorkspaceName},+ entities::view::ViewPB,+};+use collab_folder::core::Workspace;+use flowy_derive::ProtoBuf;+use flowy_error::ErrorCode;+use std::convert::TryInto;++#[derive(Eq, PartialEq, ProtoBuf, Default, Debug, Clone)]+pub struct WorkspacePB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub name: String,++ #[pb(index = 3)]+ pub views: Vec<ViewPB>,++ #[pb(index = 4)]+ pub create_time: i64,+}++impl std::convert::From<Workspace> for WorkspacePB {+ fn from(workspace: Workspace) -> Self {+ WorkspacePB {+ id: workspace.id,+ name: workspace.name,+ views: Default::default(),+ create_time: workspace.created_at,+ }+ }+}++#[derive(PartialEq, Eq, Debug, Default, ProtoBuf)]+pub struct RepeatedWorkspacePB {+ #[pb(index = 1)]+ pub items: Vec<WorkspacePB>,+}++impl From<Vec<Workspace>> for RepeatedWorkspacePB {+ fn from(workspaces: Vec<Workspace>) -> Self {+ Self {+ items: workspaces+ .into_iter()+ .map(|workspace| workspace.into())+ .collect::<Vec<WorkspacePB>>(),+ }+ }+}++#[derive(ProtoBuf, Default)]+pub struct CreateWorkspacePayloadPB {+ #[pb(index = 1)]+ pub name: String,++ #[pb(index = 2)]+ pub desc: String,+}++#[derive(Clone, Debug)]+pub struct CreateWorkspaceParams {+ pub name: String,+ pub desc: String,+}++impl TryInto<CreateWorkspaceParams> for CreateWorkspacePayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<CreateWorkspaceParams, Self::Error> {+ let name = WorkspaceName::parse(self.name)?;+ let desc = WorkspaceDesc::parse(self.desc)?;++ Ok(CreateWorkspaceParams {+ name: name.0,+ desc: desc.0,+ })+ }+}++// Read all workspaces if the workspace_id is None+#[derive(Clone, ProtoBuf, Default, Debug)]+pub struct WorkspaceIdPB {+ #[pb(index = 1, one_of)]+ pub value: Option<String>,+}++impl WorkspaceIdPB {+ pub fn new(workspace_id: Option<String>) -> Self {+ Self {+ value: workspace_id,+ }+ }+}++#[derive(Default, ProtoBuf, Clone)]+pub struct WorkspaceSettingPB {+ #[pb(index = 1)]+ pub workspace: WorkspacePB,++ #[pb(index = 2, one_of)]+ pub latest_view: Option<ViewPB>,+}++#[derive(ProtoBuf, Default)]+pub struct UpdateWorkspacePayloadPB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2, one_of)]+ pub name: Option<String>,++ #[pb(index = 3, one_of)]+ pub desc: Option<String>,+}++#[derive(Clone, Debug)]+pub struct UpdateWorkspaceParams {+ pub id: String,+ pub name: Option<String>,+ pub desc: Option<String>,+}++impl TryInto<UpdateWorkspaceParams> for UpdateWorkspacePayloadPB {+ type Error = ErrorCode;++ fn try_into(self) -> Result<UpdateWorkspaceParams, Self::Error> {+ let name = match self.name {+ None => None,+ Some(name) => Some(WorkspaceName::parse(name)?.0),+ };+ let id = WorkspaceIdentify::parse(self.id)?;++ Ok(UpdateWorkspaceParams {+ id: id.0,+ name,+ desc: self.desc,+ })+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/event_handler.rs b/frontend/rust-lib/flowy-folder2/src/event_handler.rsnew file mode 100644index 0000000000..38bc761964--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/event_handler.rs@@ -0,0 +1,201 @@+use crate::entities::{+ CreateViewParams, CreateViewPayloadPB, CreateWorkspaceParams, CreateWorkspacePayloadPB,+ MoveFolderItemPayloadPB, MoveViewParams, RepeatedTrashIdPB, RepeatedTrashPB, RepeatedViewIdPB,+ RepeatedViewPB, RepeatedWorkspacePB, TrashIdPB, UpdateViewParams, UpdateViewPayloadPB, ViewIdPB,+ ViewPB, WorkspaceIdPB, WorkspacePB, WorkspaceSettingPB,+};+use crate::manager::Folder2Manager;++use flowy_error::FlowyError;+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};+use std::sync::Arc;++#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn create_workspace_handler(+ data: AFPluginData<CreateWorkspacePayloadPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<WorkspacePB, FlowyError> {+ let params: CreateWorkspaceParams = data.into_inner().try_into()?;+ let workspace = folder.create_workspace(params).await?;+ data_result_ok(workspace.into())+}++#[tracing::instrument(level = "debug", skip(folder), err)]+pub(crate) async fn read_workspace_apps_handler(+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<RepeatedViewPB, FlowyError> {+ let child_views = folder.get_current_workspace_views().await?;+ let repeated_view: RepeatedViewPB = child_views.into();+ data_result_ok(repeated_view)+}++#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn open_workspace_handler(+ data: AFPluginData<WorkspaceIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<WorkspacePB, FlowyError> {+ let params: WorkspaceIdPB = data.into_inner();+ match params.value {+ None => Err(FlowyError::workspace_id().context("workspace id should not be empty")),+ Some(workspace_id) => {+ let workspace = folder.open_workspace(&workspace_id).await?;+ let workspace_pb: WorkspacePB = workspace.into();+ data_result_ok(workspace_pb)+ },+ }+}++#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn read_workspaces_handler(+ data: AFPluginData<WorkspaceIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<RepeatedWorkspacePB, FlowyError> {+ let params: WorkspaceIdPB = data.into_inner();+ let workspaces = match params.value {+ None => folder.get_all_workspaces().await,+ Some(workspace_id) => folder+ .get_workspace(&workspace_id)+ .await+ .map(|workspace| vec![workspace])+ .unwrap_or_default(),+ };++ data_result_ok(workspaces.into())+}++#[tracing::instrument(level = "debug", skip(folder), err)]+pub async fn read_cur_workspace_setting_handler(+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<WorkspaceSettingPB, FlowyError> {+ let workspace: WorkspacePB = folder.get_current_workspace().await?.into();+ let latest_view: Option<ViewPB> = folder.get_current_view().await;+ data_result_ok(WorkspaceSettingPB {+ workspace,+ latest_view,+ })+}++pub(crate) async fn create_view_handler(+ data: AFPluginData<CreateViewPayloadPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<ViewPB, FlowyError> {+ let params: CreateViewParams = data.into_inner().try_into()?;+ let view = folder.create_view_with_params(params).await?;+ let _ = folder.set_current_view(&view.id).await;+ data_result_ok(view.into())+}++pub(crate) async fn read_view_handler(+ data: AFPluginData<ViewIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<ViewPB, FlowyError> {+ let view_id: ViewIdPB = data.into_inner();+ let view_pb = folder.get_view(&view_id.value).await?;+ data_result_ok(view_pb)+}++#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn update_view_handler(+ data: AFPluginData<UpdateViewPayloadPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let params: UpdateViewParams = data.into_inner().try_into()?;+ let _ = folder.update_view_with_params(params).await?;+ Ok(())+}++pub(crate) async fn delete_view_handler(+ data: AFPluginData<RepeatedViewIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let params: RepeatedViewIdPB = data.into_inner();+ for view_id in ¶ms.items {+ let _ = folder.move_view_to_trash(view_id).await;+ }+ Ok(())+}++pub(crate) async fn set_latest_view_handler(+ data: AFPluginData<ViewIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let view_id: ViewIdPB = data.into_inner();+ let _ = folder.set_current_view(&view_id.value).await;+ Ok(())+}++pub(crate) async fn close_view_handler(+ data: AFPluginData<ViewIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let view_id: ViewIdPB = data.into_inner();+ let _ = folder.close_view(&view_id.value).await;+ Ok(())+}++#[tracing::instrument(level = "debug", skip_all, err)]+pub(crate) async fn move_view_handler(+ data: AFPluginData<MoveFolderItemPayloadPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let params: MoveViewParams = data.into_inner().try_into()?;+ folder+ .move_view(¶ms.item_id, params.from, params.to)+ .await?;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn duplicate_view_handler(+ data: AFPluginData<ViewPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let view: ViewPB = data.into_inner();+ folder.duplicate_view(&view.id).await?;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(folder), err)]+pub(crate) async fn read_trash_handler(+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> DataResult<RepeatedTrashPB, FlowyError> {+ let trash = folder.get_all_trash().await;+ data_result_ok(trash.into())+}++#[tracing::instrument(level = "debug", skip(identifier, folder), err)]+pub(crate) async fn putback_trash_handler(+ identifier: AFPluginData<TrashIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ folder.restore_trash(&identifier.id).await;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(identifiers, folder), err)]+pub(crate) async fn delete_trash_handler(+ identifiers: AFPluginData<RepeatedTrashIdPB>,+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ let trash_ids = identifiers.into_inner().items;+ for trash_id in trash_ids {+ folder.delete_trash(&trash_id.id).await;+ }+ Ok(())+}++#[tracing::instrument(level = "debug", skip(folder), err)]+pub(crate) async fn restore_all_trash_handler(+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ folder.restore_all_trash().await;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(folder), err)]+pub(crate) async fn delete_all_trash_handler(+ folder: AFPluginState<Arc<Folder2Manager>>,+) -> Result<(), FlowyError> {+ folder.delete_all_trash().await;+ Ok(())+}diff --git a/frontend/rust-lib/flowy-folder2/src/event_map.rs b/frontend/rust-lib/flowy-folder2/src/event_map.rsnew file mode 100644index 0000000000..ee72436baf--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/event_map.rs@@ -0,0 +1,119 @@+use crate::event_handler::*;+use crate::manager::Folder2Manager;+use flowy_derive::{Flowy_Event, ProtoBuf_Enum};++use lib_dispatch::prelude::*;+use std::sync::Arc;+use strum_macros::Display;++pub fn init(folder: Arc<Folder2Manager>) -> AFPlugin {+ AFPlugin::new().name("Flowy-Folder").state(folder)+ // Workspace+ .event(FolderEvent::CreateWorkspace, create_workspace_handler)+ .event(+ FolderEvent::ReadCurrentWorkspace,+ read_cur_workspace_setting_handler,+ )+ .event(FolderEvent::ReadWorkspaces, read_workspaces_handler)+ .event(FolderEvent::OpenWorkspace, open_workspace_handler)+ .event(FolderEvent::ReadWorkspaceApps, read_workspace_apps_handler)+ // View+ .event(FolderEvent::CreateView, create_view_handler)+ .event(FolderEvent::ReadView, read_view_handler)+ .event(FolderEvent::UpdateView, update_view_handler)+ .event(FolderEvent::DeleteView, delete_view_handler)+ .event(FolderEvent::DuplicateView, duplicate_view_handler)+ .event(FolderEvent::SetLatestView, set_latest_view_handler)+ .event(FolderEvent::CloseView, close_view_handler)+ .event(FolderEvent::MoveItem, move_view_handler)+ // Trash+ .event(FolderEvent::ReadTrash, read_trash_handler)+ .event(FolderEvent::PutbackTrash, putback_trash_handler)+ .event(FolderEvent::DeleteTrash, delete_trash_handler)+ .event(FolderEvent::RestoreAllTrash, restore_all_trash_handler)+ .event(FolderEvent::DeleteAllTrash, delete_all_trash_handler)+}++#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]+#[event_err = "FlowyError"]+pub enum FolderEvent {+ /// Create a new workspace+ #[event(input = "CreateWorkspacePayloadPB", output = "WorkspacePB")]+ CreateWorkspace = 0,++ /// Read the current opening workspace+ #[event(output = "WorkspaceSettingPB")]+ ReadCurrentWorkspace = 1,++ /// Open the workspace and mark it as the current workspace+ #[event(input = "WorkspaceIdPB", output = "RepeatedWorkspacePB")]+ ReadWorkspaces = 2,++ /// Delete the workspace+ #[event(input = "WorkspaceIdPB")]+ DeleteWorkspace = 3,++ /// Open the workspace and mark it as the current workspace+ #[event(input = "WorkspaceIdPB", output = "WorkspacePB")]+ OpenWorkspace = 4,++ /// Return a list of apps that belong to this workspace+ #[event(input = "WorkspaceIdPB", output = "RepeatedViewPB")]+ ReadWorkspaceApps = 5,++ /// Create a new view in the corresponding app+ #[event(input = "CreateViewPayloadPB", output = "ViewPB")]+ CreateView = 201,++ /// Return the view info+ #[event(input = "ViewIdPB", output = "ViewPB")]+ ReadView = 202,++ /// Update the view's properties including the name,description, etc.+ #[event(input = "UpdateViewPayloadPB", output = "ViewPB")]+ UpdateView = 203,++ /// Move the view to the trash folder+ #[event(input = "RepeatedViewIdPB")]+ DeleteView = 204,++ /// Duplicate the view+ #[event(input = "ViewPB")]+ DuplicateView = 205,++ /// Close and release the resources that are used by this view.+ /// It should get called when the 'View' page get destroy+ #[event(input = "ViewIdPB")]+ CloseView = 206,++ #[event()]+ CopyLink = 220,++ /// Set the current visiting view+ #[event(input = "ViewIdPB")]+ SetLatestView = 221,++ /// Move the view or app to another place+ #[event(input = "MoveFolderItemPayloadPB")]+ MoveItem = 230,++ /// Read the trash that was deleted by the user+ #[event(output = "RepeatedTrashPB")]+ ReadTrash = 300,++ /// Put back the trash to the origin folder+ #[event(input = "TrashIdPB")]+ PutbackTrash = 301,++ /// Delete the trash from the disk+ #[event(input = "RepeatedTrashIdPB")]+ DeleteTrash = 302,++ /// Put back all the trash to its original folder+ #[event()]+ RestoreAllTrash = 303,++ /// Delete all the trash from the disk+ #[event()]+ DeleteAllTrash = 304,+}diff --git a/frontend/rust-lib/flowy-folder2/src/lib.rs b/frontend/rust-lib/flowy-folder2/src/lib.rsnew file mode 100644index 0000000000..244caa9ab4--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/lib.rs@@ -0,0 +1,13 @@+pub mod entities;+pub mod event_handler;+pub mod event_map;+pub mod manager;+mod notification;+pub mod protobuf;+mod user_default;+pub mod view_ext;++#[cfg(feature = "test_helper")]+mod test_helper;++pub use collab_folder::core::ViewLayout;diff --git a/frontend/rust-lib/flowy-folder2/src/manager.rs b/frontend/rust-lib/flowy-folder2/src/manager.rsnew file mode 100644index 0000000000..396c74cca2--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/manager.rs@@ -0,0 +1,614 @@+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<View>> {+ let views = self.with_folder(vec![], |folder| {+ let trash_ids = folder+ .trash+ .get_all_trash()+ .into_iter()+ .map(|trash| trash.id)+ .collect::<Vec<String>>();++ let mut views = folder.get_views_belong_to_current_workspace();+ views.retain(|view| !trash_ids.contains(&view.id));+ views+ });++ Ok(views)+ }++ pub async fn get_workspace_views<F>(+ &self,+ workspace_id: &str,+ filter: F,+ ) -> FlowyResult<Vec<View>>+ where+ F: Fn(&ViewLayout) -> bool,+ {+ Ok(self.with_folder(vec![], |folder| {+ folder+ .views+ .get_views_belong_to(workspace_id)+ .into_iter()+ .filter(|view| filter(&view.layout))+ .collect::<Vec<_>>()+ }))+ }++ /// 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));+ 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,+ ¶ms.view_id,+ ¶ms.name,+ view_layout.clone(),+ ext,+ )+ .await?;+ },+ false => {+ tracing::trace!("Create view with view data");+ processor+ .create_view_with_custom_data(+ user_id,+ ¶ms.view_id,+ ¶ms.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(¶ms.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);+ }+ });+}++#[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 mut child_views = folder.get_views_belong_to_current_workspace();+ child_views.retain(|view| !trash_ids.contains(&view.id));+ let repeated_view: RepeatedViewPB = child_views.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 --git a/frontend/rust-lib/flowy-folder2/src/notification.rs b/frontend/rust-lib/flowy-folder2/src/notification.rsnew file mode 100644index 0000000000..5599b68d2f--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/notification.rs@@ -0,0 +1,72 @@+use crate::entities::{ViewPB, WorkspacePB, WorkspaceSettingPB};+use collab_folder::core::{View, Workspace};+use flowy_derive::ProtoBuf_Enum;+use flowy_notification::NotificationBuilder;+use lib_dispatch::prelude::ToBytes;++const OBSERVABLE_CATEGORY: &str = "Workspace";++#[derive(ProtoBuf_Enum, Debug)]+pub(crate) enum FolderNotification {+ Unknown = 0,+ /// Trigger after creating a workspace+ DidCreateWorkspace = 1,+ // /// Trigger after updating a workspace+ DidUpdateWorkspace = 2,++ DidUpdateWorkspaceViews = 3,+ /// Trigger when the settings of the workspace are changed. The changes including the latest visiting view, etc+ DidUpdateWorkspaceSetting = 4,++ DidUpdateView = 29,+ /// Trigger when the properties including rename,update description of the view are changed+ DidUpdateChildViews = 30,+ /// Trigger after deleting the view+ DidDeleteView = 31,+ /// Trigger when restore the view from trash+ DidRestoreView = 32,+ /// Trigger after moving the view to trash+ DidMoveViewToTrash = 33,+ /// Trigger when the number of trash is changed+ DidUpdateTrash = 34,+}++impl std::default::Default for FolderNotification {+ fn default() -> Self {+ FolderNotification::Unknown+ }+}++impl std::convert::From<FolderNotification> for i32 {+ fn from(notification: FolderNotification) -> Self {+ notification as i32+ }+}++#[tracing::instrument(level = "trace")]+pub(crate) fn send_notification(id: &str, ty: FolderNotification) -> NotificationBuilder {+ NotificationBuilder::new(id, ty, OBSERVABLE_CATEGORY)+}++/// The [CURRENT_WORKSPACE] represents as the current workspace that opened by the+/// user. Only one workspace can be opened at a time.+const CURRENT_WORKSPACE: &str = "current-workspace";+pub(crate) fn send_workspace_notification<T: ToBytes>(ty: FolderNotification, payload: T) {+ send_notification(CURRENT_WORKSPACE, ty)+ .payload(payload)+ .send();+}++pub(crate) fn send_workspace_setting_notification(+ current_workspace: Option<Workspace>,+ current_view: Option<View>,+) -> Option<()> {+ let workspace: WorkspacePB = current_workspace?.into();+ let latest_view = current_view.map(ViewPB::from);+ let setting = WorkspaceSettingPB {+ workspace,+ latest_view,+ };+ send_workspace_notification(FolderNotification::DidUpdateWorkspaceSetting, setting);+ None+}diff --git a/frontend/rust-lib/flowy-folder2/src/test_helper.rs b/frontend/rust-lib/flowy-folder2/src/test_helper.rsnew file mode 100644index 0000000000..f6a243336a--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/test_helper.rs@@ -0,0 +1,50 @@+use crate::entities::{CreateViewParams, ViewLayoutTypePB};+use crate::manager::Folder2Manager;+use crate::view_ext::gen_view_id;+use std::collections::HashMap;++#[cfg(feature = "test_helper")]+impl Folder2Manager {+ pub async fn create_test_grid_view(+ &self,+ app_id: &str,+ name: &str,+ ext: HashMap<String, String>,+ ) -> String {+ self+ .create_test_view(app_id, name, ViewLayoutTypePB::Grid, ext)+ .await+ }++ pub async fn create_test_board_view(+ &self,+ app_id: &str,+ name: &str,+ ext: HashMap<String, String>,+ ) -> String {+ self+ .create_test_view(app_id, name, ViewLayoutTypePB::Board, ext)+ .await+ }++ async fn create_test_view(+ &self,+ app_id: &str,+ name: &str,+ layout: ViewLayoutTypePB,+ ext: HashMap<String, String>,+ ) -> String {+ let view_id = gen_view_id();+ let params = CreateViewParams {+ belong_to_id: app_id.to_string(),+ name: name.to_string(),+ desc: "".to_string(),+ layout,+ view_id: view_id.clone(),+ initial_data: vec![],+ ext,+ };+ self.create_view_with_params(params).await.unwrap();+ view_id+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/user_default.rs b/frontend/rust-lib/flowy-folder2/src/user_default.rsnew file mode 100644index 0000000000..879a91ea32--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/user_default.rs@@ -0,0 +1,105 @@+use crate::entities::{ViewPB, WorkspacePB};++use crate::view_ext::{gen_view_id, ViewDataProcessorMap};+use chrono::Utc;+use collab_folder::core::{Belonging, Belongings, FolderData, View, ViewLayout, Workspace};+use flowy_document::editor::initial_read_me;+use nanoid::nanoid;+use std::collections::HashMap;++pub struct DefaultFolderBuilder();+impl DefaultFolderBuilder {+ pub async fn build(+ uid: i64,+ view_processors: &ViewDataProcessorMap,+ ) -> (FolderData, WorkspacePB) {+ let time = Utc::now().timestamp();+ let workspace_id = gen_workspace_id();+ let view_id = gen_view_id();+ let child_view_id = gen_view_id();++ let child_view_layout = ViewLayout::Document;+ let child_view = View {+ id: child_view_id.clone(),+ bid: view_id.clone(),+ name: "Read me".to_string(),+ desc: "".to_string(),+ belongings: Default::default(),+ created_at: time,+ layout: child_view_layout.clone(),+ database_id: None,+ };++ // create the document+ let data = initial_read_me().into_bytes();+ let processor = view_processors.get(&child_view_layout).unwrap();+ processor+ .create_view_with_custom_data(+ uid,+ &child_view.id,+ &child_view.name,+ data,+ child_view_layout.clone(),+ HashMap::default(),+ )+ .await+ .unwrap();++ let view = View {+ id: view_id,+ bid: workspace_id.clone(),+ name: "⭐️ Getting started".to_string(),+ desc: "".to_string(),+ belongings: Belongings::new(vec![Belonging {+ id: child_view.id.clone(),+ name: child_view.name.clone(),+ }]),+ created_at: time,+ layout: ViewLayout::Document,+ database_id: None,+ };++ let workspace = Workspace {+ id: workspace_id,+ name: "Workspace".to_string(),+ belongings: Belongings::new(vec![Belonging {+ id: view.id.clone(),+ name: view.name.clone(),+ }]),+ created_at: time,+ };++ let workspace_pb = workspace_pb_from_workspace(&workspace, &view, &child_view);++ (+ FolderData {+ current_workspace: workspace.id.clone(),+ current_view: child_view_id,+ workspaces: vec![workspace],+ views: vec![view, child_view],+ },+ workspace_pb,+ )+ }+}++pub fn gen_workspace_id() -> String {+ nanoid!(10)+}++fn workspace_pb_from_workspace(+ workspace: &Workspace,+ view: &View,+ child_view: &View,+) -> WorkspacePB {+ let child_view_pb: ViewPB = child_view.clone().into();+ let mut view_pb: ViewPB = view.clone().into();+ view_pb.belongings.push(child_view_pb);++ WorkspacePB {+ id: workspace.id.clone(),+ name: workspace.name.clone(),+ views: vec![view_pb],+ create_time: workspace.created_at,+ }+}diff --git a/frontend/rust-lib/flowy-folder2/src/view_ext.rs b/frontend/rust-lib/flowy-folder2/src/view_ext.rsnew file mode 100644index 0000000000..fa371840d7--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/src/view_ext.rs@@ -0,0 +1,72 @@+use crate::entities::{CreateViewParams, ViewLayoutTypePB};+use bytes::Bytes;+use collab_folder::core::{View, ViewLayout};+use flowy_error::FlowyError;+use lib_infra::future::FutureResult;+use lib_infra::util::timestamp;+use nanoid::nanoid;+use std::collections::HashMap;+use std::sync::Arc;++pub trait ViewDataProcessor {+ /// Closes the view and releases the resources that this view has in+ /// the backend+ fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError>;++ /// Gets the data of the this view.+ /// For example, the data can be used to duplicate the view.+ fn get_view_data(&self, view_id: &str) -> FutureResult<Bytes, FlowyError>;++ /// Create a view with the pre-defined data.+ /// For example, the initial data of the grid/calendar/kanban board when+ /// you create a new view.+ fn create_view_with_build_in_data(+ &self,+ user_id: i64,+ view_id: &str,+ name: &str,+ layout: ViewLayout,+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError>;++ /// Create a view with custom data+ fn create_view_with_custom_data(+ &self,+ user_id: i64,+ view_id: &str,+ name: &str,+ data: Vec<u8>,+ layout: ViewLayout,+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError>;+}++pub type ViewDataProcessorMap = Arc<HashMap<ViewLayout, Arc<dyn ViewDataProcessor + Send + Sync>>>;++impl From<ViewLayoutTypePB> for ViewLayout {+ fn from(pb: ViewLayoutTypePB) -> Self {+ match pb {+ ViewLayoutTypePB::Document => ViewLayout::Document,+ ViewLayoutTypePB::Grid => ViewLayout::Grid,+ ViewLayoutTypePB::Board => ViewLayout::Board,+ ViewLayoutTypePB::Calendar => ViewLayout::Calendar,+ }+ }+}++pub fn view_from_create_view_params(params: CreateViewParams, layout: ViewLayout) -> View {+ let time = timestamp();+ View {+ id: params.view_id,+ bid: params.belong_to_id,+ name: params.name,+ desc: params.desc,+ belongings: Default::default(),+ created_at: time,+ layout,+ database_id: None,+ }+}+pub fn gen_view_id() -> String {+ format!("v:{}", nanoid!(10))+}diff --git a/frontend/rust-lib/flowy-folder2/tests/workspace/folder_test.rs b/frontend/rust-lib/flowy-folder2/tests/workspace/folder_test.rsnew file mode 100644index 0000000000..1171f34132--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/tests/workspace/folder_test.rs@@ -0,0 +1,273 @@+use crate::script::{invalid_workspace_name_test_case, FolderScript::*, FolderTest};+use collab_folder::core::ViewLayout;+use flowy_folder2::entities::CreateWorkspacePayloadPB;+use flowy_test::{event_builder::*, FlowySDKTest};++#[tokio::test]+async fn workspace_read_all() {+ let mut test = FolderTest::new().await;+ test.run_scripts(vec![ReadAllWorkspaces]).await;+ assert!(!test.all_workspace.is_empty());+}++#[tokio::test]+async fn workspace_create() {+ let mut test = FolderTest::new().await;+ let name = "My new workspace".to_owned();+ let desc = "Daily routines".to_owned();+ test+ .run_scripts(vec![CreateWorkspace {+ name: name.clone(),+ desc: desc.clone(),+ }])+ .await;++ let workspace = test.workspace.clone();+ assert_eq!(workspace.name, name);++ test+ .run_scripts(vec![+ ReadWorkspace(Some(workspace.id.clone())),+ AssertWorkspace(workspace),+ ])+ .await;+}++#[tokio::test]+async fn workspace_read() {+ let mut test = FolderTest::new().await;+ let workspace = test.workspace.clone();++ test+ .run_scripts(vec![+ ReadWorkspace(Some(workspace.id.clone())),+ AssertWorkspace(workspace),+ ])+ .await;+}++#[tokio::test]+async fn workspace_create_with_apps() {+ let mut test = FolderTest::new().await;+ test+ .run_scripts(vec![CreateApp {+ name: "App".to_string(),+ desc: "App description".to_string(),+ }])+ .await;++ let app = test.parent_view.clone();+ test.run_scripts(vec![RefreshRootView(app.id)]).await;+}++#[tokio::test]+async fn workspace_create_with_invalid_name() {+ for (name, code) in invalid_workspace_name_test_case() {+ let sdk = FlowySDKTest::default();+ let request = CreateWorkspacePayloadPB {+ name,+ desc: "".to_owned(),+ };+ assert_eq!(+ Folder2EventBuilder::new(sdk)+ .event(flowy_folder2::event_map::FolderEvent::CreateWorkspace)+ .payload(request)+ .async_send()+ .await+ .error()+ .code,+ code.value()+ )+ }+}++#[tokio::test]+#[should_panic]+async fn app_delete() {+ let mut test = FolderTest::new().await;+ let app = test.parent_view.clone();+ test+ .run_scripts(vec![DeleteRootView, RefreshRootView(app.id)])+ .await;+}++#[tokio::test]+async fn app_delete_then_restore() {+ let mut test = FolderTest::new().await;+ test+ .run_scripts(vec![RefreshRootView(test.parent_view.id.clone())])+ .await;++ let parent_view = test.parent_view.clone();+ test+ .run_scripts(vec![+ DeleteRootView,+ RestoreAppFromTrash,+ RefreshRootView(parent_view.id.clone()),+ AssertRootView(parent_view),+ ])+ .await;+}++#[tokio::test]+async fn app_update() {+ let mut test = FolderTest::new().await;+ let app = test.parent_view.clone();+ let new_name = "😁 hell world".to_owned();+ assert_ne!(app.name, new_name);++ test+ .run_scripts(vec![+ UpdateRootView {+ name: Some(new_name.clone()),+ desc: None,+ },+ RefreshRootView(app.id),+ ])+ .await;+ assert_eq!(test.parent_view.name, new_name);+}++#[tokio::test]+async fn app_create_with_view() {+ let mut test = FolderTest::new().await;+ let mut app = test.parent_view.clone();+ test+ .run_scripts(vec![+ CreateView {+ name: "View A".to_owned(),+ desc: "View A description".to_owned(),+ layout: ViewLayout::Document,+ },+ CreateView {+ name: "Grid".to_owned(),+ desc: "Grid description".to_owned(),+ layout: ViewLayout::Grid,+ },+ RefreshRootView(app.id),+ ])+ .await;++ app = test.parent_view.clone();+ assert_eq!(app.belongings.len(), 3);+ assert_eq!(app.belongings[1].name, "View A");+ assert_eq!(app.belongings[2].name, "Grid")+}++#[tokio::test]+async fn view_update() {+ let mut test = FolderTest::new().await;+ let view = test.child_view.clone();+ let new_name = "😁 123".to_owned();+ assert_ne!(view.name, new_name);++ test+ .run_scripts(vec![+ UpdateView {+ name: Some(new_name.clone()),+ desc: None,+ },+ ReadView(view.id),+ ])+ .await;+ assert_eq!(test.child_view.name, new_name);+}++#[tokio::test]+#[should_panic]+async fn view_delete() {+ let mut test = FolderTest::new().await;+ let view = test.child_view.clone();+ test.run_scripts(vec![DeleteView, ReadView(view.id)]).await;+}++#[tokio::test]+async fn view_delete_then_restore() {+ let mut test = FolderTest::new().await;+ let view = test.child_view.clone();+ test+ .run_scripts(vec![+ DeleteView,+ RestoreViewFromTrash,+ ReadView(view.id.clone()),+ AssertView(view),+ ])+ .await;+}++#[tokio::test]+async fn view_delete_all() {+ let mut test = FolderTest::new().await;+ let parent_view = test.parent_view.clone();+ test+ .run_scripts(vec![+ CreateView {+ name: "View A".to_owned(),+ desc: "View A description".to_owned(),+ layout: ViewLayout::Document,+ },+ CreateView {+ name: "Grid".to_owned(),+ desc: "Grid description".to_owned(),+ layout: ViewLayout::Grid,+ },+ RefreshRootView(parent_view.id.clone()),+ ])+ .await;++ assert_eq!(+ test.parent_view.belongings.len(),+ 3,+ "num of belongings should be 3"+ );+ let view_ids = test+ .parent_view+ .belongings+ .iter()+ .map(|view| view.id.clone())+ .collect::<Vec<String>>();+ test+ .run_scripts(vec![+ DeleteViews(view_ids),+ RefreshRootView(parent_view.id),+ ReadTrash,+ ])+ .await;++ assert_eq!(test.parent_view.belongings.len(), 0);+ assert_eq!(test.trash.len(), 3);+}++#[tokio::test]+async fn view_delete_all_permanent() {+ let mut test = FolderTest::new().await;+ let app = test.parent_view.clone();+ test+ .run_scripts(vec![+ CreateView {+ name: "View A".to_owned(),+ desc: "View A description".to_owned(),+ layout: ViewLayout::Document,+ },+ RefreshRootView(app.id.clone()),+ ])+ .await;++ let view_ids = test+ .parent_view+ .belongings+ .iter()+ .map(|view| view.id.clone())+ .collect::<Vec<String>>();+ test+ .run_scripts(vec![+ DeleteViews(view_ids),+ RefreshRootView(app.id),+ DeleteAllTrash,+ ReadTrash,+ ])+ .await;++ assert_eq!(test.parent_view.belongings.len(), 0);+ assert_eq!(test.trash.len(), 0);+}diff --git a/frontend/rust-lib/flowy-folder2/tests/workspace/main.rs b/frontend/rust-lib/flowy-folder2/tests/workspace/main.rsnew file mode 100644index 0000000000..ff48b349e1--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/tests/workspace/main.rs@@ -0,0 +1,2 @@+mod folder_test;+mod script;diff --git a/frontend/rust-lib/flowy-folder2/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder2/tests/workspace/script.rsnew file mode 100644index 0000000000..aadc7d2fcf--- /dev/null+++ b/frontend/rust-lib/flowy-folder2/tests/workspace/script.rs@@ -0,0 +1,329 @@+use collab_folder::core::ViewLayout;+use flowy_error::ErrorCode;+use flowy_folder2::entities::*;+use flowy_folder2::event_map::FolderEvent::*;+use flowy_test::event_builder::Folder2EventBuilder;+use flowy_test::FlowySDKTest;++pub enum FolderScript {+ // Workspace+ ReadAllWorkspaces,+ CreateWorkspace {+ name: String,+ desc: String,+ },+ AssertWorkspace(WorkspacePB),+ ReadWorkspace(Option<String>),++ // App+ CreateApp {+ name: String,+ desc: String,+ },+ AssertRootView(ViewPB),+ RefreshRootView(String),+ UpdateRootView {+ name: Option<String>,+ desc: Option<String>,+ },+ DeleteRootView,++ // View+ CreateView {+ name: String,+ desc: String,+ layout: ViewLayout,+ },+ AssertView(ViewPB),+ ReadView(String),+ UpdateView {+ name: Option<String>,+ desc: Option<String>,+ },+ DeleteView,+ DeleteViews(Vec<String>),++ // Trash+ RestoreAppFromTrash,+ RestoreViewFromTrash,+ ReadTrash,+ DeleteAllTrash,+}++pub struct FolderTest {+ pub sdk: FlowySDKTest,+ pub all_workspace: Vec<WorkspacePB>,+ pub workspace: WorkspacePB,+ pub parent_view: ViewPB,+ pub child_view: ViewPB,+ pub trash: Vec<TrashPB>,+}++impl FolderTest {+ pub async fn new() -> Self {+ let sdk = FlowySDKTest::default();+ let _ = sdk.init_user().await;+ let workspace = create_workspace(&sdk, "FolderWorkspace", "Folder test workspace").await;+ let parent_view = create_app(&sdk, &workspace.id, "Folder App", "Folder test app").await;+ let view = create_view(+ &sdk,+ &parent_view.id,+ "Folder View",+ "Folder test view",+ ViewLayout::Document,+ )+ .await;+ Self {+ sdk,+ all_workspace: vec![],+ workspace,+ parent_view,+ child_view: view,+ trash: vec![],+ }+ }++ pub async fn run_scripts(&mut self, scripts: Vec<FolderScript>) {+ for script in scripts {+ self.run_script(script).await;+ }+ }++ pub async fn run_script(&mut self, script: FolderScript) {+ let sdk = &self.sdk;+ match script {+ FolderScript::ReadAllWorkspaces => {+ let all_workspace = read_workspace(sdk, None).await;+ self.all_workspace = all_workspace;+ },+ FolderScript::CreateWorkspace { name, desc } => {+ let workspace = create_workspace(sdk, &name, &desc).await;+ self.workspace = workspace;+ },+ FolderScript::AssertWorkspace(workspace) => {+ assert_eq!(self.workspace, workspace, "Workspace not equal");+ },+ FolderScript::ReadWorkspace(workspace_id) => {+ let workspace = read_workspace(sdk, workspace_id).await.pop().unwrap();+ self.workspace = workspace;+ },+ FolderScript::CreateApp { name, desc } => {+ let app = create_app(sdk, &self.workspace.id, &name, &desc).await;+ self.parent_view = app;+ },+ FolderScript::AssertRootView(app) => {+ assert_eq!(self.parent_view, app, "App not equal");+ },+ FolderScript::RefreshRootView(app_id) => {+ let app = read_view(sdk, &app_id).await;+ self.parent_view = app;+ },+ FolderScript::UpdateRootView { name, desc } => {+ update_view(sdk, &self.parent_view.id, name, desc).await;+ },+ FolderScript::DeleteRootView => {+ delete_view(sdk, vec![self.parent_view.id.clone()]).await;+ },++ FolderScript::CreateView { name, desc, layout } => {+ let view = create_view(sdk, &self.parent_view.id, &name, &desc, layout).await;+ self.child_view = view;+ },+ FolderScript::AssertView(view) => {+ assert_eq!(self.child_view, view, "View not equal");+ },+ FolderScript::ReadView(view_id) => {+ let view = read_view(sdk, &view_id).await;+ self.child_view = view;+ },+ FolderScript::UpdateView { name, desc } => {+ update_view(sdk, &self.child_view.id, name, desc).await;+ },+ FolderScript::DeleteView => {+ delete_view(sdk, vec![self.child_view.id.clone()]).await;+ },+ FolderScript::DeleteViews(view_ids) => {+ delete_view(sdk, view_ids).await;+ },+ FolderScript::RestoreAppFromTrash => {+ restore_app_from_trash(sdk, &self.parent_view.id).await;+ },+ FolderScript::RestoreViewFromTrash => {+ restore_view_from_trash(sdk, &self.child_view.id).await;+ },+ FolderScript::ReadTrash => {+ let trash = read_trash(sdk).await;+ self.trash = trash.items;+ },+ FolderScript::DeleteAllTrash => {+ delete_all_trash(sdk).await;+ self.trash = vec![];+ },+ }+ }+}++pub fn invalid_workspace_name_test_case() -> Vec<(String, ErrorCode)> {+ vec![+ ("".to_owned(), ErrorCode::WorkspaceNameInvalid),+ ("1234".repeat(100), ErrorCode::WorkspaceNameTooLong),+ ]+}++pub async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> WorkspacePB {+ let request = CreateWorkspacePayloadPB {+ name: name.to_owned(),+ desc: desc.to_owned(),+ };++ Folder2EventBuilder::new(sdk.clone())+ .event(CreateWorkspace)+ .payload(request)+ .async_send()+ .await+ .parse::<WorkspacePB>()+}++pub async fn read_workspace(sdk: &FlowySDKTest, workspace_id: Option<String>) -> Vec<WorkspacePB> {+ let request = WorkspaceIdPB {+ value: workspace_id,+ };+ let repeated_workspace = Folder2EventBuilder::new(sdk.clone())+ .event(ReadWorkspaces)+ .payload(request.clone())+ .async_send()+ .await+ .parse::<RepeatedWorkspacePB>();++ let workspaces;+ if let Some(workspace_id) = &request.value {+ workspaces = repeated_workspace+ .items+ .into_iter()+ .filter(|workspace| &workspace.id == workspace_id)+ .collect::<Vec<WorkspacePB>>();+ debug_assert_eq!(workspaces.len(), 1);+ } else {+ workspaces = repeated_workspace.items;+ }++ workspaces+}++pub async fn create_app(sdk: &FlowySDKTest, workspace_id: &str, name: &str, desc: &str) -> ViewPB {+ let create_view_request = CreateViewPayloadPB {+ belong_to_id: workspace_id.to_owned(),+ name: name.to_string(),+ desc: desc.to_string(),+ thumbnail: None,+ layout: ViewLayout::Document.into(),+ initial_data: vec![],+ ext: Default::default(),+ };++ Folder2EventBuilder::new(sdk.clone())+ .event(CreateView)+ .payload(create_view_request)+ .async_send()+ .await+ .parse::<ViewPB>()+}++pub async fn create_view(+ sdk: &FlowySDKTest,+ app_id: &str,+ name: &str,+ desc: &str,+ layout: ViewLayout,+) -> ViewPB {+ let request = CreateViewPayloadPB {+ belong_to_id: app_id.to_string(),+ name: name.to_string(),+ desc: desc.to_string(),+ thumbnail: None,+ layout: layout.into(),+ initial_data: vec![],+ ext: Default::default(),+ };+ Folder2EventBuilder::new(sdk.clone())+ .event(CreateView)+ .payload(request)+ .async_send()+ .await+ .parse::<ViewPB>()+}++pub async fn read_view(sdk: &FlowySDKTest, view_id: &str) -> ViewPB {+ let view_id: ViewIdPB = view_id.into();+ Folder2EventBuilder::new(sdk.clone())+ .event(ReadView)+ .payload(view_id)+ .async_send()+ .await+ .parse::<ViewPB>()+}++pub async fn update_view(+ sdk: &FlowySDKTest,+ view_id: &str,+ name: Option<String>,+ desc: Option<String>,+) {+ let request = UpdateViewPayloadPB {+ view_id: view_id.to_string(),+ name,+ desc,+ thumbnail: None,+ };+ Folder2EventBuilder::new(sdk.clone())+ .event(UpdateView)+ .payload(request)+ .async_send()+ .await;+}++pub async fn delete_view(sdk: &FlowySDKTest, view_ids: Vec<String>) {+ let request = RepeatedViewIdPB { items: view_ids };+ Folder2EventBuilder::new(sdk.clone())+ .event(DeleteView)+ .payload(request)+ .async_send()+ .await;+}++pub async fn read_trash(sdk: &FlowySDKTest) -> RepeatedTrashPB {+ Folder2EventBuilder::new(sdk.clone())+ .event(ReadTrash)+ .async_send()+ .await+ .parse::<RepeatedTrashPB>()+}++pub async fn restore_app_from_trash(sdk: &FlowySDKTest, app_id: &str) {+ let id = TrashIdPB {+ id: app_id.to_owned(),+ };+ Folder2EventBuilder::new(sdk.clone())+ .event(PutbackTrash)+ .payload(id)+ .async_send()+ .await;+}++pub async fn restore_view_from_trash(sdk: &FlowySDKTest, view_id: &str) {+ let id = TrashIdPB {+ id: view_id.to_owned(),+ };+ Folder2EventBuilder::new(sdk.clone())+ .event(PutbackTrash)+ .payload(id)+ .async_send()+ .await;+}++pub async fn delete_all_trash(sdk: &FlowySDKTest) {+ Folder2EventBuilder::new(sdk.clone())+ .event(DeleteAllTrash)+ .async_send()+ .await;+}diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.tomlindex addea337b0..a7bc4f23af 100644--- a/frontend/rust-lib/flowy-net/Cargo.toml+++ b/frontend/rust-lib/flowy-net/Cargo.toml@@ -19,7 +19,7 @@ flowy-client-ws = { path = "../../../shared-lib/flowy-client-ws"}flowy-client-network-config= { path = "../../../shared-lib/flowy-client-network-config"}flowy-sync = { path = "../../../shared-lib/flowy-sync"}user-model = { path = "../../../shared-lib/user-model"}-flowy-folder = { path = "../flowy-folder" }+flowy-folder2 = { path = "../flowy-folder2" }flowy-user = { path = "../flowy-user" }flowy-document = { path = "../flowy-document" }lazy_static = "1.4.0"diff --git a/frontend/rust-lib/flowy-net/src/http_server/folder.rs b/frontend/rust-lib/flowy-net/src/http_server/folder.rsdeleted file mode 100644index 4694136444..0000000000--- a/frontend/rust-lib/flowy-net/src/http_server/folder.rs+++ /dev/null@@ -1,457 +0,0 @@-use crate::request::{HttpRequestBuilder, ResponseMiddleware};-use crate::response::HttpResponse;-use flowy_client_network_config::ClientServerConfiguration;-use flowy_error::FlowyError;-use flowy_folder::entities::{- trash::RepeatedTrashIdPB,- view::{CreateViewParams, RepeatedViewIdPB, UpdateViewParams, ViewIdPB},- workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceIdPB},- {AppIdPB, CreateAppParams, UpdateAppParams},-};-use flowy_folder::event_map::FolderCouldServiceV1;-use folder_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};-use lazy_static::lazy_static;-use lib_infra::future::FutureResult;-use std::sync::Arc;-use tokio::sync::broadcast;--pub struct FolderHttpCloudService {- config: ClientServerConfiguration,-}--impl FolderHttpCloudService {- pub fn new(config: ClientServerConfiguration) -> FolderHttpCloudService {- Self { config }- }-}--impl FolderCouldServiceV1 for FolderHttpCloudService {- fn init(&self) {}-- fn create_workspace(- &self,- token: &str,- params: CreateWorkspaceParams,- ) -> FutureResult<WorkspaceRevision, FlowyError> {- let token = token.to_owned();- let url = self.config.workspace_url();- FutureResult::new(async move {- let workspace = create_workspace_request(&token, params, &url).await?;- Ok(workspace)- })- }-- fn read_workspace(- &self,- token: &str,- params: WorkspaceIdPB,- ) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {- let token = token.to_owned();- let url = self.config.workspace_url();- FutureResult::new(async move {- let workspace_revs = read_workspaces_request(&token, params, &url).await?;- Ok(workspace_revs)- })- }-- fn update_workspace(- &self,- token: &str,- params: UpdateWorkspaceParams,- ) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.workspace_url();- FutureResult::new(async move {- update_workspace_request(&token, params, &url).await?;- Ok(())- })- }-- fn delete_workspace(&self, token: &str, params: WorkspaceIdPB) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.workspace_url();- FutureResult::new(async move {- delete_workspace_request(&token, params, &url).await?;- Ok(())- })- }-- fn create_view(- &self,- token: &str,- params: CreateViewParams,- ) -> FutureResult<ViewRevision, FlowyError> {- let token = token.to_owned();- let url = self.config.view_url();- FutureResult::new(async move {- let view = create_view_request(&token, params, &url).await?;- Ok(view)- })- }-- fn read_view(- &self,- token: &str,- params: ViewIdPB,- ) -> FutureResult<Option<ViewRevision>, FlowyError> {- let token = token.to_owned();- let url = self.config.view_url();- FutureResult::new(async move {- let view_rev = read_view_request(&token, params, &url).await?;- Ok(view_rev)- })- }-- fn delete_view(&self, token: &str, params: RepeatedViewIdPB) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.view_url();- FutureResult::new(async move {- delete_view_request(&token, params, &url).await?;- Ok(())- })- }-- fn update_view(&self, token: &str, params: UpdateViewParams) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.view_url();- FutureResult::new(async move {- update_view_request(&token, params, &url).await?;- Ok(())- })- }-- fn create_app(- &self,- token: &str,- params: CreateAppParams,- ) -> FutureResult<AppRevision, FlowyError> {- let token = token.to_owned();- let url = self.config.app_url();- FutureResult::new(async move {- let app = create_app_request(&token, params, &url).await?;- Ok(app)- })- }-- fn read_app(- &self,- token: &str,- params: AppIdPB,- ) -> FutureResult<Option<AppRevision>, FlowyError> {- let token = token.to_owned();- let url = self.config.app_url();- FutureResult::new(async move {- let app_rev = read_app_request(&token, params, &url).await?;- Ok(app_rev)- })- }-- fn update_app(&self, token: &str, params: UpdateAppParams) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.app_url();- FutureResult::new(async move {- update_app_request(&token, params, &url).await?;- Ok(())- })- }-- fn delete_app(&self, token: &str, params: AppIdPB) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.app_url();- FutureResult::new(async move {- delete_app_request(&token, params, &url).await?;- Ok(())- })- }-- fn create_trash(&self, token: &str, params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.trash_url();- FutureResult::new(async move {- create_trash_request(&token, params, &url).await?;- Ok(())- })- }-- fn delete_trash(&self, token: &str, params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {- let token = token.to_owned();- let url = self.config.trash_url();- FutureResult::new(async move {- delete_trash_request(&token, params, &url).await?;- Ok(())- })- }-- fn read_trash(&self, token: &str) -> FutureResult<Vec<TrashRevision>, FlowyError> {- let token = token.to_owned();- let url = self.config.trash_url();- FutureResult::new(async move {- let repeated_trash = read_trash_request(&token, &url).await?;- Ok(repeated_trash)- })- }-}--#[allow(dead_code)]-fn request_builder() -> HttpRequestBuilder {- HttpRequestBuilder::new().middleware(MIDDLEWARE.clone())-}--pub async fn create_workspace_request(- _token: &str,- _params: CreateWorkspaceParams,- _url: &str,-) -> Result<WorkspaceRevision, FlowyError> {- // let workspace = request_builder()- // .post(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .response()- // .await?;- // Ok(workspace)- unimplemented!()-}--pub async fn read_workspaces_request(- _token: &str,- _params: WorkspaceIdPB,- _url: &str,-) -> Result<Vec<WorkspaceRevision>, FlowyError> {- // let repeated_workspace = request_builder()- // .get(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .response::<RepeatedWorkspace>()- // .await?;- //- // Ok(repeated_workspace)- unimplemented!()-}--pub async fn update_workspace_request(- _token: &str,- _params: UpdateWorkspaceParams,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .patch(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn delete_workspace_request(- _token: &str,- _params: WorkspaceIdPB,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .delete(url)- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--// App-pub async fn create_app_request(- _token: &str,- _params: CreateAppParams,- _url: &str,-) -> Result<AppRevision, FlowyError> {- // let app = request_builder()- // .post(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .response()- // .await?;- // Ok(app)- unimplemented!()-}--pub async fn read_app_request(- _token: &str,- _params: AppIdPB,- _url: &str,-) -> Result<Option<AppRevision>, FlowyError> {- // let app = request_builder()- // .get(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .option_response()- // .await?;- // Ok(app)-- unimplemented!()-}--pub async fn update_app_request(- _token: &str,- _params: UpdateAppParams,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .patch(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn delete_app_request(- _token: &str,- _params: AppIdPB,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .delete(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--// View-pub async fn create_view_request(- _token: &str,- _params: CreateViewParams,- _url: &str,-) -> Result<ViewRevision, FlowyError> {- // let view = request_builder()- // .post(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .response()- // .await?;- // Ok(view)- unimplemented!()-}--pub async fn read_view_request(- _token: &str,- _params: ViewIdPB,- _url: &str,-) -> Result<Option<ViewRevision>, FlowyError> {- // let view = request_builder()- // .get(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .option_response()- // .await?;- //- // Ok(view)- unimplemented!()-}--pub async fn update_view_request(- _token: &str,- _params: UpdateViewParams,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .patch(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn delete_view_request(- _token: &str,- _params: RepeatedViewIdPB,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .delete(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn create_trash_request(- _token: &str,- _params: RepeatedTrashIdPB,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .post(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn delete_trash_request(- _token: &str,- _params: RepeatedTrashIdPB,- _url: &str,-) -> Result<(), FlowyError> {- // let _ = request_builder()- // .delete(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .protobuf(params)?- // .send()- // .await?;- Ok(())-}--pub async fn read_trash_request(- _token: &str,- _url: &str,-) -> Result<Vec<TrashRevision>, FlowyError> {- // let repeated_trash = request_builder()- // .get(&url.to_owned())- // .header(HEADER_TOKEN, token)- // .response::<RepeatedTrash>()- // .await?;- // Ok(repeated_trash)- unimplemented!()-}--lazy_static! {- static ref MIDDLEWARE: Arc<FolderResponseMiddleware> = Arc::new(FolderResponseMiddleware::new());-}--pub struct FolderResponseMiddleware {- invalid_token_sender: broadcast::Sender<String>,-}--impl FolderResponseMiddleware {- fn new() -> Self {- let (sender, _) = broadcast::channel(10);- FolderResponseMiddleware {- invalid_token_sender: sender,- }- }-- #[allow(dead_code)]- fn invalid_token_subscribe(&self) -> broadcast::Receiver<String> {- self.invalid_token_sender.subscribe()- }-}--impl ResponseMiddleware for FolderResponseMiddleware {- fn receive_response(&self, token: &Option<String>, response: &HttpResponse) {- if let Some(error) = &response.error {- if error.is_unauthorized() {- tracing::error!("user is unauthorized");- match token {- None => {},- Some(token) => match self.invalid_token_sender.send(token.clone()) {- Ok(_) => {},- Err(e) => tracing::error!("{:?}", e),- },- }- }- }- }-}diff --git a/frontend/rust-lib/flowy-net/src/http_server/mod.rs b/frontend/rust-lib/flowy-net/src/http_server/mod.rsindex 53fd3bdead..a7b831d704 100644--- a/frontend/rust-lib/flowy-net/src/http_server/mod.rs+++ b/frontend/rust-lib/flowy-net/src/http_server/mod.rs@@ -1,3 +1,2 @@pub mod document;-pub mod folder;pub mod user;diff --git a/frontend/rust-lib/flowy-net/src/local_server/server.rs b/frontend/rust-lib/flowy-net/src/local_server/server.rsindex 78fe79a663..c124567de9 100644--- a/frontend/rust-lib/flowy-net/src/local_server/server.rs+++ b/frontend/rust-lib/flowy-net/src/local_server/server.rs@@ -7,26 +7,19 @@ use document_model::document::{use flowy_client_sync::errors::SyncError;use flowy_document::DocumentCloudService;use flowy_error::{internal_error, FlowyError};-use flowy_folder::entities::{- app::{AppIdPB, CreateAppParams, UpdateAppParams},- trash::RepeatedTrashIdPB,- view::{CreateViewParams, RepeatedViewIdPB, UpdateViewParams, ViewIdPB},- workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceIdPB},-};-use flowy_folder::event_map::FolderCouldServiceV1;use flowy_server_sync::server_document::ServerDocumentManager;use flowy_server_sync::server_folder::ServerFolderManager;use flowy_sync::{RevisionSyncResponse, RevisionUser};use flowy_user::entities::UserProfilePB;use flowy_user::event_map::UserCloudService;-use folder_model::{- gen_app_id, gen_workspace_id, AppRevision, TrashRevision, ViewRevision, WorkspaceRevision,-};++use flowy_user::uid::UserIDGenerator;use futures_util::stream::StreamExt;-use lib_infra::{future::FutureResult, util::timestamp};+use lib_infra::future::FutureResult;use lib_ws::{WSChannel, WebSocketRawMessage};-use nanoid::nanoid;-use parking_lot::RwLock;++use lazy_static::lazy_static;+use parking_lot::{Mutex, RwLock};use std::{convert::{TryFrom, TryInto},fmt::Debug,@@ -35,6 +28,9 @@ use std::{use tokio::sync::{broadcast, mpsc, mpsc::UnboundedSender};use user_model::*;use ws_model::ws_revision::{ClientRevisionWSData, ClientRevisionWSDataType};+lazy_static! {+ static ref ID_GEN: Mutex<UserIDGenerator> = Mutex::new(UserIDGenerator::new(1));+}pub struct LocalServer {doc_manager: Arc<ServerDocumentManager>,@@ -53,7 +49,6 @@ impl LocalServer {let doc_manager = Arc::new(ServerDocumentManager::new(persistence.clone()));let folder_manager = Arc::new(ServerFolderManager::new(persistence));let stop_tx = RwLock::new(None);-LocalServer {doc_manager,folder_manager,@@ -271,151 +266,27 @@ impl RevisionUser for LocalRevisionUser {}}-impl FolderCouldServiceV1 for LocalServer {- fn init(&self) {}-- fn create_workspace(- &self,- _token: &str,- params: CreateWorkspaceParams,- ) -> FutureResult<WorkspaceRevision, FlowyError> {- let time = timestamp();- let workspace = WorkspaceRevision {- id: gen_workspace_id(),- name: params.name,- desc: params.desc,- apps: vec![],- modified_time: time,- create_time: time,- };-- FutureResult::new(async { Ok(workspace) })- }-- fn read_workspace(- &self,- _token: &str,- _params: WorkspaceIdPB,- ) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {- FutureResult::new(async { Ok(vec![]) })- }-- fn update_workspace(- &self,- _token: &str,- _params: UpdateWorkspaceParams,- ) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn delete_workspace(&self, _token: &str, _params: WorkspaceIdPB) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn create_view(- &self,- _token: &str,- params: CreateViewParams,- ) -> FutureResult<ViewRevision, FlowyError> {- let time = timestamp();- let view = ViewRevision::new(- params.view_id,- params.belong_to_id,- params.name,- params.desc,- params.data_format.into(),- params.layout.into(),- time,- time,- );- FutureResult::new(async { Ok(view) })- }-- fn read_view(- &self,- _token: &str,- _params: ViewIdPB,- ) -> FutureResult<Option<ViewRevision>, FlowyError> {- FutureResult::new(async { Ok(None) })- }-- fn delete_view(&self, _token: &str, _params: RepeatedViewIdPB) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn update_view(&self, _token: &str, _params: UpdateViewParams) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn create_app(- &self,- _token: &str,- params: CreateAppParams,- ) -> FutureResult<AppRevision, FlowyError> {- let time = timestamp();- let app = AppRevision {- id: gen_app_id(),- workspace_id: params.workspace_id,- name: params.name,- desc: params.desc,- belongings: vec![],- version: 0,- modified_time: time,- create_time: time,- };- FutureResult::new(async { Ok(app) })- }-- fn read_app(- &self,- _token: &str,- _params: AppIdPB,- ) -> FutureResult<Option<AppRevision>, FlowyError> {- FutureResult::new(async { Ok(None) })- }-- fn update_app(&self, _token: &str, _params: UpdateAppParams) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn delete_app(&self, _token: &str, _params: AppIdPB) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn create_trash(&self, _token: &str, _params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn delete_trash(&self, _token: &str, _params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn read_trash(&self, _token: &str) -> FutureResult<Vec<TrashRevision>, FlowyError> {- FutureResult::new(async { Ok(vec![]) })- }-}-impl UserCloudService for LocalServer {fn sign_up(&self, params: SignUpParams) -> FutureResult<SignUpResponse, FlowyError> {- let uid = nanoid!(20);+ let uid = ID_GEN.lock().next_id();FutureResult::new(async move {Ok(SignUpResponse {- user_id: uid.clone(),+ user_id: uid,name: params.name,email: params.email,- token: uid,+ token: "".to_string(),})})}fn sign_in(&self, params: SignInParams) -> FutureResult<SignInResponse, FlowyError> {- let user_id = nanoid!(20);- FutureResult::new(async {+ let uid = ID_GEN.lock().next_id();+ FutureResult::new(async move {Ok(SignInResponse {- user_id: user_id.clone(),+ user_id: uid,name: params.name,email: params.email,- token: user_id,+ token: "".to_string(),})})}diff --git a/frontend/rust-lib/flowy-net/src/local_server/ws.rs b/frontend/rust-lib/flowy-net/src/local_server/ws.rsindex 733a2632c0..c02778061d 100644--- a/frontend/rust-lib/flowy-net/src/local_server/ws.rs+++ b/frontend/rust-lib/flowy-net/src/local_server/ws.rs@@ -8,7 +8,7 @@ use std::sync::Arc;use tokio::sync::{broadcast, broadcast::Receiver, mpsc::UnboundedReceiver};pub struct LocalWebSocket {- user_id: Arc<RwLock<Option<String>>>,+ user_id: Arc<RwLock<Option<i64>>>,receivers: Arc<DashMap<WSChannel, Arc<dyn WSMessageReceiver>>>,state_sender: broadcast::Sender<WSConnectState>,server_ws_receiver: RwLock<Option<UnboundedReceiver<WebSocketRawMessage>>>,@@ -53,7 +53,7 @@ impl FlowyRawWebSocket for LocalWebSocket {FutureResult::new(async { Ok(()) })}- fn start_connect(&self, _addr: String, user_id: String) -> FutureResult<(), WSErrorCode> {+ fn start_connect(&self, _addr: String, user_id: i64) -> FutureResult<(), WSErrorCode> {*self.user_id.write() = Some(user_id);FutureResult::new(async { Ok(()) })}diff --git a/frontend/rust-lib/flowy-revision/src/cache/reset.rs b/frontend/rust-lib/flowy-revision/src/cache/reset.rsindex ba29870ec3..b6179e7022 100644--- a/frontend/rust-lib/flowy-revision/src/cache/reset.rs+++ b/frontend/rust-lib/flowy-revision/src/cache/reset.rs@@ -22,7 +22,6 @@ pub trait RevisionResettable {}pub struct RevisionStructReset<T, C> {- user_id: String,target: T,disk_cache: Arc<dyn RevisionDiskCache<C, Error = FlowyError>>,}@@ -32,13 +31,8 @@ whereT: RevisionResettable,C: 'static,{- pub fn new(- user_id: &str,- object: T,- disk_cache: Arc<dyn RevisionDiskCache<C, Error = FlowyError>>,- ) -> Self {+ pub fn new(object: T, disk_cache: Arc<dyn RevisionDiskCache<C, Error = FlowyError>>) -> Self {Self {- user_id: user_id.to_owned(),target: object,disk_cache,}@@ -67,14 +61,12 @@ whereasync fn reset_object(&self) -> FlowyResult<()> {let configuration = RevisionPersistenceConfiguration::new(2, false);let rev_persistence = Arc::new(RevisionPersistence::from_disk_cache(- &self.user_id,self.target.target_id(),self.disk_cache.clone(),configuration,));let revisions = RevisionLoader {object_id: self.target.target_id().to_owned(),- user_id: self.user_id.clone(),cloud: None,rev_persistence,}diff --git a/frontend/rust-lib/flowy-revision/src/conflict_resolve.rs b/frontend/rust-lib/flowy-revision/src/conflict_resolve.rsindex 4d1c182078..83442ed351 100644--- a/frontend/rust-lib/flowy-revision/src/conflict_resolve.rs+++ b/frontend/rust-lib/flowy-revision/src/conflict_resolve.rs@@ -40,7 +40,6 @@ pub struct ConflictController<Operations, Connection>whereOperations: Send + Sync,{- user_id: String,resolver: Arc<dyn ConflictResolver<Operations> + Send + Sync>,rev_sink: Arc<dyn ConflictRevisionSink>,rev_manager: Arc<RevisionManager<Connection>>,@@ -52,14 +51,11 @@ whereConnection: 'static,{pub fn new(- user_id: &str,resolver: Arc<dyn ConflictResolver<Operations> + Send + Sync>,rev_sink: Arc<dyn ConflictRevisionSink>,rev_manager: Arc<RevisionManager<Connection>>,) -> Self {- let user_id = user_id.to_owned();Self {- user_id,resolver,rev_sink,rev_manager,@@ -135,7 +131,6 @@ whereself.rev_manager.add_remote_revision(revision).await?;}let (client_revision, server_revision) = make_client_and_server_revision(- &self.user_id,&self.rev_manager,client_operations,Some(server_operations),@@ -152,7 +147,6 @@ where}fn make_client_and_server_revision<Operations, Connection>(- _user_id: &str,rev_manager: &Arc<RevisionManager<Connection>>,client_operations: Operations,server_operations: Option<Operations>,diff --git a/frontend/rust-lib/flowy-revision/src/rev_manager.rs b/frontend/rust-lib/flowy-revision/src/rev_manager.rsindex c0722e4a6c..b9438aaa43 100644--- a/frontend/rust-lib/flowy-revision/src/rev_manager.rs+++ b/frontend/rust-lib/flowy-revision/src/rev_manager.rs@@ -52,7 +52,6 @@ pub trait RevisionObjectSerializer: Send + Sync {pub trait RevisionMergeable: Send + Sync {fn merge_revisions(&self,- _user_id: &str,object_id: &str,mut revisions: Vec<Revision>,) -> FlowyResult<Revision> {@@ -77,7 +76,6 @@ pub trait RevisionMergeable: Send + Sync {pub struct RevisionManager<Connection> {pub object_id: String,- user_id: String,rev_id_counter: Arc<RevIdCounter>,rev_persistence: Arc<RevisionPersistence<Connection>>,rev_snapshot: Arc<RevisionSnapshotController<Connection>>,@@ -89,7 +87,6 @@ pub struct RevisionManager<Connection> {impl<Connection: 'static> RevisionManager<Connection> {pub fn new<Snapshot, Compress>(- user_id: &str,object_id: &str,rev_persistence: RevisionPersistence<Connection>,rev_compress: Compress,@@ -103,7 +100,6 @@ impl<Connection: 'static> RevisionManager<Connection> {let rev_compress = Arc::new(rev_compress);let rev_persistence = Arc::new(rev_persistence);let rev_snapshot = RevisionSnapshotController::new(- user_id,object_id,snapshot_persistence,rev_id_counter.clone(),@@ -121,7 +117,6 @@ impl<Connection: 'static> RevisionManager<Connection> {tokio::spawn(queue.run());Self {object_id: object_id.to_string(),- user_id: user_id.to_owned(),rev_id_counter,rev_persistence,rev_snapshot: Arc::new(rev_snapshot),@@ -219,7 +214,6 @@ impl<Connection: 'static> RevisionManager<Connection> {pub async fn load_revisions(&self) -> FlowyResult<Vec<Revision>> {let revisions = RevisionLoader {object_id: self.object_id.clone(),- user_id: self.user_id.clone(),cloud: None,rev_persistence: self.rev_persistence.clone(),}@@ -357,7 +351,6 @@ impl<Connection: 'static> RevisionManager<Connection> {pub struct RevisionLoader<Connection> {pub object_id: String,- pub user_id: String,pub cloud: Option<Arc<dyn RevisionCloudService>>,pub rev_persistence: Arc<RevisionPersistence<Connection>>,}diff --git a/frontend/rust-lib/flowy-revision/src/rev_persistence.rs b/frontend/rust-lib/flowy-revision/src/rev_persistence.rsindex 21ba5c2f47..59c0b1209b 100644--- a/frontend/rust-lib/flowy-revision/src/rev_persistence.rs+++ b/frontend/rust-lib/flowy-revision/src/rev_persistence.rs@@ -53,7 +53,6 @@ impl std::default::Default for RevisionPersistenceConfiguration {/// The generic parameter, `Connection`, represents as the disk backend's connection./// If the backend is SQLite, then the Connect will be SQLiteConnect.pub struct RevisionPersistence<Connection> {- user_id: String,object_id: String,disk_cache: Arc<dyn RevisionDiskCache<Connection, Error = FlowyError>>,memory_cache: Arc<RevisionMemoryCache>,@@ -66,7 +65,6 @@ whereConnection: 'static,{pub fn new<C>(- user_id: &str,object_id: &str,disk_cache: C,configuration: RevisionPersistenceConfiguration,@@ -76,24 +74,21 @@ where{let disk_cache =Arc::new(disk_cache) as Arc<dyn RevisionDiskCache<Connection, Error = FlowyError>>;- Self::from_disk_cache(user_id, object_id, disk_cache, configuration)+ Self::from_disk_cache(object_id, disk_cache, configuration)}pub fn from_disk_cache(- user_id: &str,object_id: &str,disk_cache: Arc<dyn RevisionDiskCache<Connection, Error = FlowyError>>,configuration: RevisionPersistenceConfiguration,) -> RevisionPersistence<Connection> {let object_id = object_id.to_owned();- let user_id = user_id.to_owned();let sync_seq = RwLock::new(DeferSyncSequence::new());let memory_cache = Arc::new(RevisionMemoryCache::new(&object_id,Arc::new(disk_cache.clone()),));Self {- user_id,object_id,disk_cache,memory_cache,@@ -130,8 +125,7 @@ wherelet rev_ids = range.to_rev_ids();debug_assert_eq!(range.len() as usize, revisions.len());// compact multiple revisions into one- let merged_revision =- rev_compress.merge_revisions(&self.user_id, &self.object_id, revisions)?;+ let merged_revision = rev_compress.merge_revisions(&self.object_id, revisions)?;tracing::Span::current().record("rev_id", merged_revision.rev_id);let record = SyncRecord {@@ -193,8 +187,7 @@ whererevisions.push(new_revision);// compact multiple revisions into one- let merged_revision =- rev_compress.merge_revisions(&self.user_id, &self.object_id, revisions)?;+ let merged_revision = rev_compress.merge_revisions(&self.object_id, revisions)?;let new_rev_id = merged_revision.rev_id;tracing::Span::current().record("rev_id", merged_revision.rev_id);sync_seq.recv(new_rev_id)?;diff --git a/frontend/rust-lib/flowy-revision/src/rev_snapshot.rs b/frontend/rust-lib/flowy-revision/src/rev_snapshot.rsindex a6079295be..6a316d58f2 100644--- a/frontend/rust-lib/flowy-revision/src/rev_snapshot.rs+++ b/frontend/rust-lib/flowy-revision/src/rev_snapshot.rs@@ -28,7 +28,6 @@ pub trait RevisionSnapshotDataGenerator: Send + Sync {const AUTO_GEN_SNAPSHOT_PER_10_REVISION: i64 = 10;pub struct RevisionSnapshotController<Connection> {- user_id: String,object_id: String,rev_snapshot_persistence: Arc<dyn RevisionSnapshotPersistence>,rev_snapshot_data: Option<Arc<dyn RevisionSnapshotDataGenerator>>,@@ -43,7 +42,6 @@ whereConnection: 'static,{pub fn new<D>(- user_id: &str,object_id: &str,disk_cache: D,rev_id_counter: Arc<RevIdCounter>,@@ -55,7 +53,6 @@ where{let rev_snapshot_persistence = Arc::new(disk_cache);Self {- user_id: user_id.to_string(),object_id: object_id.to_string(),rev_snapshot_persistence,rev_id_counter,diff --git a/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs b/frontend/rust-lib/flowy-revision/tests/revision_test/script.rsindex ec285a0cc6..22824b88c9 100644--- a/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs+++ b/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs@@ -28,7 +28,6 @@ pub enum RevisionScript {}pub struct RevisionTest {- user_id: String,object_id: String,configuration: RevisionPersistenceConfiguration,rev_manager: Arc<RevisionManager<RevisionConnectionMock>>,@@ -40,22 +39,18 @@ impl RevisionTest {}pub async fn new_with_configuration(max_merge_len: i64) -> Self {- let user_id = nanoid!(10);let object_id = nanoid!(6);let configuration = RevisionPersistenceConfiguration::new(max_merge_len as usize, false);let disk_cache = RevisionDiskCacheMock::new(vec![]);- let persistence =- RevisionPersistence::new(&user_id, &object_id, disk_cache, configuration.clone());+ let persistence = RevisionPersistence::new(&object_id, disk_cache, configuration.clone());let compress = RevisionMergeableMock {};let snapshot = RevisionSnapshotMock {};- let mut rev_manager =- RevisionManager::new(&user_id, &object_id, persistence, compress, snapshot);+ let mut rev_manager = RevisionManager::new(&object_id, persistence, compress, snapshot);rev_manager.initialize::<RevisionObjectMockSerde>(None).await.unwrap();Self {- user_id,object_id,configuration,rev_manager: Arc::new(rev_manager),@@ -66,28 +61,18 @@ impl RevisionTest {let records = old_test.rev_manager.get_all_revision_records().unwrap();let disk_cache = RevisionDiskCacheMock::new(records);let configuration = old_test.configuration;- let persistence = RevisionPersistence::new(- &old_test.user_id,- &old_test.object_id,- disk_cache,- configuration.clone(),- );+ let persistence =+ RevisionPersistence::new(&old_test.object_id, disk_cache, configuration.clone());let compress = RevisionMergeableMock {};let snapshot = RevisionSnapshotMock {};- let mut rev_manager = RevisionManager::new(- &old_test.user_id,- &old_test.object_id,- persistence,- compress,- snapshot,- );+ let mut rev_manager =+ RevisionManager::new(&old_test.object_id, persistence, compress, snapshot);rev_manager.initialize::<RevisionObjectMockSerde>(None).await.unwrap();Self {- user_id: old_test.user_id,object_id: old_test.object_id,configuration,rev_manager: Arc::new(rev_manager),diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rsindex 5b70cf9164..643c6cabd6 100644--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs@@ -189,21 +189,21 @@ diesel::table! {}diesel::allow_tables_to_appear_in_same_query!(- app_table,- database_refs,- document_rev_snapshot,- document_rev_table,- folder_rev_snapshot,- grid_block_index_table,- grid_meta_rev_table,- grid_rev_snapshot,- grid_rev_table,- grid_view_rev_table,- kv_table,- rev_snapshot,- rev_table,- trash_table,- user_table,- view_table,- workspace_table,+ app_table,+ database_refs,+ document_rev_snapshot,+ document_rev_table,+ folder_rev_snapshot,+ grid_block_index_table,+ grid_meta_rev_table,+ grid_rev_snapshot,+ grid_rev_table,+ grid_view_rev_table,+ kv_table,+ rev_snapshot,+ rev_table,+ trash_table,+ user_table,+ view_table,+ workspace_table,);diff --git a/frontend/rust-lib/flowy-test/Cargo.toml b/frontend/rust-lib/flowy-test/Cargo.tomlindex 2e137f48c8..4f454a925c 100644--- a/frontend/rust-lib/flowy-test/Cargo.toml+++ b/frontend/rust-lib/flowy-test/Cargo.toml@@ -9,7 +9,7 @@ edition = "2018"flowy-core = { path = "../flowy-core" }flowy-user = { path = "../flowy-user"}flowy-net = { path = "../flowy-net"}-flowy-folder = { path = "../flowy-folder", features = ["flowy_unit_test"] }+flowy-folder2 = { path = "../flowy-folder2", features = ["test_helper"] }flowy-document= { path = "../flowy-document" }lib-dispatch = { path = "../lib-dispatch" }diff --git a/frontend/rust-lib/flowy-test/src/event_builder.rs b/frontend/rust-lib/flowy-test/src/event_builder.rsindex f6083838a2..764f6d087a 100644--- a/frontend/rust-lib/flowy-test/src/event_builder.rs+++ b/frontend/rust-lib/flowy-test/src/event_builder.rs@@ -12,8 +12,8 @@ use std::{sync::Arc,};-pub type FolderEventBuilder = EventBuilder<FlowyError>;-impl FolderEventBuilder {+pub type Folder2EventBuilder = EventBuilder<FlowyError>;+impl Folder2EventBuilder {pub fn new(sdk: FlowySDKTest) -> Self {EventBuilder::test(TestContext::new(sdk))}@@ -22,7 +22,7 @@ impl FolderEventBuilder {}}-pub type UserModuleEventBuilder = FolderEventBuilder;+pub type UserModuleEventBuilder = Folder2EventBuilder;#[derive(Clone)]pub struct EventBuilder<E> {diff --git a/frontend/rust-lib/flowy-test/src/helper.rs b/frontend/rust-lib/flowy-test/src/helper.rsindex dc275549fa..cd6a10f22c 100644--- a/frontend/rust-lib/flowy-test/src/helper.rs+++ b/frontend/rust-lib/flowy-test/src/helper.rs@@ -1,13 +1,9 @@use crate::prelude::*;-use flowy_folder::entities::WorkspaceIdPB;-use flowy_folder::{- entities::{- app::*,- view::*,- workspace::{CreateWorkspacePayloadPB, WorkspacePB},- },- event_map::FolderEvent::{CreateWorkspace, OpenWorkspace, *},+use flowy_folder2::entities::{+ CreateViewPayloadPB, CreateWorkspacePayloadPB, ViewLayoutTypePB, ViewPB, WorkspaceIdPB,+ WorkspacePB,};+use flowy_folder2::event_map::FolderEvent::{CreateView, CreateWorkspace, OpenWorkspace};use flowy_user::{entities::{SignInPayloadPB, SignUpPayloadPB, UserProfilePB},errors::FlowyError,@@ -19,8 +15,8 @@ use std::{fs, path::PathBuf, sync::Arc};pub struct ViewTest {pub sdk: FlowySDKTest,pub workspace: WorkspacePB,- pub app: AppPB,- pub view: ViewPB,+ pub parent_view: ViewPB,+ pub child_view: ViewPB,}impl ViewTest {@@ -33,8 +29,8 @@ impl ViewTest {Self {sdk: sdk.clone(),workspace,- app,- view,+ parent_view: app,+ child_view: view,}}@@ -61,7 +57,7 @@ async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> Workspadesc: desc.to_owned(),};- FolderEventBuilder::new(sdk.clone())+ Folder2EventBuilder::new(sdk.clone()).event(CreateWorkspace).payload(request).async_send()@@ -73,27 +69,30 @@ async fn open_workspace(sdk: &FlowySDKTest, workspace_id: &str) {let payload = WorkspaceIdPB {value: Some(workspace_id.to_owned()),};- let _ = FolderEventBuilder::new(sdk.clone())+ let _ = Folder2EventBuilder::new(sdk.clone()).event(OpenWorkspace).payload(payload).async_send().await;}-async fn create_app(sdk: &FlowySDKTest, name: &str, desc: &str, workspace_id: &str) -> AppPB {- let create_app_request = CreateAppPayloadPB {- workspace_id: workspace_id.to_owned(),+async fn create_app(sdk: &FlowySDKTest, name: &str, desc: &str, workspace_id: &str) -> ViewPB {+ let create_app_request = CreateViewPayloadPB {+ belong_to_id: workspace_id.to_owned(),name: name.to_string(),desc: desc.to_string(),- color_style: Default::default(),+ thumbnail: None,+ layout: ViewLayoutTypePB::Document,+ initial_data: vec![],+ ext: Default::default(),};- FolderEventBuilder::new(sdk.clone())- .event(CreateApp)+ Folder2EventBuilder::new(sdk.clone())+ .event(CreateView).payload(create_app_request).async_send().await- .parse::<AppPB>()+ .parse::<ViewPB>()}async fn create_view(@@ -112,7 +111,7 @@ async fn create_view(ext: Default::default(),};- FolderEventBuilder::new(sdk.clone())+ Folder2EventBuilder::new(sdk.clone()).event(CreateView).payload(payload).async_send()diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.tomlindex c87205d909..bcbf59f605 100644--- a/frontend/rust-lib/flowy-user/Cargo.toml+++ b/frontend/rust-lib/flowy-user/Cargo.toml@@ -13,6 +13,8 @@ user-model = { path = "../../../shared-lib/user-model" }lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-notification = { path = "../flowy-notification" }lib-dispatch = { path = "../lib-dispatch" }+collab-persistence = { version = "0.1.0" }+tracing = { version = "0.1", features = ["log"] }bytes = "1.4"diff --git a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rsindex 5e17b7df30..04f6562681 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs@@ -2,8 +2,7 @@ use crate::errors::ErrorCode;use flowy_derive::ProtoBuf;use std::convert::TryInto;use user_model::{- UpdateUserProfileParams, UserEmail, UserIcon, UserId, UserName, UserOpenaiKey, UserPassword,- UserProfile,+ UpdateUserProfileParams, UserEmail, UserIcon, UserName, UserOpenaiKey, UserPassword, UserProfile,};#[derive(Default, ProtoBuf)]@@ -21,7 +20,7 @@ pub struct UserSettingPB {#[derive(ProtoBuf, Default, Debug, PartialEq, Eq, Clone)]pub struct UserProfilePB {#[pb(index = 1)]- pub id: String,+ pub id: i64,#[pb(index = 2)]pub email: String,@@ -55,7 +54,7 @@ impl std::convert::From<UserProfile> for UserProfilePB {#[derive(ProtoBuf, Default)]pub struct UpdateUserProfilePayloadPB {#[pb(index = 1)]- pub id: String,+ pub id: i64,#[pb(index = 2, one_of)]pub name: Option<String>,@@ -74,9 +73,9 @@ pub struct UpdateUserProfilePayloadPB {}impl UpdateUserProfilePayloadPB {- pub fn new(id: &str) -> Self {+ pub fn new(id: i64) -> Self {Self {- id: id.to_owned(),+ id,..Default::default()}}@@ -111,8 +110,6 @@ impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {type Error = ErrorCode;fn try_into(self) -> Result<UpdateUserProfileParams, Self::Error> {- let id = UserId::parse(self.id)?.0;-let name = match self.name {None => None,Some(name) => Some(UserName::parse(name)?.0),@@ -139,7 +136,7 @@ impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {};Ok(UpdateUserProfileParams {- id,+ id: self.id,name,email,password,diff --git a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs b/frontend/rust-lib/flowy-user/src/event_handler.rssimilarity index 70%rename from frontend/rust-lib/flowy-user/src/handlers/user_handler.rsrename to frontend/rust-lib/flowy-user/src/event_handler.rsindex 143cef84be..edf9aebd1e 100644--- a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs+++ b/frontend/rust-lib/flowy-user/src/event_handler.rs@@ -1,12 +1,41 @@-use crate::entities::{- AppearanceSettingsPB, UpdateUserProfilePayloadPB, UserProfilePB, UserSettingPB,- APPEARANCE_DEFAULT_THEME,-};-use crate::{errors::FlowyError, services::UserSession};+use crate::entities::*;+use crate::services::UserSession;+use flowy_error::FlowyError;use flowy_sqlite::kv::KV;use lib_dispatch::prelude::*;use std::{convert::TryInto, sync::Arc};-use user_model::UpdateUserProfileParams;+use user_model::{SignInParams, SignUpParams, UpdateUserProfileParams};++// tracing instrument 👉🏻 https://docs.rs/tracing/0.1.26/tracing/attr.instrument.html+#[tracing::instrument(level = "debug", name = "sign_in", skip(data, session), fields(email = %data.email), err)]+pub async fn sign_in(+ data: AFPluginData<SignInPayloadPB>,+ session: AFPluginState<Arc<UserSession>>,+) -> DataResult<UserProfilePB, FlowyError> {+ let params: SignInParams = data.into_inner().try_into()?;+ let user_profile: UserProfilePB = session.sign_in(params).await?.into();+ data_result_ok(user_profile)+}++#[tracing::instrument(+ level = "debug",+ name = "sign_up",+ skip(data, session),+ fields(+ email = %data.email,+ name = %data.name,+ ),+ err+)]+pub async fn sign_up(+ data: AFPluginData<SignUpPayloadPB>,+ session: AFPluginState<Arc<UserSession>>,+) -> DataResult<UserProfilePB, FlowyError> {+ let params: SignUpParams = data.into_inner().try_into()?;+ let user_profile: UserProfilePB = session.sign_up(params).await?.into();++ data_result_ok(user_profile)+}#[tracing::instrument(level = "debug", skip(session))]pub async fn init_user_handler(session: AFPluginState<Arc<UserSession>>) -> Result<(), FlowyError> {diff --git a/frontend/rust-lib/flowy-user/src/event_map.rs b/frontend/rust-lib/flowy-user/src/event_map.rsindex 11a7aa83ba..7981a5e89c 100644--- a/frontend/rust-lib/flowy-user/src/event_map.rs+++ b/frontend/rust-lib/flowy-user/src/event_map.rs@@ -1,9 +1,12 @@use crate::entities::UserProfilePB;-use crate::{errors::FlowyError, handlers::*, services::UserSession};+use crate::event_handler::*;+use crate::{errors::FlowyError, services::UserSession};+use flowy_derive::{Flowy_Event, ProtoBuf_Enum};+use flowy_error::FlowyResult;use lib_dispatch::prelude::*;-use lib_infra::future::{Fut, FutureResult};use std::sync::Arc;+use strum_macros::Display;use user_model::{SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile,};@@ -25,9 +28,10 @@ pub fn init(user_session: Arc<UserSession>) -> AFPlugin {}pub trait UserStatusCallback: Send + Sync + 'static {- fn did_sign_in(&self, token: &str, user_id: &str) -> Fut<FlowyResult<()>>;+ fn did_sign_in(&self, token: &str, user_id: i64) -> Fut<FlowyResult<()>>;fn did_sign_up(&self, user_profile: &UserProfile) -> Fut<FlowyResult<()>>;- fn did_expired(&self, token: &str, user_id: &str) -> Fut<FlowyResult<()>>;+ fn did_expired(&self, token: &str, user_id: i64) -> Fut<FlowyResult<()>>;+ fn will_migrated(&self, token: &str, old_user_id: &str, user_id: i64) -> Fut<FlowyResult<()>>;}pub trait UserCloudService: Send + Sync {@@ -43,10 +47,6 @@ pub trait UserCloudService: Send + Sync {fn ws_addr(&self) -> String;}-use flowy_derive::{Flowy_Event, ProtoBuf_Enum};-use flowy_error::FlowyResult;-use strum_macros::Display;-#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]#[event_err = "FlowyError"]pub enum UserEvent {diff --git a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs b/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rsdeleted file mode 100644index fc994fa004..0000000000--- a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs+++ /dev/null@@ -1,37 +0,0 @@-use crate::entities::*;-use crate::services::UserSession;-use flowy_error::FlowyError;-use lib_dispatch::prelude::*;-use std::{convert::TryInto, sync::Arc};-use user_model::{SignInParams, SignUpParams};--// tracing instrument 👉🏻 https://docs.rs/tracing/0.1.26/tracing/attr.instrument.html-#[tracing::instrument(level = "debug", name = "sign_in", skip(data, session), fields(email = %data.email), err)]-pub async fn sign_in(- data: AFPluginData<SignInPayloadPB>,- session: AFPluginState<Arc<UserSession>>,-) -> DataResult<UserProfilePB, FlowyError> {- let params: SignInParams = data.into_inner().try_into()?;- let user_profile: UserProfilePB = session.sign_in(params).await?.into();- data_result_ok(user_profile)-}--#[tracing::instrument(- level = "debug",- name = "sign_up",- skip(data, session),- fields(- email = %data.email,- name = %data.name,- ),- err-)]-pub async fn sign_up(- data: AFPluginData<SignUpPayloadPB>,- session: AFPluginState<Arc<UserSession>>,-) -> DataResult<UserProfilePB, FlowyError> {- let params: SignUpParams = data.into_inner().try_into()?;- let user_profile: UserProfilePB = session.sign_up(params).await?.into();-- data_result_ok(user_profile)-}diff --git a/frontend/rust-lib/flowy-user/src/handlers/mod.rs b/frontend/rust-lib/flowy-user/src/handlers/mod.rsdeleted file mode 100644index b220539145..0000000000--- a/frontend/rust-lib/flowy-user/src/handlers/mod.rs+++ /dev/null@@ -1,5 +0,0 @@-mod auth_handler;-mod user_handler;--pub use auth_handler::*;-pub use user_handler::*;diff --git a/frontend/rust-lib/flowy-user/src/lib.rs b/frontend/rust-lib/flowy-user/src/lib.rsindex 5156668ae1..e53ce14814 100644--- a/frontend/rust-lib/flowy-user/src/lib.rs+++ b/frontend/rust-lib/flowy-user/src/lib.rs@@ -1,9 +1,10 @@pub mod entities;+mod event_handler;pub mod event_map;-mod handlers;mod notification;pub mod protobuf;pub mod services;+pub mod uid;// mod sql_tables;#[macro_use]diff --git a/frontend/rust-lib/flowy-user/src/services/database.rs b/frontend/rust-lib/flowy-user/src/services/database.rsindex d54fe4aa94..f4df3cd2d1 100644--- a/frontend/rust-lib/flowy-user/src/services/database.rs+++ b/frontend/rust-lib/flowy-user/src/services/database.rs@@ -1,4 +1,5 @@-use flowy_error::{ErrorCode, FlowyError};+use collab_persistence::CollabKV;+use flowy_error::FlowyError;use flowy_sqlite::ConnectionPool;use flowy_sqlite::{schema::user_table, DBConnection, Database};use lazy_static::lazy_static;@@ -18,25 +19,21 @@ impl UserDB {}}- fn open_user_db_if_need(&self, user_id: &str) -> Result<Arc<ConnectionPool>, FlowyError> {- if user_id.is_empty() {- return Err(ErrorCode::UserIdIsEmpty.into());- }-- if let Some(database) = DB_MAP.read().get(user_id) {+ fn open_user_db_if_need(&self, user_id: i64) -> Result<Arc<ConnectionPool>, FlowyError> {+ if let Some(database) = DB_MAP.read().get(&user_id) {return Ok(database.get_pool());}let mut write_guard = DB_MAP.write();// The Write guard acquire exclusive access that will guarantee the user db only initialize once.- match write_guard.get(user_id) {+ match write_guard.get(&user_id) {None => {},Some(database) => return Ok(database.get_pool()),}let mut dir = PathBuf::new();dir.push(&self.db_dir);- dir.push(user_id);+ dir.push(user_id.to_string());let dir = dir.to_str().unwrap().to_owned();tracing::trace!("open user db {} at path: {}", user_id, dir);@@ -50,29 +47,59 @@ impl UserDB {Ok(pool)}- pub(crate) fn close_user_db(&self, user_id: &str) -> Result<(), FlowyError> {+ fn open_kv_db_if_need(&self, user_id: i64) -> Result<Arc<CollabKV>, FlowyError> {+ if let Some(kv) = KVDB_MAP.read().get(&user_id) {+ return Ok(kv.clone());+ }++ let mut write_guard = KVDB_MAP.write();+ // The Write guard acquire exclusive access that will guarantee the user db only initialize once.+ match write_guard.get(&user_id) {+ None => {},+ Some(kv) => return Ok(kv.clone()),+ }++ let mut dir = PathBuf::new();+ dir.push(&self.db_dir);+ dir.push(user_id.to_string());++ tracing::trace!("open kv db {} at path: {:?}", user_id, dir);+ let kv_db = CollabKV::open(dir).map_err(|err| FlowyError::internal().context(err))?;+ let kv_db = Arc::new(kv_db);+ write_guard.insert(user_id.to_owned(), kv_db.clone());+ drop(write_guard);+ Ok(kv_db)+ }++ pub(crate) fn close_user_db(&self, user_id: i64) -> Result<(), FlowyError> {match DB_MAP.try_write_for(Duration::from_millis(300)) {None => Err(FlowyError::internal().context("Acquire write lock to close user db failed")),Some(mut write_guard) => {- write_guard.remove(user_id);+ write_guard.remove(&user_id);Ok(())},}}- pub(crate) fn get_connection(&self, user_id: &str) -> Result<DBConnection, FlowyError> {+ pub(crate) fn get_connection(&self, user_id: i64) -> Result<DBConnection, FlowyError> {let conn = self.get_pool(user_id)?.get()?;Ok(conn)}- pub(crate) fn get_pool(&self, user_id: &str) -> Result<Arc<ConnectionPool>, FlowyError> {+ pub(crate) fn get_pool(&self, user_id: i64) -> Result<Arc<ConnectionPool>, FlowyError> {let pool = self.open_user_db_if_need(user_id)?;Ok(pool)}++ pub(crate) fn get_kv_db(&self, user_id: i64) -> Result<Arc<CollabKV>, FlowyError> {+ let kv_db = self.open_kv_db_if_need(user_id)?;+ Ok(kv_db)+ }}lazy_static! {- static ref DB_MAP: RwLock<HashMap<String, Database>> = RwLock::new(HashMap::new());+ static ref DB_MAP: RwLock<HashMap<i64, Database>> = RwLock::new(HashMap::new());+ static ref KVDB_MAP: RwLock<HashMap<i64, Arc<CollabKV>>> = RwLock::new(HashMap::new());}#[derive(Clone, Default, Queryable, Identifiable, Insertable)]@@ -108,20 +135,20 @@ impl UserTable {impl std::convert::From<SignUpResponse> for UserTable {fn from(resp: SignUpResponse) -> Self {- UserTable::new(resp.user_id, resp.name, resp.email, resp.token)+ UserTable::new(resp.user_id.to_string(), resp.name, resp.email, resp.token)}}impl std::convert::From<SignInResponse> for UserTable {fn from(resp: SignInResponse) -> Self {- UserTable::new(resp.user_id, resp.name, resp.email, resp.token)+ UserTable::new(resp.user_id.to_string(), resp.name, resp.email, resp.token)}}impl std::convert::From<UserTable> for UserProfile {fn from(table: UserTable) -> Self {UserProfile {- id: table.id,+ id: table.id.parse::<i64>().unwrap_or(0),email: table.email,name: table.name,token: table.token,@@ -145,7 +172,7 @@ pub struct UserTableChangeset {impl UserTableChangeset {pub fn new(params: UpdateUserProfileParams) -> Self {UserTableChangeset {- id: params.id,+ id: params.id.to_string(),workspace: None,name: params.name,email: params.email,diff --git a/frontend/rust-lib/flowy-user/src/services/user_session.rs b/frontend/rust-lib/flowy-user/src/services/user_session.rsindex f9ec7ca80c..4abbd2b594 100644--- a/frontend/rust-lib/flowy-user/src/services/user_session.rs+++ b/frontend/rust-lib/flowy-user/src/services/user_session.rs@@ -1,11 +1,13 @@use crate::entities::{UserProfilePB, UserSettingPB};use crate::event_map::UserStatusCallback;+use crate::{errors::{ErrorCode, FlowyError},event_map::UserCloudService,notification::*,services::database::{UserDB, UserTable, UserTableChangeset},};+use collab_persistence::CollabKV;use flowy_sqlite::ConnectionPool;use flowy_sqlite::{kv::KV,@@ -13,6 +15,7 @@ use flowy_sqlite::{schema::{user_table, user_table::dsl},DBConnection, ExpressionMethods, UserDatabaseConnection,};+use serde::{Deserialize, Serialize};use std::sync::Arc;use tokio::sync::RwLock;@@ -20,6 +23,9 @@ use user_model::{SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile,};+// lazy_static! {+// static ref ID_GEN: Mutex<UserIDGenerator> = Mutex::new(UserIDGenerator::new(1));+// }pub struct UserSessionConfig {root_dir: String,@@ -59,9 +65,45 @@ impl UserSession {}pub async fn init<C: UserStatusCallback + 'static>(&self, user_status_callback: C) {+ // if let Some(old_session) = self.get_old_session() {+ // let uid = ID_GEN.lock().next_id();+ // let _ = user_status_callback+ // .will_migrated(&old_session.token, &old_session.user_id, uid)+ // .await;+ //+ // let new_session = Session {+ // user_id: uid,+ // token: old_session.token.clone(),+ // email: old_session.email.clone(),+ // name: old_session.name.clone(),+ // };+ // self.set_session(Some(new_session)).unwrap();+ //+ // if let Ok(db) = self.db_connection() {+ // // Update db+ // let _ = db.immediate_transaction(|| {+ // // get the user data+ // let mut user = dsl::user_table+ // .filter(user_table::id.eq(&old_session.user_id))+ // .first::<UserTable>(&*db)?;+ //+ // // delete the existing row+ // let _ = diesel::delete(dsl::user_table.filter(dsl::id.eq(&old_session.user_id)))+ // .execute(&*db)?;+ //+ // // insert new row+ // user.id = uid.to_string();+ // let _ = diesel::insert_into(user_table::table)+ // .values(user)+ // .execute(&*db)?;+ // Ok::<(), FlowyError>(())+ // });+ // }+ // }+if let Ok(session) = self.get_session() {let _ = user_status_callback- .did_sign_in(&session.token, &session.user_id)+ .did_sign_in(&session.token, session.user_id).await;}*self.user_status_callback.write().await = Some(Arc::new(user_status_callback));@@ -69,7 +111,7 @@ impl UserSession {pub fn db_connection(&self) -> Result<DBConnection, FlowyError> {let user_id = self.get_session()?.user_id;- self.database.get_connection(&user_id)+ self.database.get_connection(user_id)}// The caller will be not 'Sync' before of the return value,@@ -80,7 +122,12 @@ impl UserSession {// let conn: PooledConnection<ConnectionManager> = pool.get()?;pub fn db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError> {let user_id = self.get_session()?.user_id;- self.database.get_pool(&user_id)+ self.database.get_pool(user_id)+ }++ pub fn get_kv_db(&self) -> Result<Arc<CollabKV>, FlowyError> {+ let user_id = self.get_session()?.user_id;+ self.database.get_kv_db(user_id)}#[tracing::instrument(level = "debug", skip(self))]@@ -106,7 +153,7 @@ impl UserSession {.await.as_ref().unwrap()- .did_sign_in(&user_profile.token, &user_profile.id)+ .did_sign_in(&user_profile.token, user_profile.id).await;send_sign_in_notification().payload::<UserProfilePB>(user_profile.clone().into())@@ -140,9 +187,10 @@ impl UserSession {#[tracing::instrument(level = "debug", skip(self))]pub async fn sign_out(&self) -> Result<(), FlowyError> {let session = self.get_session()?;- let _ = diesel::delete(dsl::user_table.filter(dsl::id.eq(&session.user_id)))+ let uid = session.user_id.to_string();+ let _ = diesel::delete(dsl::user_table.filter(dsl::id.eq(&uid))).execute(&*(self.db_connection()?))?;- self.database.close_user_db(&session.user_id)?;+ self.database.close_user_db(session.user_id)?;self.set_session(None)?;let _ = self.user_status_callback@@ -150,7 +198,7 @@ impl UserSession {.await.as_ref().unwrap()- .did_expired(&session.token, &session.user_id)+ .did_expired(&session.token, session.user_id).await;self.sign_out_on_server(&session.token).await?;@@ -181,7 +229,7 @@ impl UserSession {pub async fn check_user(&self) -> Result<UserProfile, FlowyError> {let (user_id, token) = self.get_session()?.into_part();-+ let user_id = user_id.to_string();let user = dsl::user_table.filter(user_table::id.eq(&user_id)).first::<UserTable>(&*(self.db_connection()?))?;@@ -192,6 +240,7 @@ impl UserSession {pub async fn get_user_profile(&self) -> Result<UserProfile, FlowyError> {let (user_id, token) = self.get_session()?.into_part();+ let user_id = user_id.to_string();let user = dsl::user_table.filter(user_table::id.eq(&user_id)).first::<UserTable>(&*(self.db_connection()?))?;@@ -212,7 +261,7 @@ impl UserSession {Ok(user_setting)}- pub fn user_id(&self) -> Result<String, FlowyError> {+ pub fn user_id(&self) -> Result<i64, FlowyError> {Ok(self.get_session()?.user_id)}@@ -288,6 +337,11 @@ impl UserSession {}}+ // fn get_old_session(&self) -> Option<OldSession> {+ // let s = KV::get_str(&self.config.session_cache_key)?;+ // serde_json::from_str::<OldSession>(&s).ok()+ // }+fn is_user_login(&self, email: &str) -> bool {match self.get_session() {Ok(session) => session.email == email,@@ -315,7 +369,7 @@ impl UserDatabaseConnection for UserSession {#[derive(Debug, Clone, Default, Serialize, Deserialize)]struct Session {- user_id: String,+ user_id: i64,token: String,email: String,#[serde(default)]@@ -345,7 +399,7 @@ impl std::convert::From<SignUpResponse> for Session {}impl Session {- pub fn into_part(self) -> (String, String) {+ pub fn into_part(self) -> (i64, String) {(self.user_id, self.token)}}@@ -372,3 +426,12 @@ impl std::convert::From<Session> for String {}}}++#[derive(Debug, Clone, Default, Serialize, Deserialize)]+struct OldSession {+ user_id: String,+ token: String,+ email: String,+ #[serde(default)]+ name: String,+}diff --git a/frontend/rust-lib/flowy-user/src/uid.rs b/frontend/rust-lib/flowy-user/src/uid.rsnew file mode 100644index 0000000000..a39252e379--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/uid.rs@@ -0,0 +1,58 @@+use std::time::SystemTime;++const EPOCH: u64 = 1637806706000;+const NODE_ID_BITS: u64 = 10;+const SEQUENCE_BITS: u64 = 12;+const NODE_ID_SHIFT: u64 = SEQUENCE_BITS;+const TIMESTAMP_SHIFT: u64 = NODE_ID_BITS + SEQUENCE_BITS;+const SEQUENCE_MASK: u64 = (1 << SEQUENCE_BITS) - 1;++pub struct UserIDGenerator {+ node_id: u64,+ sequence: u64,+ last_timestamp: u64,+}++impl UserIDGenerator {+ pub fn new(node_id: u64) -> UserIDGenerator {+ UserIDGenerator {+ node_id,+ sequence: 0,+ last_timestamp: 0,+ }+ }++ pub fn next_id(&mut self) -> i64 {+ let timestamp = self.timestamp();+ if timestamp < self.last_timestamp {+ panic!("Clock moved backwards!");+ }++ if timestamp == self.last_timestamp {+ self.sequence = (self.sequence + 1) & SEQUENCE_MASK;+ if self.sequence == 0 {+ self.wait_next_millis();+ }+ } else {+ self.sequence = 0;+ }++ self.last_timestamp = timestamp;+ let id = (timestamp - EPOCH) << TIMESTAMP_SHIFT | self.node_id << NODE_ID_SHIFT | self.sequence;+ id as i64+ }++ fn wait_next_millis(&self) {+ let mut timestamp = self.timestamp();+ while timestamp == self.last_timestamp {+ timestamp = self.timestamp();+ }+ }++ fn timestamp(&self) -> u64 {+ SystemTime::now()+ .duration_since(SystemTime::UNIX_EPOCH)+ .expect("Clock moved backwards!")+ .as_millis() as u64+ }+}diff --git a/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs b/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rsindex ebaf06016d..3878cbb464 100644--- a/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs+++ b/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs@@ -33,7 +33,7 @@ async fn user_update_with_name() {let sdk = FlowySDKTest::default();let user = sdk.init_user().await;let new_name = "hello_world".to_owned();- let request = UpdateUserProfilePayloadPB::new(&user.id).name(&new_name);+ let request = UpdateUserProfilePayloadPB::new(user.id).name(&new_name);let _ = UserModuleEventBuilder::new(sdk.clone()).event(UpdateUserProfile).payload(request)@@ -53,7 +53,7 @@ async fn user_update_with_email() {let sdk = FlowySDKTest::default();let user = sdk.init_user().await;let new_email = format!("{}@gmail.com", nanoid!(6));- let request = UpdateUserProfilePayloadPB::new(&user.id).email(&new_email);+ let request = UpdateUserProfilePayloadPB::new(user.id).email(&new_email);let _ = UserModuleEventBuilder::new(sdk.clone()).event(UpdateUserProfile).payload(request)@@ -72,7 +72,7 @@ async fn user_update_with_password() {let sdk = FlowySDKTest::default();let user = sdk.init_user().await;let new_password = "H123world!".to_owned();- let request = UpdateUserProfilePayloadPB::new(&user.id).password(&new_password);+ let request = UpdateUserProfilePayloadPB::new(user.id).password(&new_password);let _ = UserModuleEventBuilder::new(sdk.clone()).event(UpdateUserProfile)@@ -86,7 +86,7 @@ async fn user_update_with_invalid_email() {let test = FlowySDKTest::default();let user = test.init_user().await;for email in invalid_email_test_case() {- let request = UpdateUserProfilePayloadPB::new(&user.id).email(&email);+ let request = UpdateUserProfilePayloadPB::new(user.id).email(&email);assert_eq!(UserModuleEventBuilder::new(test.clone()).event(UpdateUserProfile)@@ -104,7 +104,7 @@ async fn user_update_with_invalid_password() {let test = FlowySDKTest::default();let user = test.init_user().await;for password in invalid_password_test_case() {- let request = UpdateUserProfilePayloadPB::new(&user.id).password(&password);+ let request = UpdateUserProfilePayloadPB::new(user.id).password(&password);UserModuleEventBuilder::new(test.clone()).event(UpdateUserProfile)@@ -118,7 +118,7 @@ async fn user_update_with_invalid_password() {async fn user_update_with_invalid_name() {let test = FlowySDKTest::default();let user = test.init_user().await;- let request = UpdateUserProfilePayloadPB::new(&user.id).name("");+ let request = UpdateUserProfilePayloadPB::new(user.id).name("");UserModuleEventBuilder::new(test.clone()).event(UpdateUserProfile).payload(request)diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.tomlindex 3f85eaa75e..30831ec2b6 100644--- a/frontend/scripts/makefile/tests.toml+++ b/frontend/scripts/makefile/tests.toml@@ -1,4 +1,13 @@+#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_testdiff --git a/shared-lib/flowy-client-ws/src/connection.rs b/shared-lib/flowy-client-ws/src/connection.rsindex 87f2abcc1a..ff547a87b3 100644--- a/shared-lib/flowy-client-ws/src/connection.rs+++ b/shared-lib/flowy-client-ws/src/connection.rs@@ -17,7 +17,7 @@ pub enum WSErrorCode {pub trait FlowyRawWebSocket: Send + Sync {fn initialize(&self) -> FutureResult<(), WSErrorCode>;- fn start_connect(&self, addr: String, user_id: String) -> FutureResult<(), WSErrorCode>;+ fn start_connect(&self, addr: String, user_id: i64) -> FutureResult<(), WSErrorCode>;fn stop_connect(&self) -> FutureResult<(), WSErrorCode>;fn subscribe_connect_state(&self) -> BoxFuture<broadcast::Receiver<WSConnectState>>;fn reconnect(&self, count: usize) -> FutureResult<(), WSErrorCode>;@@ -87,7 +87,7 @@ impl FlowyWebSocketConnect {}}- pub async fn start(&self, token: String, user_id: String) -> Result<(), WSErrorCode> {+ pub async fn start(&self, token: String, user_id: i64) -> Result<(), WSErrorCode> {let addr = format!("{}/{}", self.addr, &token);self.inner.stop_connect().await?;self.inner.start_connect(addr, user_id).await?;diff --git a/shared-lib/flowy-client-ws/src/ws.rs b/shared-lib/flowy-client-ws/src/ws.rsindex 149b6da821..93ad852f7a 100644--- a/shared-lib/flowy-client-ws/src/ws.rs+++ b/shared-lib/flowy-client-ws/src/ws.rs@@ -12,7 +12,7 @@ impl FlowyRawWebSocket for Arc<WSController> {FutureResult::new(async { Ok(()) })}- fn start_connect(&self, addr: String, _user_id: String) -> FutureResult<(), WSErrorCode> {+ fn start_connect(&self, addr: String, _user_id: i64) -> FutureResult<(), WSErrorCode> {let cloned_ws = self.clone();FutureResult::new(async move {cloned_ws.start(addr).await.map_err(internal_error)?;diff --git a/shared-lib/user-model/src/lib.rs b/shared-lib/user-model/src/lib.rsindex 6856c7c971..4d4645c910 100644--- a/shared-lib/user-model/src/lib.rs+++ b/shared-lib/user-model/src/lib.rs@@ -14,7 +14,7 @@ pub struct SignInParams {#[derive(Debug, Default, Serialize, Deserialize, Clone)]pub struct SignInResponse {- pub user_id: String,+ pub user_id: i64,pub name: String,pub email: String,pub token: String,@@ -29,7 +29,7 @@ pub struct SignUpParams {#[derive(Serialize, Deserialize, Debug, Default, Clone)]pub struct SignUpResponse {- pub user_id: String,+ pub user_id: i64,pub name: String,pub email: String,pub token: String,@@ -37,7 +37,7 @@ pub struct SignUpResponse {#[derive(Serialize, Deserialize, Default, Debug, Clone)]pub struct UserProfile {- pub id: String,+ pub id: i64,pub email: String,pub name: String,pub token: String,@@ -47,7 +47,7 @@ pub struct UserProfile {#[derive(Serialize, Deserialize, Default, Clone, Debug)]pub struct UpdateUserProfileParams {- pub id: String,+ pub id: i64,pub name: Option<String>,pub email: Option<String>,pub password: Option<String>,@@ -56,9 +56,9 @@ pub struct UpdateUserProfileParams {}impl UpdateUserProfileParams {- pub fn new(user_id: &str) -> Self {+ pub fn new(id: i64) -> Self {Self {- id: user_id.to_owned(),+ id,name: None,email: None,password: None,