Skip to content

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.

chore: explicit using any int64 (#6020)

Nathan.fooo93a110d37d2d
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
index c7247f61da..695b36fe1e 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock
@@ -963,7 +963,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -988,7 +988,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-trait",
@@ -1018,7 +1018,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -1038,7 +1038,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"bytes",
@@ -1057,7 +1057,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -1100,7 +1100,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-stream",
@@ -1180,7 +1180,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"collab",
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
index eaf9c45240..2aac8f12c9 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
# 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.lock
index 67a03fc4b2..3c6481f07e 100644
--- a/frontend/appflowy_web_app/src-tauri/Cargo.lock
+++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock
@@ -946,7 +946,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -971,7 +971,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-trait",
@@ -1001,7 +1001,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -1021,7 +1021,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"bytes",
@@ -1040,7 +1040,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -1083,7 +1083,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-stream",
@@ -1163,7 +1163,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"collab",
diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml
index 9939037c67..05e3b89617 100644
--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml
+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml
@@ -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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
# Working directory: frontend
# To update the commit ID, run:
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index ccf8f27506..3831b53f05 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -824,7 +824,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -849,7 +849,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-trait",
@@ -879,7 +879,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -899,7 +899,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"bytes",
@@ -918,7 +918,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"arc-swap",
@@ -961,7 +961,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"async-stream",
@@ -1041,7 +1041,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f29a7f182da0f5a84bdc6cd0c7862934faab4afe#f29a7f182da0f5a84bdc6cd0c7862934faab4afe"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=2cc23e05010a7ed72e5c63c59dfa3db7d789620c#2cc23e05010a7ed72e5c63c59dfa3db7d789620c"
dependencies = [
"anyhow",
"collab",
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index 86c73438be..f6c2073a83 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
# Working directory: frontend
# To update the commit ID, run:
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index d6cd0c6635..8ec17fa5f6 100644
--- a/frontend/rust-lib/flowy-core/Cargo.toml
+++ b/frontend/rust-lib/flowy-core/Cargo.toml
@@ -26,7 +26,7 @@ collab-integrate = { workspace = true }
flowy-search = { workspace = true }
flowy-search-pub = { workspace = true }
collab-entity = { workspace = true }
-collab-plugins = { workspace = true }
+collab-plugins = { workspace = true, features = ["verbose_log"] }
collab = { workspace = true }
diesel.workspace = true
uuid.workspace = true
diff --git a/frontend/rust-lib/flowy-database2/src/services/calculations/entities.rs b/frontend/rust-lib/flowy-database2/src/services/calculations/entities.rs
index 2a2613230d..42f2b60ca1 100644
--- a/frontend/rust-lib/flowy-database2/src/services/calculations/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/calculations/entities.rs
@@ -25,7 +25,7 @@ impl From<Calculation> for CalculationMap {
CalculationMapBuilder::from([
(CALCULATION_ID.into(), data.id.into()),
(FIELD_ID.into(), data.field_id.into()),
- (CALCULATION_TYPE.into(), data.calculation_type.into()),
+ (CALCULATION_TYPE.into(), Any::BigInt(data.calculation_type)),
(CALCULATION_VALUE.into(), data.value.into()),
])
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs
index 2a7a713b61..16a626fbcb 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs
@@ -3,6 +3,7 @@ use std::str::FromStr;
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, NaiveTime, Offset, TimeZone};
use chrono_tz::Tz;
+use collab::preclude::Any;
use collab::util::AnyMapExt;
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
use collab_database::rows::Cell;
@@ -55,8 +56,8 @@ impl From<TypeOptionData> for DateTypeOption {
impl From<DateTypeOption> for TypeOptionData {
fn from(data: DateTypeOption) -> Self {
TypeOptionDataBuilder::from([
- ("date_format".into(), data.date_format.value().into()),
- ("time_format".into(), data.time_format.value().into()),
+ ("date_format".into(), Any::BigInt(data.date_format.value())),
+ ("time_format".into(), Any::BigInt(data.time_format.value())),
("timezone_id".into(), data.timezone_id.into()),
])
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
index eee660af86..c13b007fa6 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
@@ -96,8 +96,8 @@ impl From<TypeOptionData> for NumberTypeOption {
impl From<NumberTypeOption> for TypeOptionData {
fn from(data: NumberTypeOption) -> Self {
TypeOptionDataBuilder::from([
- ("format".into(), data.format.value().into()),
- ("scale".into(), data.scale.into()),
+ ("format".into(), Any::BigInt(data.format.value())),
+ ("scale".into(), Any::BigInt(data.scale as i64)),
("name".into(), data.name.into()),
("symbol".into(), data.symbol.into()),
])
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
index 116bd1a0a4..0e1416ab89 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
@@ -1,6 +1,7 @@
use std::cmp::Ordering;
use chrono::{DateTime, Local, Offset};
+use collab::preclude::Any;
use collab::util::AnyMapExt;
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
use collab_database::rows::Cell;
@@ -68,10 +69,16 @@ impl From<TypeOptionData> for TimestampTypeOption {
impl From<TimestampTypeOption> for TypeOptionData {
fn from(option: TimestampTypeOption) -> Self {
TypeOptionDataBuilder::from([
- ("date_format".into(), option.date_format.value().into()),
- ("time_format".into(), option.time_format.value().into()),
- ("include_time".into(), option.include_time.into()),
- ("field_type".into(), option.field_type.value().into()),
+ (
+ "date_format".into(),
+ Any::BigInt(option.date_format.value()),
+ ),
+ (
+ "time_format".into(),
+ Any::BigInt(option.time_format.value()),
+ ),
+ ("include_time".into(), Any::Bool(option.include_time)),
+ ("field_type".into(), Any::BigInt(option.field_type.value())),
])
}
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/translate_type_option/translate.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/translate_type_option/translate.rs
index ff84213a15..fedfd9b4f8 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/translate_type_option/translate.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/translate_type_option/translate.rs
@@ -60,7 +60,7 @@ impl From<TranslateTypeOption> for TypeOptionData {
fn from(value: TranslateTypeOption) -> Self {
TypeOptionDataBuilder::from([
("auto_fill".into(), value.auto_fill.into()),
- ("language".into(), value.language_type.into()),
+ ("language".into(), Any::BigInt(value.language_type)),
])
}
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field_settings/entities.rs b/frontend/rust-lib/flowy-database2/src/services/field_settings/entities.rs
index 1fb7cde207..65d58441bc 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field_settings/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field_settings/entities.rs
@@ -1,3 +1,4 @@
+use collab::preclude::Any;
use collab::util::AnyMapExt;
use collab_database::views::{DatabaseLayout, FieldSettingsMap, FieldSettingsMapBuilder};
@@ -45,12 +46,12 @@ impl From<FieldSettings> for FieldSettingsMap {
FieldSettingsMapBuilder::from([
(
VISIBILITY.into(),
- i64::from(field_settings.visibility).into(),
+ Any::BigInt(i64::from(field_settings.visibility)),
),
- (WIDTH.into(), field_settings.width.into()),
+ (WIDTH.into(), Any::BigInt(field_settings.width as i64)),
(
WRAP_CELL_CONTENT.into(),
- field_settings.wrap_cell_content.into(),
+ Any::Bool(field_settings.wrap_cell_content),
),
])
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field_settings/field_settings_builder.rs b/frontend/rust-lib/flowy-database2/src/services/field_settings/field_settings_builder.rs
index 7f9ed6b2c0..95d70184c2 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field_settings/field_settings_builder.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field_settings/field_settings_builder.rs
@@ -1,9 +1,9 @@
-use std::collections::HashMap;
-
+use collab::preclude::Any;
use collab_database::fields::Field;
use collab_database::views::{
DatabaseLayout, FieldSettingsByFieldIdMap, FieldSettingsMap, FieldSettingsMapBuilder,
};
+use std::collections::HashMap;
use strum::IntoEnumIterator;
use crate::entities::FieldVisibility;
@@ -87,7 +87,7 @@ pub fn default_field_settings_by_layout_map() -> HashMap<DatabaseLayout, FieldSe
for layout_ty in DatabaseLayout::iter() {
let visibility = default_field_visibility(layout_ty);
let field_settings =
- FieldSettingsMapBuilder::from([(VISIBILITY.into(), i64::from(visibility).into())]);
+ FieldSettingsMapBuilder::from([(VISIBILITY.into(), Any::BigInt(i64::from(visibility)))]);
map.insert(layout_ty, field_settings);
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
index adb5ef8c5b..1d4cadd468 100644
--- a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
@@ -320,7 +320,7 @@ impl<'a> From<&'a Filter> for FilterMap {
fn from(filter: &'a Filter) -> Self {
let mut builder = FilterMapBuilder::from([
(FILTER_ID.into(), filter.id.as_str().into()),
- (FILTER_TYPE.into(), filter.inner.get_int_repr().into()),
+ (FILTER_TYPE.into(), Any::BigInt(filter.inner.get_int_repr())),
]);
builder = match &filter.inner {
@@ -397,8 +397,8 @@ impl<'a> From<&'a Filter> for FilterMap {
});
builder.insert(FIELD_ID.into(), field_id.as_str().into());
- builder.insert(FIELD_TYPE.into(), i64::from(field_type).into());
- builder.insert(FILTER_CONDITION.into(), (condition as i64).into());
+ builder.insert(FIELD_TYPE.into(), Any::BigInt(i64::from(field_type)));
+ builder.insert(FILTER_CONDITION.into(), Any::BigInt(condition as i64));
builder.insert(FILTER_CONTENT.into(), content.into());
builder
},
diff --git a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs b/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
index cfb5de588e..d14ec235f9 100644
--- a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
@@ -58,7 +58,7 @@ impl From<GroupSetting> for GroupSettingMap {
GroupSettingBuilder::from([
(GROUP_ID.into(), setting.id.into()),
(FIELD_ID.into(), setting.field_id.into()),
- (FIELD_TYPE.into(), setting.field_type.into()),
+ (FIELD_TYPE.into(), Any::BigInt(setting.field_type)),
(GROUPS.into(), groups),
(CONTENT.into(), setting.content.into()),
])
diff --git a/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs b/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs
index 5a71b58127..8535f46024 100644
--- a/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs
@@ -27,13 +27,16 @@ impl From<LayoutSetting> for CalendarLayoutSetting {
impl From<CalendarLayoutSetting> for LayoutSetting {
fn from(setting: CalendarLayoutSetting) -> Self {
LayoutSettingBuilder::from([
- ("layout_ty".into(), setting.layout_ty.value().into()),
+ ("layout_ty".into(), Any::BigInt(setting.layout_ty.value())),
(
"first_day_of_week".into(),
- (setting.first_day_of_week as i64).into(),
+ Any::BigInt(setting.first_day_of_week as i64),
),
- ("show_week_numbers".into(), setting.show_week_numbers.into()),
- ("show_weekends".into(), setting.show_weekends.into()),
+ (
+ "show_week_numbers".into(),
+ Any::Bool(setting.show_week_numbers),
+ ),
+ ("show_weekends".into(), Any::Bool(setting.show_weekends)),
("field_id".into(), setting.field_id.into()),
])
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs b/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs
index 9b5608761a..cc4908cda9 100644
--- a/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/sort/entities.rs
@@ -1,6 +1,7 @@
use std::cmp::Ordering;
use anyhow::bail;
+use collab::preclude::Any;
use collab::util::AnyMapExt;
use collab_database::rows::{RowDetail, RowId};
use collab_database::views::{SortMap, SortMapBuilder};
@@ -47,7 +48,7 @@ impl From<Sort> for SortMap {
SortMapBuilder::from([
(SORT_ID.into(), data.id.into()),
(FIELD_ID.into(), data.field_id.into()),
- (SORT_CONDITION.into(), data.condition.value().into()),
+ (SORT_CONDITION.into(), Any::BigInt(data.condition.value())),
])
}
}