Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: move group row (#6233)
Nathan.fooo187c5892ea8e
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dartindex ebe4a0a1dc..e35bd3497b 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart@@ -93,9 +93,9 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {(event, emit) async {await event.when(initial: () async {+ emit(BoardState.initial(viewId));_startListening();await _openDatabase(emit);- emit(BoardState.initial(viewId));},createRow: (groupId, position, title, targetRowId) async {final primaryField = databaseController.fieldController.fieldInfos@@ -490,6 +490,8 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {}GroupController _initializeGroupController(GroupPB group) {+ group.freeze();+final delegate = GroupControllerDelegateImpl(controller: boardController,fieldController: fieldController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/application/group_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/board/application/group_controller.dartindex 4fa7a15672..4e0ad9bada 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/application/group_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/application/group_controller.dart@@ -50,6 +50,10 @@ class GroupController {}for (final insertedRow in changeset.insertedRows) {+ if (newItems.any((rowPB) => rowPB.id == insertedRow.rowMeta.id)) {+ continue;+ }+final index = insertedRow.hasIndex() ? insertedRow.index : null;if (insertedRow.hasIndex() &&newItems.length > insertedRow.index) {@@ -80,11 +84,14 @@ class GroupController {}}- group.freeze();group = group.rebuild((group) {group.rows.clear();group.rows.addAll(newItems);});+ group.freeze();+ Log.debug(+ "Build GroupPB:${group.groupId}: items: ${group.rows.length}",+ );onGroupChanged(group);},(err) => Log.error(err),@@ -93,8 +100,8 @@ class GroupController {);}- Future<void> dispose() {- return _listener.stop();+ Future<void> dispose() async {+ await _listener.stop();}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dartindex 0a18a252e3..e12cad59be 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart@@ -116,6 +116,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {}},onRowsUpdated: (rows, reason) {+ // TODO(nathan): separate different reasonsif (!isClosed) {add(GridEvent.didLoadRows(databaseController.rowCache.rowInfos, reason),diff --git a/frontend/appflowy_flutter/lib/startup/tasks/file_storage_task.dart b/frontend/appflowy_flutter/lib/startup/tasks/file_storage_task.dartindex ffa331f9be..5077173c0d 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/file_storage_task.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/file_storage_task.dart@@ -47,8 +47,11 @@ class FileStorageService {},);- final payload = RegisterStreamPB()..port = Int64(_port.sendPort.nativePort);- FileStorageEventRegisterStream(payload).send();+ if (!integrationMode().isTest) {+ final payload = RegisterStreamPB()+ ..port = Int64(_port.sendPort.nativePort);+ FileStorageEventRegisterStream(payload).send();+ }}final Map<String, AutoRemoveNotifier<FileProgress>> _notifierList = {};diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dartindex aafcf86c5d..17878d56bc 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dart@@ -24,7 +24,6 @@ class ImportBackendService {final request = ImportPayloadPB(parentViewId: parentViewId,values: values,- syncAfterCreate: true,);return FolderEventImportData(request).send();diff --git a/frontend/appflowy_flutter/macos/Podfile.lock b/frontend/appflowy_flutter/macos/Podfile.lockindex 615bfca955..0fc6b09590 100644--- a/frontend/appflowy_flutter/macos/Podfile.lock+++ b/frontend/appflowy_flutter/macos/Podfile.lock@@ -142,7 +142,7 @@ SPEC CHECKSUMS:HotKey: e96d8a2ddbf4591131e2bb3f54e69554d90cdca6hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023cirondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478- local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff+ local_notifier: c6c371695f914641ab7bc8601944f7e358632d0bpackage_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0cpath_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147cReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979diff --git a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dartindex 01b5c0d5fc..eb9cdcd443 100644--- a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart@@ -54,7 +54,7 @@ Future<void> boardResponseFuture() {return Future.delayed(boardResponseDuration());}-Duration boardResponseDuration({int milliseconds = 200}) {+Duration boardResponseDuration({int milliseconds = 2000}) {return Duration(milliseconds: milliseconds);}diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 274c9d6a13..f6d17280be 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -975,7 +975,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -1000,13 +1000,14 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-trait","chrono","collab","collab-entity",+ "csv","dashmap 5.5.3","futures","getrandom 0.2.10",@@ -1029,7 +1030,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -1049,7 +1050,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","bytes",@@ -1068,7 +1069,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -1111,7 +1112,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-stream",@@ -1191,7 +1192,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","collab",@@ -1446,7 +1447,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1462,9 +1463,9 @@ dependencies = [[[package]]name = "csv"-version = "1.2.2"+version = "1.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"dependencies = ["csv-core","itoa 1.0.6",@@ -1474,9 +1475,9 @@ dependencies = [[[package]]name = "csv-core"-version = "0.1.10"+version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"dependencies = ["memchr",]@@ -2217,6 +2218,7 @@ dependencies = ["strum","strum_macros 0.25.2","tokio",+ "tokio-retry","tokio-util","tracing","url",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 05c822cd96..1c13a247ed 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -119,13 +119,13 @@ custom-protocol = ["tauri/custom-protocol"]# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lockindex 7fdcdb07a7..69d7f05ca4 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.lock+++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock@@ -958,7 +958,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -983,13 +983,14 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-trait","chrono","collab","collab-entity",+ "csv","dashmap 5.5.3","futures","getrandom 0.2.12",@@ -1012,7 +1013,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -1032,7 +1033,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","bytes",@@ -1051,7 +1052,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -1094,7 +1095,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-stream",@@ -1174,7 +1175,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","collab",@@ -2247,6 +2248,7 @@ dependencies = ["strum","strum_macros 0.25.3","tokio",+ "tokio-retry","tokio-util","tracing","url",diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.tomlindex f34e2e3a70..f5ff8ed8c4 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml@@ -117,13 +117,13 @@ custom-protocol = ["tauri/custom-protocol"]# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 02e48890ee..35b4ddc5d2 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -836,7 +836,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -861,13 +861,14 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-trait","chrono","collab","collab-entity",+ "csv","dashmap 5.5.3","futures","getrandom 0.2.10",@@ -890,7 +891,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -910,7 +911,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","bytes",@@ -929,7 +930,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","arc-swap",@@ -972,7 +973,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","async-stream",@@ -1052,7 +1053,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ee6028e4ed0b45294f27fe89bda241b770bf5625#ee6028e4ed0b45294f27fe89bda241b770bf5625"dependencies = ["anyhow","collab",@@ -1281,7 +1282,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1297,9 +1298,9 @@ dependencies = [[[package]]name = "csv"-version = "1.2.2"+version = "1.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"dependencies = ["csv-core","itoa",@@ -1309,9 +1310,9 @@ dependencies = [[[package]]name = "csv-core"-version = "0.1.10"+version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"dependencies = ["memchr",]@@ -2025,6 +2026,7 @@ dependencies = ["fancy-regex 0.11.0","flowy-codegen","flowy-database-pub",+ "flowy-database2","flowy-derive","flowy-error","flowy-notification",@@ -4144,7 +4146,7 @@ version = "0.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"dependencies = [- "phf_macros",+ "phf_macros 0.8.0","phf_shared 0.8.0","proc-macro-hack",]@@ -4164,6 +4166,7 @@ version = "0.11.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"dependencies = [+ "phf_macros 0.11.2","phf_shared 0.11.2",]@@ -4231,6 +4234,19 @@ dependencies = ["syn 1.0.109",]+[[package]]+name = "phf_macros"+version = "0.11.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"+dependencies = [+ "phf_generator 0.11.2",+ "phf_shared 0.11.2",+ "proc-macro2",+ "quote",+ "syn 2.0.47",+]+[[package]]name = "phf_shared"version = "0.8.0"diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 1cfefd9494..8aaed42f60 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -141,13 +141,13 @@ rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "b987647c190b337d0dca2718c93ff918e94b3730" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ee6028e4ed0b45294f27fe89bda241b770bf5625" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/collab-integrate/src/collab_builder.rs b/frontend/rust-lib/collab-integrate/src/collab_builder.rsindex 1a8b1786ff..dc18fcbed3 100644--- a/frontend/rust-lib/collab-integrate/src/collab_builder.rs+++ b/frontend/rust-lib/collab-integrate/src/collab_builder.rs@@ -161,7 +161,10 @@ impl AppFlowyCollabBuilder {let mut collab = self.build_collab(&object, &collab_db, data_source)?;collab.enable_undo_redo();- let document = Document::open_with(collab, data)?;+ let document = match data {+ None => Document::open(collab)?,+ Some(data) => Document::create_with_data(collab, data)?,+ };let document = Arc::new(RwLock::new(document));self.finalize(object, builder_config, document)}diff --git a/frontend/rust-lib/event-integration-test/src/lib.rs b/frontend/rust-lib/event-integration-test/src/lib.rsindex 758d035841..760f217084 100644--- a/frontend/rust-lib/event-integration-test/src/lib.rs+++ b/frontend/rust-lib/event-integration-test/src/lib.rs@@ -1,16 +1,16 @@use collab::core::collab::DataSource;use collab::core::origin::CollabOrigin;+use collab::preclude::Collab;use collab_document::blocks::DocumentData;use collab_document::document::Document;use collab_entity::CollabType;+use nanoid::nanoid;+use semver::Version;use std::env::temp_dir;use std::path::PathBuf;use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};use std::sync::Arc;use std::time::Duration;--use nanoid::nanoid;-use semver::Version;use tokio::select;use tokio::task::LocalSet;use tokio::time::sleep;@@ -157,13 +157,15 @@ pub fn document_data_from_document_doc_state(doc_id: &str, doc_state: Vec<u8>) -}pub fn document_from_document_doc_state(doc_id: &str, doc_state: Vec<u8>) -> Document {- Document::open_with_options(+ let collab = Collab::new_with_source(CollabOrigin::Empty,- DataSource::DocStateV1(doc_state),doc_id,+ DataSource::DocStateV1(doc_state),vec![],+ true,)- .unwrap()+ .unwrap();+ Document::open(collab).unwrap()}async fn init_core(config: AppFlowyCoreConfig) -> AppFlowyCore {diff --git a/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rsindex 995be5bb89..682cde232d 100644--- a/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/import_test.rs@@ -47,7 +47,6 @@ async fn import_10240_row_csv_file_test() {fn gen_import_data(file_name: String, csv_string: String, workspace_id: String) -> ImportPayloadPB {ImportPayloadPB {parent_view_id: workspace_id.clone(),- sync_after_create: false,values: vec![ImportValuePayloadPB {name: file_name,data: Some(csv_string.as_bytes().to_vec()),diff --git a/frontend/rust-lib/event-integration-test/tests/folder/local_test/publish_database_test.rs b/frontend/rust-lib/event-integration-test/tests/folder/local_test/publish_database_test.rsindex cbf814d6f2..aeaa13c582 100644--- a/frontend/rust-lib/event-integration-test/tests/folder/local_test/publish_database_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/folder/local_test/publish_database_test.rs@@ -144,7 +144,6 @@ async fn import_csv(file_name: &str, test: &EventIntegrationTest) -> ViewPB {fn gen_import_data(file_name: String, csv_string: String, workspace_id: String) -> ImportPayloadPB {ImportPayloadPB {parent_view_id: workspace_id.clone(),- sync_after_create: false,values: vec![ImportValuePayloadPB {name: file_name,data: Some(csv_string.as_bytes().to_vec()),diff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.tomlindex 8c2e9e007c..a6a356795e 100644--- a/frontend/rust-lib/flowy-database2/Cargo.toml+++ b/frontend/rust-lib/flowy-database2/Cargo.toml@@ -45,7 +45,7 @@ rayon = "1.9.0"nanoid = "0.4.0"async-trait.workspace = truechrono-tz = "0.8.2"-csv = "1.1.6"+csv = "1.3.0"strum = "0.25"strum_macros = "0.25"validator = { workspace = true, features = ["derive"] }@@ -54,6 +54,7 @@ tokio-retry = "0.3"[dev-dependencies]event-integration-test = { path = "../event-integration-test", default-features = false }+flowy-database2 = { path = ".", features = ["verbose_log"] }[build-dependencies]flowy-codegen.workspace = truediff --git a/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs b/frontend/rust-lib/flowy-database2/src/entities/row_entities.rsindex 68b6628a0a..73909bd46b 100644--- a/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs@@ -109,6 +109,18 @@ impl From<RowDetail> for RowMetaPB {}}}++impl From<&RowDetail> for RowMetaPB {+ fn from(row_detail: &RowDetail) -> Self {+ Self {+ id: row_detail.row.id.to_string(),+ document_id: Some(row_detail.document_id.clone()),+ icon: row_detail.meta.icon_url.clone(),+ is_document_empty: Some(row_detail.meta.is_document_empty),+ attachment_count: Some(row_detail.meta.attachment_count),+ }+ }+}//#[derive(Debug, Default, Clone, ProtoBuf)]diff --git a/frontend/rust-lib/flowy-database2/src/entities/view_entities.rs b/frontend/rust-lib/flowy-database2/src/entities/view_entities.rsindex 9809516bed..b04fcb3aff 100644--- a/frontend/rust-lib/flowy-database2/src/entities/view_entities.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/view_entities.rs@@ -1,4 +1,5 @@use collab_database::rows::RowDetail;+use std::fmt::{Display, Formatter};use flowy_derive::ProtoBuf;@@ -26,6 +27,54 @@ pub struct RowsChangePB {#[pb(index = 3)]pub updated_rows: Vec<UpdatedRowPB>,++ #[pb(index = 4)]+ pub is_move_row: bool,+}++impl RowsChangePB {+ pub fn new() -> Self {+ Default::default()+ }+}+impl Display for RowsChangePB {+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {+ let mut parts = Vec::new();++ // Conditionally add inserted rows if not empty+ if !self.inserted_rows.is_empty() {+ let inserted_rows = self+ .inserted_rows+ .iter()+ .map(|row| format!("{}:{:?}", row.row_meta.id, row.index))+ .collect::<Vec<String>>()+ .join(", ");+ parts.push(format!("Inserted rows: {}", inserted_rows));+ }++ // Conditionally add deleted rows if not empty+ if !self.deleted_rows.is_empty() {+ let deleted_rows = self.deleted_rows.join(", ");+ parts.push(format!("Deleted rows: {}", deleted_rows));+ }++ // Conditionally add updated rows if not empty+ if !self.updated_rows.is_empty() {+ let updated_rows = self+ .updated_rows+ .iter()+ .map(|row| row.row_id.to_string())+ .collect::<Vec<String>>()+ .join(", ");+ parts.push(format!("Updated rows: {}", updated_rows));+ }++ // Always add is_move_row+ parts.push(format!("is_move_row: {}", self.is_move_row));++ // Join the parts together and write them to the formatter+ f.write_str(&parts.join(", "))+ }}impl RowsChangePB {diff --git a/frontend/rust-lib/flowy-database2/src/event_handler.rs b/frontend/rust-lib/flowy-database2/src/event_handler.rsindex c5184aafb3..e6fd8f5797 100644--- a/frontend/rust-lib/flowy-database2/src/event_handler.rs+++ b/frontend/rust-lib/flowy-database2/src/event_handler.rs@@ -37,7 +37,7 @@ pub(crate) async fn get_database_data_handler(.await?;let database_editor = manager.get_database_editor(&database_id).await?;let data = database_editor- .async_open_database_view(view_id.as_ref())+ .open_database_view(view_id.as_ref(), None).await?;trace!("layout: {:?}, rows: {}, fields: {}",diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex 5c1e28782a..019be4a518 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -265,7 +265,8 @@ impl DatabaseManager {let workspace_database = lock.read().await;if let Some(database_id) = workspace_database.get_database_id_with_view_id(view_id) {if self.editors.lock().await.get(&database_id).is_none() {- self.open_database(&database_id).await?;+ let database = self.open_database(&database_id).await?;+ database.as_ref().open_database_view(view_id, None).await?;}}Ok(())diff --git a/frontend/rust-lib/flowy-database2/src/notification.rs b/frontend/rust-lib/flowy-database2/src/notification.rsindex bd79843f35..327bf4c2ce 100644--- a/frontend/rust-lib/flowy-database2/src/notification.rs+++ b/frontend/rust-lib/flowy-database2/src/notification.rs@@ -95,7 +95,7 @@ impl std::convert::From<i32> for DatabaseNotification {#[tracing::instrument(level = "trace")]pub fn send_notification(id: &str, ty: DatabaseNotification) -> NotificationBuilder {#[cfg(feature = "verbose_log")]- trace!("[Database Notification]: id:{}, ty:{:?}", id, ty);+ tracing::trace!("[Database Notification]: id:{}, ty:{:?}", id, ty);NotificationBuilder::new(id, ty, DATABASE_OBSERVABLE_SOURCE)}diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rsindex 0c9e44ce96..276c4cebaa 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs@@ -16,7 +16,7 @@ use crate::services::field::{};use crate::services::field_settings::{default_field_settings_by_layout_map, FieldSettings};use crate::services::filter::{Filter, FilterChangeset};-use crate::services::group::{default_group_setting, GroupChangeset, GroupSetting, RowChangeset};+use crate::services::group::{default_group_setting, GroupChangeset, GroupSetting};use crate::services::share::csv::{CSVExport, CSVFormat};use crate::services::sort::Sort;use crate::utils::cache::AnyTypeCache;@@ -27,7 +27,7 @@ use collab::lock::RwLock;use collab_database::database::Database;use collab_database::entity::DatabaseView;use collab_database::fields::{Field, TypeOptionData};-use collab_database::rows::{Cell, Cells, Row, RowCell, RowDetail, RowId};+use collab_database::rows::{Cell, Cells, DatabaseRow, Row, RowCell, RowDetail, RowId};use collab_database::views::{DatabaseLayout, FilterMap, LayoutSetting, OrderObjectPosition, RowOrder,};@@ -156,7 +156,11 @@ impl DatabaseEditor {}pub async fn get_layout_type(&self, view_id: &str) -> DatabaseLayout {- let view = self.database_views.get_view_editor(view_id).await.ok();+ let view = self+ .database_views+ .get_or_init_view_editor(view_id)+ .await+ .ok();if let Some(editor) = view {editor.v_get_layout_type().await} else {@@ -169,7 +173,7 @@ impl DatabaseEditor {view_id: &str,layout_type: DatabaseLayout,) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_update_layout_type(layout_type).await?;Ok(())@@ -179,7 +183,7 @@ impl DatabaseEditor {&self,view_id: &str,) -> FlowyResult<broadcast::Receiver<DatabaseViewChanged>> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;Ok(view_editor.notifier.subscribe())}@@ -214,7 +218,7 @@ impl DatabaseEditor {let has_same_content =old_group_setting.is_some() && old_group_setting.unwrap().content == setting_content;- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;if !view_editor.is_grouping_field(field_id).await || !has_same_content {view_editor.v_initialize_new_group(field_id).await?;}@@ -222,9 +226,11 @@ impl DatabaseEditor {}pub async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;let changes = view_editor.v_delete_group(¶ms.group_id).await?;-if !changes.is_empty() {for view in self.database_views.editors().await {send_notification(&view.view_id, DatabaseNotification::DidUpdateRow)@@ -249,13 +255,13 @@ impl DatabaseEditor {view_id: &str,changesets: Vec<GroupChangeset>,) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_update_group(changesets).await?;Ok(())}pub async fn rename_group(&self, view_id: &str, changeset: GroupChangeset) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_rename_group(changeset).await?;Ok(())}@@ -265,31 +271,40 @@ impl DatabaseEditor {view_id: &str,changeset: FilterChangeset,) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_modify_filters(changeset).await?;Ok(())}pub async fn create_or_update_sort(&self, params: UpdateSortPayloadPB) -> FlowyResult<Sort> {- let view_editor = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;let sort = view_editor.v_create_or_update_sort(params).await?;Ok(sort)}pub async fn reorder_sort(&self, params: ReorderSortPayloadPB) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;view_editor.v_reorder_sort(params).await?;Ok(())}pub async fn delete_sort(&self, params: DeleteSortPayloadPB) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;view_editor.v_delete_sort(params).await?;Ok(())}pub async fn get_all_calculations(&self, view_id: &str) -> RepeatedCalculationsPB {- if let Ok(view_editor) = self.database_views.get_view_editor(view_id).await {+ if let Ok(view_editor) = self.database_views.get_or_init_view_editor(view_id).await {view_editor.v_get_all_calculations().await.into()} else {RepeatedCalculationsPB { items: vec![] }@@ -297,19 +312,25 @@ impl DatabaseEditor {}pub async fn update_calculation(&self, update: UpdateCalculationChangesetPB) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(&update.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(&update.view_id)+ .await?;view_editor.v_update_calculations(update).await?;Ok(())}pub async fn remove_calculation(&self, remove: RemoveCalculationChangesetPB) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(&remove.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(&remove.view_id)+ .await?;view_editor.v_remove_calculation(remove).await?;Ok(())}pub async fn get_all_filters(&self, view_id: &str) -> RepeatedFilterPB {- if let Ok(view_editor) = self.database_views.get_view_editor(view_id).await {+ if let Ok(view_editor) = self.database_views.get_or_init_view_editor(view_id).await {let filters = view_editor.v_get_all_filters().await;RepeatedFilterPB::from(&filters)} else {@@ -318,14 +339,14 @@ impl DatabaseEditor {}pub async fn get_filter(&self, view_id: &str, filter_id: &str) -> Option<Filter> {- if let Ok(view_editor) = self.database_views.get_view_editor(view_id).await {+ if let Ok(view_editor) = self.database_views.get_or_init_view_editor(view_id).await {Some(view_editor.v_get_filter(filter_id).await?)} else {None}}pub async fn get_all_sorts(&self, view_id: &str) -> RepeatedSortPB {- if let Ok(view_editor) = self.database_views.get_view_editor(view_id).await {+ if let Ok(view_editor) = self.database_views.get_or_init_view_editor(view_id).await {view_editor.v_get_all_sorts().await.into()} else {RepeatedSortPB { items: vec![] }@@ -333,7 +354,7 @@ impl DatabaseEditor {}pub async fn delete_all_sorts(&self, view_id: &str) {- if let Ok(view_editor) = self.database_views.get_view_editor(view_id).await {+ if let Ok(view_editor) = self.database_views.get_or_init_view_editor(view_id).await {let _ = view_editor.v_delete_all_sorts().await;}}@@ -550,6 +571,7 @@ impl DatabaseEditor {Ok(())}+ #[tracing::instrument(level = "trace", skip_all, err)]pub async fn move_row(&self,view_id: &str,@@ -557,34 +579,78 @@ impl DatabaseEditor {to_row_id: RowId,) -> FlowyResult<()> {let mut database = self.database.write().await;-- let row_detail = database.get_row_detail(&from_row_id).await.ok_or_else(|| {- let msg = format!("Cannot find row {}", from_row_id);- FlowyError::internal().with_context(msg)- })?;-database.update_database_view(view_id, |view| {view.move_row_order(&from_row_id, &to_row_id);});- let new_index = database.index_of_row(view_id, &from_row_id);- drop(database);+ Ok(())+ }- if let Some(index) = new_index {- let delete_row_id = from_row_id.into_inner();- let insert_row = InsertedRowPB::new(RowMetaPB::from(row_detail)).with_index(index as i32);- let changes = RowsChangePB::from_move(vec![delete_row_id], vec![insert_row]);+ #[tracing::instrument(level = "trace", skip_all, err)]+ pub async fn move_group_row(+ &self,+ view_id: &str,+ from_group: &str,+ to_group: &str,+ from_row: RowId,+ to_row: Option<RowId>,+ ) -> FlowyResult<()> {+ let row = self.get_row(view_id, &from_row).await.ok_or_else(|| {+ let msg = format!("Can not find the row:{}", from_row);+ FlowyError::internal().with_context(msg)+ })?;+ trace!(+ "Move row:{} from group:{} to group:{}",+ from_row,+ from_group,+ to_group+ );- send_notification(view_id, DatabaseNotification::DidUpdateRow)- .payload(changes)- .send();+ // when moving row between groups, the cells of the row should be updated+ // if the updated cells is not empty, we need to update cells for given row+ let updated_cells = self+ .database_views+ .get_or_init_view_editor(view_id)+ .await?+ .v_move_group_row(&row, to_group, to_row.clone())+ .await;+ if !updated_cells.is_empty() {+ self+ .database+ .write()+ .await+ .update_row(row.id, |row| {+ row+ .set_last_modified(timestamp())+ .set_cells(Cells::from(updated_cells));+ })+ .await;+ }++ let to_row = if to_row.is_some() {+ to_row+ } else {+ self+ .database+ .read()+ .await+ .get_row_orders_for_view(view_id)+ .last()+ .map(|row| row.id.clone())+ };++ if let Some(to_row_id) = to_row.clone() {+ self.move_row(view_id, from_row.clone(), to_row_id).await?;}Ok(())}pub async fn create_row(&self, params: CreateRowPayloadPB) -> FlowyResult<Option<RowDetail>> {- let view_editor = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view_editor = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;let CreateRowParams {collab_params,@@ -680,7 +746,7 @@ impl DatabaseEditor {}pub async fn get_all_rows(&self, view_id: &str) -> FlowyResult<Vec<Arc<Row>>> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;Ok(view_editor.v_get_all_rows().await)}@@ -693,10 +759,20 @@ impl DatabaseEditor {}}- pub async fn init_database_row(&self, row_id: &RowId) -> FlowyResult<()> {+ pub async fn init_database_row(&self, row_id: &RowId) -> FlowyResult<Arc<RwLock<DatabaseRow>>> {if let Some(entry) = self.finalized_rows.get(row_id) {if *entry.value() {- return Ok(());+ let database_row = self+ .database+ .read()+ .await+ .get_database_row(row_id)+ .await+ .ok_or_else(|| {+ FlowyError::record_not_found()+ .with_context(format!("The row:{} in database not found", row_id))+ })?;+ return Ok(database_row);}}@@ -720,15 +796,15 @@ impl DatabaseEditor {CollabType::DatabaseRow,)?;- if let Err(err) =- self- .collab_builder- .finalize(collab_object, CollabBuilderConfig::default(), database_row)- {+ if let Err(err) = self.collab_builder.finalize(+ collab_object,+ CollabBuilderConfig::default(),+ database_row.clone(),+ ) {error!("Failed to init database row: {}", err);}- Ok(())+ Ok(database_row)}pub async fn get_row_meta(&self, view_id: &str, row_id: &RowId) -> Option<RowMetaPB> {@@ -753,28 +829,8 @@ impl DatabaseEditor {}}- pub async fn get_row_detail(&self, view_id: &str, row_id: &RowId) -> Option<RowDetail> {- let database = self.database.read().await;- if database.contains_row(view_id, row_id) {- database.get_row_detail(row_id).await- } else {- warn!(- "the row:{} is not exist in view:{}",- row_id.as_str(),- view_id- );- None- }- }-pub async fn delete_rows(&self, row_ids: &[RowId]) {- let rows = self.database.write().await.remove_rows(row_ids).await;- for row in rows {- tracing::trace!("Did delete row:{:?}", row);- for view in self.database_views.editors().await {- view.v_did_delete_row(&row).await;- }- }+ let _ = self.database.write().await.remove_rows(row_ids).await;}#[tracing::instrument(level = "trace", skip_all)]@@ -1193,14 +1249,14 @@ impl DatabaseEditor {#[tracing::instrument(level = "trace", skip_all, err)]pub async fn load_groups(&self, view_id: &str) -> FlowyResult<RepeatedGroupPB> {- let view = self.database_views.get_view_editor(view_id).await?;+ let view = self.database_views.get_or_init_view_editor(view_id).await?;let groups = view.v_load_groups().await.unwrap_or_default();Ok(RepeatedGroupPB { items: groups })}#[tracing::instrument(level = "trace", skip_all, err)]pub async fn get_group(&self, view_id: &str, group_id: &str) -> FlowyResult<GroupPB> {- let view = self.database_views.get_view_editor(view_id).await?;+ let view = self.database_views.get_or_init_view_editor(view_id).await?;let group = view.v_get_group(group_id).await?;Ok(group)}@@ -1217,79 +1273,19 @@ impl DatabaseEditor {return Ok(());}- let view = self.database_views.get_view_editor(view_id).await?;+ let view = self.database_views.get_or_init_view_editor(view_id).await?;view.v_move_group(from_group, to_group).await?;Ok(())}- #[tracing::instrument(level = "trace", skip_all, err)]- pub async fn move_group_row(- &self,- view_id: &str,- from_group: &str,- to_group: &str,- from_row: RowId,- to_row: Option<RowId>,- ) -> FlowyResult<()> {- let row_detail = self.get_row_detail(view_id, &from_row).await;- match row_detail {- None => {- warn!(- "Move row between group failed, can not find the row:{}",- from_row- )- },- Some(row_detail) => {- let view = self.database_views.get_view_editor(view_id).await?;- let mut row_changeset = RowChangeset::new(row_detail.row.id.clone());- view- .v_move_group_row(- &row_detail.row,- &mut row_changeset,- to_group,- to_row.clone(),- )- .await;-- let to_row = if to_row.is_some() {- to_row- } else {- let row_details = self.get_all_rows(view_id).await?;- row_details.last().map(|row| row.id.clone())- };- if let Some(row_id) = to_row.clone() {- self.move_row(view_id, from_row.clone(), row_id).await?;- }-- if from_group == to_group {- return Ok(());- }-- tracing::trace!("Row data changed: {:?}", row_changeset);- self- .database- .write()- .await- .update_row(row_detail.row.id, |row| {- row- .set_last_modified(timestamp())- .set_cells(Cells::from(row_changeset.cell_by_field_id.clone()));- })- .await;- },- }-- Ok(())- }-pub async fn group_by_field(&self, view_id: &str, field_id: &str) -> FlowyResult<()> {- let view = self.database_views.get_view_editor(view_id).await?;+ let view = self.database_views.get_or_init_view_editor(view_id).await?;view.v_group_by_field(field_id).await?;Ok(())}pub async fn create_group(&self, view_id: &str, name: &str) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_create_group(name).await?;Ok(())}@@ -1300,7 +1296,7 @@ impl DatabaseEditor {view_id: &str,layout_setting: LayoutSettingChangeset,) -> FlowyResult<()> {- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;view_editor.v_set_layout_settings(layout_setting).await?;Ok(())}@@ -1310,14 +1306,18 @@ impl DatabaseEditor {view_id: &str,layout_ty: DatabaseLayout,) -> Option<LayoutSettingParams> {- let view = self.database_views.get_view_editor(view_id).await.ok()?;+ let view = self+ .database_views+ .get_or_init_view_editor(view_id)+ .await+ .ok()?;let layout_setting = view.v_get_layout_settings(&layout_ty).await;Some(layout_setting)}#[tracing::instrument(level = "trace", skip_all)]pub async fn get_all_calendar_events(&self, view_id: &str) -> Vec<CalendarEventPB> {- match self.database_views.get_view_editor(view_id).await {+ match self.database_views.get_or_init_view_editor(view_id).await {Ok(view) => view.v_get_all_calendar_events().await.unwrap_or_default(),Err(_) => {warn!("Can not find the view: {}", view_id);@@ -1331,13 +1331,17 @@ impl DatabaseEditor {&self,view_id: &str,) -> FlowyResult<Vec<NoDateCalendarEventPB>> {- let _database_view = self.database_views.get_view_editor(view_id).await?;+ let _database_view = self.database_views.get_or_init_view_editor(view_id).await?;Ok(vec![])}#[tracing::instrument(level = "trace", skip_all)]pub async fn get_calendar_event(&self, view_id: &str, row_id: RowId) -> Option<CalendarEventPB> {- let view = self.database_views.get_view_editor(view_id).await.ok()?;+ let view = self+ .database_views+ .get_or_init_view_editor(view_id)+ .await+ .ok()?;view.v_get_calendar_event(row_id).await}@@ -1392,35 +1396,16 @@ impl DatabaseEditor {}}- // Only used in test- #[cfg(debug_assertions)]- pub async fn open_database_view(&self, view_id: &str) -> FlowyResult<DatabasePB> {- let rows = self- .get_all_rows(view_id)- .await?- .into_iter()- .map(|order| RowMetaPB::from(order.as_ref().clone()))- .collect::<Vec<RowMetaPB>>();- let view_layout = self.database.read().await.get_database_view_layout(view_id);- let fields = self- .database- .read()- .await- .get_all_field_orders()- .into_iter()- .map(FieldIdPB::from)- .collect::<Vec<_>>();- Ok(DatabasePB {- id: self.database_id.clone(),- fields,- rows,- layout_type: view_layout.into(),- is_linked: self.database.read().await.is_inline_view(view_id),- })- }-- pub async fn async_open_database_view(&self, view_id: &str) -> FlowyResult<DatabasePB> {- info!("Open database: {}, view: {}", self.database_id, view_id);+ /// Open database view+ /// When opening database view, it will load database rows from remote if they are not exist in local disk.+ /// After load all rows, it will apply filters and sorts to the rows.+ ///+ /// If notify_finish is not None, it will send a notification to the sender when the opening process is complete.+ pub async fn open_database_view(+ &self,+ view_id: &str,+ notify_finish: Option<tokio::sync::oneshot::Sender<()>>,+ ) -> FlowyResult<DatabasePB> {let (tx, rx) = oneshot::channel();self.opening_ret_txs.write().await.push(tx);// Check if the database is currently being opened@@ -1439,9 +1424,10 @@ impl DatabaseEditor {old_token.cancel();}- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;let row_orders = view_editor.get_all_row_orders().await?;- let cloned_row_orders = row_orders.clone();+ view_editor.set_row_orders(row_orders.clone()).await;+// Collect database details in a single block holding the `read` locklet (database_id, fields, is_linked) = {let database = self.database.read().await;@@ -1462,7 +1448,7 @@ impl DatabaseEditor {.collect::<Vec<RowMetaPB>>();trace!(- "database: {}, num fields: {}, num rows: {}",+ "[Database]: database: {}, num fields: {}, num rows: {}",database_id,fields.len(),rows.len()@@ -1470,11 +1456,18 @@ impl DatabaseEditor {trace!("[Database]: start loading rows");let cloned_database = Arc::downgrade(&self.database);- let view_editor = self.database_views.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;tokio::spawn(async move {const CHUNK_SIZE: usize = 10;let apply_filter_and_sort =|mut loaded_rows: Vec<Arc<Row>>, view_editor: Arc<DatabaseViewEditor>| async move {+ for loaded_row in loaded_rows.iter() {+ view_editor+ .row_by_row_id+ .insert(loaded_row.id.to_string(), loaded_row.clone());+ }++ tokio::time::sleep(Duration::from_millis(500)).await;if view_editor.has_filters().await {trace!("[Database]: filtering rows:{}", loaded_rows.len());view_editor.v_filter_rows_and_notify(&mut loaded_rows).await;@@ -1487,13 +1480,13 @@ impl DatabaseEditor {};let mut loaded_rows = vec![];- for chunk_row_orders in cloned_row_orders.chunks(CHUNK_SIZE) {+ for chunk_row_orders in view_editor.row_orders.read().await.chunks(CHUNK_SIZE) {match cloned_database.upgrade() {None => break,Some(database) => {- for row_order in chunk_row_orders {+ for lazy_row in chunk_row_orders {if let Some(database_row) =- database.read().await.init_database_row(&row_order.id).await+ database.read().await.init_database_row(&lazy_row.id).await{if let Some(row) = database_row.read().await.get_row() {loaded_rows.push(Arc::new(row));@@ -1513,6 +1506,10 @@ impl DatabaseEditor {info!("[Database]: Finish loading rows: {}", loaded_rows.len());apply_filter_and_sort(loaded_rows.clone(), view_editor).await;++ if let Some(notify_finish) = notify_finish {+ let _ = notify_finish.send(());+ }});Ok::<_, FlowyError>(DatabasePB {@@ -1559,7 +1556,7 @@ impl DatabaseEditor {view_id: &str,field_ids: Vec<String>,) -> FlowyResult<Vec<FieldSettings>> {- let view = self.database_views.get_view_editor(view_id).await?;+ let view = self.database_views.get_or_init_view_editor(view_id).await?;let field_settings = view.v_get_field_settings(&field_ids)@@ -1585,7 +1582,10 @@ impl DatabaseEditor {&self,params: FieldSettingsChangesetPB,) -> FlowyResult<()> {- let view = self.database_views.get_view_editor(¶ms.view_id).await?;+ let view = self+ .database_views+ .get_or_init_view_editor(¶ms.view_id)+ .await?;view.v_update_field_settings(params).await?;Ok(())diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_observe.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_observe.rsindex 7d914ed456..f6d033d764 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_observe.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_observe.rs@@ -1,17 +1,19 @@-use crate::entities::{DatabaseSyncStatePB, DidFetchRowPB, RowsChangePB};+use crate::entities::{DatabaseSyncStatePB, DidFetchRowPB, InsertedRowPB, RowMetaPB, RowsChangePB};use crate::notification::{send_notification, DatabaseNotification, DATABASE_OBSERVABLE_SOURCE};use crate::services::database::{DatabaseEditor, UpdatedRow};+use crate::services::database_view::DatabaseViewEditor;use collab::lock::RwLock;use collab_database::blocks::BlockEvent;use collab_database::database::Database;use collab_database::fields::FieldChange;use collab_database::rows::{RowChange, RowId};-use collab_database::views::DatabaseViewChange;+use collab_database::views::{DatabaseViewChange, RowOrder};+use dashmap::DashMap;use flowy_notification::{DebounceNotificationSender, NotificationBuilder};use futures::StreamExt;use lib_dispatch::prelude::af_spawn;use std::sync::Arc;-use tracing::{error, trace, warn};+use tracing::{error, info, trace, warn};pub(crate) async fn observe_sync_state(database_id: &str, database: &Arc<RwLock<Database>>) {let weak_database = Arc::downgrade(database);@@ -110,66 +112,188 @@ pub(crate) async fn observe_view_change(database_id: &str, database_editor: &Arc.subscribe_view_change();af_spawn(async move {while let Ok(view_change) = view_change.recv().await {+ trace!(+ "[Database View Observe]: {} view change:{:?}",+ database_id,+ view_change+ );match weak_database_editor.upgrade() {None => break,- Some(database_editor) => {- trace!(- "[Database View Observe]: {} view change:{:?}",- database_id,- view_change- );- match view_change {- DatabaseViewChange::DidCreateView { .. } => {},- DatabaseViewChange::DidUpdateView { .. } => {},- DatabaseViewChange::DidDeleteView { .. } => {},- DatabaseViewChange::LayoutSettingChanged { .. } => {},- DatabaseViewChange::DidInsertRowOrders { row_orders } => {- trace!("Did insert row orders: {:?}", row_orders);- for row in row_orders {- if let Err(err) = database_editor.init_database_row(&row.id).await {- error!("Failed to init row: {:?}", err);- }-- for view in database_editor.database_views.editors().await {- if let Some(index) = database_editor.get_row_index(&view.view_id, &row.id).await {- if let Some(row) = database_editor.get_row(&view.view_id, &row.id).await {- view.v_did_create_row(&row, index).await;- }- }- }- }- },- DatabaseViewChange::DidDeleteRowAtIndex { .. } => {- // for index in index {- // for view in database_editor.database_views.editors().await {- // if let Some(row_order) = database_editor- // .get_row_order_at_index(&view.view_id, index)- // .await- // {- // trace!("Did delete row at index: {:?}", index);- // if let Some(row) = database_editor.get_row(&view.view_id, &row_order.id).await {- // trace!("Did delete row at index2: {:?}", row);- // view.v_did_delete_row(&row).await;- // }- // }- // }- // }- },- DatabaseViewChange::DidCreateFilters { .. } => {},- DatabaseViewChange::DidUpdateFilter { .. } => {},- DatabaseViewChange::DidCreateGroupSettings { .. } => {},- DatabaseViewChange::DidUpdateGroupSetting { .. } => {},- DatabaseViewChange::DidCreateSorts { .. } => {},- DatabaseViewChange::DidUpdateSort { .. } => {},- DatabaseViewChange::DidCreateFieldOrder { .. } => {},- DatabaseViewChange::DidDeleteFieldOrder { .. } => {},- }+ Some(database_editor) => match view_change {+ DatabaseViewChange::DidCreateView { .. } => {},+ DatabaseViewChange::DidUpdateView { .. } => {},+ DatabaseViewChange::DidDeleteView { .. } => {},+ DatabaseViewChange::LayoutSettingChanged { .. } => {},+ DatabaseViewChange::DidUpdateRowOrders {+ database_view_id: _,+ is_local_change,+ insert_row_orders,+ delete_row_indexes,+ } => {+ handle_did_update_row_orders(+ database_editor,+ is_local_change,+ insert_row_orders,+ delete_row_indexes,+ )+ .await;+ },+ DatabaseViewChange::DidCreateFilters { .. } => {},+ DatabaseViewChange::DidUpdateFilter { .. } => {},+ DatabaseViewChange::DidCreateGroupSettings { .. } => {},+ DatabaseViewChange::DidUpdateGroupSetting { .. } => {},+ DatabaseViewChange::DidCreateSorts { .. } => {},+ DatabaseViewChange::DidUpdateSort { .. } => {},+ DatabaseViewChange::DidCreateFieldOrder { .. } => {},+ DatabaseViewChange::DidDeleteFieldOrder { .. } => {},},}}});}+async fn handle_did_update_row_orders(+ database_editor: Arc<DatabaseEditor>,+ is_local_change: bool,+ insert_row_orders: Vec<(RowOrder, u32)>,+ delete_row_indexes: Vec<u32>,+) {+ // DidUpdateRowOrders is triggered whenever a user performs operations such as+ // deleting, inserting, or moving a row in the database.+ //+ // Before DidUpdateRowOrders is called, the changes (insert/move/delete) have already been+ // applied to the underlying database. This means the current order of rows reflects these updates.+ //+ // Example:+ // Imagine the current state of rows is:+ // Before any changes: [a, b, c]+ //+ // Operation: Move 'a' before 'c'+ // Initial state: [a, b, c]+ //+ // Move 'a' to before 'c': This operation is divided into two parts:+ // Insert row orders: Insert a at position 2 (right before c).+ // Delete row indexes: Delete a from its original position (index 0).+ // The steps are:+ //+ // Insert row: After inserting a at position 2, the rows temporarily look like this:+ // Insert row orders: [(a, 2)]+ // State after insert: [a, b, a, c]+ // Delete row: Next, we delete a from its original position at index 0.+ // Delete row indexes: [0]+ // Final state after delete: [b, a, c]+ let database_view_rows = DashMap::new();+ // 1. handle insert row orders+ for (row_order, index) in insert_row_orders {+ if let Err(err) = database_editor.init_database_row(&row_order.id).await {+ error!("Failed to init row: {:?}", err);+ }++ for database_view in database_editor.database_views.editors().await {+ trace!(+ "[RowOrder]: insert row:{} at index:{}, is_local:{}",+ row_order.id,+ index,+ is_local_change+ );++ // insert row order+ {+ let mut view_row_orders = database_view.row_orders.write().await;+ if view_row_orders.len() >= index as usize {+ view_row_orders.insert(index as usize, row_order.clone());+ info!(+ "[RowOrder]: view row orders after:{:?}",+ view_row_orders+ .iter()+ .map(|x| x.id.to_string())+ .collect::<Vec<String>>()+ );+ } else {+ warn!(+ "[RowOrder]: insert row at index:{} out of range:{}",+ index,+ view_row_orders.len()+ );+ }+ }++ let is_move_row = is_move_row(&database_view, &row_order, &delete_row_indexes).await;+ if let Some(row) = database_editor+ .get_row(&database_view.view_id, &row_order.id)+ .await+ {+ database_view+ .v_did_create_row(&row, index, is_move_row, is_local_change)+ .await;+ }++ // gather changes for notification+ if let Some((index, row_detail)) = database_view.v_get_row(&row_order.id).await {+ database_view_rows+ .entry(database_view.view_id.clone())+ .or_insert_with(|| {+ let mut change = RowsChangePB::new();+ change.is_move_row = is_move_row;+ change+ })+ .inserted_rows+ .push(InsertedRowPB::new(RowMetaPB::from(row_detail.as_ref())).with_index(index as i32));+ }+ }+ }++ // handle delete row orders+ for index in delete_row_indexes {+ let index = index as usize;+ for database_view in database_editor.database_views.editors().await {+ let mut view_row_orders = database_view.row_orders.write().await;+ if view_row_orders.len() > index {+ let lazy_row = view_row_orders.remove(index);+ // Update changeset in RowsChangePB+ let row_id = lazy_row.id.to_string();+ trace!("[RowOrder]: try to delete row:{}", lazy_row.id);++ let mut row_change = database_view_rows+ .entry(database_view.view_id.clone())+ .or_default();+ row_change.deleted_rows.push(row_id);++ // notify the view+ if let Some(row) = database_view.row_by_row_id.get(lazy_row.id.as_str()) {+ trace!(+ "[RowOrder]: Did delete row:{} at index:{}, is_move_row: {}, is_local:{}",+ row.id,+ index,+ row_change.is_move_row,+ is_local_change+ );+ database_view+ .v_did_delete_row(&row, row_change.is_move_row, is_local_change)+ .await;+ } else {+ error!("[RowOrder]: row not found: {} in cache", lazy_row.id);+ }+ } else {+ warn!(+ "[RowOrder]: delete row at index:{} out of range:{}",+ index,+ view_row_orders.len()+ );+ }+ }+ }++ // 3. notify the view+ for entry in database_view_rows.into_iter() {+ let (view_id, changes) = entry;+ trace!("[RowOrder]: {}", changes);+ send_notification(&view_id, DatabaseNotification::DidUpdateRow)+ .payload(changes)+ .send();+ }+}+pub(crate) async fn observe_block_event(database_id: &str, database_editor: &Arc<DatabaseEditor>) {let database_id = database_id.to_string();let mut block_event_rx = database_editor@@ -205,7 +329,6 @@ pub(crate) async fn observe_block_event(database_id: &str, database_editor: &Arc});}-#[allow(dead_code)]fn notify_row(notification_sender: &Arc<DebounceNotificationSender>,view_id: &str,@@ -233,3 +356,26 @@ fn notify_cell(notification_sender: &Arc<DebounceNotificationSender>, cell_id: &.build();notification_sender.send_subject(subject);}++async fn is_move_row(+ database_view: &Arc<DatabaseViewEditor>,+ insert_row_order: &RowOrder,+ delete_row_indexes: &[u32],+) -> bool {+ let mut is_move_row = false;+ for index in delete_row_indexes.iter() {+ is_move_row = database_view+ .row_orders+ .read()+ .await+ .get(*index as usize)+ .map(|deleted_row_order| deleted_row_order == insert_row_order)+ .unwrap_or(false);++ if is_move_row {+ break;+ }+ }++ is_move_row+}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rsindex 15cc389629..7e97d8e58d 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs@@ -2,6 +2,7 @@ use std::borrow::Cow;use std::collections::HashMap;use std::sync::Arc;+use super::{notify_did_rename_group, notify_did_update_calculation};use crate::entities::{CalendarEventPB, CreateRowParams, CreateRowPayloadPB, DatabaseLayoutMetaPB,DatabaseLayoutSettingPB, DeleteSortPayloadPB, FieldSettingsChangesetPB, FieldType,@@ -13,6 +14,7 @@ use crate::notification::{send_notification, DatabaseNotification};use crate::services::calculations::{Calculation, CalculationChangeset, CalculationsController};use crate::services::cell::{CellBuilder, CellCache};use crate::services::database::{database_view_setting_pb_from_view, DatabaseRowEvent, UpdatedRow};+use crate::services::database_view::view_calculations::make_calculations_controller;use crate::services::database_view::view_filter::make_filter_controller;use crate::services::database_view::view_group::{get_cell_for_row, get_cells_for_field, new_group_controller,@@ -27,7 +29,9 @@ use crate::services::database_view::{use crate::services::field::{MultiSelectTypeOption, SingleSelectTypeOption};use crate::services::field_settings::FieldSettings;use crate::services::filter::{Filter, FilterChangeset, FilterController};-use crate::services::group::{GroupChangeset, GroupController, MoveGroupRowContext, RowChangeset};+use crate::services::group::{+ DidMoveGroupRowResult, GroupChangeset, GroupController, MoveGroupRowContext, UpdatedCells,+};use crate::services::setting::CalendarLayoutSetting;use crate::services::sort::{Sort, SortChangeset, SortController};use collab_database::database::{gen_database_calculation_id, gen_database_sort_id, gen_row_id};@@ -35,14 +39,12 @@ use collab_database::entity::DatabaseView;use collab_database::fields::Field;use collab_database::rows::{Cells, Row, RowDetail, RowId};use collab_database::views::{DatabaseLayout, RowOrder};+use dashmap::DashMap;use flowy_error::{FlowyError, FlowyResult};use lib_infra::util::timestamp;use tokio::sync::{broadcast, RwLock};use tracing::instrument;-use super::view_calculations::make_calculations_controller;-use super::{notify_did_rename_group, notify_did_update_calculation};-pub struct DatabaseViewEditor {database_id: String,pub view_id: String,@@ -51,6 +53,13 @@ pub struct DatabaseViewEditor {filter_controller: Arc<FilterController>,sort_controller: Arc<RwLock<SortController>>,calculations_controller: Arc<CalculationsController>,+ /// Use lazy_rows as cache that represents the row's order for given view+ /// It can't get the row id when deleting a row. it only returns the deleted index.+ /// So using this cache to get the row id by index+ ///+ /// Check out this link (https://github.com/y-crdt/y-crdt/issues/341) for more information.+ pub(crate) row_orders: RwLock<Vec<RowOrder>>,+ pub(crate) row_by_row_id: DashMap<String, Arc<Row>>,pub notifier: DatabaseViewChangedNotifier,}@@ -112,10 +121,16 @@ impl DatabaseViewEditor {filter_controller,sort_controller,calculations_controller,+ row_orders: Default::default(),+ row_by_row_id: Default::default(),notifier,})}+ pub async fn set_row_orders(&self, row_orders: Vec<RowOrder>) {+ *self.row_orders.write().await = row_orders;+ }+pub async fn get_all_row_orders(&self) -> FlowyResult<Vec<RowOrder>> {let row_orders = self.delegate.get_all_row_orders(&self.view_id).await;Ok(row_orders)@@ -190,17 +205,23 @@ impl DatabaseViewEditor {.send();}- pub async fn v_did_create_row(&self, row: &Row, index: usize) {+ pub async fn v_did_create_row(+ &self,+ row: &Row,+ index: u32,+ is_move_row: bool,+ is_local_change: bool,+ ) {// Send the group notification if the current view has groups- if let Some(controller) = self.group_controller.write().await.as_mut() {- let mut rows = vec![Arc::new(row.clone())];- self.v_filter_rows(&mut rows).await;- if let Some(row) = rows.pop() {- if let Some(changesets) = controller.did_create_row(&row, index).await {++ if !is_move_row || !is_local_change {+ if let Some(controller) = self.group_controller.write().await.as_mut() {+ let mut rows = vec![Arc::new(row.clone())];+ self.v_filter_rows(&mut rows).await;+ if let Some(row) = rows.pop() {+ let changesets = controller.did_create_row(&row, index as usize);for changeset in changesets {- if !changeset.is_empty() {- notify_did_update_group_rows(changeset).await;- }+ notify_did_update_group_rows(changeset).await;}}}@@ -210,31 +231,20 @@ impl DatabaseViewEditor {}#[tracing::instrument(level = "trace", skip_all)]- pub async fn v_did_delete_row(&self, row: &Row) {+ pub async fn v_did_delete_row(&self, row: &Row, is_move_row: bool, is_local_change: bool) {let deleted_row = row.clone();- // Send the group notification if the current view has groups;- let result = self- .mut_group_controller(|group_controller, _| group_controller.did_delete_row(row))- .await;- if let Some(result) = result {- tracing::trace!("Delete row in view changeset: {:?}", result);- for changeset in result.row_changesets {- notify_did_update_group_rows(changeset).await;- }- if let Some(deleted_group) = result.deleted_group {- let payload = GroupChangesPB {- view_id: self.view_id.clone(),- deleted_groups: vec![deleted_group.group_id],- ..Default::default()- };- notify_did_update_num_of_groups(&self.view_id, payload).await;- }+ // Only update group rows+ // 1. when the row is deleted locally. If the row is moved, we don't need to send the group+ // notification. Because it's handled by the move_group_row function+ // 2. when the row is deleted remotely+ if !is_move_row || !is_local_change {+ // Send the group notification if the current view has groups;+ let result = self+ .mut_group_controller(|group_controller, _| group_controller.did_delete_row(row))+ .await;+ handle_mut_group_result(&self.view_id, result).await;}- let changes = RowsChangePB::from_delete(row.id.clone().into_inner());- send_notification(&self.view_id, DatabaseNotification::DidUpdateRow)- .payload(changes)- .send();// Updating calculations for each of the Rows cells is a tedious task// Therefore we spawn a separate task for this@@ -251,6 +261,7 @@ impl DatabaseViewEditor {/// Notify the view that the row has been updated. If the view has groups,/// send the group notification with [GroupRowsNotificationPB]. Otherwise,/// send the view notification with [RowsChangePB]+ #[instrument(level = "trace", skip_all)]pub async fn v_did_update_row(&self, old_row: &Option<Row>, row: &Row, field_id: Option<String>) {if let Some(controller) = self.group_controller.write().await.as_mut() {let field = self@@ -331,18 +342,22 @@ impl DatabaseViewEditor {rows}+ pub async fn v_get_row(&self, row_id: &RowId) -> Option<(usize, Arc<RowDetail>)> {+ self.delegate.get_row_detail(&self.view_id, row_id).await+ }+pub async fn v_move_group_row(&self,row: &Row,- row_changeset: &mut RowChangeset,to_group_id: &str,to_row_id: Option<RowId>,- ) {+ ) -> UpdatedCells {+ let mut updated_cells = UpdatedCells::new();let result = self.mut_group_controller(|group_controller, field| {let move_row_context = MoveGroupRowContext {row,- row_changeset,+ updated_cells: &mut updated_cells,field: &field,to_group_id,to_row_id,@@ -351,21 +366,8 @@ impl DatabaseViewEditor {}).await;- if let Some(result) = result {- if let Some(delete_group) = result.deleted_group {- tracing::trace!("Delete group after moving the row: {:?}", delete_group);- let changes = GroupChangesPB {- view_id: self.view_id.clone(),- deleted_groups: vec![delete_group.group_id],- ..Default::default()- };- notify_did_update_num_of_groups(&self.view_id, changes).await;- }-- for changeset in result.row_changesets {- notify_did_update_group_rows(changeset).await;- }- }+ handle_mut_group_result(&self.view_id, result).await;+ updated_cells}/// Only call once after database view editor initialized@@ -473,7 +475,6 @@ impl DatabaseViewEditor {drop(group_controller);let mut changes = RowsChangePB::default();-if let Some(field) = old_field {for row_id in row_ids {if let Some(row) = self.delegate.remove_row(&row_id).await {@@ -589,9 +590,7 @@ impl DatabaseViewEditor {};self.delegate.insert_sort(&self.view_id, sort.clone()).await;-let mut sort_controller = self.sort_controller.write().await;-let notification = if is_exist {sort_controller.apply_changeset(SortChangeset::from_update(sort.clone()))@@ -1227,7 +1226,7 @@ impl DatabaseViewEditor {});}- async fn gen_did_create_row_view_tasks(&self, preliminary_index: usize, row: Row) {+ async fn gen_did_create_row_view_tasks(&self, preliminary_index: u32, row: Row) {let weak_sort_controller = Arc::downgrade(&self.sort_controller);let weak_calculations_controller = Arc::downgrade(&self.calculations_controller);tokio::spawn(async move {@@ -1247,3 +1246,20 @@ impl DatabaseViewEditor {});}}++async fn handle_mut_group_result(view_id: &str, result: Option<DidMoveGroupRowResult>) {+ if let Some(result) = result {+ if let Some(deleted_group) = result.deleted_group {+ tracing::trace!("Delete group after moving the row: {:?}", deleted_group);+ let payload = GroupChangesPB {+ view_id: view_id.to_string(),+ deleted_groups: vec![deleted_group.group_id],+ ..Default::default()+ };+ notify_did_update_num_of_groups(view_id, payload).await;+ }+ for changeset in result.row_changesets {+ notify_did_update_group_rows(changeset).await;+ }+ }+}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/views.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/views.rsindex 3d460df63c..5393e9d44a 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/views.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/views.rs@@ -52,16 +52,17 @@ impl DatabaseViews {self.view_editors.read().await.values().cloned().collect()}- pub async fn get_view_editor(&self, view_id: &str) -> FlowyResult<Arc<DatabaseViewEditor>> {+ pub async fn get_or_init_view_editor(+ &self,+ view_id: &str,+ ) -> FlowyResult<Arc<DatabaseViewEditor>> {debug_assert!(!view_id.is_empty());if let Some(editor) = self.view_editors.read().await.get(view_id) {return Ok(editor.clone());}- //FIXME: not thread-safelet mut editor_map = self.view_editors.write().await;let database_id = self.database.read().await.get_database_id();- //FIXME: that method below is not Send+Synclet editor = Arc::new(DatabaseViewEditor::new(database_id,@@ -74,6 +75,10 @@ impl DatabaseViews {editor_map.insert(view_id.to_owned(), editor.clone());Ok(editor)}++ pub async fn get_view_editor(&self, view_id: &str) -> Option<Arc<DatabaseViewEditor>> {+ self.view_editors.read().await.get(view_id).cloned()+ }}pub fn gen_handler_id() -> String {diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rsindex e2aa56de94..dad9793c71 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs@@ -1,8 +1,7 @@-use collab_database::{fields::Field, rows::Cell};-use crate::entities::{CheckboxCellDataPB, CheckboxFilterConditionPB, CheckboxFilterPB};use crate::services::cell::insert_checkbox_cell;use crate::services::filter::PreFillCellsWithFilter;+use collab_database::{fields::Field, rows::Cell};impl CheckboxFilterPB {pub fn is_visible(&self, cell_data: &CheckboxCellDataPB) -> bool {diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rsindex e033c13074..bdec856681 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs@@ -394,10 +394,6 @@ impl FilterController {pub async fn filter_rows(&self, rows: &mut Vec<Arc<Row>>) {let filters = self.filters.read().await;-- if filters.is_empty() {- return;- }let field_by_field_id = self.get_field_map().await;rows.iter().for_each(|row| {let _ = filter_row(@@ -532,7 +528,7 @@ fn apply_filter(},};if *field_type != FieldType::from(field.field_type) {- tracing::error!("field type of filter doesn't match field type of field");+ error!("field type of filter doesn't match field type of field");return Some(false);}let cell = row.cells.get(field_id).cloned();diff --git a/frontend/rust-lib/flowy-database2/src/services/group/action.rs b/frontend/rust-lib/flowy-database2/src/services/group/action.rsindex dbc8571862..98a2b0730a 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/action.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/action.rs@@ -60,7 +60,7 @@ pub trait GroupCustomize: Send + Sync {fn move_row(&mut self, context: MoveGroupRowContext) -> Vec<GroupRowsNotificationPB>;/// Returns None if there is no need to delete the group when corresponding row get removed- fn delete_group_when_move_row(+ fn delete_group_after_moving_row(&mut self,_row: &Row,_cell_data: &<Self::GroupTypeOption as TypeOption>::CellProtobufType,@@ -137,11 +137,7 @@ pub trait GroupController: Send + Sync {/// Returns a changeset payload to be sent as a notification.////// * `row_detail`: the newly-created row- async fn did_create_row(- &mut self,- row: &Row,- index: usize,- ) -> Option<Vec<GroupRowsNotificationPB>>;+ fn did_create_row(&mut self, row: &Row, index: usize) -> Vec<GroupRowsNotificationPB>;/// Called after a row's cell data is changed, this moves the row to the/// correct group. It may also insert a new group and/or remove an old group.diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller.rsindex 49b8c64e2d..7e167cf186 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller.rs@@ -154,57 +154,6 @@ wherechangeset.deleted_rows.extend(deleted_row_ids);Some(changeset)}-- fn insert_row_into_group(- &mut self,- new_row: &Row,- index_in_row_order_array: usize,- group_id: &str,- all_rows: &[Arc<Row>],- ) -> Option<usize> {- let mut delta: i64 = 0;- let mut left_reached = false;- let mut right_reached = false;-- let group_data = self.context.get_mut_group(group_id)?;-- // from the index in the row order array, find the nearest row that's also in the same group- let index = loop {- delta = if delta > 0 { -delta } else { -(delta - 1) };-- let query_index = index_in_row_order_array as i64 + delta;-- if query_index < 0 {- if right_reached && left_reached {- break None;- } else {- left_reached = true;- continue;- }- } else if query_index >= all_rows.len() as i64 {- if right_reached && left_reached {- break None;- } else {- right_reached = true;- continue;- }- }-- let row = &all_rows[query_index as usize];-- if let Some(index) = group_data.index_of_row(&row.id.clone()) {- if delta > 0 {- break Some(index);- } else {- break Some(index + 1);- }- }- }?;-- group_data.insert_row(index, new_row.clone());-- Some(index)- }}#[async_trait]@@ -280,71 +229,52 @@ whereself.context.move_group(from_group_id, to_group_id)}- async fn did_create_row(- &mut self,- row: &Row,- index: usize,- ) -> Option<Vec<GroupRowsNotificationPB>> {- let cell = match row.cells.get(&self.grouping_field_id) {- None => self.placeholder_cell()?,- Some(cell) => cell.clone(),- };-+ fn did_create_row(&mut self, row: &Row, index: usize) -> Vec<GroupRowsNotificationPB> {let mut changesets: Vec<GroupRowsNotificationPB> = vec![];- let cell_data = <T as TypeOption>::CellData::from(&cell);-- let mut did_insert_into_status_group = false;-- let all_rows = self.delegate.get_all_rows(&self.context.view_id).await;-- let group_ids = self- .context- .groups()- .into_iter()- .filter(|group| group.id != self.grouping_field_id)- .map(|group| group.id.clone())- .collect::<Vec<_>>();-- for group_id in group_ids {- if self.can_group(&group_id, &cell_data) {- // make sure that the row isn't already in the group data- if let Some((_, group_data)) = self.get_group(&group_id) {- if group_data.contains_row(&row.id) {- did_insert_into_status_group = true;- continue;- }- }- if let Some(index_in_group) = self.insert_row_into_group(row, index, &group_id, &all_rows) {- did_insert_into_status_group = true;+ let cell = match row.cells.get(&self.grouping_field_id) {+ None => self.placeholder_cell(),+ Some(cell) => Some(cell.clone()),+ };- changesets.push(GroupRowsNotificationPB::insert(- group_id.clone(),+ if let Some(cell) = cell {+ let cell_data = <T as TypeOption>::CellData::from(&cell);+ let mut suitable_group_ids = vec![];+ for group in self.get_all_groups() {+ if self.can_group(&group.id, &cell_data) {+ suitable_group_ids.push(group.id.clone());+ let changeset = GroupRowsNotificationPB::insert(+ group.id.clone(),vec![InsertedRowPB {row_meta: (*row).clone().into(),- index: Some(index_in_group as i32),+ index: Some(index as i32),is_new: true,}],- ))+ );+ changesets.push(changeset);}}- }-- if !did_insert_into_status_group {- let group_id = self.grouping_field_id.clone();- if let Some(index_in_group) = self.insert_row_into_group(row, index, &group_id, &all_rows) {- changesets.push(GroupRowsNotificationPB::insert(- self.grouping_field_id.clone(),+ if !suitable_group_ids.is_empty() {+ for group_id in suitable_group_ids.iter() {+ if let Some(group) = self.context.get_mut_group(group_id) {+ group.add_row((*row).clone());+ }+ }+ } else if let Some(no_status_group) = self.context.get_mut_no_status_group() {+ no_status_group.add_row((*row).clone());+ let changeset = GroupRowsNotificationPB::insert(+ no_status_group.id.clone(),vec![InsertedRowPB {row_meta: (*row).clone().into(),- index: Some(index_in_group as i32),+ index: Some(index as i32),is_new: true,}],- ))+ );+ changesets.push(changeset);}}- Some(changesets)+ changesets}fn did_update_group_row(@@ -384,7 +314,8 @@ wheredeleted_group: None,row_changesets: vec![],};- // early return if the row is not in the default group++ // remove row from its group if it is in a groupif let Some(cell) = row.cells.get(&self.grouping_field_id) {let cell_data = <T as TypeOption>::CellData::from(cell);if !cell_data.is_cell_empty() {@@ -393,6 +324,7 @@ where}}+ // when the deleted row is not in current group. It should be in the no status groupmatch self.context.get_mut_no_status_group() {None => {tracing::error!("Unexpected None value. It should have the no status group");@@ -425,7 +357,7 @@ whereif let Some(cell) = cell {let cell_bytes = get_cell_protobuf(&cell, context.field, None);let cell_data = cell_bytes.parser::<P>()?;- result.deleted_group = self.delete_group_when_move_row(context.row, &cell_data);+ result.deleted_group = self.delete_group_after_moving_row(context.row, &cell_data);result.row_changesets = self.move_row(context);} else {tracing::warn!("Unexpected moving group row, changes should not be empty");diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rsindex f0d7eb7851..43e6b4ab3b 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/date_controller.rs@@ -190,7 +190,7 @@ impl GroupCustomize for DateGroupController {group_changeset}- fn delete_group_when_move_row(+ fn delete_group_after_moving_row(&mut self,_row: &Row,cell_data: &<Self::GroupTypeOption as TypeOption>::CellProtobufType,diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rsindex 4b31b567ae..317fee022b 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs@@ -71,21 +71,17 @@ impl GroupController for DefaultGroupController {Ok(())}- async fn did_create_row(- &mut self,- row: &Row,- index: usize,- ) -> Option<Vec<GroupRowsNotificationPB>> {- self.group.insert_row(index, row.clone());+ fn did_create_row(&mut self, row: &Row, index: usize) -> Vec<GroupRowsNotificationPB> {+ self.group.add_row((*row).clone());- Some(vec![GroupRowsNotificationPB::insert(+ vec![GroupRowsNotificationPB::insert(self.group.id.clone(),vec![InsertedRowPB {row_meta: (*row).clone().into(),index: Some(index as i32),is_new: true,}],- )])+ )]}fn did_update_group_row(diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/select_option_controller/util.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/select_option_controller/util.rsindex fd8bdf47f0..1e6730cb46 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/select_option_controller/util.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/select_option_controller/util.rs@@ -1,8 +1,3 @@-use chrono::NaiveDateTime;-use collab_database::entity::SelectOption;-use collab_database::fields::Field;-use collab_database::rows::{Cell, Row};-use crate::entities::{FieldType, GroupRowsNotificationPB, InsertedRowPB, RowMetaPB, SelectOptionCellDataPB,};@@ -11,6 +6,11 @@ use crate::services::cell::{};use crate::services::field::{SelectOptionIds, CHECK};use crate::services::group::{Group, GroupData, MoveGroupRowContext};+use chrono::NaiveDateTime;+use collab_database::entity::SelectOption;+use collab_database::fields::Field;+use collab_database::rows::{Cell, Row};+use tracing::debug;pub fn add_or_remove_select_option_row(group: &mut GroupData,@@ -73,7 +73,7 @@ pub fn move_group_row(let mut changeset = GroupRowsNotificationPB::new(group.id.clone());let MoveGroupRowContext {row,- row_changeset,+ updated_cells,field,to_group_id,to_row_id,@@ -86,9 +86,8 @@ pub fn move_group_row(};// Remove the row in which group contains it- if let Some(from_index) = &from_index {+ if from_index.is_some() {changeset.deleted_rows.push(row.id.clone().into_inner());- tracing::debug!("Group:{} remove {} at {}", group.id, row.id, from_index);group.remove_row(&row.id);}@@ -97,17 +96,17 @@ pub fn move_group_row(match to_index {None => {changeset.inserted_rows.push(inserted_row);- tracing::debug!("Group:{} append row:{}", group.id, row.id);group.add_row(row.clone());},Some(to_index) => {if to_index < group.number_of_row() {- tracing::debug!("Group:{} insert {} at {} ", group.id, row.id, to_index);inserted_row.index = Some(to_index as i32);group.insert_row(to_index, row.clone());} else {- tracing::warn!("Move to index: {} is out of bounds", to_index);- tracing::debug!("Group:{} append row:{}", group.id, row.id);+ tracing::warn!(+ "[Database Group]: Move to index: {} is out of bounds",+ to_index+ );group.add_row(row.clone());}changeset.inserted_rows.push(inserted_row);@@ -120,14 +119,11 @@ pub fn move_group_row(if from_index.is_none() {let cell = make_inserted_cell(&group.id, field);if let Some(cell) = cell {- tracing::debug!(- "Update content of the cell in the row:{} to group:{}",- row.id,- group.id+ debug!(+ "[Database Group]: Update content of the cell in the row:{} to group:{}",+ row.id, group.id);- row_changeset- .cell_by_field_id- .insert(field.id.clone(), cell);+ updated_cells.insert(field.id.clone(), cell);}}}diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/url_controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/url_controller.rsindex 2a486d824d..ea5884e175 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/url_controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/url_controller.rs@@ -154,7 +154,7 @@ impl GroupCustomize for URLGroupController {group_changeset}- fn delete_group_when_move_row(+ fn delete_group_after_moving_row(&mut self,_row: &Row,cell_data: &<Self::GroupTypeOption as TypeOption>::CellProtobufType,diff --git a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs b/frontend/rust-lib/flowy-database2/src/services/group/entities.rsindex f423dcb0a9..5e8bf3b0c9 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/entities.rs@@ -123,6 +123,13 @@ impl GroupData {}pub fn remove_row(&mut self, row_id: &RowId) {+ #[cfg(feature = "verbose_log")]+ tracing::trace!(+ "[Database Group]: Remove row:{} from group:{}",+ row_id,+ self.id+ );+match self.rows.iter().position(|row| &row.id == row_id) {None => {},Some(pos) => {@@ -132,14 +139,25 @@ impl GroupData {}pub fn add_row(&mut self, row: Row) {+ #[cfg(feature = "verbose_log")]+ tracing::trace!("[Database Group]: Add row:{} to group:{}", row.id, self.id);match self.rows.iter().find(|r| r.id == row.id) {- None => self.rows.push(row),+ None => {+ self.rows.push(row);+ },Some(_) => {},}}pub fn insert_row(&mut self, index: usize, row: Row) {- if index <= self.rows.len() {+ #[cfg(feature = "verbose_log")]+ tracing::trace!(+ "[Database Group]: Insert row:{} to group:{} at index:{}",+ row.id,+ self.id,+ index+ );+ if index < self.rows.len() {self.rows.insert(index, row);} else {tracing::error!(diff --git a/frontend/rust-lib/flowy-database2/src/services/group/group_builder.rs b/frontend/rust-lib/flowy-database2/src/services/group/group_builder.rsindex 3b1b9f90db..f8fcd61cb2 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/group_builder.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/group_builder.rs@@ -37,36 +37,15 @@ pub struct GeneratedGroups {pub struct MoveGroupRowContext<'a> {pub row: &'a Row,- pub row_changeset: &'a mut RowChangeset,+ pub updated_cells: &'a mut UpdatedCells,pub field: &'a Field,pub to_group_id: &'a str,pub to_row_id: Option<RowId>,}-#[derive(Debug, Clone)]-pub struct RowChangeset {- pub row_id: RowId,- pub height: Option<i32>,- pub visibility: Option<bool>,- // Contains the key/value changes represents as the update of the cells. For example,- // if there is one cell was changed, then the `cell_by_field_id` will only have one key/value.- pub cell_by_field_id: HashMap<String, Cell>,-}--impl RowChangeset {- pub fn new(row_id: RowId) -> Self {- Self {- row_id,- height: None,- visibility: None,- cell_by_field_id: Default::default(),- }- }-- pub fn is_empty(&self) -> bool {- self.height.is_none() && self.visibility.is_none() && self.cell_by_field_id.is_empty()- }-}+/// A map of the updated cells.+/// The key is the field id, the value is the updated cell.+pub type UpdatedCells = HashMap<String, Cell>;/// Returns a group controller.///diff --git a/frontend/rust-lib/flowy-database2/src/services/group/mod.rs b/frontend/rust-lib/flowy-database2/src/services/group/mod.rsindex c2ac8300b4..9fba427e11 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/mod.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/mod.rs@@ -5,7 +5,7 @@ mod controller_impls;mod entities;mod group_builder;-pub(crate) use action::GroupController;+pub(crate) use action::*;pub(crate) use configuration::*;pub(crate) use controller::*;pub(crate) use controller_impls::*;diff --git a/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs b/frontend/rust-lib/flowy-database2/src/services/sort/controller.rsindex 7c19ca5da4..08dfb7afee 100644--- a/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs@@ -99,7 +99,7 @@ impl SortController {}}- pub async fn did_create_row(&self, preliminary_index: usize, row: &Row) {+ pub async fn did_create_row(&self, preliminary_index: u32, row: &Row) {if !self.delegate.filter_row(row).await {return;}@@ -172,7 +172,7 @@ impl SortController {let notification = InsertRowResult {view_id: self.view_id.clone(),row: row.clone(),- index: row_index,+ index: row_index as u32,};self.row_index_cache.insert(row.id, row_index);let _ = self@@ -218,10 +218,6 @@ impl SortController {}pub async fn sort_rows(&mut self, rows: &mut Vec<Arc<Row>>) {- if self.sorts.is_empty() {- return;- }-let fields = self.delegate.get_fields(&self.view_id, None).await;for sort in self.sorts.iter().rev() {rows.par_sort_by(|left, right| cmp_row(left, right, sort, &fields, &self.cell_cache));diff --git a/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs b/frontend/rust-lib/flowy-database2/src/services/sort/entities.rsindex db503dd2fe..77b4df892a 100644--- a/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs+++ b/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs@@ -114,7 +114,7 @@ pub struct ReorderSingleRowResult {pub struct InsertRowResult {pub view_id: String,pub row: Row,- pub index: usize,+ pub index: u32,}#[derive(Debug, Default)]diff --git a/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs b/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rsindex 312649e88d..67f5bc43c2 100644--- a/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/filter_test/script.rs@@ -301,8 +301,16 @@ impl DatabaseFilterTest {}},FilterScript::AssertNumberOfVisibleRows { expected } => {- let grid = self.editor.open_database_view(&self.view_id).await.unwrap();- assert_eq!(grid.rows.len(), expected);+ let (tx, rx) = tokio::sync::oneshot::channel();+ let _ = self+ .editor+ .open_database_view(&self.view_id, Some(tx))+ .await+ .unwrap();+ rx.await.unwrap();++ let rows = self.editor.get_all_rows(&self.view_id).await.unwrap();+ assert_eq!(rows.len(), expected);},FilterScript::Wait { millisecond } => {tokio::time::sleep(Duration::from_millis(millisecond)).await;diff --git a/frontend/rust-lib/flowy-database2/tests/database/group_test/script.rs b/frontend/rust-lib/flowy-database2/tests/database/group_test/script.rsindex e97bc40fa1..304add5d03 100644--- a/frontend/rust-lib/flowy-database2/tests/database/group_test/script.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/group_test/script.rs@@ -3,9 +3,7 @@ use collab_database::fields::Field;use collab_database::rows::RowId;use std::time::Duration;-use flowy_database2::entities::{- CreateRowPayloadPB, FieldType, GroupPB, OrderObjectPositionPB, RowMetaPB,-};+use flowy_database2::entities::{CreateRowPayloadPB, FieldType, GroupPB, RowMetaPB};use flowy_database2::services::cell::{delete_select_option_cell, insert_date_cell, insert_select_option_cell, insert_url_cell,};@@ -38,7 +36,6 @@ pub enum GroupScript {},CreateRow {group_index: usize,- position: OrderObjectPositionPB,},DeleteRow {group_index: usize,@@ -96,7 +93,7 @@ impl DatabaseGroupTest {row_count,} => {// sleep for 2 seconds to wait for the row count to be updated- tokio::time::sleep(Duration::from_secs(2)).await;+ tokio::time::sleep(Duration::from_secs(3)).await;assert_eq!(row_count, self.group_at_index(group_index).await.rows.len());},GroupScript::AssertGroupCount(count) => {@@ -134,18 +131,16 @@ impl DatabaseGroupTest {row_index,row,} => {+ //let group = self.group_at_index(group_index).await;let compare_row = group.rows.get(row_index).unwrap().clone();assert_eq!(row.id, compare_row.id);},- GroupScript::CreateRow {- group_index,- position,- } => {+ GroupScript::CreateRow { group_index } => {let group = self.group_at_index(group_index).await;let params = CreateRowPayloadPB {view_id: self.view_id.clone(),- row_position: position,+ row_position: Default::default(),group_id: Some(group.group_id),data: Default::default(),};@@ -158,6 +153,8 @@ impl DatabaseGroupTest {let row = self.row_at_index(group_index, row_index).await;let row_ids = vec![RowId::from(row.id)];self.editor.delete_rows(&row_ids).await;+ // sleep for 1 second to wait for the row observation callback+ tokio::time::sleep(Duration::from_secs(1)).await;},GroupScript::UpdateGroupedCell {from_group_index,diff --git a/frontend/rust-lib/flowy-database2/tests/database/group_test/test.rs b/frontend/rust-lib/flowy-database2/tests/database/group_test/test.rsindex 12017dc9dc..9f300c065e 100644--- a/frontend/rust-lib/flowy-database2/tests/database/group_test/test.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/group_test/test.rs@@ -1,8 +1,6 @@use crate::database::group_test::script::DatabaseGroupTest;use crate::database::group_test::script::GroupScript::*;use collab_database::entity::SelectOption;-use flowy_database2::entities::OrderObjectPositionPB;-use flowy_database2::entities::OrderObjectPositionTypePB;#[tokio::test]async fn group_init_test() {@@ -55,31 +53,43 @@ async fn group_move_row_test() {}#[tokio::test]-async fn group_move_row_to_other_group_test() {+async fn test_row_movement_between_groups_with_assertions() {let mut test = DatabaseGroupTest::new().await;- let group = test.group_at_index(1).await;- let scripts = vec![- MoveRow {- from_group_index: 1,- from_row_index: 0,- to_group_index: 2,- to_row_index: 1,- },- AssertGroupRowCount {- group_index: 1,- row_count: 1,- },- AssertGroupRowCount {- group_index: 2,- row_count: 3,- },- AssertRow {- group_index: 2,- row_index: 1,- row: group.rows.first().unwrap().clone(),- },- ];- test.run_scripts(scripts).await;+ for _ in 0..5 {+ let scripts = vec![+ MoveRow {+ from_group_index: 1,+ from_row_index: 0,+ to_group_index: 2,+ to_row_index: 1,+ },+ AssertGroupRowCount {+ group_index: 1,+ row_count: 1,+ },+ AssertGroupRowCount {+ group_index: 2,+ row_count: 3,+ },+ // Move the row back to origin group+ MoveRow {+ from_group_index: 2,+ from_row_index: 1,+ to_group_index: 1,+ to_row_index: 0,+ },+ AssertGroupRowCount {+ group_index: 2,+ row_count: 2,+ },+ AssertGroupRowCount {+ group_index: 1,+ row_count: 2,+ },+ ];+ test.run_scripts(scripts).await;+ tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;+ }}#[tokio::test]@@ -203,79 +213,20 @@ async fn group_move_row_to_other_group_and_reorder_from_bottom_to_up_test() {];test.run_scripts(scripts).await;}-#[tokio::test]async fn group_create_row_test() {let mut test = DatabaseGroupTest::new().await;-- let group1 = test.group_at_index(1).await;-let scripts = vec![- CreateRow {- group_index: 1,- position: Default::default(),- },+ CreateRow { group_index: 1 },AssertGroupRowCount {group_index: 1,row_count: 3,},- AssertRow {- group_index: 1,- row_index: 0,- row: group1.rows.first().unwrap().clone(),- },- AssertRow {- group_index: 1,- row_index: 1,- row: group1.rows.get(1).unwrap().clone(),- },- ];- test.run_scripts(scripts).await;-- let group1 = test.group_at_index(1).await;-- let scripts = vec![- CreateRow {- group_index: 1,- position: OrderObjectPositionPB {- position: OrderObjectPositionTypePB::Before,- object_id: Some(group1.rows.first().unwrap().clone().id),- },- },- CreateRow {- group_index: 1,- position: OrderObjectPositionPB {- position: OrderObjectPositionTypePB::After,- object_id: Some(group1.rows.first().unwrap().clone().id),- },- },- CreateRow {- group_index: 1,- position: OrderObjectPositionPB {- position: OrderObjectPositionTypePB::Before,- object_id: Some(group1.rows.get(2).unwrap().clone().id),- },- },- CreateRow {- group_index: 1,- position: OrderObjectPositionPB {- position: OrderObjectPositionTypePB::After,- object_id: Some(group1.rows.get(2).unwrap().clone().id),- },- },+ CreateRow { group_index: 2 },+ CreateRow { group_index: 2 },AssertGroupRowCount {- group_index: 1,- row_count: 7,- },- AssertRow {- group_index: 1,- row_index: 1,- row: group1.rows.first().unwrap().clone(),- },- AssertRow {- group_index: 1,- row_index: 5,- row: group1.rows.get(2).unwrap().clone(),+ group_index: 2,+ row_count: 4,},];test.run_scripts(scripts).await;diff --git a/frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rs b/frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rsindex 9b61fdc9d9..6fb35954d7 100644--- a/frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/sort_test/script.rs@@ -7,20 +7,25 @@ use collab_database::rows::RowId;use futures::stream::StreamExt;use tokio::sync::broadcast::Receiver;+use crate::database::database_editor::DatabaseEditorTest;use flowy_database2::entities::{- CreateRowPayloadPB, DeleteSortPayloadPB, ReorderSortPayloadPB, UpdateSortPayloadPB,+ CreateRowPayloadPB, DeleteSortPayloadPB, FieldType, ReorderSortPayloadPB, UpdateSortPayloadPB,};use flowy_database2::services::cell::stringify_cell;use flowy_database2::services::database_view::DatabaseViewChanged;+use flowy_database2::services::filter::{FilterChangeset, FilterInner};use flowy_database2::services::sort::SortCondition;--use crate::database::database_editor::DatabaseEditorTest;+use lib_infra::box_any::BoxAny;pub enum SortScript {InsertSort {field: Field,condition: SortCondition,},+ InsertFilter {+ field_type: FieldType,+ data: BoxAny,+ },ReorderSort {from_sort_id: String,to_sort_id: String,@@ -83,6 +88,22 @@ impl DatabaseSortTest {};let _ = self.editor.create_or_update_sort(params).await.unwrap();},+ SortScript::InsertFilter { field_type, data } => {+ let field = self.get_first_field(field_type).await;+ let params = FilterChangeset::Insert {+ parent_filter_id: None,+ data: FilterInner::Data {+ field_id: field.id,+ field_type,+ condition_and_content: data,+ },+ };+ self+ .editor+ .modify_view_filters(&self.view_id, params)+ .await+ .unwrap();+ },SortScript::ReorderSort {from_sort_id,to_sort_id,diff --git a/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs b/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rsindex df4164a18e..9293b55762 100644--- a/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs@@ -1,7 +1,7 @@-use flowy_database2::entities::FieldType;-use flowy_database2::services::sort::SortCondition;-use crate::database::sort_test::script::{DatabaseSortTest, SortScript::*};+use flowy_database2::entities::{CheckboxFilterConditionPB, CheckboxFilterPB, FieldType};+use flowy_database2::services::sort::SortCondition;+use lib_infra::box_any::BoxAny;#[tokio::test]async fn sort_text_by_ascending_test() {@@ -20,6 +20,16 @@ async fn sort_text_by_ascending_test() {field_id: text_field.id.clone(),orders: vec!["A", "AE", "AE", "C", "CB", "DA", ""],},+ InsertFilter {+ field_type: FieldType::Checkbox,+ data: BoxAny::new(CheckboxFilterPB {+ condition: CheckboxFilterConditionPB::IsChecked,+ }),+ },+ AssertCellContentOrder {+ field_id: text_field.id.clone(),+ orders: vec!["A", "AE", ""],+ },];test.run_scripts(scripts).await;}diff --git a/frontend/rust-lib/flowy-document/src/manager.rs b/frontend/rust-lib/flowy-document/src/manager.rsindex ee4bf64785..511d790437 100644--- a/frontend/rust-lib/flowy-document/src/manager.rs+++ b/frontend/rust-lib/flowy-document/src/manager.rs@@ -470,7 +470,7 @@ async fn doc_state_from_document_data(// spawn_blocking is used to avoid blocking the tokio thread pool if the document is large.let encoded_collab = tokio::task::spawn_blocking(move || {let collab = Collab::new_with_origin(CollabOrigin::Empty, doc_id, vec![], false);- let document = Document::open_with(collab, Some(data)).map_err(internal_error)?;+ let document = Document::create_with_data(collab, data).map_err(internal_error)?;let encode_collab = document.encode_collab()?;Ok::<_, FlowyError>(encode_collab)})diff --git a/frontend/rust-lib/flowy-folder/src/entities/import.rs b/frontend/rust-lib/flowy-folder/src/entities/import.rsindex b2982fcd5f..8029b88bb2 100644--- a/frontend/rust-lib/flowy-folder/src/entities/import.rs+++ b/frontend/rust-lib/flowy-folder/src/entities/import.rs@@ -4,6 +4,8 @@ use crate::share::{ImportParams, ImportType, ImportValue};use collab_entity::CollabType;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_error::FlowyError;+use lib_infra::validator_fn::{required_not_empty_str, required_valid_path};+use validator::Validate;#[derive(Clone, Debug, ProtoBuf_Enum)]pub enum ImportTypePB {@@ -66,16 +68,25 @@ pub struct ImportValuePayloadPB {pub import_type: ImportTypePB,}-#[derive(Clone, Debug, ProtoBuf, Default)]+#[derive(Clone, Debug, Validate, ProtoBuf, Default)]pub struct ImportPayloadPB {#[pb(index = 1)]+ #[validate(custom = "required_not_empty_str")]pub parent_view_id: String,#[pb(index = 2)]pub values: Vec<ImportValuePayloadPB>,+}++#[derive(Clone, Debug, Validate, ProtoBuf, Default)]+pub struct ImportZipPB {+ #[pb(index = 1)]+ #[validate(custom = "required_not_empty_str")]+ pub parent_view_id: String,- #[pb(index = 3)]- pub sync_after_create: bool,+ #[pb(index = 2)]+ #[validate(custom = "required_valid_path")]+ pub file_path: String,}impl TryInto<ImportParams> for ImportPayloadPB {@@ -118,7 +129,6 @@ impl TryInto<ImportParams> for ImportPayloadPB {Ok(ImportParams {parent_view_id,values,- sync_after_create: self.sync_after_create,})}}diff --git a/frontend/rust-lib/flowy-folder/src/event_handler.rs b/frontend/rust-lib/flowy-folder/src/event_handler.rsindex 30b6566862..dbc8fb39e4 100644--- a/frontend/rust-lib/flowy-folder/src/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/event_handler.rs@@ -382,6 +382,19 @@ pub(crate) async fn import_data_handler(data_result_ok(views)}+#[tracing::instrument(level = "debug", skip(data, folder), err)]+pub(crate) async fn import_zip_file_handler(+ data: AFPluginData<ImportZipPB>,+ folder: AFPluginState<Weak<FolderManager>>,+) -> DataResult<RepeatedViewPB, FlowyError> {+ let folder = upgrade_folder(folder)?;+ let data = data.try_into_inner()?;+ folder+ .import_zip_file(&data.parent_view_id, &data.file_path)+ .await?;+ todo!()+}+#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn get_folder_snapshots_handler(data: AFPluginData<WorkspaceIdPB>,diff --git a/frontend/rust-lib/flowy-folder/src/event_map.rs b/frontend/rust-lib/flowy-folder/src/event_map.rsindex 88ab73b04d..d4308f2908 100644--- a/frontend/rust-lib/flowy-folder/src/event_map.rs+++ b/frontend/rust-lib/flowy-folder/src/event_map.rs@@ -32,6 +32,7 @@ pub fn init(folder: Weak<FolderManager>) -> AFPlugin {.event(FolderEvent::RecoverAllTrashItems, restore_all_trash_handler).event(FolderEvent::PermanentlyDeleteAllTrashItem, delete_my_trash_handler).event(FolderEvent::ImportData, import_data_handler)+ // .event(FolderEvent::ImportZipFile, import_zip_file_handler).event(FolderEvent::GetFolderSnapshots, get_folder_snapshots_handler).event(FolderEvent::UpdateViewIcon, update_view_icon_handler).event(FolderEvent::ReadFavorites, read_favorites_handler)@@ -196,4 +197,7 @@ pub enum FolderEvent {#[event(input = "UnpublishViewsPayloadPB")]UnpublishViews = 47,++ #[event(input = "ImportZipPB", output = "RepeatedViewPB")]+ ImportZipFile = 48,}diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex 8e2ab46d04..e69127f5db 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -1481,16 +1481,20 @@ impl FolderManager {Ok((view, encoded_collab))}+ #[allow(dead_code)]+ pub(crate) async fn import_zip_file(+ &self,+ _parent_view_id: &str,+ _zip_file_path: &str,+ ) -> FlowyResult<RepeatedViewPB> {+ todo!()+ }+/// Import function to handle the import of data.pub(crate) async fn import(&self, import_data: ImportParams) -> FlowyResult<RepeatedViewPB> {let workspace_id = self.user.workspace_id()?;-- // Initialize an empty vector to store the objects- let sync_after_create = import_data.sync_after_create;let mut objects = vec![];let mut views = vec![];-- // Iterate over the values in the import datafor data in import_data.values {// Import a single file and get the view and encoded collab datalet (view, encoded_collabs) = self@@ -1498,26 +1502,21 @@ impl FolderManager {.await?;views.push(view_pb_without_child_views(view));- if sync_after_create {- for (object_id, collab_type, encode_collab) in encoded_collabs {- match self.get_folder_collab_params(object_id, collab_type, encode_collab) {- Ok(params) => objects.push(params),- Err(e) => {- error!("import error {}", e);- },- }+ for (object_id, collab_type, encode_collab) in encoded_collabs {+ match self.get_folder_collab_params(object_id, collab_type, encode_collab) {+ Ok(params) => objects.push(params),+ Err(e) => {+ error!("import error {}", e);+ },}}}- // Sync the view to the cloud- if sync_after_create {- info!("Syncing the imported {} collab to the cloud", objects.len());- self- .cloud_service- .batch_create_folder_collab_objects(&workspace_id, objects)- .await?;- }+ info!("Syncing the imported {} collab to the cloud", objects.len());+ self+ .cloud_service+ .batch_create_folder_collab_objects(&workspace_id, objects)+ .await?;// Notify that the parent view has changedif let Some(lock) = self.mutex_folder.load_full() {diff --git a/frontend/rust-lib/flowy-folder/src/share/import.rs b/frontend/rust-lib/flowy-folder/src/share/import.rsindex c94edfa528..0b9fbcbf22 100644--- a/frontend/rust-lib/flowy-folder/src/share/import.rs+++ b/frontend/rust-lib/flowy-folder/src/share/import.rs@@ -21,5 +21,4 @@ pub struct ImportValue {pub struct ImportParams {pub parent_view_id: String,pub values: Vec<ImportValue>,- pub sync_after_create: bool,}diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rsindex fc4d1dff75..000feac80f 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs@@ -2,6 +2,7 @@ use anyhow::Error;use client_api::entity::{QueryCollab, QueryCollabParams};use collab::core::collab::DataSource;use collab::core::origin::CollabOrigin;+use collab::preclude::Collab;use collab_document::document::Document;use collab_entity::CollabType;use std::sync::Arc;@@ -91,12 +92,14 @@ where&cloned_user,format!("Get {} document", document_id),)?;- let document = Document::open_with_options(+ let collab = Collab::new_with_source(CollabOrigin::Empty,- DataSource::DocStateV1(doc_state),&document_id,+ DataSource::DocStateV1(doc_state),vec![],+ false,)?;+ let document = Document::open(collab)?;Ok(document.get_document_data().ok())}}diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rsindex 9c2802b46a..01b828dfa6 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs@@ -68,7 +68,7 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {_workspace_id: &str,_objects: Vec<FolderCollabParams>,) -> Result<(), Error> {- Err(anyhow!("Local server doesn't support create collab"))+ Ok(())}fn service_name(&self) -> String {diff --git a/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs b/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rsindex 7d64647fd4..4fc86487be 100644--- a/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs@@ -87,7 +87,7 @@ where// If the document is not exist, we don't need to migrate it.if load_collab(user_id, write_txn, &view.id).is_err() {let collab = Collab::new_with_origin(origin.clone(), &view.id, vec![], false);- let document = Document::open_with(collab, Some(default_document_data(&view.id)))?;+ let document = Document::create_with_data(collab, default_document_data(&view.id))?;let encode = document.encode_collab_v1(|_| Ok::<(), PersistenceError>(()))?;write_txn.flush_doc(user_id,