;
- modified_time?: number;
- create_time?: number;
- } = pb.toObject();
- setWorkspaceId(workspace?.id || '');
- } else {
- throw new Error('create workspace error');
- }
-
- /**/
- }
-
- return (
- <>
-
- sendSignInEvent()}>
- Sign in and create sample data
-
-
-
- );
-};
-
-export default TestApiButton;
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGrid.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGrid.tsx
index 1a3925c82c..e44d334861 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGrid.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGrid.tsx
@@ -1,11 +1,5 @@
import React from 'react';
-import {
- FieldType,
- NumberFormat,
- NumberTypeOptionPB,
- SelectOptionCellDataPB,
- ViewLayoutTypePB,
-} from '@/services/backend';
+import { FieldType, NumberFormat, NumberTypeOptionPB, SelectOptionCellDataPB, ViewLayoutPB } from '@/services/backend';
import { Log } from '$app/utils/log';
import {
assert,
@@ -60,7 +54,7 @@ export const RunAllGridTests = () => {
};
async function createBuildInGrid() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
databaseController.subscribe({
onViewChanged: (databasePB) => {
@@ -82,7 +76,7 @@ async function createBuildInGrid() {
}
async function testEditGridCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -95,7 +89,7 @@ async function testEditGridCell() {
}
async function testEditTextCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -117,7 +111,7 @@ async function testEditTextCell() {
}
async function testEditURLCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -144,7 +138,7 @@ async function testEditURLCell() {
}
async function testEditDateCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -169,7 +163,7 @@ async function testEditDateCell() {
}
async function testCheckboxCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -195,7 +189,7 @@ async function testCheckboxCell() {
}
async function testCreateRow() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
await assertNumberOfRows(view.id, 3);
@@ -207,7 +201,7 @@ async function testCreateRow() {
}
async function testDeleteRow() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -226,7 +220,7 @@ async function testDeleteRow() {
}
async function testCreateOptionInCell() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
for (const [index, row] of databaseController.databaseViewCache.rowInfos.entries()) {
@@ -253,7 +247,7 @@ async function testCreateOptionInCell() {
}
async function testMoveField() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -271,7 +265,7 @@ async function testMoveField() {
}
async function testGetSingleSelectFieldData() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -296,7 +290,7 @@ async function testGetSingleSelectFieldData() {
}
async function testSwitchFromSingleSelectToNumber() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -322,7 +316,7 @@ async function testSwitchFromSingleSelectToNumber() {
}
async function testSwitchFromMultiSelectToRichText() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -372,7 +366,7 @@ async function testSwitchFromMultiSelectToRichText() {
}
async function testEditField() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
const fieldInfos = databaseController.fieldController.fieldInfos;
@@ -390,7 +384,7 @@ async function testEditField() {
}
async function testCreateNewField() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
await assertNumberOfFields(view.id, 3);
@@ -403,7 +397,7 @@ async function testCreateNewField() {
}
async function testDeleteField() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Grid);
+ const view = await createTestDatabaseView(ViewLayoutPB.Grid);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGroup.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGroup.tsx
index bbcf7a860c..b612d9ab9c 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGroup.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestGroup.tsx
@@ -5,7 +5,7 @@ import {
createTestDatabaseView,
openTestDatabase,
} from './DatabaseTestHelper';
-import { FieldType, ViewLayoutTypePB } from '../../../services/backend';
+import { FieldType, ViewLayoutPB } from '../../../services/backend';
import React from 'react';
export const TestAllKanbanTests = () => {
@@ -29,7 +29,7 @@ export const TestAllKanbanTests = () => {
};
async function createBuildInBoard() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Board);
+ const view = await createTestDatabaseView(ViewLayoutPB.Board);
const databaseController = await openTestDatabase(view.id);
databaseController.subscribe({
onGroupByField: (groups) => {
@@ -49,7 +49,7 @@ async function createBuildInBoard() {
}
async function createKanbanBoardRow() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Board);
+ const view = await createTestDatabaseView(ViewLayoutPB.Board);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -62,7 +62,7 @@ async function createKanbanBoardRow() {
}
async function moveKanbanBoardRow() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Board);
+ const view = await createTestDatabaseView(ViewLayoutPB.Board);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -113,7 +113,7 @@ async function moveKanbanBoardRow() {
}
async function createKanbanBoardColumn() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Board);
+ const view = await createTestDatabaseView(ViewLayoutPB.Board);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
@@ -128,7 +128,7 @@ async function createKanbanBoardColumn() {
}
async function createColumnInBoard() {
- const view = await createTestDatabaseView(ViewLayoutTypePB.Board);
+ const view = await createTestDatabaseView(ViewLayoutPB.Board);
const databaseController = await openTestDatabase(view.id);
await databaseController.open().then((result) => result.unwrap());
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts
index bce7783ddc..8b41f96f1c 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/database_bd_svc.ts
@@ -23,7 +23,7 @@ import {
CreateRowPayloadPB,
ViewIdPB,
} from '@/services/backend';
-import { FolderEventCloseView } from '@/services/backend/events/flowy-folder';
+import { FolderEventCloseView } from '@/services/backend/events/flowy-folder2';
/// A service that wraps the backend service
export class DatabaseBackendService {
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts
index 095abcaa5b..c582b1f7d2 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts
@@ -8,7 +8,7 @@ import {
} from '@/services/backend';
import { DocumentEventApplyEdit, DocumentEventGetDocument } from '@/services/backend/events/flowy-document';
import { Result } from 'ts-results';
-import { FolderEventCloseView } from '@/services/backend/events/flowy-folder';
+import { FolderEventCloseView } from '@/services/backend/events/flowy-folder2';
export class DocumentBackendService {
constructor(public readonly viewId: string) {}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts
index 47c27c741d..57cabe7705 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_bd_svc.ts
@@ -1,21 +1,20 @@
import {
FolderEventCreateView,
- FolderEventDeleteApp,
FolderEventDeleteView,
FolderEventMoveItem,
- FolderEventReadApp,
- FolderEventUpdateApp,
- ViewLayoutTypePB,
-} from '@/services/backend/events/flowy-folder';
+ FolderEventReadView,
+ FolderEventUpdateView,
+ ViewLayoutPB,
+} from '@/services/backend/events/flowy-folder2';
import {
- AppIdPB,
- UpdateAppPayloadPB,
CreateViewPayloadPB,
RepeatedViewIdPB,
ViewPB,
MoveFolderItemPayloadPB,
MoveFolderItemType,
FlowyError,
+ ViewIdPB,
+ UpdateViewPayloadPB,
} from '@/services/backend';
import { None, Result, Some } from 'ts-results';
@@ -23,14 +22,14 @@ export class AppBackendService {
constructor(public readonly appId: string) {}
getApp = () => {
- const payload = AppIdPB.fromObject({ value: this.appId });
- return FolderEventReadApp(payload);
+ const payload = ViewIdPB.fromObject({ value: this.appId });
+ return FolderEventReadView(payload);
};
createView = async (params: {
name: string;
desc?: string;
- layoutType: ViewLayoutTypePB;
+ layoutType: ViewLayoutPB;
/// The initial data should be the JSON of the document
/// For example: {"document":{"type":"editor","children":[]}}
initialData?: string;
@@ -54,9 +53,9 @@ export class AppBackendService {
};
getAllViews = (): Promise> => {
- const payload = AppIdPB.fromObject({ value: this.appId });
- return FolderEventReadApp(payload).then((result) => {
- return result.map((app) => app.belongings.items);
+ const payload = ViewIdPB.fromObject({ value: this.appId });
+ return FolderEventReadView(payload).then((result) => {
+ return result.map((app) => app.belongings);
});
};
@@ -75,16 +74,16 @@ export class AppBackendService {
};
update = async (params: { name: string }) => {
- const payload = UpdateAppPayloadPB.fromObject({ app_id: this.appId, name: params.name });
- const result = await FolderEventUpdateApp(payload);
+ const payload = UpdateViewPayloadPB.fromObject({ view_id: this.appId, name: params.name });
+ const result = await FolderEventUpdateView(payload);
if (!result.ok) {
throw new Error(result.val.msg);
}
};
delete = async () => {
- const payload = AppIdPB.fromObject({ value: this.appId });
- const result = await FolderEventDeleteApp(payload);
+ const payload = RepeatedViewIdPB.fromObject({ items: [this.appId] });
+ const result = await FolderEventDeleteView(payload);
if (!result.ok) {
throw new Error(result.val.msg);
}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts
index 6440cb37c0..a2c430d92f 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/app/app_observer.ts
@@ -1,12 +1,12 @@
import { Ok, Result } from 'ts-results';
-import { AppPB, FlowyError, FolderNotification } from '@/services/backend';
+import { FlowyError, FolderNotification, RepeatedViewPB } from '@/services/backend';
import { ChangeNotifier } from '$app/utils/change_notifier';
import { FolderNotificationObserver } from '../notifications/observer';
-export type AppUpdateNotifyCallback = (value: Result) => void;
+export type AppUpdateNotifyCallback = (value: Result) => void;
export class AppObserver {
- _appNotifier = new ChangeNotifier>();
+ _appNotifier = new ChangeNotifier>();
_listener?: FolderNotificationObserver;
constructor(public readonly appId: string) {}
@@ -17,9 +17,9 @@ export class AppObserver {
viewId: this.appId,
parserHandler: (notification, result) => {
switch (notification) {
- case FolderNotification.DidUpdateWorkspaceApps:
+ case FolderNotification.DidUpdateWorkspaceViews:
if (result.ok) {
- this._appNotifier?.notify(Ok(AppPB.deserializeBinary(result.val)));
+ this._appNotifier?.notify(Ok(RepeatedViewPB.deserializeBinary(result.val)));
} else {
this._appNotifier?.notify(result);
}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts
index f3fbd99829..ec98fb08ce 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/view/view_bd_svc.ts
@@ -3,7 +3,7 @@ import {
FolderEventDeleteView,
FolderEventDuplicateView,
FolderEventUpdateView,
-} from '@/services/backend/events/flowy-folder';
+} from '@/services/backend/events/flowy-folder2';
export class ViewBackendService {
constructor(public readonly viewId: string) {}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts
index fec8269cc6..c92169ade7 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_bd_svc.ts
@@ -1,24 +1,31 @@
import { Err, Ok } from 'ts-results';
import {
- FolderEventCreateApp,
+ FolderEventCreateView,
FolderEventMoveItem,
FolderEventReadWorkspaceApps,
FolderEventReadWorkspaces,
-} from '@/services/backend/events/flowy-folder';
-import { CreateAppPayloadPB, WorkspaceIdPB, FlowyError, MoveFolderItemPayloadPB } from '@/services/backend';
+} from '@/services/backend/events/flowy-folder2';
+import {
+ CreateViewPayloadPB,
+ FlowyError,
+ MoveFolderItemPayloadPB,
+ ViewLayoutPB,
+ WorkspaceIdPB,
+} from '@/services/backend';
import assert from 'assert';
export class WorkspaceBackendService {
constructor(public readonly workspaceId: string) {}
createApp = async (params: { name: string; desc?: string }) => {
- const payload = CreateAppPayloadPB.fromObject({
- workspace_id: this.workspaceId,
+ const payload = CreateViewPayloadPB.fromObject({
+ belong_to_id: this.workspaceId,
name: params.name,
desc: params.desc || '',
+ layout: ViewLayoutPB.Document,
});
- const result = await FolderEventCreateApp(payload);
+ const result = await FolderEventCreateView(payload);
if (result.ok) {
return result.val;
} else {
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts
index 0b9efdab5a..7fd72c6622 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/folder/workspace/workspace_observer.ts
@@ -1,9 +1,9 @@
import { Ok, Result } from 'ts-results';
-import { AppPB, FolderNotification, RepeatedAppPB, WorkspacePB, FlowyError } from '@/services/backend';
+import { FolderNotification, WorkspacePB, FlowyError, RepeatedViewPB, ViewPB } from '@/services/backend';
import { ChangeNotifier } from '$app/utils/change_notifier';
import { FolderNotificationObserver } from '../notifications/observer';
-export type AppListNotifyValue = Result;
+export type AppListNotifyValue = Result;
export type AppListNotifyCallback = (value: AppListNotifyValue) => void;
export type WorkspaceNotifyValue = Result;
export type WorkspaceNotifyCallback = (value: WorkspaceNotifyValue) => void;
@@ -33,9 +33,9 @@ export class WorkspaceObserver {
this.workspaceNotifier?.notify(result);
}
break;
- case FolderNotification.DidUpdateWorkspaceApps:
+ case FolderNotification.DidUpdateWorkspaceViews:
if (result.ok) {
- this.appListNotifier?.notify(Ok(RepeatedAppPB.deserializeBinary(result.val).items));
+ this.appListNotifier?.notify(Ok(RepeatedViewPB.deserializeBinary(result.val).items));
} else {
this.appListNotifier?.notify(result);
}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts
index 2e80f34e54..7c9e50d3fc 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/user/user_bd_svc.ts
@@ -21,10 +21,10 @@ import {
FolderEventOpenWorkspace,
FolderEventReadCurrentWorkspace,
FolderEventReadWorkspaces,
-} from '@/services/backend/events/flowy-folder';
+} from '@/services/backend/events/flowy-folder2';
export class UserBackendService {
- constructor(public readonly userId: string) {}
+ constructor(public readonly userId: number) {}
getUserProfile = () => {
return UserEventGetUserProfile();
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts
index 4b5fbcb5ea..be68ddf6c9 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts
@@ -1,9 +1,9 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { nanoid } from 'nanoid';
-import { WorkspaceSettingPB } from '@/services/backend/models/flowy-folder/workspace';
+import { WorkspaceSettingPB } from '@/services/backend/models/flowy-folder2/workspace';
export interface ICurrentUser {
- id?: string;
+ id?: number;
displayName?: string;
email?: string;
token?: string;
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts
index 804038444f..7ad447601c 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts
@@ -1,10 +1,10 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { ViewLayoutTypePB } from '@/services/backend';
+import { ViewLayoutPB } from '@/services/backend';
export interface IPage {
id: string;
title: string;
- pageType: ViewLayoutTypePB;
+ pageType: ViewLayoutPB;
folderId: string;
}
diff --git a/frontend/appflowy_tauri/src/services/backend/index.ts b/frontend/appflowy_tauri/src/services/backend/index.ts
index d9b08aff40..af708e6c22 100644
--- a/frontend/appflowy_tauri/src/services/backend/index.ts
+++ b/frontend/appflowy_tauri/src/services/backend/index.ts
@@ -1,6 +1,6 @@
export * from "./models/flowy-user";
export * from "./models/flowy-document";
export * from "./models/flowy-database";
-export * from "./models/flowy-folder";
+export * from "./models/flowy-folder2";
export * from "./models/flowy-net";
export * from "./models/flowy-error";
diff --git a/frontend/rust-lib/.gitignore b/frontend/rust-lib/.gitignore
index 264aad238c..740f8d77a7 100644
--- a/frontend/rust-lib/.gitignore
+++ b/frontend/rust-lib/.gitignore
@@ -12,4 +12,5 @@
bin/
**/src/protobuf
**/resources/proto
-.idea/
\ No newline at end of file
+.idea/
+AppFlowy-Collab/
\ No newline at end of file
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index 2052c1707c..a61256f6b9 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -67,9 +67,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.68"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "arrayvec"
@@ -102,7 +102,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -113,7 +113,7 @@ checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -298,7 +298,7 @@ dependencies = [
"borsh-schema-derive-internal",
"proc-macro-crate",
"proc-macro2",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -309,7 +309,7 @@ checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -320,7 +320,7 @@ checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -369,7 +369,7 @@ checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -407,9 +407,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.23"
+version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -475,7 +475,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -488,6 +488,70 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "collab"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#306f27e56481eb2a998da4cb9f13763699dade76"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "collab-persistence",
+ "lib0",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+ "y-sync",
+ "yrs",
+]
+
+[[package]]
+name = "collab-derive"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#306f27e56481eb2a998da4cb9f13763699dade76"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 1.0.109",
+ "yrs",
+]
+
+[[package]]
+name = "collab-folder"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#306f27e56481eb2a998da4cb9f13763699dade76"
+dependencies = [
+ "anyhow",
+ "collab",
+ "collab-derive",
+ "collab-persistence",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "collab-persistence"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#306f27e56481eb2a998da4cb9f13763699dade76"
+dependencies = [
+ "bincode",
+ "chrono",
+ "lib0",
+ "serde",
+ "sled",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "yrs",
+]
+
[[package]]
name = "color-eyre"
version = "0.5.11"
@@ -739,7 +803,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -756,7 +820,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -813,7 +877,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -826,7 +890,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -854,7 +918,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1022,7 +1086,7 @@ version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1093,7 +1157,7 @@ dependencies = [
"serde",
"serde_json",
"similar",
- "syn",
+ "syn 1.0.109",
"tera",
"toml",
"walkdir",
@@ -1104,6 +1168,7 @@ name = "flowy-core"
version = "0.1.0"
dependencies = [
"bytes",
+ "collab-persistence",
"console-subscriber",
"database-model",
"flowy-client-ws",
@@ -1111,6 +1176,7 @@ dependencies = [
"flowy-document",
"flowy-error",
"flowy-folder",
+ "flowy-folder2",
"flowy-net",
"flowy-revision",
"flowy-sqlite",
@@ -1192,7 +1258,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_json",
- "syn",
+ "syn 1.0.109",
"tokio",
"trybuild",
"walkdir",
@@ -1307,6 +1373,35 @@ dependencies = [
"ws-model",
]
+[[package]]
+name = "flowy-folder2"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "chrono",
+ "collab",
+ "collab-folder",
+ "collab-persistence",
+ "flowy-codegen",
+ "flowy-derive",
+ "flowy-document",
+ "flowy-error",
+ "flowy-folder2",
+ "flowy-notification",
+ "flowy-test",
+ "lazy_static",
+ "lib-dispatch",
+ "lib-infra",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "protobuf",
+ "strum",
+ "strum_macros",
+ "tokio",
+ "tracing",
+ "unicode-segmentation",
+]
+
[[package]]
name = "flowy-net"
version = "0.1.0"
@@ -1324,7 +1419,7 @@ dependencies = [
"flowy-derive",
"flowy-document",
"flowy-error",
- "flowy-folder",
+ "flowy-folder2",
"flowy-server-sync",
"flowy-sync",
"flowy-user",
@@ -1478,7 +1573,7 @@ dependencies = [
"flowy-client-sync",
"flowy-core",
"flowy-document",
- "flowy-folder",
+ "flowy-folder2",
"flowy-net",
"flowy-user",
"futures",
@@ -1503,6 +1598,7 @@ name = "flowy-user"
version = "0.1.0"
dependencies = [
"bytes",
+ "collab-persistence",
"diesel",
"diesel_derives",
"flowy-codegen",
@@ -1568,6 +1664,16 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "futures"
version = "0.3.26"
@@ -1624,7 +1730,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1657,6 +1763,15 @@ dependencies = [
"slab",
]
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "generic-array"
version = "0.14.6"
@@ -1684,8 +1799,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
]
[[package]]
@@ -2166,6 +2283,17 @@ dependencies = [
"url",
]
+[[package]]
+name = "lib0"
+version = "0.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3994538ae0215990b1c3df6dc45bb5afad77abce3a6ba3335512c5f5d9bfb1d4"
+dependencies = [
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
[[package]]
name = "libc"
version = "0.2.139"
@@ -2285,7 +2413,7 @@ dependencies = [
"migrations_internals",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2448,7 +2576,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2589,7 +2717,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2664,7 +2792,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2703,7 +2831,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2776,7 +2904,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -2799,9 +2927,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
dependencies = [
"unicode-ident",
]
@@ -2826,7 +2954,7 @@ dependencies = [
"itertools",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2942,7 +3070,7 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2964,14 +3092,14 @@ checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@@ -3218,7 +3346,7 @@ checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3362,9 +3490,9 @@ checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
[[package]]
name = "serde"
-version = "1.0.152"
+version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
dependencies = [
"serde_derive",
]
@@ -3392,20 +3520,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.152"
+version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.8",
]
[[package]]
name = "serde_json"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
dependencies = [
"itoa 1.0.5",
"ryu",
@@ -3420,7 +3548,7 @@ checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3454,7 +3582,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3520,6 +3648,22 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "sled"
+version = "0.34.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
+dependencies = [
+ "crc32fast",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "fs2",
+ "fxhash",
+ "libc",
+ "log",
+ "parking_lot 0.11.2",
+]
+
[[package]]
name = "slug"
version = "0.1.4"
@@ -3529,6 +3673,15 @@ dependencies = [
"deunicode",
]
+[[package]]
+name = "smallstr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e922794d168678729ffc7e07182721a14219c65814e66e91b839a272fe5ae4f"
+dependencies = [
+ "smallvec",
+]
+
[[package]]
name = "smallvec"
version = "1.10.0"
@@ -3566,7 +3719,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3580,6 +3733,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn"
+version = "2.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "sync_wrapper"
version = "0.1.2"
@@ -3652,22 +3816,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.8",
]
[[package]]
@@ -3765,7 +3929,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3940,7 +4104,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4306,7 +4470,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
@@ -4340,7 +4504,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4504,6 +4668,17 @@ dependencies = [
"serde_repr",
]
+[[package]]
+name = "y-sync"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e77a143afe4dde83bc987ad3119228d0f107053a3da131a00738cb2d7f496641"
+dependencies = [
+ "lib0",
+ "thiserror",
+ "yrs",
+]
+
[[package]]
name = "yaml-rust"
version = "0.4.5"
@@ -4512,3 +4687,17 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]
+
+[[package]]
+name = "yrs"
+version = "0.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2b23ac465bed6c0ffbb9fbd80ec808bd89b37b823a420b16917d1806d76d75"
+dependencies = [
+ "atomic_refcell",
+ "lib0",
+ "rand 0.7.3",
+ "smallstr",
+ "smallvec",
+ "thiserror",
+]
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index 83a5e25bc0..a7e271a950 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -8,7 +8,8 @@ members = [
"flowy-user",
"flowy-test",
"flowy-sqlite",
- "flowy-folder",
+# "flowy-folder",r
+ "flowy-folder2",
"flowy-notification",
"flowy-document",
"flowy-error",
@@ -34,4 +35,12 @@ opt-level = 3
#strip = "debuginfo"
## For from-scratch builds, incremental adds an extra dependency-tracking overhead. It also significantly increases
## the amount of IO and the size of ./target, which make caching less effective.
-incremental = false
\ No newline at end of file
+incremental = false
+
+[patch.crates-io]
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab" }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab" }
+#collab = { path = "../AppFlowy-Collab/collab" }
+#collab-folder = { path = "../AppFlowy-Collab/collab-folder" }
+#collab-persistence = { path = "../AppFlowy-Collab/collab-persistence" }
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index 591f459963..98903e60f6 100644
--- a/frontend/rust-lib/flowy-core/Cargo.toml
+++ b/frontend/rust-lib/flowy-core/Cargo.toml
@@ -11,6 +11,7 @@ lib-log = { path = "../lib-log" }
flowy-user = { path = "../flowy-user" }
flowy-net = { path = "../flowy-net" }
flowy-folder = { path = "../flowy-folder" }
+flowy-folder2 = { path = "../flowy-folder2" }
flowy-database = { path = "../flowy-database" }
database-model = { path = "../../../shared-lib/database-model" }
user-model = { path = "../../../shared-lib/user-model" }
@@ -20,6 +21,7 @@ flowy-document = { path = "../flowy-document" }
flowy-revision = { path = "../flowy-revision" }
flowy-error = { path = "../flowy-error", features = ["adaptor_ws"] }
flowy-task = { path = "../flowy-task" }
+collab-persistence = { version = "0.1.0" }
tracing = { version = "0.1", features = ["log"] }
futures-core = { version = "0.3", default-features = false }
@@ -44,14 +46,16 @@ use_bunyan = ["lib-log/use_bunyan"]
dart = [
"flowy-user/dart",
"flowy-net/dart",
- "flowy-folder/dart",
+# "flowy-folder/dart",
+ "flowy-folder2/dart",
"flowy-database/dart",
"flowy-document/dart",
]
ts = [
"flowy-user/ts",
"flowy-net/ts",
- "flowy-folder/ts",
+# "flowy-folder/ts",
+ "flowy-folder2/ts",
"flowy-database/ts",
"flowy-document/ts",
]
diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs
index b08b99769e..90b0d34ff7 100644
--- a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs
+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs
@@ -61,7 +61,7 @@ impl DocumentUser for BlockUserImpl {
Ok(doc_dir)
}
- fn user_id(&self) -> Result {
+ fn user_id(&self) -> Result {
self.0.user_id()
}
diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs
new file mode 100644
index 0000000000..c33d990730
--- /dev/null
+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs
@@ -0,0 +1,259 @@
+use bytes::Bytes;
+use collab_persistence::CollabKV;
+use database_model::BuildDatabaseContext;
+use flowy_database::entities::DatabaseLayoutPB;
+use flowy_database::manager::{create_new_database, link_existing_database, DatabaseManager};
+use flowy_database::util::{make_default_board, make_default_calendar, make_default_grid};
+use flowy_document::editor::make_transaction_from_document_content;
+use flowy_document::DocumentManager;
+use flowy_error::FlowyError;
+
+use flowy_folder2::entities::ViewLayoutPB;
+use flowy_folder2::manager::{Folder2Manager, FolderUser};
+use flowy_folder2::view_ext::{ViewDataProcessor, ViewDataProcessorMap};
+use flowy_folder2::ViewLayout;
+use flowy_user::services::UserSession;
+use lib_infra::future::FutureResult;
+use revision_model::Revision;
+use std::collections::HashMap;
+use std::convert::TryFrom;
+use std::sync::Arc;
+
+pub struct Folder2DepsResolver();
+impl Folder2DepsResolver {
+ pub async fn resolve(
+ user_session: Arc,
+ document_manager: &Arc,
+ database_manager: &Arc,
+ ) -> Arc {
+ let user: Arc = Arc::new(FolderUserImpl(user_session.clone()));
+
+ let view_data_processor =
+ make_view_data_processor(document_manager.clone(), database_manager.clone());
+ Arc::new(
+ Folder2Manager::new(user.clone(), view_data_processor)
+ .await
+ .unwrap(),
+ )
+ }
+}
+
+fn make_view_data_processor(
+ document_manager: Arc,
+ database_manager: Arc,
+) -> ViewDataProcessorMap {
+ let mut map: HashMap> = HashMap::new();
+
+ let document_processor = Arc::new(DocumentViewDataProcessor(document_manager));
+ map.insert(ViewLayout::Document, document_processor);
+
+ let database_processor = Arc::new(DatabaseViewDataProcessor(database_manager));
+ map.insert(ViewLayout::Board, database_processor.clone());
+ map.insert(ViewLayout::Grid, database_processor.clone());
+ map.insert(ViewLayout::Calendar, database_processor);
+ Arc::new(map)
+}
+
+struct FolderUserImpl(Arc);
+impl FolderUser for FolderUserImpl {
+ fn user_id(&self) -> Result {
+ self
+ .0
+ .user_id()
+ .map_err(|e| FlowyError::internal().context(e))
+ }
+
+ fn token(&self) -> Result {
+ self
+ .0
+ .token()
+ .map_err(|e| FlowyError::internal().context(e))
+ }
+
+ fn kv_db(&self) -> Result, FlowyError> {
+ self.0.get_kv_db()
+ }
+}
+
+struct DocumentViewDataProcessor(Arc);
+impl ViewDataProcessor for DocumentViewDataProcessor {
+ fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {
+ let manager = self.0.clone();
+ let view_id = view_id.to_string();
+ FutureResult::new(async move {
+ manager.close_document_editor(view_id).await?;
+ Ok(())
+ })
+ }
+
+ fn get_view_data(&self, view_id: &str) -> FutureResult {
+ let manager = self.0.clone();
+ let view_id = view_id.to_string();
+ FutureResult::new(async move {
+ let editor = manager.open_document_editor(view_id).await?;
+ let document_data = Bytes::from(editor.duplicate().await?);
+ Ok(document_data)
+ })
+ }
+
+ fn create_view_with_build_in_data(
+ &self,
+ _user_id: i64,
+ view_id: &str,
+ _name: &str,
+ layout: ViewLayout,
+ _ext: HashMap,
+ ) -> FutureResult<(), FlowyError> {
+ debug_assert_eq!(layout, ViewLayout::Document);
+ let view_id = view_id.to_string();
+ let manager = self.0.clone();
+ let document_content = self.0.initial_document_content();
+ FutureResult::new(async move {
+ let delta_data = Bytes::from(document_content);
+ let revision = Revision::initial_revision(&view_id, delta_data);
+ manager.create_document(view_id, vec![revision]).await?;
+ Ok(())
+ })
+ }
+
+ fn create_view_with_custom_data(
+ &self,
+ _user_id: i64,
+ view_id: &str,
+ _name: &str,
+ data: Vec,
+ layout: ViewLayout,
+ _ext: HashMap,
+ ) -> FutureResult<(), FlowyError> {
+ debug_assert_eq!(layout, ViewLayout::Document);
+ let view_data = match String::from_utf8(data) {
+ Ok(content) => match make_transaction_from_document_content(&content) {
+ Ok(transaction) => transaction.to_bytes().unwrap_or_else(|_| vec![]),
+ Err(_) => vec![],
+ },
+ Err(_) => vec![],
+ };
+
+ let revision = Revision::initial_revision(view_id, Bytes::from(view_data));
+ let view_id = view_id.to_string();
+ let manager = self.0.clone();
+
+ FutureResult::new(async move {
+ manager.create_document(view_id, vec![revision]).await?;
+ Ok(())
+ })
+ }
+}
+
+struct DatabaseViewDataProcessor(Arc);
+impl ViewDataProcessor for DatabaseViewDataProcessor {
+ fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {
+ let database_manager = self.0.clone();
+ let view_id = view_id.to_string();
+ FutureResult::new(async move {
+ database_manager.close_database_view(view_id).await?;
+ Ok(())
+ })
+ }
+
+ fn get_view_data(&self, view_id: &str) -> FutureResult {
+ let database_manager = self.0.clone();
+ let view_id = view_id.to_owned();
+ FutureResult::new(async move {
+ let editor = database_manager.open_database_view(&view_id).await?;
+ let delta_bytes = editor.duplicate_database(&view_id).await?;
+ Ok(delta_bytes.into())
+ })
+ }
+
+ /// Create a database view with build-in data.
+ /// If the ext contains the {"database_id": "xx"}, then it will link to
+ /// the existing database. The data of the database will be shared within
+ /// these references views.
+ fn create_view_with_build_in_data(
+ &self,
+ _user_id: i64,
+ view_id: &str,
+ name: &str,
+ layout: ViewLayout,
+ ext: HashMap,
+ ) -> FutureResult<(), FlowyError> {
+ let view_id = view_id.to_string();
+ let name = name.to_string();
+ let database_manager = self.0.clone();
+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {
+ None => {
+ let (build_context, layout) = match layout {
+ ViewLayout::Grid => (make_default_grid(), DatabaseLayoutPB::Grid),
+ ViewLayout::Board => (make_default_board(), DatabaseLayoutPB::Board),
+ ViewLayout::Calendar => (make_default_calendar(), DatabaseLayoutPB::Calendar),
+ ViewLayout::Document => {
+ return FutureResult::new(async move {
+ Err(FlowyError::internal().context(format!("Can't handle {:?} layout type", layout)))
+ });
+ },
+ };
+ FutureResult::new(async move {
+ create_new_database(&view_id, name, layout, database_manager, build_context).await
+ })
+ },
+ Some(database_id) => {
+ let layout = layout_type_from_view_layout(layout.into());
+ FutureResult::new(async move {
+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await
+ })
+ },
+ }
+ }
+
+ /// Create a database view with custom data.
+ /// If the ext contains the {"database_id": "xx"}, then it will link
+ /// to the existing database. The data of the database will be shared
+ /// within these references views.
+ fn create_view_with_custom_data(
+ &self,
+ _user_id: i64,
+ view_id: &str,
+ name: &str,
+ data: Vec,
+ layout: ViewLayout,
+ ext: HashMap,
+ ) -> FutureResult<(), FlowyError> {
+ let view_id = view_id.to_string();
+ let database_manager = self.0.clone();
+ let layout = layout_type_from_view_layout(layout.into());
+ let name = name.to_string();
+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {
+ None => FutureResult::new(async move {
+ let bytes = Bytes::from(data);
+ let build_context = BuildDatabaseContext::try_from(bytes)?;
+ let _ = create_new_database(&view_id, name, layout, database_manager, build_context).await;
+ Ok(())
+ }),
+ Some(database_id) => FutureResult::new(async move {
+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await
+ }),
+ }
+ }
+}
+
+#[derive(Debug, serde::Deserialize)]
+struct DatabaseExtParams {
+ database_id: String,
+}
+
+impl DatabaseExtParams {
+ pub fn from_map(map: HashMap) -> Option {
+ let value = serde_json::to_value(map).ok()?;
+ serde_json::from_value::(value).ok()
+ }
+}
+
+pub fn layout_type_from_view_layout(layout: ViewLayoutPB) -> DatabaseLayoutPB {
+ match layout {
+ ViewLayoutPB::Grid => DatabaseLayoutPB::Grid,
+ ViewLayoutPB::Board => DatabaseLayoutPB::Board,
+ ViewLayoutPB::Calendar => DatabaseLayoutPB::Calendar,
+ ViewLayoutPB::Document => DatabaseLayoutPB::Grid,
+ }
+}
diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs
index 63fdf4bcad..77f07ebde3 100644
--- a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs
+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs
@@ -46,7 +46,7 @@ impl DatabaseDBConnection for DatabaseDBConnectionImpl {
struct GridUserImpl(Arc);
impl DatabaseUser for GridUserImpl {
- fn user_id(&self) -> Result 
+ 
