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: Observe database row event (#6190)
Nathan.fooo31567d451fdf
diff --git a/frontend/appflowy_flutter/lib/workspace/application/sidebar/billing/sidebar_plan_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/sidebar/billing/sidebar_plan_bloc.dartindex e8265703ef..feb4afe7e8 100644--- a/frontend/appflowy_flutter/lib/workspace/application/sidebar/billing/sidebar_plan_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/sidebar/billing/sidebar_plan_bloc.dart@@ -117,6 +117,7 @@ class SidebarPlanBloc extends Bloc<SidebarPlanEvent, SidebarPlanState> {userProfile: userProfile,),);+_checkWorkspaceUsage();},updateWorkspaceUsage: (WorkspaceUsagePB usage) {diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 87b923e7dc..274c9d6a13 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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -837,7 +837,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["again","anyhow",@@ -888,7 +888,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["collab-entity","collab-rt-entity",@@ -901,7 +901,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["futures-channel","futures-util",@@ -975,7 +975,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -1000,7 +1000,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-trait",@@ -1029,7 +1029,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -1049,7 +1049,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","bytes",@@ -1068,7 +1068,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -1111,7 +1111,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-stream",@@ -1149,7 +1149,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bincode",@@ -1174,7 +1174,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","async-trait",@@ -1191,7 +1191,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","collab",@@ -1446,7 +1446,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.11.2",+ "phf 0.8.0","smallvec",]@@ -1571,7 +1571,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -3121,7 +3121,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","futures-util",@@ -3138,7 +3138,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -3570,7 +3570,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -6174,7 +6174,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 0e1560190b..15ddcaaa95 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -53,7 +53,7 @@ collab-user = { version = "0.2" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "886376e8bd95ef633aa4b3d7a8377f1003764748" }[dependencies]serde_json.workspace = true@@ -116,13 +116,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 = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }+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" }# 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 d572c25cfb..7fdcdb07a7 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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -811,7 +811,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["again","anyhow",@@ -862,7 +862,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["collab-entity","collab-rt-entity",@@ -875,7 +875,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["futures-channel","futures-util",@@ -958,7 +958,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -983,7 +983,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-trait",@@ -1012,7 +1012,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -1032,7 +1032,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","bytes",@@ -1051,7 +1051,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -1094,7 +1094,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-stream",@@ -1132,7 +1132,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bincode",@@ -1157,7 +1157,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","async-trait",@@ -1174,7 +1174,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","collab",@@ -1436,7 +1436,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.10",- "phf 0.11.2",+ "phf 0.8.0","smallvec",]@@ -1561,7 +1561,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -3188,7 +3188,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","futures-util",@@ -3205,7 +3205,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -3642,7 +3642,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -6238,7 +6238,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.tomlindex 24bfc9d359..2847fc59d7 100644--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml@@ -52,7 +52,7 @@ collab-user = { version = "0.2" }# Run the script:# scripts/tool/update_client_api_rev.sh new_rev_id# ⚠️⚠️⚠️️-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "886376e8bd95ef633aa4b3d7a8377f1003764748" }[dependencies]serde_json.workspace = true@@ -116,13 +116,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 = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }+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" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 4d35e97c45..77ebf2c251 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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"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=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -729,7 +729,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["again","anyhow",@@ -780,7 +780,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["collab-entity","collab-rt-entity",@@ -793,7 +793,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["futures-channel","futures-util",@@ -836,7 +836,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -861,7 +861,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-trait",@@ -890,7 +890,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -910,7 +910,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","bytes",@@ -929,7 +929,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","arc-swap",@@ -972,7 +972,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","async-stream",@@ -1010,7 +1010,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bincode",@@ -1035,7 +1035,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","async-trait",@@ -1052,7 +1052,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=b987647c190b337d0dca2718c93ff918e94b3730#b987647c190b337d0dca2718c93ff918e94b3730"dependencies = ["anyhow","collab",@@ -1281,7 +1281,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa",- "phf 0.11.2",+ "phf 0.8.0","smallvec",]@@ -1395,7 +1395,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -2799,7 +2799,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","futures-util",@@ -2816,7 +2816,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",@@ -3181,7 +3181,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","bytes",@@ -4143,7 +4143,7 @@ version = "0.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"dependencies = [- "phf_macros 0.8.0",+ "phf_macros","phf_shared 0.8.0","proc-macro-hack",]@@ -4163,7 +4163,6 @@ 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,19 +4230,6 @@ 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"@@ -5396,7 +5382,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755#5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=886376e8bd95ef633aa4b3d7a8377f1003764748#886376e8bd95ef633aa4b3d7a8377f1003764748"dependencies = ["anyhow","app-error",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex efc0b5a76c..a951562940 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -100,8 +100,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 = "5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755" }-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5b5e561afbb161e25d77f3ae5f2ae50ffa2b1755" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "886376e8bd95ef633aa4b3d7a8377f1003764748" }+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "886376e8bd95ef633aa4b3d7a8377f1003764748" }[profile.dev]opt-level = 0@@ -136,13 +136,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 = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }+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" }# 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 2119db8cfd..d06da79403 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -769,15 +769,15 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {},Ok(None) => {if self.is_local_user {+ info!(+ "build collab: {}:{} with empty encode collab",+ collab_type, object_id+ );CollabPersistenceImpl {persistence: Some(self.persistence.clone()),}.into()} else {- error!(- "build collab: {}:{} with empty encode collab",- collab_type, object_id- );return Err(DatabaseError::RecordNotFound);}},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 7d42b41ffc..a79651dae1 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@@ -54,8 +54,6 @@ pub struct DatabaseEditor {pub cell_cache: CellCache,pub(crate) database_views: Arc<DatabaseViews>,#[allow(dead_code)]- /// Used to send notification to the frontend.- notification_sender: Arc<DebounceNotificationSender>,user: Arc<dyn DatabaseUser>,collab_builder: Arc<AppFlowyCollabBuilder>,is_opening: ArcSwap<bool>,@@ -77,7 +75,6 @@ impl DatabaseEditor {let database_cancellation = Arc::new(RwLock::new(None));// Receive database sync state and send to frontend via the notificationobserve_sync_state(&database_id, &database).await;- // observe_view_change(&database_id, &database).await;// observe_field_change(&database_id, &database).await;observe_rows_change(&database_id, &database, ¬ification_sender).await;@@ -119,7 +116,6 @@ impl DatabaseEditor {database,cell_cache,database_views,- notification_sender,collab_builder,is_opening: Default::default(),opening_ret_txs: Arc::new(Default::default()),@@ -127,6 +123,7 @@ impl DatabaseEditor {finalized_rows: Arc::new(Default::default()),});observe_block_event(&database_id, &this).await;+ observe_view_change(&database_id, &this).await;Ok(this)}@@ -528,28 +525,20 @@ impl DatabaseEditor {}pub async fn duplicate_row(&self, view_id: &str, row_id: &RowId) -> FlowyResult<()> {- let (row, index) = {- let mut database = self.database.write().await;-- let params = database- .duplicate_row(row_id)- .await- .ok_or_else(|| FlowyError::internal().with_context("error while copying row"))?;-- let (index, row_order) = database.create_row_in_view(view_id, params).await?;- trace!(- "duplicate row: {:?} at index:{}, new row:{:?}",- row_id,- index,- row_order- );- let row = database.get_row(&row_order.id).await;- (row, index)- };+ let mut database = self.database.write().await;+ let params = database+ .duplicate_row(row_id)+ .await+ .ok_or_else(|| FlowyError::internal().with_context("error while copying row"))?;+ let (index, row_order) = database.create_row_in_view(view_id, params).await?;+ drop(database);- for view in self.database_views.editors().await {- view.v_did_create_row(&row, index).await;- }+ trace!(+ "duplicate row: {:?} at index:{}, new row:{:?}",+ row_id,+ index,+ row_order+ );Ok(())}@@ -604,9 +593,6 @@ impl DatabaseEditor {if let Some(row_detail) = row_detail {trace!("created row: {:?} at {}", row_detail, index);- for view in self.database_views.editors().await {- view.v_did_create_row(&row_detail.row, index).await;- }return Ok(Some(row_detail));}@@ -691,11 +677,6 @@ impl DatabaseEditor {Ok(view_editor.v_get_all_rows().await)}- pub async fn get_all_row_orders(&self, view_id: &str) -> FlowyResult<Vec<RowOrder>> {- let orders = self.database.read().await.get_row_orders_for_view(view_id);- Ok(orders)- }-pub async fn get_row(&self, view_id: &str, row_id: &RowId) -> Option<Row> {let database = self.database.read().await;if database.contains_row(view_id, row_id) {@@ -755,7 +736,11 @@ impl DatabaseEditor {is_document_empty: Some(row_meta.is_document_empty),})} else {- warn!("the row:{} is exist in view:{}", row_id.as_str(), view_id);+ warn!(+ "the row:{} is not exist in view:{}",+ row_id.as_str(),+ view_id+ );None}}@@ -765,14 +750,17 @@ impl DatabaseEditor {if database.contains_row(view_id, row_id) {database.get_row_detail(row_id).await} else {- warn!("the row:{} is exist in view:{}", row_id.as_str(), view_id);+ 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 {@@ -1357,7 +1345,8 @@ impl DatabaseEditor {old_token.cancel();}- let row_orders = self.database.read().await.get_row_orders_for_view(view_id);+ let view_editor = self.database_views.get_view_editor(view_id).await?;+ let row_orders = view_editor.get_all_row_orders().await?;let cloned_row_orders = row_orders.clone();// Collect database details in a single block holding the `read` locklet (database_id, fields, is_linked) = {@@ -1523,6 +1512,19 @@ impl DatabaseEditor {Ok(type_option.database_id)}+ pub async fn get_row_index(&self, view_id: &str, row_id: &RowId) -> Option<usize> {+ self.database.read().await.get_row_index(view_id, row_id)+ }++ pub async fn get_row_order_at_index(&self, view_id: &str, index: u32) -> Option<RowOrder> {+ self+ .database+ .read()+ .await+ .get_row_order_at_index(view_id, index)+ .await+ }+/// TODO(nathan): lazy load database rowspub async fn get_related_rows(&self,@@ -1676,9 +1678,8 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {}}- async fn get_all_rows(&self, view_id: &str) -> Vec<Arc<Row>> {+ async fn get_all_rows(&self, view_id: &str, row_orders: Vec<RowOrder>) -> Vec<Arc<Row>> {let view_id = view_id.to_string();- let row_orders = self.database.read().await.get_row_orders_for_view(&view_id);trace!("{} has total row orders: {}", view_id, row_orders.len());let mut all_rows = vec![];// Loading the rows in chunks of 10 rows in order to prevent blocking the main asynchronous runtime@@ -1707,6 +1708,10 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {all_rows.into_iter().map(Arc::new).collect()}+ async fn get_all_row_orders(&self, view_id: &str) -> Vec<RowOrder> {+ self.database.read().await.get_row_orders_for_view(view_id)+ }+async fn remove_row(&self, row_id: &RowId) -> Option<Row> {self.database.write().await.remove_row(row_id).await}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 270bdfb65d..7d914ed456 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@@ -11,7 +11,7 @@ use flowy_notification::{DebounceNotificationSender, NotificationBuilder};use futures::StreamExt;use lib_dispatch::prelude::af_spawn;use std::sync::Arc;-use tracing::{trace, warn};+use tracing::{error, trace, warn};pub(crate) async fn observe_sync_state(database_id: &str, database: &Arc<RwLock<Database>>) {let weak_database = Arc::downgrade(database);@@ -100,36 +100,71 @@ pub(crate) async fn observe_field_change(database_id: &str, database: &Arc<RwLoc}#[allow(dead_code)]-pub(crate) async fn observe_view_change(database_id: &str, database: &Arc<RwLock<Database>>) {+pub(crate) async fn observe_view_change(database_id: &str, database_editor: &Arc<DatabaseEditor>) {let database_id = database_id.to_string();- let weak_database = Arc::downgrade(database);- let mut view_change = database.read().await.subscribe_view_change();+ let weak_database_editor = Arc::downgrade(database_editor);+ let mut view_change = database_editor+ .database+ .read()+ .await+ .subscribe_view_change();af_spawn(async move {while let Ok(view_change) = view_change.recv().await {- if weak_database.upgrade().is_none() {- break;- }+ 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);+ }- trace!(- "[Database Observe]: {} view change:{:?}",- database_id,- view_change- );- match view_change {- DatabaseViewChange::DidCreateView { .. } => {},- DatabaseViewChange::DidUpdateView { .. } => {},- DatabaseViewChange::DidDeleteView { .. } => {},- DatabaseViewChange::LayoutSettingChanged { .. } => {},- DatabaseViewChange::DidInsertRowOrders { .. } => {},- DatabaseViewChange::DidDeleteRowAtIndex { .. } => {},- DatabaseViewChange::DidCreateFilters { .. } => {},- DatabaseViewChange::DidUpdateFilter { .. } => {},- DatabaseViewChange::DidCreateGroupSettings { .. } => {},- DatabaseViewChange::DidUpdateGroupSetting { .. } => {},- DatabaseViewChange::DidCreateSorts { .. } => {},- DatabaseViewChange::DidUpdateSort { .. } => {},- DatabaseViewChange::DidCreateFieldOrder { .. } => {},- DatabaseViewChange::DidDeleteFieldOrder { .. } => {},+ 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 { .. } => {},+ }+ },}}});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 5697892a40..3734c30184 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,6 @@ use std::borrow::Cow;use std::collections::HashMap;use std::sync::Arc;-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, Row, RowDetail, RowId};-use collab_database::views::DatabaseLayout;-use lib_infra::util::timestamp;-use tokio::sync::{broadcast, RwLock};-use tracing::instrument;--use flowy_error::{FlowyError, FlowyResult};-use lib_dispatch::prelude::af_spawn;-use crate::entities::{CalendarEventPB, CreateRowParams, CreateRowPayloadPB, DatabaseLayoutMetaPB,DatabaseLayoutSettingPB, DeleteSortPayloadPB, FieldSettingsChangesetPB, FieldType,@@ -41,6 +29,15 @@ use crate::services::filter::{Filter, FilterChangeset, FilterController};use crate::services::group::{GroupChangeset, GroupController, MoveGroupRowContext, RowChangeset};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};+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 flowy_error::{FlowyError, FlowyResult};+use lib_infra::util::timestamp;+use tokio::sync::{broadcast, RwLock};+use tracing::instrument;use super::notify_did_update_calculation;use super::view_calculations::make_calculations_controller;@@ -70,7 +67,7 @@ impl DatabaseViewEditor {cell_cache: CellCache,) -> FlowyResult<Self> {let (notifier, _) = broadcast::channel(100);- af_spawn(DatabaseViewChangedReceiverRunner(Some(notifier.subscribe())).run());+ tokio::spawn(DatabaseViewChangedReceiverRunner(Some(notifier.subscribe())).run());// Filterlet filter_controller = make_filter_controller(@@ -118,6 +115,11 @@ impl DatabaseViewEditor {})}+ 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)+ }+pub async fn close(&self) {self.sort_controller.write().await.close().await;self.filter_controller.close().await;@@ -176,7 +178,6 @@ impl DatabaseViewEditor {filter_controller.fill_cells(&mut cells).await;result.collab_params.cells = cells;-Ok(result)}@@ -193,10 +194,8 @@ impl DatabaseViewEditor {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);-for changeset in changesets {notify_did_update_group_rows(changeset).await;}@@ -209,7 +208,6 @@ impl DatabaseViewEditor {#[tracing::instrument(level = "trace", skip_all)]pub async fn v_did_delete_row(&self, row: &Row) {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))@@ -230,7 +228,6 @@ impl DatabaseViewEditor {}}let changes = RowsChangePB::from_delete(row.id.clone().into_inner());-send_notification(&self.view_id, DatabaseNotification::DidUpdateRow).payload(changes).send();@@ -238,7 +235,7 @@ impl DatabaseViewEditor {// Updating calculations for each of the Rows cells is a tedious task// Therefore we spawn a separate task for thislet weak_calculations_controller = Arc::downgrade(&self.calculations_controller);- af_spawn(async move {+ tokio::spawn(async move {if let Some(calculations_controller) = weak_calculations_controller.upgrade() {calculations_controller.did_receive_row_changed(deleted_row)@@ -323,7 +320,8 @@ impl DatabaseViewEditor {#[instrument(level = "info", skip(self))]pub async fn v_get_all_rows(&self) -> Vec<Arc<Row>> {- let mut rows = self.delegate.get_all_rows(&self.view_id).await;+ let row_orders = self.delegate.get_all_row_orders(&self.view_id).await;+ let mut rows = self.delegate.get_all_rows(&self.view_id, row_orders).await;self.v_filter_rows(&mut rows).await;self.v_sort_rows(&mut rows).await;rows@@ -1111,7 +1109,7 @@ impl DatabaseViewEditor {let weak_filter_controller = Arc::downgrade(&self.filter_controller);let weak_sort_controller = Arc::downgrade(&self.sort_controller);let weak_calculations_controller = Arc::downgrade(&self.calculations_controller);- af_spawn(async move {+ tokio::spawn(async move {if let Some(filter_controller) = weak_filter_controller.upgrade() {filter_controller.did_receive_row_changed(row_id.clone())@@ -1138,7 +1136,7 @@ impl DatabaseViewEditor {async fn gen_did_create_row_view_tasks(&self, preliminary_index: usize, row: Row) {let weak_sort_controller = Arc::downgrade(&self.sort_controller);let weak_calculations_controller = Arc::downgrade(&self.calculations_controller);- af_spawn(async move {+ tokio::spawn(async move {if let Some(sort_controller) = weak_sort_controller.upgrade() {sort_controller.read()diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_filter.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_filter.rsindex e73f454b6d..91341ae3b3 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_filter.rs@@ -1,14 +1,13 @@use async_trait::async_trait;use std::sync::Arc;-use collab_database::fields::Field;-use collab_database::rows::{Row, RowDetail, RowId};-use crate::services::cell::CellCache;use crate::services::database_view::{gen_handler_id, DatabaseViewChangedNotifier, DatabaseViewOperation,};use crate::services::filter::{Filter, FilterController, FilterDelegate, FilterTaskHandler};+use collab_database::fields::Field;+use collab_database::rows::{Row, RowDetail, RowId};pub async fn make_filter_controller(view_id: &str,@@ -53,7 +52,8 @@ impl FilterDelegate for DatabaseViewFilterDelegateImpl {}async fn get_rows(&self, view_id: &str) -> Vec<Arc<Row>> {- self.0.get_all_rows(view_id).await+ let row_orders = self.0.get_all_row_orders(view_id).await;+ self.0.get_all_rows(view_id, row_orders).await}async fn get_row(&self, view_id: &str, rows_id: &RowId) -> Option<(usize, Arc<RowDetail>)> {diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rsindex 6df851160c..bb1f4a0dfc 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs@@ -97,7 +97,8 @@ impl GroupControllerDelegate for GroupControllerDelegateImpl {}async fn get_all_rows(&self, view_id: &str) -> Vec<Arc<Row>> {- let mut rows = self.delegate.get_all_rows(view_id).await;+ let row_orders = self.delegate.get_all_row_orders(view_id).await;+ let mut rows = self.delegate.get_all_rows(view_id, row_orders).await;self.filter_controller.filter_rows(&mut rows).await;rows}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rsindex 8de209a956..14e382f9ae 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs@@ -4,7 +4,7 @@ use collab_database::database::Database;use collab_database::entity::DatabaseView;use collab_database::fields::{Field, TypeOptionData};use collab_database::rows::{Row, RowCell, RowDetail, RowId};-use collab_database::views::{DatabaseLayout, LayoutSetting};+use collab_database::views::{DatabaseLayout, LayoutSetting, RowOrder};use std::collections::HashMap;use std::sync::Arc;use tokio::sync::RwLock as TokioRwLock;@@ -57,7 +57,8 @@ pub trait DatabaseViewOperation: Send + Sync + 'static {async fn get_row_detail(&self, view_id: &str, row_id: &RowId) -> Option<(usize, Arc<RowDetail>)>;/// Returns all the rows in the view- async fn get_all_rows(&self, view_id: &str) -> Vec<Arc<Row>>;+ async fn get_all_rows(&self, view_id: &str, row_orders: Vec<RowOrder>) -> Vec<Arc<Row>>;+ async fn get_all_row_orders(&self, view_id: &str) -> Vec<RowOrder>;async fn remove_row(&self, row_id: &RowId) -> Option<Row>;diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rsindex 9af2f96f0a..8b4b9dec94 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs@@ -61,7 +61,8 @@ impl SortDelegate for DatabaseViewSortDelegateImpl {async fn get_rows(&self, view_id: &str) -> Vec<Arc<Row>> {let view_id = view_id.to_string();- let mut rows = self.delegate.get_all_rows(&view_id).await;+ let row_orders = self.delegate.get_all_row_orders(&view_id).await;+ let mut rows = self.delegate.get_all_rows(&view_id, row_orders).await;self.filter_controller.filter_rows(&mut rows).await;rows}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 266cebd339..895cbbf42b 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@@ -1,6 +1,7 @@use collab_database::entity::SelectOption;use collab_database::fields::Field;use collab_database::rows::RowId;+use std::time::Duration;use flowy_database2::entities::{CreateRowPayloadPB, FieldType, GroupPB, RowMetaPB};use flowy_database2::services::cell::{@@ -91,6 +92,8 @@ impl DatabaseGroupTest {group_index,row_count,} => {+ // sleep for 2 seconds to wait for the row count to be updated+ tokio::time::sleep(Duration::from_secs(2)).await;assert_eq!(row_count, self.group_at_index(group_index).await.rows.len());},GroupScript::AssertGroupCount(count) => {diff --git a/frontend/rust-lib/flowy-storage/src/uploader.rs b/frontend/rust-lib/flowy-storage/src/uploader.rsindex 2ebe3dcf69..d88aa15aa9 100644--- a/frontend/rust-lib/flowy-storage/src/uploader.rs+++ b/frontend/rust-lib/flowy-storage/src/uploader.rs@@ -98,10 +98,6 @@ impl FileUploader {}pub fn resume(&self) {- if self.pause_sync.load(std::sync::atomic::Ordering::Relaxed) {- return;- }-self.pause_sync.store(false, std::sync::atomic::Ordering::SeqCst);@@ -111,6 +107,7 @@ impl FileUploader {pub async fn process_next(&self) -> Option<()> {// Do not proceed if the uploader is paused.if self.pause_sync.load(std::sync::atomic::Ordering::Relaxed) {+ info!("[File] Uploader is paused");return None;}@@ -235,13 +232,17 @@ impl FileUploaderRunner {loop {// stops the runner if the notifier was closed.if notifier.changed().await.is_err() {+ info!("[File]:Uploader runner stopped, notifier closed");break;}if let Some(uploader) = weak_uploader.upgrade() {let value = notifier.borrow().clone();match value {- Signal::Stop => break,+ Signal::Stop => {+ info!("[File]:Uploader runner stopped, stop signal received");+ break;+ },Signal::Proceed => {tokio::spawn(async move {uploader.process_next().await;@@ -255,6 +256,7 @@ impl FileUploaderRunner {},}} else {+ info!("[File]:Uploader runner stopped, uploader dropped");break;}}