From 2c8fa1a2c34c7380b10442299b0e6b3d558805d7 Mon Sep 17 00:00:00 2001 From: Zack Date: Wed, 13 Mar 2024 11:32:51 +0800 Subject: [PATCH] chore: update client api (#4886) * chore: update client api * chore: bump client api * ci: fix test --------- Co-authored-by: nathan --- frontend/appflowy_tauri/src-tauri/Cargo.lock | 24 ++++----- frontend/appflowy_tauri/src-tauri/Cargo.toml | 2 +- frontend/appflowy_web/wasm-libs/Cargo.lock | 52 ++++++++++++------- frontend/appflowy_web/wasm-libs/Cargo.toml | 2 +- frontend/rust-lib/Cargo.lock | 22 ++++---- frontend/rust-lib/Cargo.toml | 2 +- .../tests/database/share_test/export_test.rs | 5 ++ 7 files changed, 64 insertions(+), 45 deletions(-) diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 4b556d9825..4217b995b9 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -162,7 +162,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -714,7 +714,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "again", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1315,7 +1315,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -2589,7 +2589,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "futures-util", @@ -2606,7 +2606,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -3061,7 +3061,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "reqwest", @@ -4803,7 +4803,7 @@ dependencies = [ [[package]] name = "realtime-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -4827,7 +4827,7 @@ dependencies = [ [[package]] name = "realtime-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -5499,7 +5499,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -6995,7 +6995,7 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "futures-channel", "futures-util", @@ -7458,7 +7458,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 6ba93681f6..f838297556 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -82,7 +82,7 @@ custom-protocol = ["tauri/custom-protocol"] # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index 456875ee7d..ac9a044701 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.lock +++ b/frontend/appflowy_web/wasm-libs/Cargo.lock @@ -221,7 +221,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -545,7 +545,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "again", "anyhow", @@ -618,7 +618,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "async-trait", @@ -641,7 +641,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "collab", @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "bytes", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "chrono", @@ -712,7 +712,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "async-stream", @@ -750,7 +750,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" dependencies = [ "anyhow", "collab", @@ -902,7 +902,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -947,7 +947,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -1701,7 +1701,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "futures-util", @@ -1718,7 +1718,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -2052,7 +2052,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "reqwest", @@ -2781,7 +2781,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros", + "phf_macros 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", ] @@ -2801,6 +2801,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -2868,6 +2869,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -3296,7 +3310,7 @@ dependencies = [ [[package]] name = "realtime-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -3320,7 +3334,7 @@ dependencies = [ [[package]] name = "realtime-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -3773,7 +3787,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -4715,7 +4729,7 @@ checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "futures-channel", "futures-util", @@ -5023,4 +5037,4 @@ dependencies = [ [[patch.unused]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9b189e7dc180ddc7fd79c49ed16f9c8a46216380#9b189e7dc180ddc7fd79c49ed16f9c8a46216380" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7" diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index 7be865bfab..499f27ffb8 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.toml +++ b/frontend/appflowy_web/wasm-libs/Cargo.toml @@ -55,7 +55,7 @@ codegen-units = 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 = "0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 992af39b56..d032eb95b4 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -163,7 +163,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -673,7 +673,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "again", "anyhow", @@ -1239,7 +1239,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -2413,7 +2413,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "futures-util", @@ -2430,7 +2430,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -2824,7 +2824,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "reqwest", @@ -4321,7 +4321,7 @@ dependencies = [ [[package]] name = "realtime-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -4345,7 +4345,7 @@ dependencies = [ [[package]] name = "realtime-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "bincode", @@ -4939,7 +4939,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "app-error", @@ -6129,7 +6129,7 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "futures-channel", "futures-util", @@ -6370,7 +6370,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=0bee7cd0dff240eeca972f3d15d6de3df9c0aceb#0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 82b32f10d0..83d2d3d96e 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -105,7 +105,7 @@ incremental = false # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "0bee7cd0dff240eeca972f3d15d6de3df9c0aceb" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs b/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs index e7c227f26d..d898c34ad5 100644 --- a/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs +++ b/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs @@ -1,7 +1,9 @@ +use chrono::Duration; use flowy_database2::entities::FieldType; use flowy_database2::services::cell::stringify_cell_data; use flowy_database2::services::field::CHECK; use flowy_database2::services::share::csv::CSVFormat; +use tokio::time::sleep; use crate::database::database_editor::DatabaseEditorTest; @@ -48,6 +50,9 @@ async fn export_and_then_import_meta_csv_test() { let csv_1 = database.export_csv(format).await.unwrap(); let result = test.import(csv_1.clone(), format).await; + // TODO(nathan): remove this sleep + // workaround for the rows that are created asynchronously + sleep(Duration::from_secs(2)).await; let database = test.get_database(&result.database_id).await.unwrap(); let fields = database.get_fields(&result.view_id, None);