diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 2c55dcc580..e2604d4b92 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -468,8 +468,8 @@ dependencies = [ "dashmap", "derive_more", "flowy-collaboration", - "flowy-core-data-model", "flowy-document", + "flowy-folder-data-model", "flowy-net", "flowy-sdk", "flowy-test", @@ -520,7 +520,7 @@ dependencies = [ "config", "derive_more", "flowy-collaboration", - "flowy-core-data-model", + "flowy-folder-data-model", "flowy-user-data-model", "hyper", "lazy_static", @@ -1234,8 +1234,8 @@ dependencies = [ "chrono", "dashmap", "dissimilar", - "flowy-core-data-model", "flowy-derive", + "flowy-folder-data-model", "futures", "lib-infra", "lib-ot", @@ -1252,63 +1252,6 @@ dependencies = [ "url", ] -[[package]] -name = "flowy-core" -version = "0.1.0" -dependencies = [ - "bincode", - "bytes", - "chrono", - "crossbeam", - "crossbeam-utils", - "dart-notify", - "derive_more", - "diesel", - "diesel_derives", - "flowy-collaboration", - "flowy-core-data-model", - "flowy-database", - "flowy-derive", - "flowy-document", - "flowy-error", - "flowy-sync", - "futures", - "futures-core", - "lazy_static", - "lib-dispatch", - "lib-infra", - "lib-ot", - "lib-sqlite", - "log", - "parking_lot", - "pin-project 1.0.8", - "protobuf", - "serde", - "strum", - "strum_macros", - "tokio", - "tracing", -] - -[[package]] -name = "flowy-core-data-model" -version = "0.1.0" -dependencies = [ - "bytes", - "chrono", - "derive_more", - "error-code", - "flowy-derive", - "log", - "protobuf", - "serde", - "serde_json", - "strum", - "strum_macros", - "unicode-segmentation", - "uuid", -] - [[package]] name = "flowy-database" version = "0.1.0" @@ -1389,6 +1332,63 @@ dependencies = [ "serde_json", ] +[[package]] +name = "flowy-folder" +version = "0.1.0" +dependencies = [ + "bincode", + "bytes", + "chrono", + "crossbeam", + "crossbeam-utils", + "dart-notify", + "derive_more", + "diesel", + "diesel_derives", + "flowy-collaboration", + "flowy-database", + "flowy-derive", + "flowy-document", + "flowy-error", + "flowy-folder-data-model", + "flowy-sync", + "futures", + "futures-core", + "lazy_static", + "lib-dispatch", + "lib-infra", + "lib-ot", + "lib-sqlite", + "log", + "parking_lot", + "pin-project 1.0.8", + "protobuf", + "serde", + "strum", + "strum_macros", + "tokio", + "tracing", +] + +[[package]] +name = "flowy-folder-data-model" +version = "0.1.0" +dependencies = [ + "bytes", + "chrono", + "derive_more", + "error-code", + "flowy-derive", + "log", + "protobuf", + "serde", + "serde_json", + "strum", + "strum_macros", + "unicode-segmentation", + "uuid", +] + [[package]] name = "flowy-net" version = "0.1.0" @@ -1399,11 +1399,11 @@ dependencies = [ "bytes", "dashmap", "flowy-collaboration", - "flowy-core", - "flowy-core-data-model", "flowy-derive", "flowy-document", "flowy-error", + "flowy-folder", + "flowy-folder-data-model", "flowy-user", "flowy-user-data-model", "futures-util", @@ -1427,9 +1427,9 @@ dependencies = [ "bytes", "color-eyre", "flowy-collaboration", - "flowy-core", "flowy-database", "flowy-document", + "flowy-folder", "flowy-net", "flowy-sync", "flowy-user", @@ -1479,7 +1479,7 @@ dependencies = [ "bytes", "claim", "flowy-collaboration", - "flowy-core", + "flowy-folder", "flowy-net", "flowy-sdk", "flowy-user", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 437f04f8d2..f16966df15 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -62,7 +62,7 @@ byteorder = {version = "1.3.4"} async-stream = "0.3.2" flowy-user-data-model = { path = "../shared-lib/flowy-user-data-model" } -flowy-core-data-model = { path = "../shared-lib/flowy-core-data-model" } +flowy-folder-data-model = { path = "../shared-lib/flowy-folder-data-model" } flowy-collaboration = { path = "../shared-lib/flowy-collaboration" } lib-ws = { path = "../shared-lib/lib-ws" } lib-ot = { path = "../shared-lib/lib-ot" } diff --git a/backend/src/services/folder/app/controller.rs b/backend/src/services/folder/app/controller.rs index 8f6498d10a..ba997580df 100644 --- a/backend/src/services/folder/app/controller.rs +++ b/backend/src/services/folder/app/controller.rs @@ -7,7 +7,7 @@ use crate::{ }; use backend_service::errors::{invalid_params, ServerError}; use chrono::Utc; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::{ app::{AppDesc, AppName}, workspace::WorkspaceIdentify, diff --git a/backend/src/services/folder/app/persistence.rs b/backend/src/services/folder/app/persistence.rs index 182e10b176..58832eccd0 100644 --- a/backend/src/services/folder/app/persistence.rs +++ b/backend/src/services/folder/app/persistence.rs @@ -1,7 +1,7 @@ use crate::util::sqlx_ext::SqlBuilder; use backend_service::errors::{invalid_params, ServerError}; use chrono::{DateTime, NaiveDateTime, Utc}; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::app::AppIdentify, protobuf::{App as AppPB, ColorStyle as ColorStylePB, RepeatedView as RepeatedViewPB}, }; diff --git a/backend/src/services/folder/app/router.rs b/backend/src/services/folder/app/router.rs index 6e00bc05d2..54aa42983c 100644 --- a/backend/src/services/folder/app/router.rs +++ b/backend/src/services/folder/app/router.rs @@ -15,7 +15,7 @@ use backend_service::{ errors::{invalid_params, ServerError}, response::FlowyResponse, }; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::app::{AppDesc, AppName}, protobuf::{AppId as AppIdPB, CreateAppParams as CreateAppParamsPB, UpdateAppParams as UpdateAppParamsPB}, }; diff --git a/backend/src/services/folder/trash/persistence.rs b/backend/src/services/folder/trash/persistence.rs index 07134dda85..20faf2e417 100644 --- a/backend/src/services/folder/trash/persistence.rs +++ b/backend/src/services/folder/trash/persistence.rs @@ -1,5 +1,5 @@ use crate::services::folder::{app::persistence::AppTable, view::persistence::ViewTable}; -use flowy_core_data_model::protobuf::{Trash, TrashType}; +use flowy_folder_data_model::protobuf::{Trash, TrashType}; pub(crate) const TRASH_TABLE: &str = "trash_table"; diff --git a/backend/src/services/folder/trash/router.rs b/backend/src/services/folder/trash/router.rs index b19e9e1125..d943c4d1a0 100644 --- a/backend/src/services/folder/trash/router.rs +++ b/backend/src/services/folder/trash/router.rs @@ -14,7 +14,7 @@ use backend_service::{ errors::{invalid_params, ServerError}, response::FlowyResponse, }; -use flowy_core_data_model::{parser::trash::TrashIdentify, protobuf::RepeatedTrashId}; +use flowy_folder_data_model::{parser::trash::TrashIdentify, protobuf::RepeatedTrashId}; use sqlx::PgPool; use std::sync::Arc; use uuid::Uuid; diff --git a/backend/src/services/folder/trash/trash.rs b/backend/src/services/folder/trash/trash.rs index f038b691cd..9df45779ba 100644 --- a/backend/src/services/folder/trash/trash.rs +++ b/backend/src/services/folder/trash/trash.rs @@ -10,7 +10,7 @@ use crate::{ }; use ::protobuf::ProtobufEnum; use backend_service::errors::ServerError; -use flowy_core_data_model::protobuf::{RepeatedTrash, Trash, TrashType}; +use flowy_folder_data_model::protobuf::{RepeatedTrash, Trash, TrashType}; use sqlx::{postgres::PgArguments, Postgres, Row}; use std::sync::Arc; use uuid::Uuid; diff --git a/backend/src/services/folder/view/controller.rs b/backend/src/services/folder/view/controller.rs index c2dd134ea2..b9883d1286 100644 --- a/backend/src/services/folder/view/controller.rs +++ b/backend/src/services/folder/view/controller.rs @@ -15,7 +15,7 @@ use flowy_collaboration::{ entities::revision::{RepeatedRevision, Revision}, protobuf::CreateDocParams as CreateDocParamsPB, }; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::{ app::AppIdentify, view::{ViewDesc, ViewName, ViewThumbnail}, diff --git a/backend/src/services/folder/view/persistence.rs b/backend/src/services/folder/view/persistence.rs index c9e572abaa..f43e1573bb 100644 --- a/backend/src/services/folder/view/persistence.rs +++ b/backend/src/services/folder/view/persistence.rs @@ -1,7 +1,7 @@ use crate::util::sqlx_ext::SqlBuilder; use backend_service::errors::{invalid_params, ServerError}; use chrono::{DateTime, NaiveDateTime, Utc}; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::view::ViewIdentify, protobuf::{RepeatedView as RepeatedViewPB, View as ViewPB, ViewType as ViewTypePB}, }; diff --git a/backend/src/services/folder/view/router.rs b/backend/src/services/folder/view/router.rs index b328ed3e83..ce66dda39d 100644 --- a/backend/src/services/folder/view/router.rs +++ b/backend/src/services/folder/view/router.rs @@ -17,7 +17,7 @@ use backend_service::{ errors::{invalid_params, ServerError}, response::FlowyResponse, }; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::view::{ViewDesc, ViewName, ViewThumbnail}, protobuf::{ CreateViewParams as CreateViewParamsPB, QueryViewRequest as QueryViewRequestPB, diff --git a/backend/src/services/folder/workspace/controller.rs b/backend/src/services/folder/workspace/controller.rs index d9d3a4b88f..6a3a6d54fc 100644 --- a/backend/src/services/folder/workspace/controller.rs +++ b/backend/src/services/folder/workspace/controller.rs @@ -9,7 +9,7 @@ use crate::{ }; use anyhow::Context; use backend_service::errors::{invalid_params, ServerError}; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::workspace::WorkspaceIdentify, protobuf::{RepeatedApp as RepeatedAppPB, RepeatedWorkspace as RepeatedWorkspacePB, Workspace as WorkspacePB}, }; diff --git a/backend/src/services/folder/workspace/persistence.rs b/backend/src/services/folder/workspace/persistence.rs index 5e4b27dbc7..48957c98af 100644 --- a/backend/src/services/folder/workspace/persistence.rs +++ b/backend/src/services/folder/workspace/persistence.rs @@ -1,7 +1,7 @@ use crate::util::sqlx_ext::SqlBuilder; use backend_service::errors::{invalid_params, ServerError}; use chrono::{DateTime, NaiveDateTime, Utc}; -use flowy_core_data_model::{parser::workspace::WorkspaceIdentify, protobuf::Workspace as WorkspacePB}; +use flowy_folder_data_model::{parser::workspace::WorkspaceIdentify, protobuf::Workspace as WorkspacePB}; use sqlx::postgres::PgArguments; use uuid::Uuid; diff --git a/backend/src/services/folder/workspace/router.rs b/backend/src/services/folder/workspace/router.rs index 8ad8d9d93a..764a1ba78c 100644 --- a/backend/src/services/folder/workspace/router.rs +++ b/backend/src/services/folder/workspace/router.rs @@ -14,7 +14,7 @@ use backend_service::{ errors::{invalid_params, ServerError}, response::FlowyResponse, }; -use flowy_core_data_model::{ +use flowy_folder_data_model::{ parser::workspace::{WorkspaceDesc, WorkspaceName}, protobuf::{ CreateWorkspaceParams as CreateWorkspaceParamsPB, UpdateWorkspaceParams as UpdateWorkspaceParamsPB, diff --git a/backend/tests/api_test/workspace_test.rs b/backend/tests/api_test/workspace_test.rs index 80cd50e1ad..33a7157e84 100644 --- a/backend/tests/api_test/workspace_test.rs +++ b/backend/tests/api_test/workspace_test.rs @@ -8,7 +8,7 @@ use flowy_collaboration::{ revision::{md5, RepeatedRevision, Revision}, }, }; -use flowy_core_data_model::entities::{ +use flowy_folder_data_model::entities::{ app::{AppId, UpdateAppParams}, trash::{RepeatedTrashId, TrashId, TrashType}, view::{RepeatedViewId, UpdateViewParams, ViewId}, diff --git a/backend/tests/util/helper.rs b/backend/tests/util/helper.rs index 9990bf0bf6..cce94b54eb 100644 --- a/backend/tests/util/helper.rs +++ b/backend/tests/util/helper.rs @@ -11,7 +11,7 @@ use flowy_collaboration::{ client_document::default::initial_delta_string, entities::document_info::{CreateDocParams, DocumentId, DocumentInfo}, }; -use flowy_core_data_model::entities::{app::*, trash::*, view::*, workspace::*}; +use flowy_folder_data_model::entities::{app::*, trash::*, view::*, workspace::*}; use flowy_net::http_server::{ core::*, document::{create_document_request, read_document_request}, diff --git a/frontend/app_flowy/lib/user/domain/i_auth.dart b/frontend/app_flowy/lib/user/domain/i_auth.dart index b62fe1df9e..5133c07e5c 100644 --- a/frontend/app_flowy/lib/user/domain/i_auth.dart +++ b/frontend/app_flowy/lib/user/domain/i_auth.dart @@ -1,6 +1,6 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; import 'package:flutter/material.dart'; diff --git a/frontend/app_flowy/lib/user/domain/i_splash.dart b/frontend/app_flowy/lib/user/domain/i_splash.dart index 99c2eba22e..385d9e8ae6 100644 --- a/frontend/app_flowy/lib/user/domain/i_splash.dart +++ b/frontend/app_flowy/lib/user/domain/i_splash.dart @@ -1,5 +1,5 @@ import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flutter/widgets.dart'; import 'auth_state.dart'; diff --git a/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart b/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart index ca1f5322e0..6596fa7dc1 100644 --- a/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart +++ b/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart @@ -9,7 +9,7 @@ import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show Use import 'package:app_flowy/user/domain/i_auth.dart'; import 'package:app_flowy/user/infrastructure/repos/auth_repo.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flutter/material.dart'; class AuthImpl extends IAuth { diff --git a/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart b/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart index fe74c4bd8b..ce3daf8461 100644 --- a/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart +++ b/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart @@ -11,7 +11,7 @@ import 'package:flowy_infra/time/duration.dart'; import 'package:flowy_infra_ui/widget/route/animation.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart b/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart index 55c82ef862..64283c05c8 100644 --- a/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart +++ b/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart @@ -24,7 +24,7 @@ class AuthRepository { // return UserEventSignUp(request).send().then((result) { // return result.fold((userProfile) async { - // return await WorkspaceEventCreateDefaultWorkspace().send().then((result) { + // return await FolderEventCreateDefaultWorkspace().send().then((result) { // return result.fold((workspaceIdentifier) { // return left(Tuple2(userProfile, workspaceIdentifier.workspaceId)); // }, (error) { diff --git a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart index 7801e4d322..6db6ce9d8b 100644 --- a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart @@ -9,7 +9,7 @@ import 'package:flowy_infra_ui/widget/rounded_button.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -100,7 +100,7 @@ class _SkipLogInScreenState extends State { final result = await widget.authManager.signUp(LocaleKeys.defaultUsername.tr(), password, userEmail); result.fold( (user) { - WorkspaceEventReadCurWorkspace().send().then((result) { + FolderEventReadCurWorkspace().send().then((result) { _openCurrentWorkspace(context, user, result); }); }, diff --git a/frontend/app_flowy/lib/user/presentation/splash_screen.dart b/frontend/app_flowy/lib/user/presentation/splash_screen.dart index 4c848087e0..9b43408935 100644 --- a/frontend/app_flowy/lib/user/presentation/splash_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/splash_screen.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/user/domain/auth_state.dart'; import 'package:app_flowy/user/domain/i_splash.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/errors.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/errors.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -44,7 +44,7 @@ class SplashScreen extends StatelessWidget { void _handleAuthenticated(BuildContext context, Authenticated result) { final userProfile = result.userProfile; - WorkspaceEventReadCurWorkspace().send().then( + FolderEventReadCurWorkspace().send().then( (result) { return result.fold( (workspaceSetting) => getIt().pushHomeScreen(context, userProfile, workspaceSetting), diff --git a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart index 88b72ad043..f1b8f2c3bf 100644 --- a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart @@ -5,7 +5,7 @@ import 'package:flowy_infra/theme.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:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart index 77efab66de..438941fe2f 100644 --- a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_app.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.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:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; 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 e9f213f859..7327987610 100644 --- a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'package:app_flowy/workspace/domain/i_trash.dart'; import 'package:app_flowy/workspace/domain/i_view.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.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'; import 'package:flowy_log/flowy_log.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart b/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart index 9ddc722d20..6053525aad 100644 --- a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_share.dart'; import 'package:app_flowy/workspace/infrastructure/markdown/delta_markdown.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/share.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/share.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:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart b/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart index 6a1610d452..3435b537d8 100644 --- a/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart @@ -1,5 +1,5 @@ import 'package:app_flowy/workspace/domain/i_user.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/errors.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart index 1e8e36518b..6a8deb0d2c 100644 --- a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart'; import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart index 770f6f11f2..599023dcde 100644 --- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart @@ -1,6 +1,6 @@ import 'package:app_flowy/workspace/domain/i_user.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart b/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart index be6979c1d1..dd2bac1861 100644 --- a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_trash.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; 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 112fc701de..11a9805d9e 100644 --- a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart @@ -1,5 +1,5 @@ import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.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_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart b/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart index 7291b88a97..c180aeb298 100644 --- a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_user.dart'; import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/domain/i_app.dart b/frontend/app_flowy/lib/workspace/domain/i_app.dart index a8dae73c4d..a276c71a0a 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_app.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_app.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; diff --git a/frontend/app_flowy/lib/workspace/domain/i_share.dart b/frontend/app_flowy/lib/workspace/domain/i_share.dart index bea4aa3e1a..fa4b1c4853 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_share.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_share.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; abstract class IShare { diff --git a/frontend/app_flowy/lib/workspace/domain/i_trash.dart b/frontend/app_flowy/lib/workspace/domain/i_trash.dart index 76f07b75e7..dadff00009 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_trash.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_trash.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; abstract class ITrash { diff --git a/frontend/app_flowy/lib/workspace/domain/i_user.dart b/frontend/app_flowy/lib/workspace/domain/i_user.dart index b0e3173988..c43aaa1857 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_user.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_user.dart @@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_infra/notifier.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; export 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; abstract class IUser { diff --git a/frontend/app_flowy/lib/workspace/domain/i_view.dart b/frontend/app_flowy/lib/workspace/domain/i_view.dart index f769be99fe..4e56fbaeb0 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_view.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_view.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_infra/notifier.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; diff --git a/frontend/app_flowy/lib/workspace/domain/i_workspace.dart b/frontend/app_flowy/lib/workspace/domain/i_workspace.dart index a4bb7672da..6e0393a1cf 100644 --- a/frontend/app_flowy/lib/workspace/domain/i_workspace.dart +++ b/frontend/app_flowy/lib/workspace/domain/i_workspace.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; diff --git a/frontend/app_flowy/lib/workspace/domain/image.dart b/frontend/app_flowy/lib/workspace/domain/image.dart index b58ce3ce89..bc10a98697 100644 --- a/frontend/app_flowy/lib/workspace/domain/image.dart +++ b/frontend/app_flowy/lib/workspace/domain/image.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flutter/material.dart'; import 'package:flowy_infra/image.dart'; diff --git a/frontend/app_flowy/lib/workspace/domain/view_ext.dart b/frontend/app_flowy/lib/workspace/domain/view_ext.dart index 8029b8255a..6950061820 100644 --- a/frontend/app_flowy/lib/workspace/domain/view_ext.dart +++ b/frontend/app_flowy/lib/workspace/domain/view_ext.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart'; import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart'; import 'package:app_flowy/workspace/presentation/stack_page/doc/doc_stack_page.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; extension ToHomeStackContext on View { HomeStackContext stackContext() { diff --git a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart index 5badf3b775..4acf2b4a13 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart @@ -21,8 +21,8 @@ import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart'; import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:get_it/get_it.dart'; import 'i_share_impl.dart'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart index 1b4eaa49c8..cfb92287df 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/infrastructure/repos/app_repo.dart'; import 'package:dartz/dartz.dart'; import 'package:app_flowy/workspace/domain/i_app.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; export 'package:app_flowy/workspace/domain/i_app.dart'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart index a2e7e2ba8b..cfd484399f 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart @@ -1,5 +1,5 @@ import 'package:app_flowy/workspace/domain/i_share.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:dartz/dartz.dart'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart index bb8531e223..2e822e2609 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_trash.dart'; import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; class ITrashImpl implements ITrash { diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart index b6735a6cc3..f28dae455b 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart @@ -6,11 +6,11 @@ import 'package:app_flowy/workspace/domain/i_user.dart'; import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; import 'package:flowy_infra/notifier.dart'; import 'package:flowy_sdk/protobuf/dart-notify/protobuf.dart'; -import 'package:flowy_sdk/protobuf/flowy-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/errors.pb.dart'; // import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error; import 'package:flowy_sdk/protobuf/flowy-user/dart_notification.pb.dart' as user; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; export 'package:app_flowy/workspace/domain/i_user.dart'; export 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; @@ -64,7 +64,7 @@ class IUserListenerImpl extends IUserListener { @override final workspaceUpdatedNotifier = PublishNotifier(); - late WorkspaceNotificationParser _workspaceParser; + late FolderNotificationParser _workspaceParser; late UserNotificationParser _userParser; late UserProfile _user; IUserListenerImpl({ @@ -75,7 +75,7 @@ class IUserListenerImpl extends IUserListener { @override void start() { - _workspaceParser = WorkspaceNotificationParser(id: _user.token, callback: _notificationCallback); + _workspaceParser = FolderNotificationParser(id: _user.token, callback: _notificationCallback); _userParser = UserNotificationParser(id: _user.token, callback: _userNotificationCallback); _subscription = RustStreamReceiver.listen((observable) { _workspaceParser.parse(observable); @@ -88,17 +88,17 @@ class IUserListenerImpl extends IUserListener { await _subscription?.cancel(); } - void _notificationCallback(WorkspaceNotification ty, Either result) { + void _notificationCallback(FolderNotification ty, Either result) { switch (ty) { - case WorkspaceNotification.UserCreateWorkspace: - case WorkspaceNotification.UserDeleteWorkspace: - case WorkspaceNotification.WorkspaceListUpdated: + case FolderNotification.UserCreateWorkspace: + case FolderNotification.UserDeleteWorkspace: + case FolderNotification.WorkspaceListUpdated: result.fold( (payload) => workspaceUpdatedNotifier.value = left(RepeatedWorkspace.fromBuffer(payload).items), (error) => workspaceUpdatedNotifier.value = right(error), ); break; - case WorkspaceNotification.UserUnauthorized: + case FolderNotification.UserUnauthorized: result.fold( (_) {}, (error) => authDidChangedNotifier.value = right(FlowyError.create()..code = ErrorCode.UserUnauthorized.value), diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart index 07c4ff3b34..466fa563d7 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart @@ -2,7 +2,7 @@ import 'package:app_flowy/workspace/domain/i_view.dart'; import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart'; import 'package:flowy_infra/notifier.dart'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.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 IViewImpl extends IView { diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart index d957106db3..ef1d35fe96 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/workspace/domain/i_workspace.dart'; import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; export 'package:app_flowy/workspace/domain/i_workspace.dart'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart index 8c647baad1..ff642c3370 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart @@ -5,10 +5,10 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.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-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; import 'package:flowy_sdk/rust_stream.dart'; import 'helper.dart'; @@ -21,7 +21,7 @@ class AppRepository { Future> getAppDesc() { final request = QueryAppRequest.create()..appIds.add(appId); - return WorkspaceEventReadApp(request).send(); + return FolderEventReadApp(request).send(); } Future> createView(String name, String desc, ViewType viewType) { @@ -31,13 +31,13 @@ class AppRepository { ..desc = desc ..viewType = viewType; - return WorkspaceEventCreateView(request).send(); + return FolderEventCreateView(request).send(); } Future, FlowyError>> getViews() { final request = QueryAppRequest.create()..appIds.add(appId); - return WorkspaceEventReadApp(request).send().then((result) { + return FolderEventReadApp(request).send().then((result) { return result.fold( (app) => left(app.belongings.items), (error) => right(error), @@ -47,7 +47,7 @@ class AppRepository { Future> delete() { final request = QueryAppRequest.create()..appIds.add(appId); - return WorkspaceEventDeleteApp(request).send(); + return FolderEventDeleteApp(request).send(); } Future> updateApp({String? name}) { @@ -56,7 +56,7 @@ class AppRepository { if (name != null) { request.name = name; } - return WorkspaceEventUpdateApp(request).send(); + return FolderEventUpdateApp(request).send(); } } @@ -64,7 +64,7 @@ class AppListenerRepository { StreamSubscription? _subscription; AppViewsChangeCallback? _viewsChanged; AppUpdatedCallback? _update; - late WorkspaceNotificationParser _parser; + late FolderNotificationParser _parser; String appId; AppListenerRepository({ @@ -74,13 +74,13 @@ class AppListenerRepository { void startListening({AppViewsChangeCallback? viewsChanged, AppUpdatedCallback? update}) { _viewsChanged = viewsChanged; _update = update; - _parser = WorkspaceNotificationParser(id: appId, callback: _bservableCallback); + _parser = FolderNotificationParser(id: appId, callback: _bservableCallback); _subscription = RustStreamReceiver.listen((observable) => _parser.parse(observable)); } - void _bservableCallback(WorkspaceNotification ty, Either result) { + void _bservableCallback(FolderNotification ty, Either result) { switch (ty) { - case WorkspaceNotification.AppViewsChanged: + case FolderNotification.AppViewsChanged: if (_viewsChanged != null) { result.fold( (payload) { @@ -91,7 +91,7 @@ class AppListenerRepository { ); } break; - case WorkspaceNotification.AppUpdated: + case FolderNotification.AppUpdated: if (_update != null) { result.fold( (payload) { diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart index 48c324cb9c..9ee62fd8d4 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart @@ -1,7 +1,7 @@ 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-core-data-model/view.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 DocRepository { @@ -12,18 +12,18 @@ class DocRepository { Future> readDoc() { final request = QueryViewRequest(viewIds: [docId]); - return WorkspaceEventOpenDocument(request).send(); + return FolderEventOpenDocument(request).send(); } Future> composeDelta({required String data}) { final request = DocumentDelta.create() ..docId = docId ..deltaJson = data; - return WorkspaceEventApplyDocDelta(request).send(); + return FolderEventApplyDocDelta(request).send(); } Future> closeDoc() { final request = QueryViewRequest(viewIds: [docId]); - return WorkspaceEventCloseView(request).send(); + return FolderEventCloseView(request).send(); } } diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart index 30c278e49d..88b299aa3a 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart @@ -3,7 +3,7 @@ import 'package:flowy_sdk/protobuf/dart-notify/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; typedef UserNotificationCallback = void Function(UserNotification, Either); @@ -17,14 +17,14 @@ class UserNotificationParser extends NotificationParser); +typedef NotificationCallback = void Function(FolderNotification, Either); -class WorkspaceNotificationParser extends NotificationParser { - WorkspaceNotificationParser({String? id, required NotificationCallback callback}) +class FolderNotificationParser extends NotificationParser { + FolderNotificationParser({String? id, required NotificationCallback callback}) : super( id: id, callback: callback, - tyParser: (ty) => WorkspaceNotification.valueOf(ty), + tyParser: (ty) => FolderNotification.valueOf(ty), errorParser: (bytes) => FlowyError.fromBuffer(bytes), ); } diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart index bd4d2e1e92..d8bec1327a 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; class ShareRepo { @@ -10,6 +10,6 @@ class ShareRepo { ..docId = docId ..exportType = type; - return WorkspaceEventExportDocument(request).send(); + return FolderEventExportDocument(request).send(); } } diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart index 5a40092897..8522ac693c 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart @@ -5,20 +5,20 @@ import 'package:app_flowy/workspace/infrastructure/repos/helper.dart'; 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-core-data-model/trash.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; import 'package:flowy_sdk/rust_stream.dart'; class TrashRepo { Future> readTrash() { - return WorkspaceEventReadTrash().send(); + return FolderEventReadTrash().send(); } Future> putback(String trashId) { final id = TrashId.create()..id = trashId; - return WorkspaceEventPutbackTrash(id).send(); + return FolderEventPutbackTrash(id).send(); } Future> deleteViews(List> trashList) { @@ -29,32 +29,32 @@ class TrashRepo { }); final ids = RepeatedTrashId(items: items); - return WorkspaceEventDeleteTrash(ids).send(); + return FolderEventDeleteTrash(ids).send(); } Future> restoreAll() { - return WorkspaceEventRestoreAllTrash().send(); + return FolderEventRestoreAllTrash().send(); } Future> deleteAll() { - return WorkspaceEventDeleteAllTrash().send(); + return FolderEventDeleteAllTrash().send(); } } class TrashListenerRepo { StreamSubscription? _subscription; TrashUpdatedCallback? _trashUpdated; - late WorkspaceNotificationParser _parser; + late FolderNotificationParser _parser; void startListening({TrashUpdatedCallback? trashUpdated}) { _trashUpdated = trashUpdated; - _parser = WorkspaceNotificationParser(callback: _bservableCallback); + _parser = FolderNotificationParser(callback: _bservableCallback); _subscription = RustStreamReceiver.listen((observable) => _parser.parse(observable)); } - void _bservableCallback(WorkspaceNotification ty, Either result) { + void _bservableCallback(FolderNotification ty, Either result) { switch (ty) { - case WorkspaceNotification.TrashUpdated: + case FolderNotification.TrashUpdated: if (_trashUpdated != null) { result.fold( (payload) { diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart index 843f12922e..6c299a0854 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:app_flowy/workspace/domain/i_user.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; @@ -30,7 +30,7 @@ class UserRepo { Future, FlowyError>> getWorkspaces() { final request = QueryWorkspaceRequest.create(); - return WorkspaceEventReadWorkspaces(request).send().then((result) { + return FolderEventReadWorkspaces(request).send().then((result) { return result.fold( (workspaces) => left(workspaces.items), (error) => right(error), @@ -40,7 +40,7 @@ class UserRepo { Future> openWorkspace(String workspaceId) { final request = QueryWorkspaceRequest.create()..workspaceId = workspaceId; - return WorkspaceEventOpenWorkspace(request).send().then((result) { + return FolderEventOpenWorkspace(request).send().then((result) { return result.fold( (workspace) => left(workspace), (error) => right(error), @@ -52,7 +52,7 @@ class UserRepo { final request = CreateWorkspaceRequest.create() ..name = name ..desc = desc; - return WorkspaceEventCreateWorkspace(request).send().then((result) { + return FolderEventCreateWorkspace(request).send().then((result) { return result.fold( (workspace) => left(workspace), (error) => right(error), 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 519fc45f11..7a03cf405d 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart @@ -3,9 +3,9 @@ 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-core-data-model/view.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-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; import 'package:flowy_sdk/rust_stream.dart'; import 'package:app_flowy/workspace/domain/i_view.dart'; @@ -21,7 +21,7 @@ class ViewRepository { Future> readView() { final request = QueryViewRequest(viewIds: [view.id]); - return WorkspaceEventReadView(request).send(); + return FolderEventReadView(request).send(); } Future> updateView({String? name, String? desc}) { @@ -35,17 +35,17 @@ class ViewRepository { request.desc = desc; } - return WorkspaceEventUpdateView(request).send(); + return FolderEventUpdateView(request).send(); } Future> delete() { final request = QueryViewRequest.create()..viewIds.add(view.id); - return WorkspaceEventDeleteView(request).send(); + return FolderEventDeleteView(request).send(); } Future> duplicate() { final request = QueryViewRequest.create()..viewIds.add(view.id); - return WorkspaceEventDuplicateView(request).send(); + return FolderEventDuplicateView(request).send(); } } @@ -54,7 +54,7 @@ class ViewListenerRepository { PublishNotifier updatedNotifier = PublishNotifier(); PublishNotifier deletedNotifier = PublishNotifier(); PublishNotifier restoredNotifier = PublishNotifier(); - late WorkspaceNotificationParser _parser; + late FolderNotificationParser _parser; View view; ViewListenerRepository({ @@ -62,7 +62,7 @@ class ViewListenerRepository { }); void start() { - _parser = WorkspaceNotificationParser( + _parser = FolderNotificationParser( id: view.id, callback: (ty, result) { _handleObservableType(ty, result); @@ -72,21 +72,21 @@ class ViewListenerRepository { _subscription = RustStreamReceiver.listen((observable) => _parser.parse(observable)); } - void _handleObservableType(WorkspaceNotification ty, Either result) { + void _handleObservableType(FolderNotification ty, Either result) { switch (ty) { - case WorkspaceNotification.ViewUpdated: + case FolderNotification.ViewUpdated: result.fold( (payload) => updatedNotifier.value = left(View.fromBuffer(payload)), (error) => updatedNotifier.value = right(error), ); break; - case WorkspaceNotification.ViewDeleted: + case FolderNotification.ViewDeleted: result.fold( (payload) => deletedNotifier.value = left(View.fromBuffer(payload)), (error) => deletedNotifier.value = right(error), ); break; - case WorkspaceNotification.ViewRestored: + case FolderNotification.ViewRestored: result.fold( (payload) => restoredNotifier.value = left(View.fromBuffer(payload)), (error) => restoredNotifier.value = right(error), diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart index 3da75484d3..c027bcdfff 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart +++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart @@ -7,10 +7,10 @@ import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core/dart_notification.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; import 'package:flowy_sdk/rust_stream.dart'; import 'package:app_flowy/generated/locale_keys.g.dart'; @@ -31,12 +31,12 @@ class WorkspaceRepo { ..name = appName ..workspaceId = workspaceId ..desc = desc; - return WorkspaceEventCreateApp(request).send(); + return FolderEventCreateApp(request).send(); } Future> getWorkspace() { final request = QueryWorkspaceRequest.create()..workspaceId = workspaceId; - return WorkspaceEventReadWorkspaces(request).send().then((result) { + return FolderEventReadWorkspaces(request).send().then((result) { return result.fold( (workspaces) { assert(workspaces.items.length == 1); @@ -54,7 +54,7 @@ class WorkspaceRepo { Future, FlowyError>> getApps() { final request = QueryWorkspaceRequest.create()..workspaceId = workspaceId; - return WorkspaceEventReadWorkspaceApps(request).send().then((result) { + return FolderEventReadWorkspaceApps(request).send().then((result) { return result.fold( (apps) => left(apps.items), (error) => right(error), @@ -67,7 +67,7 @@ class WorkspaceListenerRepo { StreamSubscription? _subscription; WorkspaceAppsChangedCallback? _appsChanged; WorkspaceUpdatedCallback? _update; - late WorkspaceNotificationParser _parser; + late FolderNotificationParser _parser; final UserProfile user; final String workspaceId; @@ -83,7 +83,7 @@ class WorkspaceListenerRepo { _appsChanged = appsChanged; _update = update; - _parser = WorkspaceNotificationParser( + _parser = FolderNotificationParser( id: workspaceId, callback: (ty, result) { _handleObservableType(ty, result); @@ -93,9 +93,9 @@ class WorkspaceListenerRepo { _subscription = RustStreamReceiver.listen((observable) => _parser.parse(observable)); } - void _handleObservableType(WorkspaceNotification ty, Either result) { + void _handleObservableType(FolderNotification ty, Either result) { switch (ty) { - case WorkspaceNotification.WorkspaceUpdated: + case FolderNotification.WorkspaceUpdated: if (_update != null) { result.fold( (payload) { @@ -106,7 +106,7 @@ class WorkspaceListenerRepo { ); } break; - case WorkspaceNotification.WorkspaceAppsChanged: + case FolderNotification.WorkspaceAppsChanged: if (_appsChanged != null) { result.fold( (payload) => _appsChanged!( diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart index a1cf7aea0f..bc81ac53f3 100644 --- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart +++ b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart @@ -8,7 +8,7 @@ import 'package:app_flowy/startup/startup.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_infra_ui/style_widget/container.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart index 6989b85a74..4883cd0bec 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart @@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flutter_quill/flutter_quill.dart' as quill; import 'package:flowy_infra_ui/widget/error_page.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/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/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 de758736b1..b5fda3be0d 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 @@ -12,8 +12,8 @@ import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/widget/rounded_button.dart'; import 'package:flowy_log/flowy_log.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/share.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/share.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/material.dart'; import 'package:dartz/dartz.dart' as dartz; diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart index eff734c87e..eed9e8c0fa 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/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:flowy_sdk/protobuf/flowy-core-data-model/trash.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:fixnum/fixnum.dart' as $fixnum; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart index 7645d8d331..717ab2c139 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/presentation/home/home_sizes.dart'; import 'package:app_flowy/workspace/presentation/home/navigation.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flutter/material.dart'; import 'package:flowy_infra_ui/style_widget/extension.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart index 08dd1b88ba..7e47426316 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart @@ -5,8 +5,8 @@ import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart index b198d9da1e..106638e2c2 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart @@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/style_widget/hover.dart'; import 'package:flowy_infra_ui/style_widget/icon_button.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/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/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart index a96e51b9f3..5b959d258b 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart @@ -6,7 +6,7 @@ import 'package:flowy_infra/flowy_icon_data_icons.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:app_flowy/workspace/application/app/app_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart index 9d827efa8b..2ea4ba29aa 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart @@ -1,8 +1,8 @@ import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart'; import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/header/header.dart'; import 'package:expandable/expandable.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/app.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:app_flowy/startup/startup.dart'; 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 c896a88d8b..ffc82ed823 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 @@ -8,7 +8,7 @@ import 'package:flowy_infra/theme.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:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/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/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart index 468d6083f4..3b621fefec 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart +++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart @@ -3,7 +3,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart'; import 'package:app_flowy/workspace/domain/view_ext.dart'; import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart'; import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/menu_app.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/code_gen.dart b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/code_gen.dart index 194d10137a..e3f21785ec 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/code_gen.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/code_gen.dart @@ -1,538 +1,503 @@ - - /// Auto gen code from rust ast, do not edit part of 'dispatch.dart'; -class WorkspaceEventCreateWorkspace { - CreateWorkspaceRequest request; - WorkspaceEventCreateWorkspace(this.request); - Future> send() { +class FolderEventCreateWorkspace { + CreateWorkspaceRequest request; + FolderEventCreateWorkspace(this.request); + + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.CreateWorkspace.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.CreateWorkspace.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(Workspace.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(Workspace.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventReadCurWorkspace { - WorkspaceEventReadCurWorkspace(); +class FolderEventReadCurWorkspace { + FolderEventReadCurWorkspace(); - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadCurWorkspace.toString(); + Future> send() { + final request = FFIRequest.create()..event = FolderEvent.ReadCurWorkspace.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (okBytes) => left(CurrentWorkspaceSetting.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(CurrentWorkspaceSetting.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } -class WorkspaceEventReadWorkspaces { - QueryWorkspaceRequest request; - WorkspaceEventReadWorkspaces(this.request); +class FolderEventReadWorkspaces { + QueryWorkspaceRequest request; + FolderEventReadWorkspaces(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadWorkspaces.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.ReadWorkspaces.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(RepeatedWorkspace.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(RepeatedWorkspace.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventDeleteWorkspace { - QueryWorkspaceRequest request; - WorkspaceEventDeleteWorkspace(this.request); +class FolderEventDeleteWorkspace { + QueryWorkspaceRequest request; + FolderEventDeleteWorkspace(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.DeleteWorkspace.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.DeleteWorkspace.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventOpenWorkspace { - QueryWorkspaceRequest request; - WorkspaceEventOpenWorkspace(this.request); +class FolderEventOpenWorkspace { + QueryWorkspaceRequest request; + FolderEventOpenWorkspace(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.OpenWorkspace.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.OpenWorkspace.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(Workspace.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(Workspace.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventReadWorkspaceApps { - QueryWorkspaceRequest request; - WorkspaceEventReadWorkspaceApps(this.request); +class FolderEventReadWorkspaceApps { + QueryWorkspaceRequest request; + FolderEventReadWorkspaceApps(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadWorkspaceApps.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.ReadWorkspaceApps.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(RepeatedApp.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(RepeatedApp.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventCreateApp { - CreateAppRequest request; - WorkspaceEventCreateApp(this.request); +class FolderEventCreateApp { + CreateAppRequest request; + FolderEventCreateApp(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.CreateApp.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.CreateApp.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(App.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(App.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventDeleteApp { - QueryAppRequest request; - WorkspaceEventDeleteApp(this.request); +class FolderEventDeleteApp { + QueryAppRequest request; + FolderEventDeleteApp(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.DeleteApp.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.DeleteApp.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventReadApp { - QueryAppRequest request; - WorkspaceEventReadApp(this.request); +class FolderEventReadApp { + QueryAppRequest request; + FolderEventReadApp(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadApp.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.ReadApp.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(App.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(App.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventUpdateApp { - UpdateAppRequest request; - WorkspaceEventUpdateApp(this.request); +class FolderEventUpdateApp { + UpdateAppRequest request; + FolderEventUpdateApp(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.UpdateApp.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.UpdateApp.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventCreateView { - CreateViewRequest request; - WorkspaceEventCreateView(this.request); +class FolderEventCreateView { + CreateViewRequest request; + FolderEventCreateView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.CreateView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.CreateView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(View.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(View.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventReadView { - QueryViewRequest request; - WorkspaceEventReadView(this.request); +class FolderEventReadView { + QueryViewRequest request; + FolderEventReadView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.ReadView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(View.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(View.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventUpdateView { - UpdateViewRequest request; - WorkspaceEventUpdateView(this.request); +class FolderEventUpdateView { + UpdateViewRequest request; + FolderEventUpdateView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.UpdateView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.UpdateView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(View.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(View.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventDeleteView { - QueryViewRequest request; - WorkspaceEventDeleteView(this.request); +class FolderEventDeleteView { + QueryViewRequest request; + FolderEventDeleteView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.DeleteView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.DeleteView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventDuplicateView { - QueryViewRequest request; - WorkspaceEventDuplicateView(this.request); +class FolderEventDuplicateView { + QueryViewRequest request; + FolderEventDuplicateView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.DuplicateView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.DuplicateView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventCopyLink { - WorkspaceEventCopyLink(); +class FolderEventCopyLink { + FolderEventCopyLink(); - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.CopyLink.toString(); + Future> send() { + final request = FFIRequest.create()..event = FolderEvent.CopyLink.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } -class WorkspaceEventOpenDocument { - QueryViewRequest request; - WorkspaceEventOpenDocument(this.request); +class FolderEventOpenDocument { + QueryViewRequest request; + FolderEventOpenDocument(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.OpenDocument.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.OpenDocument.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(DocumentDelta.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(DocumentDelta.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventCloseView { - QueryViewRequest request; - WorkspaceEventCloseView(this.request); +class FolderEventCloseView { + QueryViewRequest request; + FolderEventCloseView(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.CloseView.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.CloseView.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventReadTrash { - WorkspaceEventReadTrash(); +class FolderEventReadTrash { + FolderEventReadTrash(); - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.ReadTrash.toString(); + Future> send() { + final request = FFIRequest.create()..event = FolderEvent.ReadTrash.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (okBytes) => left(RepeatedTrash.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(RepeatedTrash.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } -class WorkspaceEventPutbackTrash { - TrashId request; - WorkspaceEventPutbackTrash(this.request); +class FolderEventPutbackTrash { + TrashId request; + FolderEventPutbackTrash(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.PutbackTrash.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.PutbackTrash.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventDeleteTrash { - RepeatedTrashId request; - WorkspaceEventDeleteTrash(this.request); +class FolderEventDeleteTrash { + RepeatedTrashId request; + FolderEventDeleteTrash(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.DeleteTrash.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.DeleteTrash.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } -class WorkspaceEventRestoreAllTrash { - WorkspaceEventRestoreAllTrash(); +class FolderEventRestoreAllTrash { + FolderEventRestoreAllTrash(); - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.RestoreAllTrash.toString(); + Future> send() { + final request = FFIRequest.create()..event = FolderEvent.RestoreAllTrash.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } -class WorkspaceEventDeleteAllTrash { - WorkspaceEventDeleteAllTrash(); +class FolderEventDeleteAllTrash { + FolderEventDeleteAllTrash(); - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.DeleteAllTrash.toString(); + Future> send() { + final request = FFIRequest.create()..event = FolderEvent.DeleteAllTrash.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } -class WorkspaceEventApplyDocDelta { - DocumentDelta request; - WorkspaceEventApplyDocDelta(this.request); +class FolderEventApplyDocDelta { + DocumentDelta request; + FolderEventApplyDocDelta(this.request); - Future> send() { + Future> send() { + FFIRequest request = FFIRequest.create() + ..event = FolderEvent.ApplyDocDelta.toString() + ..payload = requestToBytes(this.request); + + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(DocumentDelta.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } +} + +class FolderEventExportDocument { + ExportRequest request; + FolderEventExportDocument(this.request); + + Future> send() { final request = FFIRequest.create() - ..event = WorkspaceEvent.ApplyDocDelta.toString() - ..payload = requestToBytes(this.request); + ..event = FolderEvent.ExportDocument.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(DocumentDelta.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(ExportData.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } -} - -class WorkspaceEventExportDocument { - ExportRequest request; - WorkspaceEventExportDocument(this.request); - - Future> send() { - final request = FFIRequest.create() - ..event = WorkspaceEvent.ExportDocument.toString() - ..payload = requestToBytes(this.request); - - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(ExportData.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + } } class NetworkEventUpdateNetworkType { - NetworkState request; - NetworkEventUpdateNetworkType(this.request); + NetworkState request; + NetworkEventUpdateNetworkType(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = NetworkEvent.UpdateNetworkType.toString() - ..payload = requestToBytes(this.request); + ..event = NetworkEvent.UpdateNetworkType.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } class UserEventInitUser { - UserEventInitUser(); + UserEventInitUser(); - Future> send() { - final request = FFIRequest.create() - ..event = UserEvent.InitUser.toString(); + Future> send() { + final request = FFIRequest.create()..event = UserEvent.InitUser.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } class UserEventSignIn { - SignInRequest request; - UserEventSignIn(this.request); + SignInRequest request; + UserEventSignIn(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = UserEvent.SignIn.toString() - ..payload = requestToBytes(this.request); + ..event = UserEvent.SignIn.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(UserProfile.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(UserProfile.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } class UserEventSignUp { - SignUpRequest request; - UserEventSignUp(this.request); + SignUpRequest request; + UserEventSignUp(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = UserEvent.SignUp.toString() - ..payload = requestToBytes(this.request); + ..event = UserEvent.SignUp.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (okBytes) => left(UserProfile.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(UserProfile.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } class UserEventSignOut { - UserEventSignOut(); + UserEventSignOut(); - Future> send() { - final request = FFIRequest.create() - ..event = UserEvent.SignOut.toString(); + Future> send() { + final request = FFIRequest.create()..event = UserEvent.SignOut.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } class UserEventUpdateUser { - UpdateUserRequest request; - UserEventUpdateUser(this.request); + UpdateUserRequest request; + UserEventUpdateUser(this.request); - Future> send() { + Future> send() { final request = FFIRequest.create() - ..event = UserEvent.UpdateUser.toString() - ..payload = requestToBytes(this.request); + ..event = UserEvent.UpdateUser.toString() + ..payload = requestToBytes(this.request); - return Dispatch.asyncRequest(request) - .then((bytesResult) => bytesResult.fold( - (bytes) => left(unit), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (bytes) => left(unit), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), )); - } + } } class UserEventGetUserProfile { - UserEventGetUserProfile(); + UserEventGetUserProfile(); - Future> send() { - final request = FFIRequest.create() - ..event = UserEvent.GetUserProfile.toString(); + Future> send() { + final request = FFIRequest.create()..event = UserEvent.GetUserProfile.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (okBytes) => left(UserProfile.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(UserProfile.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } class UserEventCheckUser { - UserEventCheckUser(); + UserEventCheckUser(); - Future> send() { - final request = FFIRequest.create() - ..event = UserEvent.CheckUser.toString(); + Future> send() { + final request = FFIRequest.create()..event = UserEvent.CheckUser.toString(); - return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( - (okBytes) => left(UserProfile.fromBuffer(okBytes)), - (errBytes) => right(FlowyError.fromBuffer(errBytes)), - )); - } + return Dispatch.asyncRequest(request).then((bytesResult) => bytesResult.fold( + (okBytes) => left(UserProfile.fromBuffer(okBytes)), + (errBytes) => right(FlowyError.fromBuffer(errBytes)), + )); + } } - diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart index 97fa0861f1..367261885a 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart @@ -8,7 +8,7 @@ import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-net/event.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-net/network_state.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user/event.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-core/event.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder/event.pb.dart'; import 'package:isolates/isolates.dart'; import 'package:isolates/ports.dart'; import 'package:ffi/ffi.dart'; @@ -19,7 +19,7 @@ import 'dart:typed_data'; import 'package:flowy_sdk/ffi.dart' as ffi; import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart'; -import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-collaboration/protobuf.dart'; // ignore: unused_import diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbenum.dart deleted file mode 100644 index 9ff51a4e56..0000000000 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbenum.dart +++ /dev/null @@ -1,48 +0,0 @@ -/// -// Generated code. Do not modify. -// source: dart_notification.proto -// -// @dart = 2.12 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields - -// ignore_for_file: UNDEFINED_SHOWN_NAME -import 'dart:core' as $core; -import 'package:protobuf/protobuf.dart' as $pb; - -class WorkspaceNotification extends $pb.ProtobufEnum { - static const WorkspaceNotification Unknown = WorkspaceNotification._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'Unknown'); - static const WorkspaceNotification UserCreateWorkspace = WorkspaceNotification._(10, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserCreateWorkspace'); - static const WorkspaceNotification UserDeleteWorkspace = WorkspaceNotification._(11, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserDeleteWorkspace'); - static const WorkspaceNotification WorkspaceUpdated = WorkspaceNotification._(12, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceUpdated'); - static const WorkspaceNotification WorkspaceListUpdated = WorkspaceNotification._(13, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceListUpdated'); - static const WorkspaceNotification WorkspaceAppsChanged = WorkspaceNotification._(14, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceAppsChanged'); - static const WorkspaceNotification AppUpdated = WorkspaceNotification._(21, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'AppUpdated'); - static const WorkspaceNotification AppViewsChanged = WorkspaceNotification._(24, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'AppViewsChanged'); - static const WorkspaceNotification ViewUpdated = WorkspaceNotification._(31, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewUpdated'); - static const WorkspaceNotification ViewDeleted = WorkspaceNotification._(32, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewDeleted'); - static const WorkspaceNotification ViewRestored = WorkspaceNotification._(33, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewRestored'); - static const WorkspaceNotification UserUnauthorized = WorkspaceNotification._(100, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserUnauthorized'); - static const WorkspaceNotification TrashUpdated = WorkspaceNotification._(1000, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'TrashUpdated'); - - static const $core.List values = [ - Unknown, - UserCreateWorkspace, - UserDeleteWorkspace, - WorkspaceUpdated, - WorkspaceListUpdated, - WorkspaceAppsChanged, - AppUpdated, - AppViewsChanged, - ViewUpdated, - ViewDeleted, - ViewRestored, - UserUnauthorized, - TrashUpdated, - ]; - - static final $core.Map<$core.int, WorkspaceNotification> _byValue = $pb.ProtobufEnum.initByValue(values); - static WorkspaceNotification? valueOf($core.int value) => _byValue[value]; - - const WorkspaceNotification._($core.int v, $core.String n) : super(v, n); -} - diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbenum.dart deleted file mode 100644 index a7b25077f7..0000000000 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbenum.dart +++ /dev/null @@ -1,72 +0,0 @@ -/// -// Generated code. Do not modify. -// source: event.proto -// -// @dart = 2.12 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields - -// ignore_for_file: UNDEFINED_SHOWN_NAME -import 'dart:core' as $core; -import 'package:protobuf/protobuf.dart' as $pb; - -class WorkspaceEvent extends $pb.ProtobufEnum { - static const WorkspaceEvent CreateWorkspace = WorkspaceEvent._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateWorkspace'); - static const WorkspaceEvent ReadCurWorkspace = WorkspaceEvent._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadCurWorkspace'); - static const WorkspaceEvent ReadWorkspaces = WorkspaceEvent._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadWorkspaces'); - static const WorkspaceEvent DeleteWorkspace = WorkspaceEvent._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteWorkspace'); - static const WorkspaceEvent OpenWorkspace = WorkspaceEvent._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'OpenWorkspace'); - static const WorkspaceEvent ReadWorkspaceApps = WorkspaceEvent._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadWorkspaceApps'); - static const WorkspaceEvent CreateApp = WorkspaceEvent._(101, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateApp'); - static const WorkspaceEvent DeleteApp = WorkspaceEvent._(102, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteApp'); - static const WorkspaceEvent ReadApp = WorkspaceEvent._(103, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadApp'); - static const WorkspaceEvent UpdateApp = WorkspaceEvent._(104, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UpdateApp'); - static const WorkspaceEvent CreateView = WorkspaceEvent._(201, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateView'); - static const WorkspaceEvent ReadView = WorkspaceEvent._(202, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadView'); - static const WorkspaceEvent UpdateView = WorkspaceEvent._(203, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UpdateView'); - static const WorkspaceEvent DeleteView = WorkspaceEvent._(204, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteView'); - static const WorkspaceEvent DuplicateView = WorkspaceEvent._(205, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DuplicateView'); - static const WorkspaceEvent CopyLink = WorkspaceEvent._(206, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CopyLink'); - static const WorkspaceEvent OpenDocument = WorkspaceEvent._(207, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'OpenDocument'); - static const WorkspaceEvent CloseView = WorkspaceEvent._(208, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CloseView'); - static const WorkspaceEvent ReadTrash = WorkspaceEvent._(300, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadTrash'); - static const WorkspaceEvent PutbackTrash = WorkspaceEvent._(301, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PutbackTrash'); - static const WorkspaceEvent DeleteTrash = WorkspaceEvent._(302, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteTrash'); - static const WorkspaceEvent RestoreAllTrash = WorkspaceEvent._(303, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'RestoreAllTrash'); - static const WorkspaceEvent DeleteAllTrash = WorkspaceEvent._(304, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteAllTrash'); - static const WorkspaceEvent ApplyDocDelta = WorkspaceEvent._(400, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ApplyDocDelta'); - static const WorkspaceEvent ExportDocument = WorkspaceEvent._(500, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ExportDocument'); - - static const $core.List values = [ - CreateWorkspace, - ReadCurWorkspace, - ReadWorkspaces, - DeleteWorkspace, - OpenWorkspace, - ReadWorkspaceApps, - CreateApp, - DeleteApp, - ReadApp, - UpdateApp, - CreateView, - ReadView, - UpdateView, - DeleteView, - DuplicateView, - CopyLink, - OpenDocument, - CloseView, - ReadTrash, - PutbackTrash, - DeleteTrash, - RestoreAllTrash, - DeleteAllTrash, - ApplyDocDelta, - ExportDocument, - ]; - - static final $core.Map<$core.int, WorkspaceEvent> _byValue = $pb.ProtobufEnum.initByValue(values); - static WorkspaceEvent? valueOf($core.int value) => _byValue[value]; - - const WorkspaceEvent._($core.int v, $core.String n) : super(v, n); -} - diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/app.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/errors.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/protobuf.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/protobuf.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/protobuf.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/protobuf.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/share.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/share.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/trash.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/view.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbenum.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbenum.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbenum.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbjson.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbjson.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder-data-model/workspace.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbenum.dart new file mode 100644 index 0000000000..5ecb48f9fd --- /dev/null +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbenum.dart @@ -0,0 +1,48 @@ +/// +// Generated code. Do not modify. +// source: dart_notification.proto +// +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields + +// ignore_for_file: UNDEFINED_SHOWN_NAME +import 'dart:core' as $core; +import 'package:protobuf/protobuf.dart' as $pb; + +class FolderNotification extends $pb.ProtobufEnum { + static const FolderNotification Unknown = FolderNotification._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'Unknown'); + static const FolderNotification UserCreateWorkspace = FolderNotification._(10, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserCreateWorkspace'); + static const FolderNotification UserDeleteWorkspace = FolderNotification._(11, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserDeleteWorkspace'); + static const FolderNotification WorkspaceUpdated = FolderNotification._(12, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceUpdated'); + static const FolderNotification WorkspaceListUpdated = FolderNotification._(13, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceListUpdated'); + static const FolderNotification WorkspaceAppsChanged = FolderNotification._(14, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'WorkspaceAppsChanged'); + static const FolderNotification AppUpdated = FolderNotification._(21, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'AppUpdated'); + static const FolderNotification AppViewsChanged = FolderNotification._(24, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'AppViewsChanged'); + static const FolderNotification ViewUpdated = FolderNotification._(31, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewUpdated'); + static const FolderNotification ViewDeleted = FolderNotification._(32, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewDeleted'); + static const FolderNotification ViewRestored = FolderNotification._(33, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ViewRestored'); + static const FolderNotification UserUnauthorized = FolderNotification._(100, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UserUnauthorized'); + static const FolderNotification TrashUpdated = FolderNotification._(1000, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'TrashUpdated'); + + static const $core.List values = [ + Unknown, + UserCreateWorkspace, + UserDeleteWorkspace, + WorkspaceUpdated, + WorkspaceListUpdated, + WorkspaceAppsChanged, + AppUpdated, + AppViewsChanged, + ViewUpdated, + ViewDeleted, + ViewRestored, + UserUnauthorized, + TrashUpdated, + ]; + + static final $core.Map<$core.int, FolderNotification> _byValue = $pb.ProtobufEnum.initByValue(values); + static FolderNotification? valueOf($core.int value) => _byValue[value]; + + const FolderNotification._($core.int v, $core.String n) : super(v, n); +} + diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbjson.dart similarity index 59% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbjson.dart index ea506ecce2..7cbe5621ba 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbjson.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbjson.dart @@ -8,9 +8,9 @@ import 'dart:core' as $core; import 'dart:convert' as $convert; import 'dart:typed_data' as $typed_data; -@$core.Deprecated('Use workspaceNotificationDescriptor instead') -const WorkspaceNotification$json = const { - '1': 'WorkspaceNotification', +@$core.Deprecated('Use folderNotificationDescriptor instead') +const FolderNotification$json = const { + '1': 'FolderNotification', '2': const [ const {'1': 'Unknown', '2': 0}, const {'1': 'UserCreateWorkspace', '2': 10}, @@ -28,5 +28,5 @@ const WorkspaceNotification$json = const { ], }; -/// Descriptor for `WorkspaceNotification`. Decode as a `google.protobuf.EnumDescriptorProto`. -final $typed_data.Uint8List workspaceNotificationDescriptor = $convert.base64Decode('ChVXb3Jrc3BhY2VOb3RpZmljYXRpb24SCwoHVW5rbm93bhAAEhcKE1VzZXJDcmVhdGVXb3Jrc3BhY2UQChIXChNVc2VyRGVsZXRlV29ya3NwYWNlEAsSFAoQV29ya3NwYWNlVXBkYXRlZBAMEhgKFFdvcmtzcGFjZUxpc3RVcGRhdGVkEA0SGAoUV29ya3NwYWNlQXBwc0NoYW5nZWQQDhIOCgpBcHBVcGRhdGVkEBUSEwoPQXBwVmlld3NDaGFuZ2VkEBgSDwoLVmlld1VwZGF0ZWQQHxIPCgtWaWV3RGVsZXRlZBAgEhAKDFZpZXdSZXN0b3JlZBAhEhQKEFVzZXJVbmF1dGhvcml6ZWQQZBIRCgxUcmFzaFVwZGF0ZWQQ6Ac='); +/// Descriptor for `FolderNotification`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List folderNotificationDescriptor = $convert.base64Decode('ChJGb2xkZXJOb3RpZmljYXRpb24SCwoHVW5rbm93bhAAEhcKE1VzZXJDcmVhdGVXb3Jrc3BhY2UQChIXChNVc2VyRGVsZXRlV29ya3NwYWNlEAsSFAoQV29ya3NwYWNlVXBkYXRlZBAMEhgKFFdvcmtzcGFjZUxpc3RVcGRhdGVkEA0SGAoUV29ya3NwYWNlQXBwc0NoYW5nZWQQDhIOCgpBcHBVcGRhdGVkEBUSEwoPQXBwVmlld3NDaGFuZ2VkEBgSDwoLVmlld1VwZGF0ZWQQHxIPCgtWaWV3RGVsZXRlZBAgEhAKDFZpZXdSZXN0b3JlZBAhEhQKEFVzZXJVbmF1dGhvcml6ZWQQZBIRCgxUcmFzaFVwZGF0ZWQQ6Ac='); diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/dart_notification.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/dart_notification.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pb.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pb.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pb.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbenum.dart new file mode 100644 index 0000000000..2d2853f0f0 --- /dev/null +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbenum.dart @@ -0,0 +1,72 @@ +/// +// Generated code. Do not modify. +// source: event.proto +// +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields + +// ignore_for_file: UNDEFINED_SHOWN_NAME +import 'dart:core' as $core; +import 'package:protobuf/protobuf.dart' as $pb; + +class FolderEvent extends $pb.ProtobufEnum { + static const FolderEvent CreateWorkspace = FolderEvent._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateWorkspace'); + static const FolderEvent ReadCurWorkspace = FolderEvent._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadCurWorkspace'); + static const FolderEvent ReadWorkspaces = FolderEvent._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadWorkspaces'); + static const FolderEvent DeleteWorkspace = FolderEvent._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteWorkspace'); + static const FolderEvent OpenWorkspace = FolderEvent._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'OpenWorkspace'); + static const FolderEvent ReadWorkspaceApps = FolderEvent._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadWorkspaceApps'); + static const FolderEvent CreateApp = FolderEvent._(101, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateApp'); + static const FolderEvent DeleteApp = FolderEvent._(102, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteApp'); + static const FolderEvent ReadApp = FolderEvent._(103, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadApp'); + static const FolderEvent UpdateApp = FolderEvent._(104, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UpdateApp'); + static const FolderEvent CreateView = FolderEvent._(201, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CreateView'); + static const FolderEvent ReadView = FolderEvent._(202, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadView'); + static const FolderEvent UpdateView = FolderEvent._(203, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'UpdateView'); + static const FolderEvent DeleteView = FolderEvent._(204, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteView'); + static const FolderEvent DuplicateView = FolderEvent._(205, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DuplicateView'); + static const FolderEvent CopyLink = FolderEvent._(206, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CopyLink'); + static const FolderEvent OpenDocument = FolderEvent._(207, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'OpenDocument'); + static const FolderEvent CloseView = FolderEvent._(208, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CloseView'); + static const FolderEvent ReadTrash = FolderEvent._(300, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ReadTrash'); + static const FolderEvent PutbackTrash = FolderEvent._(301, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PutbackTrash'); + static const FolderEvent DeleteTrash = FolderEvent._(302, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteTrash'); + static const FolderEvent RestoreAllTrash = FolderEvent._(303, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'RestoreAllTrash'); + static const FolderEvent DeleteAllTrash = FolderEvent._(304, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DeleteAllTrash'); + static const FolderEvent ApplyDocDelta = FolderEvent._(400, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ApplyDocDelta'); + static const FolderEvent ExportDocument = FolderEvent._(500, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ExportDocument'); + + static const $core.List values = [ + CreateWorkspace, + ReadCurWorkspace, + ReadWorkspaces, + DeleteWorkspace, + OpenWorkspace, + ReadWorkspaceApps, + CreateApp, + DeleteApp, + ReadApp, + UpdateApp, + CreateView, + ReadView, + UpdateView, + DeleteView, + DuplicateView, + CopyLink, + OpenDocument, + CloseView, + ReadTrash, + PutbackTrash, + DeleteTrash, + RestoreAllTrash, + DeleteAllTrash, + ApplyDocDelta, + ExportDocument, + ]; + + static final $core.Map<$core.int, FolderEvent> _byValue = $pb.ProtobufEnum.initByValue(values); + static FolderEvent? valueOf($core.int value) => _byValue[value]; + + const FolderEvent._($core.int v, $core.String n) : super(v, n); +} + diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbjson.dart similarity index 62% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbjson.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbjson.dart index 0ea157f94f..b16b98f20b 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbjson.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbjson.dart @@ -8,9 +8,9 @@ import 'dart:core' as $core; import 'dart:convert' as $convert; import 'dart:typed_data' as $typed_data; -@$core.Deprecated('Use workspaceEventDescriptor instead') -const WorkspaceEvent$json = const { - '1': 'WorkspaceEvent', +@$core.Deprecated('Use folderEventDescriptor instead') +const FolderEvent$json = const { + '1': 'FolderEvent', '2': const [ const {'1': 'CreateWorkspace', '2': 0}, const {'1': 'ReadCurWorkspace', '2': 1}, @@ -40,5 +40,5 @@ const WorkspaceEvent$json = const { ], }; -/// Descriptor for `WorkspaceEvent`. Decode as a `google.protobuf.EnumDescriptorProto`. -final $typed_data.Uint8List workspaceEventDescriptor = $convert.base64Decode('Cg5Xb3Jrc3BhY2VFdmVudBITCg9DcmVhdGVXb3Jrc3BhY2UQABIUChBSZWFkQ3VyV29ya3NwYWNlEAESEgoOUmVhZFdvcmtzcGFjZXMQAhITCg9EZWxldGVXb3Jrc3BhY2UQAxIRCg1PcGVuV29ya3NwYWNlEAQSFQoRUmVhZFdvcmtzcGFjZUFwcHMQBRINCglDcmVhdGVBcHAQZRINCglEZWxldGVBcHAQZhILCgdSZWFkQXBwEGcSDQoJVXBkYXRlQXBwEGgSDwoKQ3JlYXRlVmlldxDJARINCghSZWFkVmlldxDKARIPCgpVcGRhdGVWaWV3EMsBEg8KCkRlbGV0ZVZpZXcQzAESEgoNRHVwbGljYXRlVmlldxDNARINCghDb3B5TGluaxDOARIRCgxPcGVuRG9jdW1lbnQQzwESDgoJQ2xvc2VWaWV3ENABEg4KCVJlYWRUcmFzaBCsAhIRCgxQdXRiYWNrVHJhc2gQrQISEAoLRGVsZXRlVHJhc2gQrgISFAoPUmVzdG9yZUFsbFRyYXNoEK8CEhMKDkRlbGV0ZUFsbFRyYXNoELACEhIKDUFwcGx5RG9jRGVsdGEQkAMSEwoORXhwb3J0RG9jdW1lbnQQ9AM='); +/// Descriptor for `FolderEvent`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List folderEventDescriptor = $convert.base64Decode('CgtGb2xkZXJFdmVudBITCg9DcmVhdGVXb3Jrc3BhY2UQABIUChBSZWFkQ3VyV29ya3NwYWNlEAESEgoOUmVhZFdvcmtzcGFjZXMQAhITCg9EZWxldGVXb3Jrc3BhY2UQAxIRCg1PcGVuV29ya3NwYWNlEAQSFQoRUmVhZFdvcmtzcGFjZUFwcHMQBRINCglDcmVhdGVBcHAQZRINCglEZWxldGVBcHAQZhILCgdSZWFkQXBwEGcSDQoJVXBkYXRlQXBwEGgSDwoKQ3JlYXRlVmlldxDJARINCghSZWFkVmlldxDKARIPCgpVcGRhdGVWaWV3EMsBEg8KCkRlbGV0ZVZpZXcQzAESEgoNRHVwbGljYXRlVmlldxDNARINCghDb3B5TGluaxDOARIRCgxPcGVuRG9jdW1lbnQQzwESDgoJQ2xvc2VWaWV3ENABEg4KCVJlYWRUcmFzaBCsAhIRCgxQdXRiYWNrVHJhc2gQrQISEAoLRGVsZXRlVHJhc2gQrgISFAoPUmVzdG9yZUFsbFRyYXNoEK8CEhMKDkRlbGV0ZUFsbFRyYXNoELACEhIKDUFwcGx5RG9jRGVsdGEQkAMSEwoORXhwb3J0RG9jdW1lbnQQ9AM='); diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbserver.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/event.pbserver.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/event.pbserver.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/protobuf.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/protobuf.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core/protobuf.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-folder/protobuf.dart diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 0e48587fc8..b4033cb352 100755 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -9,7 +9,7 @@ members = [ "flowy-user", "flowy-test", "flowy-database", - "flowy-core", + "flowy-folder", "dart-notify", "flowy-document", "flowy-error", diff --git a/frontend/rust-lib/flowy-core/src/protobuf/model/dart_notification.rs b/frontend/rust-lib/flowy-core/src/protobuf/model/dart_notification.rs deleted file mode 100755 index 75cffdb1b4..0000000000 --- a/frontend/rust-lib/flowy-core/src/protobuf/model/dart_notification.rs +++ /dev/null @@ -1,159 +0,0 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit -// @generated - -// https://github.com/rust-lang/rust-clippy/issues/702 -#![allow(unknown_lints)] -#![allow(clippy::all)] - -#![allow(unused_attributes)] -#![cfg_attr(rustfmt, rustfmt::skip)] - -#![allow(box_pointers)] -#![allow(dead_code)] -#![allow(missing_docs)] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] -#![allow(non_upper_case_globals)] -#![allow(trivial_casts)] -#![allow(unused_imports)] -#![allow(unused_results)] -//! Generated file from `dart_notification.proto` - -/// Generated files are compatible only with the same version -/// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; - -#[derive(Clone,PartialEq,Eq,Debug,Hash)] -pub enum WorkspaceNotification { - Unknown = 0, - UserCreateWorkspace = 10, - UserDeleteWorkspace = 11, - WorkspaceUpdated = 12, - WorkspaceListUpdated = 13, - WorkspaceAppsChanged = 14, - AppUpdated = 21, - AppViewsChanged = 24, - ViewUpdated = 31, - ViewDeleted = 32, - ViewRestored = 33, - UserUnauthorized = 100, - TrashUpdated = 1000, -} - -impl ::protobuf::ProtobufEnum for WorkspaceNotification { - fn value(&self) -> i32 { - *self as i32 - } - - fn from_i32(value: i32) -> ::std::option::Option { - match value { - 0 => ::std::option::Option::Some(WorkspaceNotification::Unknown), - 10 => ::std::option::Option::Some(WorkspaceNotification::UserCreateWorkspace), - 11 => ::std::option::Option::Some(WorkspaceNotification::UserDeleteWorkspace), - 12 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceUpdated), - 13 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceListUpdated), - 14 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceAppsChanged), - 21 => ::std::option::Option::Some(WorkspaceNotification::AppUpdated), - 24 => ::std::option::Option::Some(WorkspaceNotification::AppViewsChanged), - 31 => ::std::option::Option::Some(WorkspaceNotification::ViewUpdated), - 32 => ::std::option::Option::Some(WorkspaceNotification::ViewDeleted), - 33 => ::std::option::Option::Some(WorkspaceNotification::ViewRestored), - 100 => ::std::option::Option::Some(WorkspaceNotification::UserUnauthorized), - 1000 => ::std::option::Option::Some(WorkspaceNotification::TrashUpdated), - _ => ::std::option::Option::None - } - } - - fn values() -> &'static [Self] { - static values: &'static [WorkspaceNotification] = &[ - WorkspaceNotification::Unknown, - WorkspaceNotification::UserCreateWorkspace, - WorkspaceNotification::UserDeleteWorkspace, - WorkspaceNotification::WorkspaceUpdated, - WorkspaceNotification::WorkspaceListUpdated, - WorkspaceNotification::WorkspaceAppsChanged, - WorkspaceNotification::AppUpdated, - WorkspaceNotification::AppViewsChanged, - WorkspaceNotification::ViewUpdated, - WorkspaceNotification::ViewDeleted, - WorkspaceNotification::ViewRestored, - WorkspaceNotification::UserUnauthorized, - WorkspaceNotification::TrashUpdated, - ]; - values - } - - fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT; - descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("WorkspaceNotification", file_descriptor_proto()) - }) - } -} - -impl ::std::marker::Copy for WorkspaceNotification { -} - -impl ::std::default::Default for WorkspaceNotification { - fn default() -> Self { - WorkspaceNotification::Unknown - } -} - -impl ::protobuf::reflect::ProtobufValue for WorkspaceNotification { - fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { - ::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self)) - } -} - -static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x17dart_notification.proto*\xa2\x02\n\x15WorkspaceNotification\x12\ - \x0b\n\x07Unknown\x10\0\x12\x17\n\x13UserCreateWorkspace\x10\n\x12\x17\n\ - \x13UserDeleteWorkspace\x10\x0b\x12\x14\n\x10WorkspaceUpdated\x10\x0c\ - \x12\x18\n\x14WorkspaceListUpdated\x10\r\x12\x18\n\x14WorkspaceAppsChang\ - ed\x10\x0e\x12\x0e\n\nAppUpdated\x10\x15\x12\x13\n\x0fAppViewsChanged\ - \x10\x18\x12\x0f\n\x0bViewUpdated\x10\x1f\x12\x0f\n\x0bViewDeleted\x10\ - \x20\x12\x10\n\x0cViewRestored\x10!\x12\x14\n\x10UserUnauthorized\x10d\ - \x12\x11\n\x0cTrashUpdated\x10\xe8\x07J\xbf\x04\n\x06\x12\x04\0\0\x10\ - \x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\x02\0\x10\ - \x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x1a\n\x0b\n\x04\x05\0\x02\0\x12\ - \x03\x03\x04\x10\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\x0b\n\x0c\n\ - \x05\x05\0\x02\0\x02\x12\x03\x03\x0e\x0f\n\x0b\n\x04\x05\0\x02\x01\x12\ - \x03\x04\x04\x1d\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\x04\x17\n\x0c\ - \n\x05\x05\0\x02\x01\x02\x12\x03\x04\x1a\x1c\n\x0b\n\x04\x05\0\x02\x02\ - \x12\x03\x05\x04\x1d\n\x0c\n\x05\x05\0\x02\x02\x01\x12\x03\x05\x04\x17\n\ - \x0c\n\x05\x05\0\x02\x02\x02\x12\x03\x05\x1a\x1c\n\x0b\n\x04\x05\0\x02\ - \x03\x12\x03\x06\x04\x1a\n\x0c\n\x05\x05\0\x02\x03\x01\x12\x03\x06\x04\ - \x14\n\x0c\n\x05\x05\0\x02\x03\x02\x12\x03\x06\x17\x19\n\x0b\n\x04\x05\0\ - \x02\x04\x12\x03\x07\x04\x1e\n\x0c\n\x05\x05\0\x02\x04\x01\x12\x03\x07\ - \x04\x18\n\x0c\n\x05\x05\0\x02\x04\x02\x12\x03\x07\x1b\x1d\n\x0b\n\x04\ - \x05\0\x02\x05\x12\x03\x08\x04\x1e\n\x0c\n\x05\x05\0\x02\x05\x01\x12\x03\ - \x08\x04\x18\n\x0c\n\x05\x05\0\x02\x05\x02\x12\x03\x08\x1b\x1d\n\x0b\n\ - \x04\x05\0\x02\x06\x12\x03\t\x04\x14\n\x0c\n\x05\x05\0\x02\x06\x01\x12\ - \x03\t\x04\x0e\n\x0c\n\x05\x05\0\x02\x06\x02\x12\x03\t\x11\x13\n\x0b\n\ - \x04\x05\0\x02\x07\x12\x03\n\x04\x19\n\x0c\n\x05\x05\0\x02\x07\x01\x12\ - \x03\n\x04\x13\n\x0c\n\x05\x05\0\x02\x07\x02\x12\x03\n\x16\x18\n\x0b\n\ - \x04\x05\0\x02\x08\x12\x03\x0b\x04\x15\n\x0c\n\x05\x05\0\x02\x08\x01\x12\ - \x03\x0b\x04\x0f\n\x0c\n\x05\x05\0\x02\x08\x02\x12\x03\x0b\x12\x14\n\x0b\ - \n\x04\x05\0\x02\t\x12\x03\x0c\x04\x15\n\x0c\n\x05\x05\0\x02\t\x01\x12\ - \x03\x0c\x04\x0f\n\x0c\n\x05\x05\0\x02\t\x02\x12\x03\x0c\x12\x14\n\x0b\n\ - \x04\x05\0\x02\n\x12\x03\r\x04\x16\n\x0c\n\x05\x05\0\x02\n\x01\x12\x03\r\ - \x04\x10\n\x0c\n\x05\x05\0\x02\n\x02\x12\x03\r\x13\x15\n\x0b\n\x04\x05\0\ - \x02\x0b\x12\x03\x0e\x04\x1b\n\x0c\n\x05\x05\0\x02\x0b\x01\x12\x03\x0e\ - \x04\x14\n\x0c\n\x05\x05\0\x02\x0b\x02\x12\x03\x0e\x17\x1a\n\x0b\n\x04\ - \x05\0\x02\x0c\x12\x03\x0f\x04\x18\n\x0c\n\x05\x05\0\x02\x0c\x01\x12\x03\ - \x0f\x04\x10\n\x0c\n\x05\x05\0\x02\x0c\x02\x12\x03\x0f\x13\x17b\x06proto\ - 3\ -"; - -static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT; - -fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { - ::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap() -} - -pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) -} diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml similarity index 91% rename from frontend/rust-lib/flowy-core/Cargo.toml rename to frontend/rust-lib/flowy-folder/Cargo.toml index c29e395f58..b8ae1e251b 100755 --- a/frontend/rust-lib/flowy-core/Cargo.toml +++ b/frontend/rust-lib/flowy-folder/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "flowy-core" +name = "flowy-folder" version = "0.1.0" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -flowy-core-data-model = { path = "../../../shared-lib/flowy-core-data-model" } +flowy-folder-data-model = { path = "../../../shared-lib/flowy-folder-data-model" } flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration" } flowy-derive = { path = "../../../shared-lib/flowy-derive" } lib-ot = { path = "../../../shared-lib/lib-ot" } @@ -46,7 +46,7 @@ chrono = "0.4" [dev-dependencies] serial_test = "0.5.1" serde_json = "1.0" -flowy-core = { path = "../flowy-core", features = ["flowy_unit_test"]} +flowy-folder = { path = "../flowy-folder", features = ["flowy_unit_test"]} flowy-test = { path = "../flowy-test" } [features] diff --git a/frontend/rust-lib/flowy-core/Flowy.toml b/frontend/rust-lib/flowy-folder/Flowy.toml similarity index 100% rename from frontend/rust-lib/flowy-core/Flowy.toml rename to frontend/rust-lib/flowy-folder/Flowy.toml diff --git a/frontend/rust-lib/flowy-core/src/controller.rs b/frontend/rust-lib/flowy-folder/src/controller.rs similarity index 97% rename from frontend/rust-lib/flowy-core/src/controller.rs rename to frontend/rust-lib/flowy-folder/src/controller.rs index 79f04815a6..bebaf8837d 100755 --- a/frontend/rust-lib/flowy-core/src/controller.rs +++ b/frontend/rust-lib/flowy-folder/src/controller.rs @@ -1,7 +1,7 @@ use bytes::Bytes; use chrono::Utc; use flowy_collaboration::client_document::default::{initial_delta, initial_read_me}; -use flowy_core_data_model::user_default; +use flowy_folder_data_model::user_default; use flowy_sync::RevisionWebSocket; use lazy_static::lazy_static; @@ -12,7 +12,7 @@ use std::{collections::HashMap, convert::TryInto, fmt::Formatter, sync::Arc}; use tokio::sync::RwLock as TokioRwLock; use crate::{ - dart_notification::{send_dart_notification, WorkspaceNotification}, + dart_notification::{send_dart_notification, FolderNotification}, entities::workspace::RepeatedWorkspace, errors::FlowyResult, module::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser}, @@ -210,7 +210,7 @@ impl DefaultFolderBuilder { let folder_id = FolderId::new(user_id); let _ = persistence.save_folder(user_id, &folder_id, folder).await?; let repeated_workspace = RepeatedWorkspace { items: vec![workspace] }; - send_dart_notification(token, WorkspaceNotification::UserCreateWorkspace) + send_dart_notification(token, FolderNotification::UserCreateWorkspace) .payload(repeated_workspace) .send(); Ok(()) diff --git a/frontend/rust-lib/flowy-core/src/dart_notification.rs b/frontend/rust-lib/flowy-folder/src/dart_notification.rs similarity index 62% rename from frontend/rust-lib/flowy-core/src/dart_notification.rs rename to frontend/rust-lib/flowy-folder/src/dart_notification.rs index 8bdc4ba782..9daaa6c387 100755 --- a/frontend/rust-lib/flowy-core/src/dart_notification.rs +++ b/frontend/rust-lib/flowy-folder/src/dart_notification.rs @@ -3,7 +3,7 @@ use flowy_derive::ProtoBuf_Enum; const OBSERVABLE_CATEGORY: &str = "Workspace"; #[derive(ProtoBuf_Enum, Debug)] -pub(crate) enum WorkspaceNotification { +pub(crate) enum FolderNotification { Unknown = 0, UserCreateWorkspace = 10, UserDeleteWorkspace = 11, @@ -19,24 +19,24 @@ pub(crate) enum WorkspaceNotification { TrashUpdated = 1000, } -impl std::default::Default for WorkspaceNotification { +impl std::default::Default for FolderNotification { fn default() -> Self { - WorkspaceNotification::Unknown + FolderNotification::Unknown } } -impl std::convert::From for i32 { - fn from(notification: WorkspaceNotification) -> Self { +impl std::convert::From for i32 { + fn from(notification: FolderNotification) -> Self { notification as i32 } } #[tracing::instrument(level = "trace")] -pub(crate) fn send_dart_notification(id: &str, ty: WorkspaceNotification) -> DartNotifyBuilder { +pub(crate) fn send_dart_notification(id: &str, ty: FolderNotification) -> DartNotifyBuilder { DartNotifyBuilder::new(id, ty, OBSERVABLE_CATEGORY) } #[tracing::instrument(level = "trace")] -pub(crate) fn send_anonymous_dart_notification(ty: WorkspaceNotification) -> DartNotifyBuilder { +pub(crate) fn send_anonymous_dart_notification(ty: FolderNotification) -> DartNotifyBuilder { DartNotifyBuilder::new("", ty, OBSERVABLE_CATEGORY) } diff --git a/frontend/rust-lib/flowy-core/src/event.rs b/frontend/rust-lib/flowy-folder/src/event.rs similarity index 98% rename from frontend/rust-lib/flowy-core/src/event.rs rename to frontend/rust-lib/flowy-folder/src/event.rs index 5972ed299f..121c8ac843 100755 --- a/frontend/rust-lib/flowy-core/src/event.rs +++ b/frontend/rust-lib/flowy-folder/src/event.rs @@ -3,7 +3,7 @@ use strum_macros::Display; #[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)] #[event_err = "FlowyError"] -pub enum WorkspaceEvent { +pub enum FolderEvent { #[event(input = "CreateWorkspaceRequest", output = "Workspace")] CreateWorkspace = 0, diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-folder/src/lib.rs similarity index 72% rename from frontend/rust-lib/flowy-core/src/lib.rs rename to frontend/rust-lib/flowy-folder/src/lib.rs index c37916024a..0a1d7b6716 100755 --- a/frontend/rust-lib/flowy-core/src/lib.rs +++ b/frontend/rust-lib/flowy-folder/src/lib.rs @@ -1,4 +1,4 @@ -pub use flowy_core_data_model::entities; +pub use flowy_folder_data_model::entities; pub mod event; pub mod module; @@ -16,7 +16,7 @@ pub mod protobuf; mod util; pub mod prelude { - pub use flowy_core_data_model::entities::{app::*, trash::*, view::*, workspace::*}; + pub use flowy_folder_data_model::entities::{app::*, trash::*, view::*, workspace::*}; pub use crate::{errors::*, module::*}; } diff --git a/frontend/rust-lib/flowy-core/src/macros.rs b/frontend/rust-lib/flowy-folder/src/macros.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/macros.rs rename to frontend/rust-lib/flowy-folder/src/macros.rs diff --git a/frontend/rust-lib/flowy-core/src/module.rs b/frontend/rust-lib/flowy-folder/src/module.rs similarity index 67% rename from frontend/rust-lib/flowy-core/src/module.rs rename to frontend/rust-lib/flowy-folder/src/module.rs index 64afe5cc0d..b3d2143db9 100755 --- a/frontend/rust-lib/flowy-core/src/module.rs +++ b/frontend/rust-lib/flowy-folder/src/module.rs @@ -7,7 +7,7 @@ use crate::{ workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId}, }, errors::FlowyError, - event::WorkspaceEvent, + event::FolderEvent, services::{app::event_handler::*, trash::event_handler::*, view::event_handler::*, workspace::event_handler::*}, }; use flowy_database::DBConnection; @@ -44,36 +44,36 @@ pub fn create(folder: Arc) -> Module { .data(folder.clone()); module = module - .event(WorkspaceEvent::CreateWorkspace, create_workspace_handler) - .event(WorkspaceEvent::ReadCurWorkspace, read_cur_workspace_handler) - .event(WorkspaceEvent::ReadWorkspaces, read_workspaces_handler) - .event(WorkspaceEvent::OpenWorkspace, open_workspace_handler) - .event(WorkspaceEvent::ReadWorkspaceApps, read_workspace_apps_handler); + .event(FolderEvent::CreateWorkspace, create_workspace_handler) + .event(FolderEvent::ReadCurWorkspace, read_cur_workspace_handler) + .event(FolderEvent::ReadWorkspaces, read_workspaces_handler) + .event(FolderEvent::OpenWorkspace, open_workspace_handler) + .event(FolderEvent::ReadWorkspaceApps, read_workspace_apps_handler); module = module - .event(WorkspaceEvent::CreateApp, create_app_handler) - .event(WorkspaceEvent::ReadApp, read_app_handler) - .event(WorkspaceEvent::UpdateApp, update_app_handler) - .event(WorkspaceEvent::DeleteApp, delete_app_handler); + .event(FolderEvent::CreateApp, create_app_handler) + .event(FolderEvent::ReadApp, read_app_handler) + .event(FolderEvent::UpdateApp, update_app_handler) + .event(FolderEvent::DeleteApp, delete_app_handler); module = module - .event(WorkspaceEvent::CreateView, create_view_handler) - .event(WorkspaceEvent::ReadView, read_view_handler) - .event(WorkspaceEvent::UpdateView, update_view_handler) - .event(WorkspaceEvent::DeleteView, delete_view_handler) - .event(WorkspaceEvent::DuplicateView, duplicate_view_handler) - .event(WorkspaceEvent::OpenDocument, open_document_handler) - .event(WorkspaceEvent::CloseView, close_view_handler) - .event(WorkspaceEvent::ApplyDocDelta, document_delta_handler); + .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::OpenDocument, open_document_handler) + .event(FolderEvent::CloseView, close_view_handler) + .event(FolderEvent::ApplyDocDelta, document_delta_handler); module = module - .event(WorkspaceEvent::ReadTrash, read_trash_handler) - .event(WorkspaceEvent::PutbackTrash, putback_trash_handler) - .event(WorkspaceEvent::DeleteTrash, delete_trash_handler) - .event(WorkspaceEvent::RestoreAllTrash, restore_all_trash_handler) - .event(WorkspaceEvent::DeleteAllTrash, delete_all_trash_handler); + .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); - module = module.event(WorkspaceEvent::ExportDocument, export_handler); + module = module.event(FolderEvent::ExportDocument, export_handler); module } diff --git a/frontend/rust-lib/flowy-core/src/protobuf/mod.rs b/frontend/rust-lib/flowy-folder/src/protobuf/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/protobuf/mod.rs rename to frontend/rust-lib/flowy-folder/src/protobuf/mod.rs diff --git a/frontend/rust-lib/flowy-folder/src/protobuf/model/dart_notification.rs b/frontend/rust-lib/flowy-folder/src/protobuf/model/dart_notification.rs new file mode 100755 index 0000000000..ea29698185 --- /dev/null +++ b/frontend/rust-lib/flowy-folder/src/protobuf/model/dart_notification.rs @@ -0,0 +1,158 @@ +// This file is generated by rust-protobuf 2.22.1. Do not edit +// @generated + +// https://github.com/rust-lang/rust-clippy/issues/702 +#![allow(unknown_lints)] +#![allow(clippy::all)] + +#![allow(unused_attributes)] +#![cfg_attr(rustfmt, rustfmt::skip)] + +#![allow(box_pointers)] +#![allow(dead_code)] +#![allow(missing_docs)] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +#![allow(non_upper_case_globals)] +#![allow(trivial_casts)] +#![allow(unused_imports)] +#![allow(unused_results)] +//! Generated file from `dart_notification.proto` + +/// Generated files are compatible only with the same version +/// of protobuf runtime. +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; + +#[derive(Clone,PartialEq,Eq,Debug,Hash)] +pub enum FolderNotification { + Unknown = 0, + UserCreateWorkspace = 10, + UserDeleteWorkspace = 11, + WorkspaceUpdated = 12, + WorkspaceListUpdated = 13, + WorkspaceAppsChanged = 14, + AppUpdated = 21, + AppViewsChanged = 24, + ViewUpdated = 31, + ViewDeleted = 32, + ViewRestored = 33, + UserUnauthorized = 100, + TrashUpdated = 1000, +} + +impl ::protobuf::ProtobufEnum for FolderNotification { + fn value(&self) -> i32 { + *self as i32 + } + + fn from_i32(value: i32) -> ::std::option::Option { + match value { + 0 => ::std::option::Option::Some(FolderNotification::Unknown), + 10 => ::std::option::Option::Some(FolderNotification::UserCreateWorkspace), + 11 => ::std::option::Option::Some(FolderNotification::UserDeleteWorkspace), + 12 => ::std::option::Option::Some(FolderNotification::WorkspaceUpdated), + 13 => ::std::option::Option::Some(FolderNotification::WorkspaceListUpdated), + 14 => ::std::option::Option::Some(FolderNotification::WorkspaceAppsChanged), + 21 => ::std::option::Option::Some(FolderNotification::AppUpdated), + 24 => ::std::option::Option::Some(FolderNotification::AppViewsChanged), + 31 => ::std::option::Option::Some(FolderNotification::ViewUpdated), + 32 => ::std::option::Option::Some(FolderNotification::ViewDeleted), + 33 => ::std::option::Option::Some(FolderNotification::ViewRestored), + 100 => ::std::option::Option::Some(FolderNotification::UserUnauthorized), + 1000 => ::std::option::Option::Some(FolderNotification::TrashUpdated), + _ => ::std::option::Option::None + } + } + + fn values() -> &'static [Self] { + static values: &'static [FolderNotification] = &[ + FolderNotification::Unknown, + FolderNotification::UserCreateWorkspace, + FolderNotification::UserDeleteWorkspace, + FolderNotification::WorkspaceUpdated, + FolderNotification::WorkspaceListUpdated, + FolderNotification::WorkspaceAppsChanged, + FolderNotification::AppUpdated, + FolderNotification::AppViewsChanged, + FolderNotification::ViewUpdated, + FolderNotification::ViewDeleted, + FolderNotification::ViewRestored, + FolderNotification::UserUnauthorized, + FolderNotification::TrashUpdated, + ]; + values + } + + fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { + static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT; + descriptor.get(|| { + ::protobuf::reflect::EnumDescriptor::new_pb_name::("FolderNotification", file_descriptor_proto()) + }) + } +} + +impl ::std::marker::Copy for FolderNotification { +} + +impl ::std::default::Default for FolderNotification { + fn default() -> Self { + FolderNotification::Unknown + } +} + +impl ::protobuf::reflect::ProtobufValue for FolderNotification { + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self)) + } +} + +static file_descriptor_proto_data: &'static [u8] = b"\ + \n\x17dart_notification.proto*\x9f\x02\n\x12FolderNotification\x12\x0b\n\ + \x07Unknown\x10\0\x12\x17\n\x13UserCreateWorkspace\x10\n\x12\x17\n\x13Us\ + erDeleteWorkspace\x10\x0b\x12\x14\n\x10WorkspaceUpdated\x10\x0c\x12\x18\ + \n\x14WorkspaceListUpdated\x10\r\x12\x18\n\x14WorkspaceAppsChanged\x10\ + \x0e\x12\x0e\n\nAppUpdated\x10\x15\x12\x13\n\x0fAppViewsChanged\x10\x18\ + \x12\x0f\n\x0bViewUpdated\x10\x1f\x12\x0f\n\x0bViewDeleted\x10\x20\x12\ + \x10\n\x0cViewRestored\x10!\x12\x14\n\x10UserUnauthorized\x10d\x12\x11\n\ + \x0cTrashUpdated\x10\xe8\x07J\xbf\x04\n\x06\x12\x04\0\0\x10\x01\n\x08\n\ + \x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\x02\0\x10\x01\n\n\n\x03\ + \x05\0\x01\x12\x03\x02\x05\x17\n\x0b\n\x04\x05\0\x02\0\x12\x03\x03\x04\ + \x10\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\x0b\n\x0c\n\x05\x05\0\ + \x02\0\x02\x12\x03\x03\x0e\x0f\n\x0b\n\x04\x05\0\x02\x01\x12\x03\x04\x04\ + \x1d\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\x04\x17\n\x0c\n\x05\x05\0\ + \x02\x01\x02\x12\x03\x04\x1a\x1c\n\x0b\n\x04\x05\0\x02\x02\x12\x03\x05\ + \x04\x1d\n\x0c\n\x05\x05\0\x02\x02\x01\x12\x03\x05\x04\x17\n\x0c\n\x05\ + \x05\0\x02\x02\x02\x12\x03\x05\x1a\x1c\n\x0b\n\x04\x05\0\x02\x03\x12\x03\ + \x06\x04\x1a\n\x0c\n\x05\x05\0\x02\x03\x01\x12\x03\x06\x04\x14\n\x0c\n\ + \x05\x05\0\x02\x03\x02\x12\x03\x06\x17\x19\n\x0b\n\x04\x05\0\x02\x04\x12\ + \x03\x07\x04\x1e\n\x0c\n\x05\x05\0\x02\x04\x01\x12\x03\x07\x04\x18\n\x0c\ + \n\x05\x05\0\x02\x04\x02\x12\x03\x07\x1b\x1d\n\x0b\n\x04\x05\0\x02\x05\ + \x12\x03\x08\x04\x1e\n\x0c\n\x05\x05\0\x02\x05\x01\x12\x03\x08\x04\x18\n\ + \x0c\n\x05\x05\0\x02\x05\x02\x12\x03\x08\x1b\x1d\n\x0b\n\x04\x05\0\x02\ + \x06\x12\x03\t\x04\x14\n\x0c\n\x05\x05\0\x02\x06\x01\x12\x03\t\x04\x0e\n\ + \x0c\n\x05\x05\0\x02\x06\x02\x12\x03\t\x11\x13\n\x0b\n\x04\x05\0\x02\x07\ + \x12\x03\n\x04\x19\n\x0c\n\x05\x05\0\x02\x07\x01\x12\x03\n\x04\x13\n\x0c\ + \n\x05\x05\0\x02\x07\x02\x12\x03\n\x16\x18\n\x0b\n\x04\x05\0\x02\x08\x12\ + \x03\x0b\x04\x15\n\x0c\n\x05\x05\0\x02\x08\x01\x12\x03\x0b\x04\x0f\n\x0c\ + \n\x05\x05\0\x02\x08\x02\x12\x03\x0b\x12\x14\n\x0b\n\x04\x05\0\x02\t\x12\ + \x03\x0c\x04\x15\n\x0c\n\x05\x05\0\x02\t\x01\x12\x03\x0c\x04\x0f\n\x0c\n\ + \x05\x05\0\x02\t\x02\x12\x03\x0c\x12\x14\n\x0b\n\x04\x05\0\x02\n\x12\x03\ + \r\x04\x16\n\x0c\n\x05\x05\0\x02\n\x01\x12\x03\r\x04\x10\n\x0c\n\x05\x05\ + \0\x02\n\x02\x12\x03\r\x13\x15\n\x0b\n\x04\x05\0\x02\x0b\x12\x03\x0e\x04\ + \x1b\n\x0c\n\x05\x05\0\x02\x0b\x01\x12\x03\x0e\x04\x14\n\x0c\n\x05\x05\0\ + \x02\x0b\x02\x12\x03\x0e\x17\x1a\n\x0b\n\x04\x05\0\x02\x0c\x12\x03\x0f\ + \x04\x18\n\x0c\n\x05\x05\0\x02\x0c\x01\x12\x03\x0f\x04\x10\n\x0c\n\x05\ + \x05\0\x02\x0c\x02\x12\x03\x0f\x13\x17b\x06proto3\ +"; + +static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT; + +fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { + ::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap() +} + +pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { + file_descriptor_proto_lazy.get(|| { + parse_descriptor_proto() + }) +} diff --git a/frontend/rust-lib/flowy-core/src/protobuf/model/event.rs b/frontend/rust-lib/flowy-folder/src/protobuf/model/event.rs similarity index 64% rename from frontend/rust-lib/flowy-core/src/protobuf/model/event.rs rename to frontend/rust-lib/flowy-folder/src/protobuf/model/event.rs index 3138e05137..f37d118e5e 100755 --- a/frontend/rust-lib/flowy-core/src/protobuf/model/event.rs +++ b/frontend/rust-lib/flowy-folder/src/protobuf/model/event.rs @@ -24,7 +24,7 @@ // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; #[derive(Clone,PartialEq,Eq,Debug,Hash)] -pub enum WorkspaceEvent { +pub enum FolderEvent { CreateWorkspace = 0, ReadCurWorkspace = 1, ReadWorkspaces = 2, @@ -52,69 +52,69 @@ pub enum WorkspaceEvent { ExportDocument = 500, } -impl ::protobuf::ProtobufEnum for WorkspaceEvent { +impl ::protobuf::ProtobufEnum for FolderEvent { fn value(&self) -> i32 { *self as i32 } - fn from_i32(value: i32) -> ::std::option::Option { + fn from_i32(value: i32) -> ::std::option::Option { match value { - 0 => ::std::option::Option::Some(WorkspaceEvent::CreateWorkspace), - 1 => ::std::option::Option::Some(WorkspaceEvent::ReadCurWorkspace), - 2 => ::std::option::Option::Some(WorkspaceEvent::ReadWorkspaces), - 3 => ::std::option::Option::Some(WorkspaceEvent::DeleteWorkspace), - 4 => ::std::option::Option::Some(WorkspaceEvent::OpenWorkspace), - 5 => ::std::option::Option::Some(WorkspaceEvent::ReadWorkspaceApps), - 101 => ::std::option::Option::Some(WorkspaceEvent::CreateApp), - 102 => ::std::option::Option::Some(WorkspaceEvent::DeleteApp), - 103 => ::std::option::Option::Some(WorkspaceEvent::ReadApp), - 104 => ::std::option::Option::Some(WorkspaceEvent::UpdateApp), - 201 => ::std::option::Option::Some(WorkspaceEvent::CreateView), - 202 => ::std::option::Option::Some(WorkspaceEvent::ReadView), - 203 => ::std::option::Option::Some(WorkspaceEvent::UpdateView), - 204 => ::std::option::Option::Some(WorkspaceEvent::DeleteView), - 205 => ::std::option::Option::Some(WorkspaceEvent::DuplicateView), - 206 => ::std::option::Option::Some(WorkspaceEvent::CopyLink), - 207 => ::std::option::Option::Some(WorkspaceEvent::OpenDocument), - 208 => ::std::option::Option::Some(WorkspaceEvent::CloseView), - 300 => ::std::option::Option::Some(WorkspaceEvent::ReadTrash), - 301 => ::std::option::Option::Some(WorkspaceEvent::PutbackTrash), - 302 => ::std::option::Option::Some(WorkspaceEvent::DeleteTrash), - 303 => ::std::option::Option::Some(WorkspaceEvent::RestoreAllTrash), - 304 => ::std::option::Option::Some(WorkspaceEvent::DeleteAllTrash), - 400 => ::std::option::Option::Some(WorkspaceEvent::ApplyDocDelta), - 500 => ::std::option::Option::Some(WorkspaceEvent::ExportDocument), + 0 => ::std::option::Option::Some(FolderEvent::CreateWorkspace), + 1 => ::std::option::Option::Some(FolderEvent::ReadCurWorkspace), + 2 => ::std::option::Option::Some(FolderEvent::ReadWorkspaces), + 3 => ::std::option::Option::Some(FolderEvent::DeleteWorkspace), + 4 => ::std::option::Option::Some(FolderEvent::OpenWorkspace), + 5 => ::std::option::Option::Some(FolderEvent::ReadWorkspaceApps), + 101 => ::std::option::Option::Some(FolderEvent::CreateApp), + 102 => ::std::option::Option::Some(FolderEvent::DeleteApp), + 103 => ::std::option::Option::Some(FolderEvent::ReadApp), + 104 => ::std::option::Option::Some(FolderEvent::UpdateApp), + 201 => ::std::option::Option::Some(FolderEvent::CreateView), + 202 => ::std::option::Option::Some(FolderEvent::ReadView), + 203 => ::std::option::Option::Some(FolderEvent::UpdateView), + 204 => ::std::option::Option::Some(FolderEvent::DeleteView), + 205 => ::std::option::Option::Some(FolderEvent::DuplicateView), + 206 => ::std::option::Option::Some(FolderEvent::CopyLink), + 207 => ::std::option::Option::Some(FolderEvent::OpenDocument), + 208 => ::std::option::Option::Some(FolderEvent::CloseView), + 300 => ::std::option::Option::Some(FolderEvent::ReadTrash), + 301 => ::std::option::Option::Some(FolderEvent::PutbackTrash), + 302 => ::std::option::Option::Some(FolderEvent::DeleteTrash), + 303 => ::std::option::Option::Some(FolderEvent::RestoreAllTrash), + 304 => ::std::option::Option::Some(FolderEvent::DeleteAllTrash), + 400 => ::std::option::Option::Some(FolderEvent::ApplyDocDelta), + 500 => ::std::option::Option::Some(FolderEvent::ExportDocument), _ => ::std::option::Option::None } } fn values() -> &'static [Self] { - static values: &'static [WorkspaceEvent] = &[ - WorkspaceEvent::CreateWorkspace, - WorkspaceEvent::ReadCurWorkspace, - WorkspaceEvent::ReadWorkspaces, - WorkspaceEvent::DeleteWorkspace, - WorkspaceEvent::OpenWorkspace, - WorkspaceEvent::ReadWorkspaceApps, - WorkspaceEvent::CreateApp, - WorkspaceEvent::DeleteApp, - WorkspaceEvent::ReadApp, - WorkspaceEvent::UpdateApp, - WorkspaceEvent::CreateView, - WorkspaceEvent::ReadView, - WorkspaceEvent::UpdateView, - WorkspaceEvent::DeleteView, - WorkspaceEvent::DuplicateView, - WorkspaceEvent::CopyLink, - WorkspaceEvent::OpenDocument, - WorkspaceEvent::CloseView, - WorkspaceEvent::ReadTrash, - WorkspaceEvent::PutbackTrash, - WorkspaceEvent::DeleteTrash, - WorkspaceEvent::RestoreAllTrash, - WorkspaceEvent::DeleteAllTrash, - WorkspaceEvent::ApplyDocDelta, - WorkspaceEvent::ExportDocument, + static values: &'static [FolderEvent] = &[ + FolderEvent::CreateWorkspace, + FolderEvent::ReadCurWorkspace, + FolderEvent::ReadWorkspaces, + FolderEvent::DeleteWorkspace, + FolderEvent::OpenWorkspace, + FolderEvent::ReadWorkspaceApps, + FolderEvent::CreateApp, + FolderEvent::DeleteApp, + FolderEvent::ReadApp, + FolderEvent::UpdateApp, + FolderEvent::CreateView, + FolderEvent::ReadView, + FolderEvent::UpdateView, + FolderEvent::DeleteView, + FolderEvent::DuplicateView, + FolderEvent::CopyLink, + FolderEvent::OpenDocument, + FolderEvent::CloseView, + FolderEvent::ReadTrash, + FolderEvent::PutbackTrash, + FolderEvent::DeleteTrash, + FolderEvent::RestoreAllTrash, + FolderEvent::DeleteAllTrash, + FolderEvent::ApplyDocDelta, + FolderEvent::ExportDocument, ]; values } @@ -122,31 +122,31 @@ impl ::protobuf::ProtobufEnum for WorkspaceEvent { fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("WorkspaceEvent", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("FolderEvent", file_descriptor_proto()) }) } } -impl ::std::marker::Copy for WorkspaceEvent { +impl ::std::marker::Copy for FolderEvent { } -impl ::std::default::Default for WorkspaceEvent { +impl ::std::default::Default for FolderEvent { fn default() -> Self { - WorkspaceEvent::CreateWorkspace + FolderEvent::CreateWorkspace } } -impl ::protobuf::reflect::ProtobufValue for WorkspaceEvent { +impl ::protobuf::reflect::ProtobufValue for FolderEvent { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self)) } } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x0bevent.proto*\xd9\x03\n\x0eWorkspaceEvent\x12\x13\n\x0fCreateWorksp\ - ace\x10\0\x12\x14\n\x10ReadCurWorkspace\x10\x01\x12\x12\n\x0eReadWorkspa\ - ces\x10\x02\x12\x13\n\x0fDeleteWorkspace\x10\x03\x12\x11\n\rOpenWorkspac\ - e\x10\x04\x12\x15\n\x11ReadWorkspaceApps\x10\x05\x12\r\n\tCreateApp\x10e\ + \n\x0bevent.proto*\xd6\x03\n\x0bFolderEvent\x12\x13\n\x0fCreateWorkspace\ + \x10\0\x12\x14\n\x10ReadCurWorkspace\x10\x01\x12\x12\n\x0eReadWorkspaces\ + \x10\x02\x12\x13\n\x0fDeleteWorkspace\x10\x03\x12\x11\n\rOpenWorkspace\ + \x10\x04\x12\x15\n\x11ReadWorkspaceApps\x10\x05\x12\r\n\tCreateApp\x10e\ \x12\r\n\tDeleteApp\x10f\x12\x0b\n\x07ReadApp\x10g\x12\r\n\tUpdateApp\ \x10h\x12\x0f\n\nCreateView\x10\xc9\x01\x12\r\n\x08ReadView\x10\xca\x01\ \x12\x0f\n\nUpdateView\x10\xcb\x01\x12\x0f\n\nDeleteView\x10\xcc\x01\x12\ @@ -157,7 +157,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x02\x12\x13\n\x0eDeleteAllTrash\x10\xb0\x02\x12\x12\n\rApplyDocDelta\ \x10\x90\x03\x12\x13\n\x0eExportDocument\x10\xf4\x03J\xab\x08\n\x06\x12\ \x04\0\0\x1c\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\ - \x02\0\x1c\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x13\n\x0b\n\x04\x05\0\ + \x02\0\x1c\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x10\n\x0b\n\x04\x05\0\ \x02\0\x12\x03\x03\x04\x18\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\ \x13\n\x0c\n\x05\x05\0\x02\0\x02\x12\x03\x03\x16\x17\n\x0b\n\x04\x05\0\ \x02\x01\x12\x03\x04\x04\x19\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\ diff --git a/frontend/rust-lib/flowy-core/src/protobuf/model/mod.rs b/frontend/rust-lib/flowy-folder/src/protobuf/model/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/protobuf/model/mod.rs rename to frontend/rust-lib/flowy-folder/src/protobuf/model/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/protobuf/proto/dart_notification.proto b/frontend/rust-lib/flowy-folder/src/protobuf/proto/dart_notification.proto similarity index 92% rename from frontend/rust-lib/flowy-core/src/protobuf/proto/dart_notification.proto rename to frontend/rust-lib/flowy-folder/src/protobuf/proto/dart_notification.proto index 349a4b8db2..7a87552f7d 100755 --- a/frontend/rust-lib/flowy-core/src/protobuf/proto/dart_notification.proto +++ b/frontend/rust-lib/flowy-folder/src/protobuf/proto/dart_notification.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -enum WorkspaceNotification { +enum FolderNotification { Unknown = 0; UserCreateWorkspace = 10; UserDeleteWorkspace = 11; diff --git a/frontend/rust-lib/flowy-core/src/protobuf/proto/event.proto b/frontend/rust-lib/flowy-folder/src/protobuf/proto/event.proto similarity index 96% rename from frontend/rust-lib/flowy-core/src/protobuf/proto/event.proto rename to frontend/rust-lib/flowy-folder/src/protobuf/proto/event.proto index 802632167c..56d4fecd2d 100755 --- a/frontend/rust-lib/flowy-core/src/protobuf/proto/event.proto +++ b/frontend/rust-lib/flowy-folder/src/protobuf/proto/event.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -enum WorkspaceEvent { +enum FolderEvent { CreateWorkspace = 0; ReadCurWorkspace = 1; ReadWorkspaces = 2; diff --git a/frontend/rust-lib/flowy-core/src/services/app/controller.rs b/frontend/rust-lib/flowy-folder/src/services/app/controller.rs similarity index 97% rename from frontend/rust-lib/flowy-core/src/services/app/controller.rs rename to frontend/rust-lib/flowy-folder/src/services/app/controller.rs index 87cefdea2d..1ff093472a 100755 --- a/frontend/rust-lib/flowy-core/src/services/app/controller.rs +++ b/frontend/rust-lib/flowy-folder/src/services/app/controller.rs @@ -88,7 +88,7 @@ impl AppController { Ok(app) }) .await?; - send_dart_notification(&app_id, WorkspaceNotification::AppUpdated) + send_dart_notification(&app_id, FolderNotification::AppUpdated) .payload(app) .send(); let _ = self.update_app_on_server(params)?; @@ -147,7 +147,7 @@ impl AppController { .await { Ok(_) => { - send_dart_notification(&app.id, WorkspaceNotification::AppUpdated) + send_dart_notification(&app.id, FolderNotification::AppUpdated) .payload(app) .send(); } @@ -228,7 +228,7 @@ fn notify_apps_changed<'a>( transaction: &'a (dyn FolderPersistenceTransaction + 'a), ) -> FlowyResult<()> { let repeated_app = read_local_workspace_apps(workspace_id, trash_controller, transaction)?; - send_dart_notification(workspace_id, WorkspaceNotification::WorkspaceAppsChanged) + send_dart_notification(workspace_id, FolderNotification::WorkspaceAppsChanged) .payload(repeated_app) .send(); Ok(()) diff --git a/frontend/rust-lib/flowy-core/src/services/app/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/app/event_handler.rs rename to frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs diff --git a/frontend/rust-lib/flowy-core/src/services/app/mod.rs b/frontend/rust-lib/flowy-folder/src/services/app/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/app/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/app/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/folder_editor.rs b/frontend/rust-lib/flowy-folder/src/services/folder_editor.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/folder_editor.rs rename to frontend/rust-lib/flowy-folder/src/services/folder_editor.rs diff --git a/frontend/rust-lib/flowy-core/src/services/mod.rs b/frontend/rust-lib/flowy-folder/src/services/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/migration.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs similarity index 98% rename from frontend/rust-lib/flowy-core/src/services/persistence/migration.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs index 4e17a08f90..3447a844cf 100755 --- a/frontend/rust-lib/flowy-core/src/services/persistence/migration.rs +++ b/frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs @@ -3,13 +3,13 @@ use crate::{ services::persistence::{AppTableSql, TrashTableSql, ViewTableSql, WorkspaceTableSql}, }; use flowy_collaboration::{client_folder::FolderPad, entities::revision::md5}; -use flowy_core_data_model::entities::{ +use flowy_database::kv::KV; +use flowy_error::{FlowyError, FlowyResult}; +use flowy_folder_data_model::entities::{ app::{App, RepeatedApp}, view::{RepeatedView, View}, workspace::Workspace, }; -use flowy_database::kv::KV; -use flowy_error::{FlowyError, FlowyResult}; use std::sync::Arc; pub(crate) const V1_MIGRATION: &str = "FOLDER_V1_MIGRATION"; diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/mod.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs similarity index 99% rename from frontend/rust-lib/flowy-core/src/services/persistence/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs index 8dbf050433..b35edc8e0c 100755 --- a/frontend/rust-lib/flowy-core/src/services/persistence/mod.rs +++ b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs @@ -15,13 +15,13 @@ use crate::{ module::WorkspaceDatabase, services::{folder_editor::FolderEditor, persistence::migration::FolderMigration}, }; -use flowy_core_data_model::entities::{ +use flowy_error::{FlowyError, FlowyResult}; +use flowy_folder_data_model::entities::{ app::App, trash::{RepeatedTrash, Trash}, view::View, workspace::Workspace, }; -use flowy_error::{FlowyError, FlowyResult}; use flowy_sync::{mk_revision_disk_cache, RevisionRecord}; use lib_sqlite::ConnectionPool; diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/app_sql.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/app_sql.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/app_sql.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/app_sql.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/mod.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/trash_sql.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/trash_sql.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/trash_sql.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/trash_sql.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/v1_impl.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs similarity index 99% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/v1_impl.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs index 092f6b07a1..847fc8225a 100755 --- a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/v1_impl.rs +++ b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs @@ -6,13 +6,13 @@ use crate::services::persistence::{ }, FolderPersistenceTransaction, TrashTableSql, }; -use flowy_core_data_model::entities::{ +use flowy_error::FlowyResult; +use flowy_folder_data_model::entities::{ app::App, trash::{RepeatedTrash, Trash}, view::View, workspace::Workspace, }; -use flowy_error::FlowyResult; use lib_sqlite::DBConnection; pub struct V1Transaction<'a>(pub &'a DBConnection); diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/view_sql.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/view_sql.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_1/workspace_sql.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/workspace_sql.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_1/workspace_sql.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_1/workspace_sql.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_2/mod.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_2/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_2/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_2/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/persistence/version_2/v2_impl.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_2/v2_impl.rs similarity index 99% rename from frontend/rust-lib/flowy-core/src/services/persistence/version_2/v2_impl.rs rename to frontend/rust-lib/flowy-folder/src/services/persistence/version_2/v2_impl.rs index 233e95e116..88b9131fe1 100755 --- a/frontend/rust-lib/flowy-core/src/services/persistence/version_2/v2_impl.rs +++ b/frontend/rust-lib/flowy-folder/src/services/persistence/version_2/v2_impl.rs @@ -2,13 +2,13 @@ use crate::services::{ folder_editor::FolderEditor, persistence::{AppChangeset, FolderPersistenceTransaction, ViewChangeset, WorkspaceChangeset}, }; -use flowy_core_data_model::entities::{ +use flowy_error::{FlowyError, FlowyResult}; +use flowy_folder_data_model::entities::{ app::App, trash::{RepeatedTrash, Trash}, view::View, workspace::Workspace, }; -use flowy_error::{FlowyError, FlowyResult}; use std::sync::Arc; impl FolderPersistenceTransaction for FolderEditor { diff --git a/frontend/rust-lib/flowy-core/src/services/trash/controller.rs b/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs similarity index 98% rename from frontend/rust-lib/flowy-core/src/services/trash/controller.rs rename to frontend/rust-lib/flowy-folder/src/services/trash/controller.rs index d5087358b3..e978d77cee 100755 --- a/frontend/rust-lib/flowy-core/src/services/trash/controller.rs +++ b/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs @@ -1,5 +1,5 @@ use crate::{ - dart_notification::{send_anonymous_dart_notification, WorkspaceNotification}, + dart_notification::{send_anonymous_dart_notification, FolderNotification}, entities::trash::{RepeatedTrash, RepeatedTrashId, Trash, TrashId, TrashType}, errors::{FlowyError, FlowyResult}, module::{FolderCouldServiceV1, WorkspaceUser}, @@ -277,7 +277,7 @@ impl TrashController { #[tracing::instrument(skip(repeated_trash), fields(n_trash))] fn notify_trash_changed(repeated_trash: RepeatedTrash) { tracing::Span::current().record("n_trash", &repeated_trash.len()); - send_anonymous_dart_notification(WorkspaceNotification::TrashUpdated) + send_anonymous_dart_notification(FolderNotification::TrashUpdated) .payload(repeated_trash) .send(); } diff --git a/frontend/rust-lib/flowy-core/src/services/trash/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/trash/event_handler.rs rename to frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs diff --git a/frontend/rust-lib/flowy-core/src/services/trash/mod.rs b/frontend/rust-lib/flowy-folder/src/services/trash/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/trash/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/trash/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/view/controller.rs b/frontend/rust-lib/flowy-folder/src/services/view/controller.rs similarity index 96% rename from frontend/rust-lib/flowy-core/src/services/view/controller.rs rename to frontend/rust-lib/flowy-folder/src/services/view/controller.rs index 30f2a53834..be0ad5ac41 100755 --- a/frontend/rust-lib/flowy-core/src/services/view/controller.rs +++ b/frontend/rust-lib/flowy-folder/src/services/view/controller.rs @@ -9,7 +9,7 @@ use futures::{FutureExt, StreamExt}; use std::{collections::HashSet, sync::Arc}; use crate::{ - dart_notification::{send_dart_notification, WorkspaceNotification}, + dart_notification::{send_dart_notification, FolderNotification}, entities::{ trash::{RepeatedTrashId, TrashType}, view::{CreateViewParams, RepeatedView, UpdateViewParams, View, ViewId}, @@ -21,9 +21,9 @@ use crate::{ TrashController, TrashEvent, }, }; -use flowy_core_data_model::entities::share::{ExportData, ExportParams}; use flowy_database::kv::KV; use flowy_document::FlowyDocumentManager; +use flowy_folder_data_model::entities::share::{ExportData, ExportParams}; use lib_infra::uuid_string; const LATEST_VIEW_ID: &str = "latest_view_id"; @@ -219,7 +219,7 @@ impl ViewController { .begin_transaction(|transaction| { let _ = transaction.update_view(changeset)?; let view = transaction.read_view(&view_id)?; - send_dart_notification(&view_id, WorkspaceNotification::ViewUpdated) + send_dart_notification(&view_id, FolderNotification::ViewUpdated) .payload(view.clone()) .send(); let _ = notify_views_changed(&view.belong_to_id, self.trash_controller.clone(), &transaction)?; @@ -292,7 +292,7 @@ impl ViewController { .await { Ok(_) => { - send_dart_notification(&view.id, WorkspaceNotification::ViewUpdated) + send_dart_notification(&view.id, FolderNotification::ViewUpdated) .payload(view.clone()) .send(); } @@ -348,7 +348,7 @@ async fn handle_trash_event( let views = read_local_views_with_transaction(identifiers, &transaction)?; for view in views { let _ = notify_views_changed(&view.belong_to_id, trash_can.clone(), &transaction)?; - notify_dart(view, WorkspaceNotification::ViewDeleted); + notify_dart(view, FolderNotification::ViewDeleted); } Ok(()) }) @@ -361,7 +361,7 @@ async fn handle_trash_event( let views = read_local_views_with_transaction(identifiers, &transaction)?; for view in views { let _ = notify_views_changed(&view.belong_to_id, trash_can.clone(), &transaction)?; - notify_dart(view, WorkspaceNotification::ViewRestored); + notify_dart(view, FolderNotification::ViewRestored); } Ok(()) }) @@ -403,7 +403,7 @@ fn read_local_views_with_transaction<'a>( Ok(views) } -fn notify_dart(view: View, notification: WorkspaceNotification) { +fn notify_dart(view: View, notification: FolderNotification) { send_dart_notification(&view.id, notification).payload(view).send(); } @@ -415,7 +415,7 @@ fn notify_views_changed<'a>( ) -> FlowyResult<()> { let repeated_view = read_belonging_views_on_local(belong_to_id, trash_controller.clone(), transaction)?; tracing::Span::current().record("view_count", &format!("{}", repeated_view.len()).as_str()); - send_dart_notification(belong_to_id, WorkspaceNotification::AppViewsChanged) + send_dart_notification(belong_to_id, FolderNotification::AppViewsChanged) .payload(repeated_view) .send(); Ok(()) diff --git a/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs similarity index 97% rename from frontend/rust-lib/flowy-core/src/services/view/event_handler.rs rename to frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs index c5aa59a3b2..71b9634abd 100755 --- a/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs +++ b/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs @@ -10,7 +10,7 @@ use crate::{ services::{TrashController, ViewController}, }; use flowy_collaboration::entities::document_info::DocumentDelta; -use flowy_core_data_model::entities::share::{ExportData, ExportParams, ExportRequest}; +use flowy_folder_data_model::entities::share::{ExportData, ExportParams, ExportRequest}; use lib_dispatch::prelude::{data_result, Data, DataResult, Unit}; use std::{convert::TryInto, sync::Arc}; diff --git a/frontend/rust-lib/flowy-core/src/services/view/mod.rs b/frontend/rust-lib/flowy-folder/src/services/view/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/view/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/view/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/services/web_socket.rs b/frontend/rust-lib/flowy-folder/src/services/web_socket.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/web_socket.rs rename to frontend/rust-lib/flowy-folder/src/services/web_socket.rs diff --git a/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs b/frontend/rust-lib/flowy-folder/src/services/workspace/controller.rs similarity index 95% rename from frontend/rust-lib/flowy-core/src/services/workspace/controller.rs rename to frontend/rust-lib/flowy-folder/src/services/workspace/controller.rs index 00cff40d84..13724c6e5e 100755 --- a/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs +++ b/frontend/rust-lib/flowy-folder/src/services/workspace/controller.rs @@ -7,8 +7,8 @@ use crate::{ read_local_workspace_apps, TrashController, }, }; -use flowy_core_data_model::entities::{app::RepeatedApp, workspace::*}; use flowy_database::kv::KV; +use flowy_folder_data_model::entities::{app::RepeatedApp, workspace::*}; use std::sync::Arc; pub struct WorkspaceController { @@ -48,7 +48,7 @@ impl WorkspaceController { }) .await?; let repeated_workspace = RepeatedWorkspace { items: workspaces }; - send_dart_notification(&token, WorkspaceNotification::UserCreateWorkspace) + send_dart_notification(&token, FolderNotification::UserCreateWorkspace) .payload(repeated_workspace) .send(); set_current_workspace(&workspace.id); @@ -68,7 +68,7 @@ impl WorkspaceController { }) .await?; - send_dart_notification(&workspace_id, WorkspaceNotification::WorkspaceUpdated) + send_dart_notification(&workspace_id, FolderNotification::WorkspaceUpdated) .payload(workspace) .send(); let _ = self.update_workspace_on_server(params)?; @@ -87,7 +87,7 @@ impl WorkspaceController { self.read_local_workspaces(None, &user_id, &transaction) }) .await?; - send_dart_notification(&token, WorkspaceNotification::UserDeleteWorkspace) + send_dart_notification(&token, FolderNotification::UserDeleteWorkspace) .payload(repeated_workspace) .send(); let _ = self.delete_workspace_on_server(workspace_id)?; diff --git a/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs similarity index 96% rename from frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs rename to frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs index 4747f46c1d..5af07cd791 100755 --- a/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs +++ b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs @@ -1,10 +1,10 @@ use crate::{ controller::FolderManager, - dart_notification::{send_dart_notification, WorkspaceNotification}, + dart_notification::{send_dart_notification, FolderNotification}, errors::FlowyError, services::{get_current_workspace, read_local_workspace_apps, WorkspaceController}, }; -use flowy_core_data_model::entities::{ +use flowy_folder_data_model::entities::{ app::RepeatedApp, view::View, workspace::{CurrentWorkspaceSetting, QueryWorkspaceRequest, RepeatedWorkspace, WorkspaceId, *}, @@ -133,7 +133,7 @@ fn read_workspaces_on_server( }) .await?; - send_dart_notification(&token, WorkspaceNotification::WorkspaceListUpdated) + send_dart_notification(&token, FolderNotification::WorkspaceListUpdated) .payload(workspaces) .send(); Result::<(), FlowyError>::Ok(()) diff --git a/frontend/rust-lib/flowy-core/src/services/workspace/mod.rs b/frontend/rust-lib/flowy-folder/src/services/workspace/mod.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/services/workspace/mod.rs rename to frontend/rust-lib/flowy-folder/src/services/workspace/mod.rs diff --git a/frontend/rust-lib/flowy-core/src/util.rs b/frontend/rust-lib/flowy-folder/src/util.rs similarity index 100% rename from frontend/rust-lib/flowy-core/src/util.rs rename to frontend/rust-lib/flowy-folder/src/util.rs diff --git a/frontend/rust-lib/flowy-core/tests/workspace/folder_test.rs b/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs similarity index 98% rename from frontend/rust-lib/flowy-core/tests/workspace/folder_test.rs rename to frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs index 9092c10aab..97809bf377 100755 --- a/frontend/rust-lib/flowy-core/tests/workspace/folder_test.rs +++ b/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs @@ -1,6 +1,6 @@ use crate::script::{invalid_workspace_name_test_case, FolderScript::*, FolderTest}; use flowy_collaboration::{client_document::default::initial_delta_string, entities::revision::RevisionState}; -use flowy_core::entities::workspace::CreateWorkspaceRequest; +use flowy_folder::entities::workspace::CreateWorkspaceRequest; use flowy_test::{event_builder::*, FlowySDKTest}; #[tokio::test] @@ -84,7 +84,7 @@ async fn workspace_create_with_invalid_name() { }; assert_eq!( FolderEventBuilder::new(sdk) - .event(flowy_core::event::WorkspaceEvent::CreateWorkspace) + .event(flowy_folder::event::FolderEvent::CreateWorkspace) .request(request) .async_send() .await diff --git a/frontend/rust-lib/flowy-core/tests/workspace/helper.rs b/frontend/rust-lib/flowy-folder/tests/workspace/helper.rs similarity index 98% rename from frontend/rust-lib/flowy-core/tests/workspace/helper.rs rename to frontend/rust-lib/flowy-folder/tests/workspace/helper.rs index ce0e6a654e..6424782254 100755 --- a/frontend/rust-lib/flowy-core/tests/workspace/helper.rs +++ b/frontend/rust-lib/flowy-folder/tests/workspace/helper.rs @@ -1,6 +1,6 @@ use flowy_collaboration::entities::document_info::DocumentInfo; -use flowy_core::event::WorkspaceEvent::*; -use flowy_core_data_model::entities::{ +use flowy_folder::event::FolderEvent::*; +use flowy_folder_data_model::entities::{ app::{App, AppId, CreateAppRequest, QueryAppRequest, UpdateAppRequest}, trash::{RepeatedTrash, TrashId, TrashType}, view::{CreateViewRequest, QueryViewRequest, UpdateViewRequest, View, ViewType}, diff --git a/frontend/rust-lib/flowy-core/tests/workspace/main.rs b/frontend/rust-lib/flowy-folder/tests/workspace/main.rs similarity index 100% rename from frontend/rust-lib/flowy-core/tests/workspace/main.rs rename to frontend/rust-lib/flowy-folder/tests/workspace/main.rs diff --git a/frontend/rust-lib/flowy-core/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs similarity index 98% rename from frontend/rust-lib/flowy-core/tests/workspace/script.rs rename to frontend/rust-lib/flowy-folder/tests/workspace/script.rs index d3674f0a75..8e84d8883a 100755 --- a/frontend/rust-lib/flowy-core/tests/workspace/script.rs +++ b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs @@ -1,7 +1,7 @@ use crate::helper::*; use flowy_collaboration::entities::{document_info::DocumentInfo, revision::RevisionState}; -use flowy_core::{errors::ErrorCode, services::folder_editor::FolderEditor}; -use flowy_core_data_model::entities::{ +use flowy_folder::{errors::ErrorCode, services::folder_editor::FolderEditor}; +use flowy_folder_data_model::entities::{ app::{App, RepeatedApp}, trash::Trash, view::{RepeatedView, View, ViewType}, diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.toml index 13aeeb2d3e..d67e12606b 100755 --- a/frontend/rust-lib/flowy-net/Cargo.toml +++ b/frontend/rust-lib/flowy-net/Cargo.toml @@ -11,9 +11,9 @@ flowy-error = { path = "../flowy-error", features = ["collaboration"] } flowy-derive = { path = "../../../shared-lib/flowy-derive" } flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration"} backend-service = { path = "../../../shared-lib/backend-service" } -flowy-core-data-model = { path = "../../../shared-lib/flowy-core-data-model" } +flowy-folder-data-model = { path = "../../../shared-lib/flowy-folder-data-model" } flowy-user-data-model = { path = "../../../shared-lib/flowy-user-data-model"} -flowy-core = { path = "../flowy-core" } +flowy-folder = { path = "../flowy-folder" } 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/core.rs b/frontend/rust-lib/flowy-net/src/http_server/core.rs index 909726e518..494d67acf1 100755 --- a/frontend/rust-lib/flowy-net/src/http_server/core.rs +++ b/frontend/rust-lib/flowy-net/src/http_server/core.rs @@ -4,15 +4,15 @@ use backend_service::{ request::{HttpRequestBuilder, ResponseMiddleware}, response::FlowyResponse, }; -use flowy_core_data_model::entities::{ +use flowy_error::FlowyError; +use flowy_folder_data_model::entities::{ app::{App, AppId, CreateAppParams, UpdateAppParams}, trash::{RepeatedTrash, RepeatedTrashId}, view::{CreateViewParams, RepeatedViewId, UpdateViewParams, View, ViewId}, workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId}, }; -use flowy_error::FlowyError; -use flowy_core::module::{FolderCouldServiceV1, FolderCouldServiceV2}; +use flowy_folder::module::{FolderCouldServiceV1, FolderCouldServiceV2}; use lazy_static::lazy_static; use lib_infra::future::FutureResult; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-net/src/local_server/server.rs b/frontend/rust-lib/flowy-net/src/local_server/server.rs index 23ccef0b56..63baa1d9f8 100755 --- a/frontend/rust-lib/flowy-net/src/local_server/server.rs +++ b/frontend/rust-lib/flowy-net/src/local_server/server.rs @@ -13,8 +13,8 @@ use flowy_collaboration::{ server_folder::ServerFolderManager, synchronizer::{RevisionSyncResponse, RevisionUser}, }; -use flowy_core::module::{FolderCouldServiceV1, FolderCouldServiceV2}; use flowy_error::{internal_error, FlowyError}; +use flowy_folder::module::{FolderCouldServiceV1, FolderCouldServiceV2}; use futures_util::stream::StreamExt; use lib_ws::{WSChannel, WebSocketRawMessage}; use parking_lot::RwLock; @@ -248,13 +248,13 @@ impl RevisionUser for LocalRevisionUser { } } -use flowy_core_data_model::entities::{ +use flowy_document::DocumentCloudService; +use flowy_folder_data_model::entities::{ app::{App, AppId, CreateAppParams, RepeatedApp, UpdateAppParams}, trash::{RepeatedTrash, RepeatedTrashId}, view::{CreateViewParams, RepeatedView, RepeatedViewId, UpdateViewParams, View, ViewId}, workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId}, }; -use flowy_document::DocumentCloudService; use flowy_user::module::UserCloudService; use flowy_user_data_model::entities::{ SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile, diff --git a/frontend/rust-lib/flowy-sdk/Cargo.toml b/frontend/rust-lib/flowy-sdk/Cargo.toml index 269f14ec4e..4f8b69bdb0 100755 --- a/frontend/rust-lib/flowy-sdk/Cargo.toml +++ b/frontend/rust-lib/flowy-sdk/Cargo.toml @@ -10,7 +10,7 @@ lib-dispatch = { path = "../lib-dispatch" } lib-log = { path = "../lib-log" } flowy-user = { path = "../flowy-user" } flowy-net = { path = "../flowy-net" } -flowy-core = { path = "../flowy-core", default-features = false } +flowy-folder = { path = "../flowy-folder", default-features = false } flowy-database = { path = "../flowy-database" } flowy-document = { path = "../flowy-document" } flowy-sync = { path = "../flowy-sync" } @@ -38,5 +38,5 @@ tokio = { version = "1", features = ["full"]} futures-util = "0.3.15" [features] -http_server = ["flowy-user/http_server", "flowy-core/http_server", "flowy-document/http_server"] +http_server = ["flowy-user/http_server", "flowy-folder/http_server", "flowy-document/http_server"] use_bunyan = ["lib-log/use_bunyan"] \ No newline at end of file diff --git a/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs b/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs index fdc9c4d1ca..7a06b3af3e 100755 --- a/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs +++ b/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs @@ -1,13 +1,13 @@ use backend_service::configuration::ClientServerConfiguration; use bytes::Bytes; use flowy_collaboration::entities::ws_data::ClientRevisionWSData; -use flowy_core::{ +use flowy_database::ConnectionPool; +use flowy_document::FlowyDocumentManager; +use flowy_folder::{ controller::FolderManager, errors::{internal_error, FlowyError}, module::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser}, }; -use flowy_database::ConnectionPool; -use flowy_document::FlowyDocumentManager; use flowy_net::{ http_server::core::CoreHttpCloudService, local_server::LocalServer, ws::connection::FlowyWebSocketConnect, }; diff --git a/frontend/rust-lib/flowy-sdk/src/lib.rs b/frontend/rust-lib/flowy-sdk/src/lib.rs index 0616d8538e..03c723db27 100755 --- a/frontend/rust-lib/flowy-sdk/src/lib.rs +++ b/frontend/rust-lib/flowy-sdk/src/lib.rs @@ -2,7 +2,7 @@ mod deps_resolve; pub mod module; use crate::deps_resolve::*; use backend_service::configuration::ClientServerConfiguration; -use flowy_core::{controller::FolderManager, errors::FlowyError}; +use flowy_folder::{controller::FolderManager, errors::FlowyError}; use flowy_net::{ entities::NetworkType, local_server::LocalServer, @@ -64,7 +64,7 @@ fn crate_log_filter(level: String) -> String { let level = std::env::var("RUST_LOG").unwrap_or(level); let mut filters = vec![]; filters.push(format!("flowy_sdk={}", level)); - filters.push(format!("flowy_core={}", level)); + filters.push(format!("flowy_folder={}", level)); filters.push(format!("flowy_user={}", level)); filters.push(format!("flowy_document={}", level)); filters.push(format!("flowy_collaboration={}", level)); diff --git a/frontend/rust-lib/flowy-sdk/src/module.rs b/frontend/rust-lib/flowy-sdk/src/module.rs index cf49c1c240..1a87662473 100755 --- a/frontend/rust-lib/flowy-sdk/src/module.rs +++ b/frontend/rust-lib/flowy-sdk/src/module.rs @@ -1,4 +1,4 @@ -use flowy_core::controller::FolderManager; +use flowy_folder::controller::FolderManager; use flowy_net::ws::connection::FlowyWebSocketConnect; use flowy_user::services::UserSession; use lib_dispatch::prelude::Module; @@ -20,7 +20,7 @@ fn mk_user_module(user_session: Arc) -> Module { } fn mk_folder_module(core: Arc) -> Module { - flowy_core::module::create(core) + flowy_folder::module::create(core) } fn mk_network_module(ws_conn: Arc) -> Module { diff --git a/frontend/rust-lib/flowy-test/Cargo.toml b/frontend/rust-lib/flowy-test/Cargo.toml index 28bdb709ed..2495da3c00 100755 --- a/frontend/rust-lib/flowy-test/Cargo.toml +++ b/frontend/rust-lib/flowy-test/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" flowy-sdk = { path = "../flowy-sdk"} flowy-user = { path = "../flowy-user"} flowy-net = { path = "../flowy-net"} -flowy-core = { path = "../flowy-core", default-features = false} +flowy-folder = { path = "../flowy-folder", default-features = false} lib-dispatch = { path = "../lib-dispatch" } flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration" } diff --git a/frontend/rust-lib/flowy-test/src/helper.rs b/frontend/rust-lib/flowy-test/src/helper.rs index 0a2b34896b..0042e12b7d 100755 --- a/frontend/rust-lib/flowy-test/src/helper.rs +++ b/frontend/rust-lib/flowy-test/src/helper.rs @@ -1,12 +1,12 @@ use crate::prelude::*; -use flowy_core::{ +use flowy_folder::{ entities::{ app::*, view::*, workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, Workspace}, }, - event::WorkspaceEvent::{CreateWorkspace, OpenWorkspace, *}, + event::FolderEvent::{CreateWorkspace, OpenWorkspace, *}, }; use flowy_user::{ entities::{SignInRequest, SignUpRequest, UserProfile}, diff --git a/frontend/rust-lib/lib-log/src/layer.rs b/frontend/rust-lib/lib-log/src/layer.rs index 57902704df..14efa4c90e 100755 --- a/frontend/rust-lib/lib-log/src/layer.rs +++ b/frontend/rust-lib/lib-log/src/layer.rs @@ -29,7 +29,7 @@ impl FlowyFormattingLayer { } } - fn serialize_flowy_core_fields( + fn serialize_flowy_folder_fields( &self, map_serializer: &mut impl SerializeMap, message: &str, @@ -50,7 +50,7 @@ impl FlowyFormattingLayer { let mut serializer = serde_json::Serializer::new(&mut buffer); let mut map_serializer = serializer.serialize_map(None)?; let message = format_span_context(span, ty); - self.serialize_flowy_core_fields(&mut map_serializer, &message, span.metadata().level())?; + self.serialize_flowy_folder_fields(&mut map_serializer, &message, span.metadata().level())?; if self.with_target { map_serializer.serialize_entry("target", &span.metadata().target())?; } @@ -153,7 +153,7 @@ where let mut map_serializer = serializer.serialize_map(None)?; let message = format_event_message(¤t_span, event, &event_visitor); - self.serialize_flowy_core_fields(&mut map_serializer, &message, event.metadata().level())?; + self.serialize_flowy_folder_fields(&mut map_serializer, &message, event.metadata().level())?; // Additional metadata useful for debugging // They should be nested under `src` (see https://github.com/trentm/node-bunyan#src ) // but `tracing` does not support nested values yet diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.toml index 90720d438a..89e3ea9140 100644 --- a/frontend/scripts/makefile/tests.toml +++ b/frontend/scripts/makefile/tests.toml @@ -13,7 +13,7 @@ cargo test dependencies = ["rm_cache"] script = """ cd rust-lib -cargo test --features "flowy-core/http_server","flowy-user/http_server" +cargo test --features "flowy-folder/http_server","flowy-user/http_server" """ diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock index 3c5a43e123..bc778e1038 100644 --- a/shared-lib/Cargo.lock +++ b/shared-lib/Cargo.lock @@ -271,7 +271,7 @@ dependencies = [ "config", "derive_more", "flowy-collaboration", - "flowy-core-data-model", + "flowy-folder-data-model", "flowy-user-data-model", "hyper", "lazy_static", @@ -638,8 +638,8 @@ dependencies = [ "chrono", "dashmap", "dissimilar", - "flowy-core-data-model", "flowy-derive", + "flowy-folder-data-model", "futures", "lib-infra", "lib-ot", @@ -657,7 +657,20 @@ dependencies = [ ] [[package]] -name = "flowy-core-data-model" +name = "flowy-derive" +version = "0.1.0" +dependencies = [ + "flowy-ast", + "log", + "proc-macro2", + "quote", + "syn", + "tokio", + "trybuild", +] + +[[package]] +name = "flowy-folder-data-model" version = "0.1.0" dependencies = [ "bytes", @@ -675,19 +688,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "flowy-derive" -version = "0.1.0" -dependencies = [ - "flowy-ast", - "log", - "proc-macro2", - "quote", - "syn", - "tokio", - "trybuild", -] - [[package]] name = "flowy-user-data-model" version = "0.1.0" diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml index d4b8372f8c..cf4dceaa68 100644 --- a/shared-lib/Cargo.toml +++ b/shared-lib/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "flowy-user-data-model", - "flowy-core-data-model", + "flowy-folder-data-model", "flowy-collaboration", "lib-ot", "lib-ws", diff --git a/shared-lib/backend-service/Cargo.toml b/shared-lib/backend-service/Cargo.toml index 343d43879a..5386524be5 100644 --- a/shared-lib/backend-service/Cargo.toml +++ b/shared-lib/backend-service/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -flowy-core-data-model = { path = "../flowy-core-data-model" } +flowy-folder-data-model = { path = "../flowy-folder-data-model" } flowy-user-data-model = { path = "../flowy-user-data-model" } flowy-collaboration = { path = "../flowy-collaboration" } diff --git a/shared-lib/flowy-collaboration/Cargo.toml b/shared-lib/flowy-collaboration/Cargo.toml index 2802406986..d96a783bec 100644 --- a/shared-lib/flowy-collaboration/Cargo.toml +++ b/shared-lib/flowy-collaboration/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" lib-ot = { path = "../lib-ot" } lib-infra = { path = "../lib-infra" } flowy-derive = { path = "../flowy-derive" } -flowy-core-data-model = { path = "../flowy-core-data-model" } +flowy-folder-data-model = { path = "../flowy-folder-data-model" } protobuf = {version = "2.18.0"} bytes = "1.0" log = "0.4.14" diff --git a/shared-lib/flowy-collaboration/src/client_folder/builder.rs b/shared-lib/flowy-collaboration/src/client_folder/builder.rs index 3f70290536..ef44e0adc6 100644 --- a/shared-lib/flowy-collaboration/src/client_folder/builder.rs +++ b/shared-lib/flowy-collaboration/src/client_folder/builder.rs @@ -5,7 +5,7 @@ use crate::{ entities::revision::Revision, errors::{CollaborateError, CollaborateResult}, }; -use flowy_core_data_model::entities::{trash::Trash, workspace::Workspace}; +use flowy_folder_data_model::entities::{trash::Trash, workspace::Workspace}; use lib_ot::core::{PlainAttributes, PlainDelta, PlainDeltaBuilder}; use serde::{Deserialize, Serialize}; use std::sync::Arc; diff --git a/shared-lib/flowy-collaboration/src/client_folder/folder_pad.rs b/shared-lib/flowy-collaboration/src/client_folder/folder_pad.rs index b751656caa..4f4f8e93fd 100644 --- a/shared-lib/flowy-collaboration/src/client_folder/folder_pad.rs +++ b/shared-lib/flowy-collaboration/src/client_folder/folder_pad.rs @@ -7,7 +7,7 @@ use crate::{ errors::{CollaborateError, CollaborateResult}, }; use dissimilar::*; -use flowy_core_data_model::entities::{app::App, trash::Trash, view::View, workspace::Workspace}; +use flowy_folder_data_model::entities::{app::App, trash::Trash, view::View, workspace::Workspace}; use lib_ot::core::{Delta, FlowyStr, OperationTransformable, PlainAttributes, PlainDeltaBuilder}; use serde::{Deserialize, Serialize}; use std::sync::Arc; @@ -403,7 +403,7 @@ mod tests { #![allow(clippy::all)] use crate::{client_folder::folder_pad::FolderPad, entities::folder_info::FolderDelta}; use chrono::Utc; - use flowy_core_data_model::entities::{app::App, trash::Trash, view::View, workspace::Workspace}; + use flowy_folder_data_model::entities::{app::App, trash::Trash, view::View, workspace::Workspace}; use lib_ot::core::{OperationTransformable, PlainDelta, PlainDeltaBuilder}; #[test] diff --git a/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs b/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs index 9b90e0b5d5..638a212c18 100644 --- a/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs +++ b/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs @@ -45,6 +45,8 @@ pub fn category_from_str(type_str: &str) -> TypeCategory { | "DocumentDelta" | "NewDocUser" | "DocumentId" + | "WSError" + | "WebSocketRawMessage" | "Workspace" | "RepeatedWorkspace" | "CreateWorkspaceRequest" @@ -78,12 +80,10 @@ pub fn category_from_str(type_str: &str) -> TypeCategory { | "RepeatedViewId" | "UpdateViewRequest" | "UpdateViewParams" - | "WSError" - | "WebSocketRawMessage" => TypeCategory::Protobuf, - "WorkspaceEvent" - | "WorkspaceNotification" - | "FFIStatusCode" + "FFIStatusCode" + | "FolderEvent" + | "FolderNotification" | "NetworkEvent" | "NetworkType" | "UserEvent" @@ -92,11 +92,11 @@ pub fn category_from_str(type_str: &str) -> TypeCategory { | "ServerRevisionWSDataType" | "RevisionState" | "RevType" + | "ErrorCode" + | "WSChannel" | "ExportType" | "TrashType" | "ViewType" - | "ErrorCode" - | "WSChannel" => TypeCategory::Enum, "Option" => TypeCategory::Opt, diff --git a/shared-lib/flowy-core-data-model/Cargo.toml b/shared-lib/flowy-folder-data-model/Cargo.toml similarity index 95% rename from shared-lib/flowy-core-data-model/Cargo.toml rename to shared-lib/flowy-folder-data-model/Cargo.toml index e6f3b67b26..8905046423 100644 --- a/shared-lib/flowy-core-data-model/Cargo.toml +++ b/shared-lib/flowy-folder-data-model/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "flowy-core-data-model" +name = "flowy-folder-data-model" version = "0.1.0" edition = "2018" diff --git a/shared-lib/flowy-core-data-model/Flowy.toml b/shared-lib/flowy-folder-data-model/Flowy.toml similarity index 100% rename from shared-lib/flowy-core-data-model/Flowy.toml rename to shared-lib/flowy-folder-data-model/Flowy.toml diff --git a/shared-lib/flowy-core-data-model/src/entities/app.rs b/shared-lib/flowy-folder-data-model/src/entities/app.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/app.rs rename to shared-lib/flowy-folder-data-model/src/entities/app.rs diff --git a/shared-lib/flowy-core-data-model/src/entities/mod.rs b/shared-lib/flowy-folder-data-model/src/entities/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/mod.rs rename to shared-lib/flowy-folder-data-model/src/entities/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/entities/share.rs b/shared-lib/flowy-folder-data-model/src/entities/share.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/share.rs rename to shared-lib/flowy-folder-data-model/src/entities/share.rs diff --git a/shared-lib/flowy-core-data-model/src/entities/trash.rs b/shared-lib/flowy-folder-data-model/src/entities/trash.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/trash.rs rename to shared-lib/flowy-folder-data-model/src/entities/trash.rs diff --git a/shared-lib/flowy-core-data-model/src/entities/view.rs b/shared-lib/flowy-folder-data-model/src/entities/view.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/view.rs rename to shared-lib/flowy-folder-data-model/src/entities/view.rs diff --git a/shared-lib/flowy-core-data-model/src/entities/workspace.rs b/shared-lib/flowy-folder-data-model/src/entities/workspace.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/entities/workspace.rs rename to shared-lib/flowy-folder-data-model/src/entities/workspace.rs diff --git a/shared-lib/flowy-core-data-model/src/lib.rs b/shared-lib/flowy-folder-data-model/src/lib.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/lib.rs rename to shared-lib/flowy-folder-data-model/src/lib.rs diff --git a/shared-lib/flowy-core-data-model/src/macros.rs b/shared-lib/flowy-folder-data-model/src/macros.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/macros.rs rename to shared-lib/flowy-folder-data-model/src/macros.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/app/app_color_style.rs b/shared-lib/flowy-folder-data-model/src/parser/app/app_color_style.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/app/app_color_style.rs rename to shared-lib/flowy-folder-data-model/src/parser/app/app_color_style.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/app/app_desc.rs b/shared-lib/flowy-folder-data-model/src/parser/app/app_desc.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/app/app_desc.rs rename to shared-lib/flowy-folder-data-model/src/parser/app/app_desc.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/app/app_id.rs b/shared-lib/flowy-folder-data-model/src/parser/app/app_id.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/app/app_id.rs rename to shared-lib/flowy-folder-data-model/src/parser/app/app_id.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/app/app_name.rs b/shared-lib/flowy-folder-data-model/src/parser/app/app_name.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/app/app_name.rs rename to shared-lib/flowy-folder-data-model/src/parser/app/app_name.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/app/mod.rs b/shared-lib/flowy-folder-data-model/src/parser/app/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/app/mod.rs rename to shared-lib/flowy-folder-data-model/src/parser/app/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/mod.rs b/shared-lib/flowy-folder-data-model/src/parser/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/mod.rs rename to shared-lib/flowy-folder-data-model/src/parser/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/trash/mod.rs b/shared-lib/flowy-folder-data-model/src/parser/trash/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/trash/mod.rs rename to shared-lib/flowy-folder-data-model/src/parser/trash/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/trash/trash_id.rs b/shared-lib/flowy-folder-data-model/src/parser/trash/trash_id.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/trash/trash_id.rs rename to shared-lib/flowy-folder-data-model/src/parser/trash/trash_id.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/delta_data.rs b/shared-lib/flowy-folder-data-model/src/parser/view/delta_data.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/delta_data.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/delta_data.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/mod.rs b/shared-lib/flowy-folder-data-model/src/parser/view/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/mod.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/view_desc.rs b/shared-lib/flowy-folder-data-model/src/parser/view/view_desc.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/view_desc.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/view_desc.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/view_id.rs b/shared-lib/flowy-folder-data-model/src/parser/view/view_id.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/view_id.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/view_id.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/view_name.rs b/shared-lib/flowy-folder-data-model/src/parser/view/view_name.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/view_name.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/view_name.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/view/view_thumbnail.rs b/shared-lib/flowy-folder-data-model/src/parser/view/view_thumbnail.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/view/view_thumbnail.rs rename to shared-lib/flowy-folder-data-model/src/parser/view/view_thumbnail.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/workspace/mod.rs b/shared-lib/flowy-folder-data-model/src/parser/workspace/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/workspace/mod.rs rename to shared-lib/flowy-folder-data-model/src/parser/workspace/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_desc.rs b/shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_desc.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/workspace/workspace_desc.rs rename to shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_desc.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_id.rs b/shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_id.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/workspace/workspace_id.rs rename to shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_id.rs diff --git a/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_name.rs b/shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_name.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/parser/workspace/workspace_name.rs rename to shared-lib/flowy-folder-data-model/src/parser/workspace/workspace_name.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/document b/shared-lib/flowy-folder-data-model/src/protobuf/document similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/document rename to shared-lib/flowy-folder-data-model/src/protobuf/document diff --git a/shared-lib/flowy-core-data-model/src/protobuf/mod.rs b/shared-lib/flowy-folder-data-model/src/protobuf/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/mod.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/app.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/app.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/app.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/app.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/errors.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/errors.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/errors.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/errors.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/mod.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/mod.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/mod.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/mod.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/share.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/share.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/share.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/share.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/trash.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/trash.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/trash.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/trash.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/view.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/view.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/view.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/model/workspace.rs b/shared-lib/flowy-folder-data-model/src/protobuf/model/workspace.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/model/workspace.rs rename to shared-lib/flowy-folder-data-model/src/protobuf/model/workspace.rs diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/app.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/app.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/app.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/app.proto diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/errors.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/errors.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/errors.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/errors.proto diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/share.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/share.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/share.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/share.proto diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/trash.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/trash.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/trash.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/trash.proto diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/view.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/view.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/view.proto diff --git a/shared-lib/flowy-core-data-model/src/protobuf/proto/workspace.proto b/shared-lib/flowy-folder-data-model/src/protobuf/proto/workspace.proto similarity index 100% rename from shared-lib/flowy-core-data-model/src/protobuf/proto/workspace.proto rename to shared-lib/flowy-folder-data-model/src/protobuf/proto/workspace.proto diff --git a/shared-lib/flowy-core-data-model/src/user_default.rs b/shared-lib/flowy-folder-data-model/src/user_default.rs similarity index 100% rename from shared-lib/flowy-core-data-model/src/user_default.rs rename to shared-lib/flowy-folder-data-model/src/user_default.rs