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
chore: fetch rows by chunk size (#6934)
Nathan.foooda0395be5e5b
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 02e7f665ae..e2415c8439 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -172,7 +172,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -192,7 +192,7 @@ dependencies = [[[package]]name = "appflowy-ai-client"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -888,7 +888,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["again","anyhow",@@ -918,7 +918,7 @@ dependencies = ["parking_lot 0.12.1","percent-encoding","pin-project",- "prost",+ "prost 0.13.3","rayon","reqwest","scraper 0.17.1",@@ -943,7 +943,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["collab-entity","collab-rt-entity",@@ -956,7 +956,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["futures-channel","futures-util",@@ -1030,7 +1030,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1055,7 +1055,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-trait",@@ -1094,7 +1094,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1115,13 +1115,13 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","bytes","collab","getrandom 0.2.10",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -1135,7 +1135,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1157,7 +1157,7 @@ dependencies = [[[package]]name = "collab-importer"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-recursion",@@ -1218,7 +1218,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-stream",@@ -1256,7 +1256,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -1267,7 +1267,7 @@ dependencies = ["collab-entity","collab-rt-protocol","database-entity",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -1281,7 +1281,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","async-trait",@@ -1298,7 +1298,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","collab",@@ -1678,7 +1678,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -1688,7 +1688,7 @@ dependencies = ["chrono","collab-entity","infra",- "prost",+ "prost 0.13.3","serde","serde_json","serde_repr",@@ -3266,7 +3266,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","futures-util",@@ -3283,7 +3283,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -3715,7 +3715,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -5349,7 +5349,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"dependencies = ["bytes",- "prost-derive",+ "prost-derive 0.12.3",+]++[[package]]+name = "prost"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"+dependencies = [+ "bytes",+ "prost-derive 0.13.3",][[package]]@@ -5366,7 +5376,7 @@ dependencies = ["once_cell","petgraph","prettyplease",- "prost",+ "prost 0.12.3","prost-types","regex","syn 2.0.47",@@ -5387,13 +5397,26 @@ dependencies = ["syn 2.0.47",]+[[package]]+name = "prost-derive"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"+dependencies = [+ "anyhow",+ "itertools 0.12.1",+ "proc-macro2",+ "quote",+ "syn 2.0.47",+]+[[package]]name = "prost-types"version = "0.12.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"dependencies = [- "prost",+ "prost 0.12.3",][[package]]@@ -6400,7 +6423,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 2778286c5b..97ba680f4d 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -59,7 +59,7 @@ collab-importer = { version = "0.1" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0ec12c5f2fdd1bce0a0457eafb9963532b5208b3" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "66deaf3fa30564530160f7ac6de6dd2833d3d211" }[dependencies]serde_json.workspace = true@@ -120,14 +120,14 @@ 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 = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }# 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 697877b14a..4e99d32391 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.lock+++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock@@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -183,7 +183,7 @@ dependencies = [[[package]]name = "appflowy-ai-client"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -877,7 +877,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["again","anyhow",@@ -907,7 +907,7 @@ dependencies = ["parking_lot 0.12.1","percent-encoding","pin-project",- "prost",+ "prost 0.13.3","rayon","reqwest","scraper 0.17.1",@@ -932,7 +932,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["collab-entity","collab-rt-entity",@@ -945,7 +945,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["futures-channel","futures-util",@@ -1028,7 +1028,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1053,7 +1053,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-trait",@@ -1092,7 +1092,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1113,13 +1113,13 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","bytes","collab","getrandom 0.2.12",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -1133,7 +1133,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1155,7 +1155,7 @@ dependencies = [[[package]]name = "collab-importer"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-recursion",@@ -1216,7 +1216,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-stream",@@ -1254,7 +1254,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -1265,7 +1265,7 @@ dependencies = ["collab-entity","collab-rt-protocol","database-entity",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -1279,7 +1279,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","async-trait",@@ -1296,7 +1296,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","collab",@@ -1683,7 +1683,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -1693,7 +1693,7 @@ dependencies = ["chrono","collab-entity","infra",- "prost",+ "prost 0.13.3","serde","serde_json","serde_repr",@@ -3348,7 +3348,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","futures-util",@@ -3365,7 +3365,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -3802,7 +3802,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -5425,7 +5425,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"dependencies = ["bytes",- "prost-derive",+ "prost-derive 0.12.3",+]++[[package]]+name = "prost"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"+dependencies = [+ "bytes",+ "prost-derive 0.13.3",][[package]]@@ -5442,7 +5452,7 @@ dependencies = ["once_cell","petgraph","prettyplease",- "prost",+ "prost 0.12.3","prost-types","regex","syn 2.0.55",@@ -5463,13 +5473,26 @@ dependencies = ["syn 2.0.55",]+[[package]]+name = "prost-derive"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"+dependencies = [+ "anyhow",+ "itertools 0.12.1",+ "proc-macro2",+ "quote",+ "syn 2.0.55",+]+[[package]]name = "prost-types"version = "0.12.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"dependencies = [- "prost",+ "prost 0.12.3",][[package]]@@ -6480,7 +6503,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.tomlindex e570ab28e2..8f74ea4cd8 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml@@ -58,7 +58,7 @@ collab-importer = { version = "0.1" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0ec12c5f2fdd1bce0a0457eafb9963532b5208b3" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "66deaf3fa30564530160f7ac6de6dd2833d3d211" }[dependencies]serde_json.workspace = true@@ -118,14 +118,14 @@ 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 = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }# Working directory: frontenddiff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 308ca45910..537343e0fe 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "app-error"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -183,7 +183,7 @@ dependencies = [[[package]]name = "appflowy-ai-client"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -780,7 +780,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["again","anyhow",@@ -810,7 +810,7 @@ dependencies = ["parking_lot 0.12.1","percent-encoding","pin-project",- "prost",+ "prost 0.13.3","rayon","reqwest","scraper 0.17.1",@@ -835,7 +835,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["collab-entity","collab-rt-entity",@@ -848,7 +848,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["futures-channel","futures-util",@@ -891,7 +891,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -916,7 +916,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-trait",@@ -955,7 +955,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -976,13 +976,13 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","bytes","collab","getrandom 0.2.10",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -996,7 +996,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","arc-swap",@@ -1018,7 +1018,7 @@ dependencies = [[[package]]name = "collab-importer"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-recursion",@@ -1079,7 +1079,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","async-stream",@@ -1117,7 +1117,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bincode",@@ -1128,7 +1128,7 @@ dependencies = ["collab-entity","collab-rt-protocol","database-entity",- "prost",+ "prost 0.13.3","prost-build","protoc-bin-vendored","serde",@@ -1142,7 +1142,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","async-trait",@@ -1159,7 +1159,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8bd376c0c71ce366d763a70385c7b445a98241ed#8bd376c0c71ce366d763a70385c7b445a98241ed"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=35181c77b448d2ac9cbfbd729790bd98c5d1a979#35181c77b448d2ac9cbfbd729790bd98c5d1a979"dependencies = ["anyhow","collab",@@ -1203,7 +1203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"dependencies = ["futures-core",- "prost",+ "prost 0.12.3","prost-types","tonic","tracing-core",@@ -1537,7 +1537,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -1547,7 +1547,7 @@ dependencies = ["chrono","collab-entity","infra",- "prost",+ "prost 0.13.3","serde","serde_json","serde_repr",@@ -2980,7 +2980,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","futures-util",@@ -2997,7 +2997,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -3359,7 +3359,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","bytes",@@ -4653,7 +4653,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"dependencies = ["bytes",- "prost-derive",+ "prost-derive 0.12.3",+]++[[package]]+name = "prost"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"+dependencies = [+ "bytes",+ "prost-derive 0.13.3",][[package]]@@ -4670,7 +4680,7 @@ dependencies = ["once_cell","petgraph","prettyplease",- "prost",+ "prost 0.12.3","prost-types","regex","syn 2.0.47",@@ -4691,13 +4701,26 @@ dependencies = ["syn 2.0.47",]+[[package]]+name = "prost-derive"+version = "0.13.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"+dependencies = [+ "anyhow",+ "itertools 0.12.1",+ "proc-macro2",+ "quote",+ "syn 2.0.47",+]+[[package]]name = "prost-types"version = "0.12.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"dependencies = [- "prost",+ "prost 0.12.3",][[package]]@@ -5665,7 +5688,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0ec12c5f2fdd1bce0a0457eafb9963532b5208b3#0ec12c5f2fdd1bce0a0457eafb9963532b5208b3"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=66deaf3fa30564530160f7ac6de6dd2833d3d211#66deaf3fa30564530160f7ac6de6dd2833d3d211"dependencies = ["anyhow","app-error",@@ -6522,7 +6545,7 @@ dependencies = ["hyper-timeout","percent-encoding","pin-project",- "prost",+ "prost 0.12.3","tokio","tokio-stream","tower",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex ca8ea1a50d..9a33800e7d 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -106,8 +106,8 @@ dashmap = "6.0.1"# Run the script.add_workspace_members:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0ec12c5f2fdd1bce0a0457eafb9963532b5208b3" }-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0ec12c5f2fdd1bce0a0457eafb9963532b5208b3" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "66deaf3fa30564530160f7ac6de6dd2833d3d211" }+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "66deaf3fa30564530160f7ac6de6dd2833d3d211" }[profile.dev]opt-level = 0@@ -142,14 +142,14 @@ 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 = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8bd376c0c71ce366d763a70385c7b445a98241ed" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "35181c77b448d2ac9cbfbd729790bd98c5d1a979" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex 8246da8a97..20be056e00 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -23,7 +23,7 @@ use std::collections::HashMap;use std::sync::{Arc, Weak};use std::time::Duration;use tokio::sync::Mutex;-use tracing::{error, info, instrument, trace, warn};+use tracing::{error, info, instrument, trace};use collab_integrate::collab_builder::{AppFlowyCollabBuilder, CollabBuilderConfig};use collab_integrate::{CollabKVAction, CollabKVDB};@@ -776,13 +776,6 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {) -> Result<Collab, DatabaseError> {let object = self.build_collab_object(object_id, collab_type.clone())?;let data_source = if self.persistence.is_collab_exist(object_id) {- if encoded_collab.is_some() {- warn!(- "build collab: {}:{} with both local and remote encode collab",- collab_type, object_id- );- }-trace!("build collab: {}:{} from local encode collab",collab_type,@@ -903,18 +896,21 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {encoded_collab_by_id.insert(k, v);}- // 2. Fetch remaining collabs from remote- let remote_collabs = self- .batch_get_encode_collab(object_ids, collab_type)- .await?;+ if !object_ids.is_empty() {+ // 2. Fetch remaining collabs from remote+ let remote_collabs = self+ .batch_get_encode_collab(object_ids, collab_type)+ .await?;- trace!(- "[Database]: load {} database row from remote",- remote_collabs.len()- );- for (k, v) in remote_collabs {- encoded_collab_by_id.insert(k, v);+ trace!(+ "[Database]: load {} database row from remote",+ remote_collabs.len()+ );+ for (k, v) in remote_collabs {+ encoded_collab_by_id.insert(k, v);+ }}+Ok(encoded_collab_by_id)}diff --git a/frontend/rust-lib/flowy-database2/src/services/calculations/controller.rs b/frontend/rust-lib/flowy-database2/src/services/calculations/controller.rsindex f8a74839d5..f6df04b171 100644--- a/frontend/rust-lib/flowy-database2/src/services/calculations/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/calculations/controller.rs@@ -110,11 +110,6 @@ impl CalculationsController {.handle_field_type_changed(field_id, new_field_type).await},- CalculationEvent::InitialRows(rows) => {- for row in rows {- self.handle_row_changed(row.as_ref()).await;- }- },}Ok(())@@ -214,7 +209,10 @@ impl CalculationsController {.await;// Update the calculation- if let Some(update) = self.update_calculation(calculation, &field, cells).await {+ if let Some(update) = self+ .update_calculation(calculation.as_ref(), &field, cells)+ .await+ {self.delegate.update_calculation(&self.view_id, update.clone())@@ -255,10 +253,16 @@ impl CalculationsController {if cells.is_empty() {let calculations = self.delegate.get_all_calculations(&self.view_id).await;for calculation in calculations.into_iter() {- let cells = self- .get_or_fetch_cells(&calculation.field_id, &mut cells_by_field)- .await;- updates.extend(self.handle_cells_changed(calculation, cells).await);+ if let Some(field) = self.delegate.get_field(&calculation.field_id).await {+ let cells = self+ .get_or_fetch_cells(&calculation.field_id, &mut cells_by_field)+ .await;+ updates.extend(+ self+ .handle_cells_changed(&field, calculation.as_ref(), cells)+ .await,+ );+ }}}@@ -270,8 +274,13 @@ impl CalculationsController {let cells = self.get_or_fetch_cells(&calculation.field_id, &mut cells_by_field).await;- let changes = self.handle_cells_changed(calculation, cells).await;- updates.extend(changes);++ if let Some(field) = self.delegate.get_field(field_id).await {+ let changes = self+ .handle_cells_changed(&field, calculation.as_ref(), cells)+ .await;+ updates.extend(changes);+ }}}@@ -305,23 +314,22 @@ impl CalculationsController {}/// field_cells will be the cells that belong to the field with field_id- async fn handle_cells_changed(+ pub async fn handle_cells_changed(&self,- calculation: Arc<Calculation>,+ field: &Field,+ calculation: &Calculation,field_cells: Vec<Arc<Cell>>,) -> Vec<CalculationPB> {let mut updates = vec![];- if let Some(field) = self.delegate.get_field(&calculation.field_id).await {- let update = self- .update_calculation(calculation, &field, field_cells)+ let update = self+ .update_calculation(calculation, &field, field_cells)+ .await;+ if let Some(update) = update {+ updates.push(CalculationPB::from(&update));+ self+ .delegate+ .update_calculation(&self.view_id, update).await;- if let Some(update) = update {- updates.push(CalculationPB::from(&update));- self- .delegate- .update_calculation(&self.view_id, update)- .await;- }}updates@@ -330,7 +338,7 @@ impl CalculationsController {#[instrument(level = "trace", skip_all)]async fn update_calculation(&self,- calculation: Arc<Calculation>,+ calculation: &Calculation,field: &Field,cells: Vec<Arc<Cell>>,) -> Option<Calculation> {@@ -401,7 +409,6 @@ impl CalculationsController {#[derive(Serialize, Deserialize, Clone, Debug)]pub(crate) enum CalculationEvent {- InitialRows(Vec<Arc<Row>>),RowChanged(Row),CellUpdated(String),FieldTypeChanged(String, FieldType),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 17e141fb4f..aa3b136035 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@@ -50,6 +50,7 @@ use tokio::select;use tokio::sync::oneshot::Sender;use tokio::sync::RwLock as TokioRwLock;use tokio::sync::{broadcast, oneshot};+use tokio::task::yield_now;use tokio_util::sync::CancellationToken;use tracing::{debug, error, event, info, instrument, trace, warn};@@ -927,7 +928,7 @@ impl DatabaseEditor {match field_type {FieldType::LastEditedTime | FieldType::CreatedTime => {database- .get_rows_for_view(view_id, None)+ .get_rows_for_view(view_id, 10, None).await.filter_map(|result| async {match result {@@ -1525,7 +1526,9 @@ impl DatabaseEditor {let blocking_read = notify_finish.is_some() || order_rows.len() < 50;let (tx, rx) = oneshot::channel();- self.async_load_rows(view_editor, Some(tx), new_token, blocking_read, row_orders);+ self+ .async_load_rows(view_editor, Some(tx), new_token, blocking_read, row_orders)+ .await;if blocking_read {// the rows returned here are applied with filters and sortsif let Ok(rows) = rx.await {@@ -1566,7 +1569,7 @@ impl DatabaseEditor {}}- fn async_load_rows(+ async fn async_load_rows(&self,view_editor: Arc<DatabaseViewEditor>,notify_finish: Option<Sender<Vec<Arc<Row>>>>,@@ -1579,6 +1582,7 @@ impl DatabaseEditor {blocking_read);let cloned_database = Arc::downgrade(&self.database);+ let fields = self.get_fields(&view_editor.view_id, None).await;tokio::spawn(async move {let apply_filter_and_sort =|mut loaded_rows: Vec<Arc<Row>>, view_editor: Arc<DatabaseViewEditor>| async move {@@ -1626,7 +1630,7 @@ impl DatabaseEditor {};let mut loaded_rows = vec![];- const CHUNK_SIZE: usize = 20;+ const CHUNK_SIZE: usize = 10;let row_orders = view_editor.row_orders.read().await;let row_orders_chunks = row_orders.chunks(CHUNK_SIZE).collect::<Vec<_>>();@@ -1646,7 +1650,7 @@ impl DatabaseEditor {let new_loaded_rows: Vec<Arc<Row>> = database.read().await- .init_database_rows(row_ids, None)+ .init_database_rows(row_ids, chunk_row_orders.len(), None).filter_map(|result| async {let database_row = result.ok()?;let read_guard = database_row.read().await;@@ -1661,6 +1665,7 @@ impl DatabaseEditor {info!("[Database]: stop loading database rows");return;}+ yield_now().await;}drop(row_orders);@@ -1670,15 +1675,13 @@ impl DatabaseEditor {blocking_read);let loaded_rows = apply_filter_and_sort(loaded_rows, view_editor.clone()).await;-// Update calculation valueslet calculate_rows = loaded_rows.clone();-if let Some(notify_finish) = notify_finish {let _ = notify_finish.send(loaded_rows);}tokio::spawn(async move {- let _ = view_editor.v_calculate_rows(calculate_rows).await;+ let _ = view_editor.v_calculate_rows(fields, calculate_rows).await;});});}@@ -1781,7 +1784,7 @@ impl DatabaseEditor {match row_ids {None => {let mut row_data = vec![];- let rows_stream = database.get_all_rows(None).await;+ let rows_stream = database.get_all_rows(10, None).await;pin_mut!(rows_stream);while let Some(result) = rows_stream.next().await {if let Ok(row) = result {@@ -1958,7 +1961,9 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {trace!("{} has total row orders: {}", view_id, row_orders.len());let mut all_rows = vec![];let read_guard = self.database.read().await;- let rows_stream = read_guard.get_rows_from_row_orders(&row_orders, None).await;+ let rows_stream = read_guard+ .get_rows_from_row_orders(&row_orders, 10, None)+ .await;pin_mut!(rows_stream);while let Some(result) = rows_stream.next().await {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 8fbff8dee5..3ce6dba723 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,18 +2,16 @@ use std::borrow::Cow;use std::collections::HashMap;use std::sync::Arc;-use super::notify_did_update_calculation;+use super::{notify_did_update_calculation, DatabaseViewChanged};use crate::entities::{- CalendarEventPB, CreateRowPayloadPB, DatabaseLayoutMetaPB, DatabaseLayoutSettingPB,- DeleteSortPayloadPB, FieldSettingsChangesetPB, FieldType, GroupChangesPB, GroupPB, InsertedRowPB,- LayoutSettingChangeset, LayoutSettingParams, RemoveCalculationChangesetPB, ReorderSortPayloadPB,- RowMetaPB, RowsChangePB, SortChangesetNotificationPB, SortPB, UpdateCalculationChangesetPB,- UpdateSortPayloadPB,+ CalculationChangesetNotificationPB, CalendarEventPB, CreateRowPayloadPB, DatabaseLayoutMetaPB,+ DatabaseLayoutSettingPB, DeleteSortPayloadPB, FieldSettingsChangesetPB, FieldType,+ GroupChangesPB, GroupPB, InsertedRowPB, LayoutSettingChangeset, LayoutSettingParams,+ RemoveCalculationChangesetPB, ReorderSortPayloadPB, RowMetaPB, RowsChangePB,+ SortChangesetNotificationPB, SortPB, UpdateCalculationChangesetPB, UpdateSortPayloadPB,};use crate::notification::{send_notification, DatabaseNotification};-use crate::services::calculations::{- Calculation, CalculationChangeset, CalculationEvent, CalculationsController,-};+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;@@ -36,14 +34,14 @@ use crate::services::sort::{Sort, SortChangeset, SortController};use collab_database::database::{gen_database_calculation_id, gen_database_sort_id, gen_row_id};use collab_database::entity::DatabaseView;use collab_database::fields::Field;-use collab_database::rows::{Cells, CreateRowParams, Row, RowCell, RowDetail, RowId};+use collab_database::rows::{Cell, Cells, CreateRowParams, Row, RowCell, RowDetail, RowId};use collab_database::views::{DatabaseLayout, RowOrder};use dashmap::DashMap;use flowy_error::{FlowyError, FlowyResult};-use lib_infra::priority_task::QualityOfService;+use lib_infra::util::timestamp;use tokio::sync::{broadcast, RwLock};-use tracing::{instrument, trace, warn};+use tracing::{error, instrument, trace, warn};pub struct DatabaseViewEditor {database_id: String,@@ -695,14 +693,57 @@ impl DatabaseViewEditor {Ok(())}- pub async fn v_calculate_rows(&self, rows: Vec<Arc<Row>>) -> FlowyResult<()> {- self- .calculations_controller- .gen_task(- CalculationEvent::InitialRows(rows),- QualityOfService::UserInteractive,- )- .await;+ pub async fn v_calculate_rows(&self, fields: Vec<Field>, rows: Vec<Arc<Row>>) -> FlowyResult<()> {+ let mut updates = vec![];+ // Filter fields to only those with calculations+ let fields_with_calculations: Vec<(&Field, Calculation)> =+ futures::future::join_all(fields.iter().map(|field| async move {+ self+ .delegate+ .get_calculation(&self.view_id, &field.id)+ .await+ .map(|cal| (field, cal))+ }))+ .await+ .into_iter()+ .filter_map(|result| result)+ .collect();++ // Pre-compute cells by field ID only for fields that have calculations+ let mut cells_by_field_id: HashMap<String, Vec<Arc<Cell>>> = fields_with_calculations+ .iter()+ .map(|(field, _)| {+ let cells = rows+ .iter()+ .filter_map(|row| row.cells.get(&field.id).cloned().map(Arc::new))+ .collect::<Vec<Arc<Cell>>>();+ (field.id.clone(), cells)+ })+ .collect();++ // Perform calculations for the filtered fields+ for (field, calculation) in fields_with_calculations {+ if let Some(cells) = cells_by_field_id.remove(&field.id) {+ let changes = self+ .calculations_controller+ .handle_cells_changed(field, &calculation, cells)+ .await;+ updates.extend(changes);+ }+ }++ // Send notification if updates were made+ if !updates.is_empty() {+ let notification = CalculationChangesetNotificationPB::from_update(&self.view_id, updates);+ if let Err(_err) = self+ .notifier+ .send(DatabaseViewChanged::CalculationValueNotification(+ notification,+ ))+ {+ error!("Failed to send CalculationValueNotification");+ }+ }Ok(())}@@ -805,7 +846,8 @@ impl DatabaseViewEditor {let row_orders = self.delegate.get_all_row_orders(&self.view_id).await;let rows = self.delegate.get_all_rows(&self.view_id, row_orders).await;- self.v_calculate_rows(rows).await?;+ let fields = self.delegate.get_fields(&self.view_id, None).await;+ self.v_calculate_rows(fields, rows).await?;Ok(())}diff --git a/frontend/rust-lib/flowy-database2/src/services/share/csv/export.rs b/frontend/rust-lib/flowy-database2/src/services/share/csv/export.rsindex c556f7ad3a..dd704f43d5 100644--- a/frontend/rust-lib/flowy-database2/src/services/share/csv/export.rs+++ b/frontend/rust-lib/flowy-database2/src/services/share/csv/export.rs@@ -49,7 +49,7 @@ impl CSVExport {field_by_field_id.insert(field.id.clone(), field);});let rows = database- .get_rows_for_view(&inline_view_id, None)+ .get_rows_for_view(&inline_view_id, 20, None).await.filter_map(|result| async { result.ok() }).collect::<Vec<_>>()