diff --git a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart index 6b977a79e0..6f2d634af5 100644 --- a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart @@ -1,9 +1,7 @@ import 'dart:convert'; -import 'package:app_flowy/workspace/infrastructure/repos/document_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart'; import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flutter_quill/flutter_quill.dart' show Document, Delta; import 'package:flowy_sdk/log.dart'; @@ -16,15 +14,13 @@ part 'doc_bloc.freezed.dart'; typedef FlutterQuillDocument = Document; class DocumentBloc extends Bloc { - final View view; - final DocumentRepository repo; + final ViewRepository repo; final ViewListener listener; final TrashRepo trashRepo; late FlutterQuillDocument document; StreamSubscription? _subscription; DocumentBloc({ - required this.view, required this.repo, required this.listener, required this.trashRepo, @@ -41,12 +37,12 @@ class DocumentBloc extends Bloc { emit(state.copyWith(isDeleted: false)); }, deletePermanently: (DeletePermanently value) async { - final result = await trashRepo.deleteViews([Tuple2(view.id, TrashType.TrashView)]); + final result = await trashRepo.deleteViews([Tuple2(repo.view.id, TrashType.TrashView)]); final newState = result.fold((l) => state.copyWith(forceClose: true), (r) => state); emit(newState); }, restorePage: (RestorePage value) async { - final result = await trashRepo.putback(view.id); + final result = await trashRepo.putback(repo.view.id); final newState = result.fold((l) => state.copyWith(isDeleted: false), (r) => state); emit(newState); }, @@ -107,7 +103,7 @@ class DocumentBloc extends Bloc { void _composeDelta(Delta composedDelta, Delta documentDelta) async { final json = jsonEncode(composedDelta.toJson()); - Log.debug("doc_id: $view.id - Send json: $json"); + Log.debug("doc_id: $repo.view.id - Send json: $json"); final result = await repo.composeDelta(data: json); result.fold((rustDoc) { diff --git a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart b/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart index 4bdc939e9a..f9feaab52f 100644 --- a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart @@ -7,12 +7,12 @@ import 'package:freezed_annotation/freezed_annotation.dart'; part 'view_bloc.freezed.dart'; -class ViewBloc extends Bloc { +class ViewMenuBloc extends Bloc { final ViewRepository repo; final ViewListener listener; - ViewBloc({ + ViewMenuBloc({ required this.repo, required this.listener, }) : super(ViewState.init(repo.view)) { diff --git a/frontend/app_flowy/lib/workspace/domain/image.dart b/frontend/app_flowy/lib/workspace/domain/image.dart index bc10a98697..ef9ab183e0 100644 --- a/frontend/app_flowy/lib/workspace/domain/image.dart +++ b/frontend/app_flowy/lib/workspace/domain/image.dart @@ -17,7 +17,9 @@ extension SvgViewType on View { String _imageNameForViewType(ViewType type) { switch (type) { - case ViewType.Doc: + case ViewType.QuillDocument: + return "file_icon"; + case ViewType.Kanban: return "file_icon"; default: return "file_icon"; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart index 43502772af..8983c4e41e 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart @@ -9,7 +9,6 @@ import 'package:app_flowy/workspace/application/view/view_bloc.dart'; import 'package:app_flowy/workspace/application/workspace/welcome_bloc.dart'; import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart'; import 'package:app_flowy/workspace/infrastructure/repos/app_repo.dart'; -import 'package:app_flowy/workspace/infrastructure/repos/document_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart'; @@ -48,8 +47,8 @@ class HomeDepsResolver { (view, _) => ViewListener(view: view), ); - getIt.registerFactoryParam( - (view, _) => ViewBloc( + getIt.registerFactoryParam( + (view, _) => ViewMenuBloc( repo: ViewRepository(view: view), listener: getIt(param1: view), ), @@ -82,8 +81,7 @@ class HomeDepsResolver { // Doc getIt.registerFactoryParam( (view, _) => DocumentBloc( - view: view, - repo: DocumentRepository(docId: view.id), + repo: ViewRepository(view: view), listener: getIt(param1: view), trashRepo: getIt(), ), diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/document_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/document_repo.dart deleted file mode 100644 index 4c01afe8ec..0000000000 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/document_repo.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-collaboration/document_info.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; - -class DocumentRepository { - final String docId; - DocumentRepository({ - required this.docId, - }); - - Future> openDocument() { - final request = ViewId(value: docId); - return FolderEventOpenView(request).send(); - } - - Future> composeDelta({required String data}) { - final request = BlockDelta.create() - ..blockId = docId - ..deltaJson = data; - return FolderEventApplyDocDelta(request).send(); - } - - Future> closeDocument() { - final request = ViewId(value: docId); - return FolderEventCloseView(request).send(); - } -} diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart index 407b7d62fb..2be27dce94 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-collaboration/document_info.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; @@ -45,6 +46,23 @@ class ViewRepository { final request = ViewId(value: view.id); return FolderEventDuplicateView(request).send(); } + + Future> openDocument() { + final request = ViewId(value: view.id); + return FolderEventOpenView(request).send(); + } + + Future> composeDelta({required String data}) { + final request = BlockDelta.create() + ..blockId = view.id + ..deltaJson = data; + return FolderEventApplyDocDelta(request).send(); + } + + Future> closeDocument() { + final request = ViewId(value: view.id); + return FolderEventCloseView(request).send(); + } } typedef DeleteNotifierValue = Either; diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart index 8094a81f73..c6d7d5c275 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart @@ -64,10 +64,6 @@ class DocStackContext extends HomeStackContext { @override ValueNotifier get isUpdated => _isUpdated; - // List get navigationItems => naviStacks.map((stack) { - // return NavigationItemImpl(context: stack); - // }).toList(); - List _makeNavigationItems() { return [ this, diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart index e005bca21d..1b0038dd89 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart @@ -35,9 +35,7 @@ class TrashStackContext extends HomeStackContext { HomeStackType get type => HomeStackType.trash; @override - Widget buildWidget() { - return const TrashStackPage(key: ValueKey('TrashStackPage')); - } + Widget buildWidget() => const TrashStackPage(key: ValueKey('TrashStackPage')); @override List get navigationItems => [this]; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart index cec56381f3..41da630923 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart @@ -36,12 +36,12 @@ class ViewSectionItem extends StatelessWidget { final theme = context.watch(); return MultiBlocProvider( providers: [ - BlocProvider(create: (ctx) => getIt(param1: view)..add(const ViewEvent.initial())), + BlocProvider(create: (ctx) => getIt(param1: view)..add(const ViewEvent.initial())), ], - child: BlocBuilder( + child: BlocBuilder( builder: (context, state) { return InkWell( - onTap: () => onSelected(context.read().state.view), + onTap: () => onSelected(context.read().state.view), child: FlowyHover( config: HoverDisplayConfig(hoverColor: theme.bg3), builder: (_, onHover) => _render(context, onHover, state, theme.iconColor), @@ -63,9 +63,9 @@ class ViewSectionItem extends StatelessWidget { if (onHover || state.isEditing) { children.add( ViewDisclosureButton( - onTap: () => context.read().add(const ViewEvent.setIsEditing(true)), + onTap: () => context.read().add(const ViewEvent.setIsEditing(true)), onSelected: (action) { - context.read().add(const ViewEvent.setIsEditing(false)); + context.read().add(const ViewEvent.setIsEditing(false)); _handleAction(context, action); }, ), @@ -87,18 +87,18 @@ class ViewSectionItem extends StatelessWidget { case ViewDisclosureAction.rename: TextFieldDialog( title: LocaleKeys.disclosureAction_rename.tr(), - value: context.read().state.view.name, + value: context.read().state.view.name, confirm: (newValue) { - context.read().add(ViewEvent.rename(newValue)); + context.read().add(ViewEvent.rename(newValue)); }, ).show(context); break; case ViewDisclosureAction.delete: - context.read().add(const ViewEvent.delete()); + context.read().add(const ViewEvent.delete()); break; case ViewDisclosureAction.duplicate: - context.read().add(const ViewEvent.duplicate()); + context.read().add(const ViewEvent.duplicate()); break; } }); diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart index 66b3e7fa16..9d5df0abe2 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart @@ -11,11 +11,13 @@ import 'package:protobuf/protobuf.dart' as $pb; class ViewType extends $pb.ProtobufEnum { static const ViewType Blank = ViewType._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'Blank'); - static const ViewType Doc = ViewType._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'Doc'); + static const ViewType QuillDocument = ViewType._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'QuillDocument'); + static const ViewType Kanban = ViewType._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'Kanban'); static const $core.List values = [ Blank, - Doc, + QuillDocument, + Kanban, ]; static final $core.Map<$core.int, ViewType> _byValue = $pb.ProtobufEnum.initByValue(values); diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart index 27f0c2a46d..04200a8398 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart @@ -13,12 +13,13 @@ const ViewType$json = const { '1': 'ViewType', '2': const [ const {'1': 'Blank', '2': 0}, - const {'1': 'Doc', '2': 1}, + const {'1': 'QuillDocument', '2': 1}, + const {'1': 'Kanban', '2': 2}, ], }; /// Descriptor for `ViewType`. Decode as a `google.protobuf.EnumDescriptorProto`. -final $typed_data.Uint8List viewTypeDescriptor = $convert.base64Decode('CghWaWV3VHlwZRIJCgVCbGFuaxAAEgcKA0RvYxAB'); +final $typed_data.Uint8List viewTypeDescriptor = $convert.base64Decode('CghWaWV3VHlwZRIJCgVCbGFuaxAAEhEKDVF1aWxsRG9jdW1lbnQQARIKCgZLYW5iYW4QAg=='); @$core.Deprecated('Use viewDescriptor instead') const View$json = const { '1': 'View', diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml index 046fd85668..96755db623 100644 --- a/frontend/rust-lib/dart-ffi/Cargo.toml +++ b/frontend/rust-lib/dart-ffi/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [lib] name = "dart_ffi" # this value will change depending on the target os -# default cdylib -crate-type = ["cdylib"] +# default staticlib +crate-type = ["staticlib"] [dependencies] diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs index ad0edbf547..d8610f6208 100644 --- a/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs +++ b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs @@ -127,8 +127,9 @@ pub(crate) struct ViewTable { impl ViewTable { pub fn new(view: View) -> Self { let view_type = match view.view_type { - ViewType::Blank => ViewTableType::Docs, - ViewType::Doc => ViewTableType::Docs, + ViewType::Kanban => ViewTableType::Kanban, + ViewType::QuillDocument => ViewTableType::QuillDocument, + ViewType::Blank => ViewTableType::QuillDocument, }; ViewTable { @@ -150,7 +151,8 @@ impl ViewTable { impl std::convert::From for View { fn from(table: ViewTable) -> Self { let view_type = match table.view_type { - ViewTableType::Docs => ViewType::Doc, + ViewTableType::QuillDocument => ViewType::QuillDocument, + ViewTableType::Kanban => ViewType::Kanban, }; View { @@ -215,22 +217,24 @@ impl ViewChangeset { #[repr(i32)] #[sql_type = "Integer"] pub enum ViewTableType { - Docs = 0, + QuillDocument = 0, + Kanban = 1, } impl std::default::Default for ViewTableType { fn default() -> Self { - ViewTableType::Docs + ViewTableType::QuillDocument } } impl std::convert::From for ViewTableType { fn from(value: i32) -> Self { match value { - 0 => ViewTableType::Docs, + 0 => ViewTableType::QuillDocument, + 1 => ViewTableType::Kanban, o => { log::error!("Unsupported view type {}, fallback to ViewType::Docs", o); - ViewTableType::Docs + ViewTableType::QuillDocument } } } diff --git a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs index 8d4b258ccc..1360c8e834 100644 --- a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs +++ b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs @@ -68,7 +68,14 @@ impl FolderTest { let _ = sdk.init_user().await; let mut workspace = create_workspace(&sdk, "FolderWorkspace", "Folder test workspace").await; let mut app = create_app(&sdk, &workspace.id, "Folder App", "Folder test app").await; - let view = create_view(&sdk, &app.id, "Folder View", "Folder test view", ViewType::Doc).await; + let view = create_view( + &sdk, + &app.id, + "Folder View", + "Folder test view", + ViewType::QuillDocument, + ) + .await; app.belongings = RepeatedView { items: vec![view.clone()], }; @@ -146,7 +153,7 @@ impl FolderTest { } FolderScript::CreateView { name, desc } => { - let view = create_view(sdk, &self.app.id, &name, &desc, ViewType::Doc).await; + let view = create_view(sdk, &self.app.id, &name, &desc, ViewType::QuillDocument).await; self.view = view; } FolderScript::AssertView(view) => { diff --git a/frontend/rust-lib/flowy-sdk/src/lib.rs b/frontend/rust-lib/flowy-sdk/src/lib.rs index 6002243117..b335c37767 100644 --- a/frontend/rust-lib/flowy-sdk/src/lib.rs +++ b/frontend/rust-lib/flowy-sdk/src/lib.rs @@ -67,7 +67,7 @@ fn crate_log_filter(level: String) -> String { filters.push(format!("flowy_folder={}", level)); filters.push(format!("flowy_user={}", level)); filters.push(format!("flowy_document={}", level)); - filters.push(format!("flowy_collaboration={}", level)); + // filters.push(format!("flowy_collaboration={}", level)); filters.push(format!("dart_notify={}", level)); filters.push(format!("lib_ot={}", level)); filters.push(format!("lib_ws={}", level)); diff --git a/frontend/rust-lib/flowy-test/src/helper.rs b/frontend/rust-lib/flowy-test/src/helper.rs index ee11346f1f..f5c165f5fc 100644 --- a/frontend/rust-lib/flowy-test/src/helper.rs +++ b/frontend/rust-lib/flowy-test/src/helper.rs @@ -88,7 +88,7 @@ async fn create_view(sdk: &FlowySDKTest, app_id: &str) -> View { name: "View A".to_string(), desc: "".to_string(), thumbnail: Some("http://1.png".to_string()), - view_type: ViewType::Doc, + view_type: ViewType::QuillDocument, }; let view = FolderEventBuilder::new(sdk.clone()) diff --git a/shared-lib/flowy-collaboration/src/synchronizer.rs b/shared-lib/flowy-collaboration/src/synchronizer.rs index 2f9603fec8..2141b84952 100644 --- a/shared-lib/flowy-collaboration/src/synchronizer.rs +++ b/shared-lib/flowy-collaboration/src/synchronizer.rs @@ -146,10 +146,9 @@ where let object_id = self.object_id.clone(); let server_rev_id = self.rev_id(); tracing::Span::current().record("server_rev_id", &server_rev_id); - match server_rev_id.cmp(&client_rev_id) { Ordering::Less => { - tracing::warn!("Client should not send ping and the server should pull the revisions from the client") + tracing::trace!("Client should not send ping and the server should pull the revisions from the client") } Ordering::Equal => tracing::trace!("{} is up to date.", object_id), Ordering::Greater => { diff --git a/shared-lib/flowy-folder-data-model/src/entities/view.rs b/shared-lib/flowy-folder-data-model/src/entities/view.rs index 03899bb9ef..b86be30b11 100644 --- a/shared-lib/flowy-folder-data-model/src/entities/view.rs +++ b/shared-lib/flowy-folder-data-model/src/entities/view.rs @@ -65,7 +65,8 @@ impl std::convert::From for Trash { #[derive(Eq, PartialEq, Debug, ProtoBuf_Enum, Clone, Serialize, Deserialize)] pub enum ViewType { Blank = 0, - Doc = 1, + QuillDocument = 1, + Kanban = 2, } impl std::default::Default for ViewType { @@ -77,8 +78,9 @@ impl std::default::Default for ViewType { impl std::convert::From for ViewType { fn from(val: i32) -> Self { match val { - 1 => ViewType::Doc, 0 => ViewType::Blank, + 1 => ViewType::QuillDocument, + 2 => ViewType::Kanban, _ => { log::error!("Invalid view type: {}", val); ViewType::Blank diff --git a/shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs index 57d3e8ff3b..8f5b1c0fd0 100644 --- a/shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs +++ b/shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs @@ -2549,7 +2549,8 @@ impl ::protobuf::reflect::ProtobufValue for UpdateViewParams { #[derive(Clone,PartialEq,Eq,Debug,Hash)] pub enum ViewType { Blank = 0, - Doc = 1, + QuillDocument = 1, + Kanban = 2, } impl ::protobuf::ProtobufEnum for ViewType { @@ -2560,7 +2561,8 @@ impl ::protobuf::ProtobufEnum for ViewType { fn from_i32(value: i32) -> ::std::option::Option { match value { 0 => ::std::option::Option::Some(ViewType::Blank), - 1 => ::std::option::Option::Some(ViewType::Doc), + 1 => ::std::option::Option::Some(ViewType::QuillDocument), + 2 => ::std::option::Option::Some(ViewType::Kanban), _ => ::std::option::Option::None } } @@ -2568,7 +2570,8 @@ impl ::protobuf::ProtobufEnum for ViewType { fn values() -> &'static [Self] { static values: &'static [ViewType] = &[ ViewType::Blank, - ViewType::Doc, + ViewType::QuillDocument, + ViewType::Kanban, ]; values } @@ -2626,8 +2629,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \tR\x06viewId\x12\x14\n\x04name\x18\x02\x20\x01(\tH\0R\x04name\x12\x14\n\ \x04desc\x18\x03\x20\x01(\tH\x01R\x04desc\x12\x1e\n\tthumbnail\x18\x04\ \x20\x01(\tH\x02R\tthumbnailB\r\n\x0bone_of_nameB\r\n\x0bone_of_descB\ - \x12\n\x10one_of_thumbnail*\x1e\n\x08ViewType\x12\t\n\x05Blank\x10\0\x12\ - \x07\n\x03Doc\x10\x01b\x06proto3\ + \x12\n\x10one_of_thumbnail*4\n\x08ViewType\x12\t\n\x05Blank\x10\0\x12\ + \x11\n\rQuillDocument\x10\x01\x12\n\n\x06Kanban\x10\x02b\x06proto3\ "; static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT; diff --git a/shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto index 149b82178e..fc39c607be 100644 --- a/shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto +++ b/shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto @@ -50,5 +50,6 @@ message UpdateViewParams { } enum ViewType { Blank = 0; - Doc = 1; + QuillDocument = 1; + Kanban = 2; } diff --git a/shared-lib/flowy-folder-data-model/src/user_default.rs b/shared-lib/flowy-folder-data-model/src/user_default.rs index 3693de6846..9bef631ae4 100644 --- a/shared-lib/flowy-folder-data-model/src/user_default.rs +++ b/shared-lib/flowy-folder-data-model/src/user_default.rs @@ -49,7 +49,7 @@ fn create_default_view(app_id: String, time: chrono::DateTime) -> View { let view_id = uuid::Uuid::new_v4(); let name = "Read me".to_string(); let desc = "".to_string(); - let view_type = ViewType::Doc; + let view_type = ViewType::QuillDocument; View { id: view_id.to_string(),