mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
chore: explicit using any int64 (#6020)
* chore: explicit using any int64 * chore: update commit id of appflowy collab
This commit is contained in:
parent
70d6351a6c
commit
93a110d37d
14
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
14
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
@ -963,7 +963,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab"
|
name = "collab"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -988,7 +988,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-database"
|
name = "collab-database"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -1018,7 +1018,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-document"
|
name = "collab-document"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -1038,7 +1038,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-entity"
|
name = "collab-entity"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@ -1057,7 +1057,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-folder"
|
name = "collab-folder"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -1100,7 +1100,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-plugins"
|
name = "collab-plugins"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-stream",
|
"async-stream",
|
||||||
@ -1180,7 +1180,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-user"
|
name = "collab-user"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"collab",
|
"collab",
|
||||||
|
@ -116,13 +116,13 @@ custom-protocol = ["tauri/custom-protocol"]
|
|||||||
# To switch to the local path, run:
|
# To switch to the local path, run:
|
||||||
# scripts/tool/update_collab_source.sh
|
# scripts/tool/update_collab_source.sh
|
||||||
# ⚠️⚠️⚠️️
|
# ⚠️⚠️⚠️️
|
||||||
collab = { 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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
|
||||||
|
|
||||||
# Working directory: frontend
|
# Working directory: frontend
|
||||||
# To update the commit ID, run:
|
# To update the commit ID, run:
|
||||||
|
14
frontend/appflowy_web_app/src-tauri/Cargo.lock
generated
14
frontend/appflowy_web_app/src-tauri/Cargo.lock
generated
@ -946,7 +946,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab"
|
name = "collab"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -971,7 +971,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-database"
|
name = "collab-database"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -1001,7 +1001,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-document"
|
name = "collab-document"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -1021,7 +1021,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-entity"
|
name = "collab-entity"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@ -1040,7 +1040,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-folder"
|
name = "collab-folder"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -1083,7 +1083,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-plugins"
|
name = "collab-plugins"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-stream",
|
"async-stream",
|
||||||
@ -1163,7 +1163,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-user"
|
name = "collab-user"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"collab",
|
"collab",
|
||||||
|
@ -116,13 +116,13 @@ custom-protocol = ["tauri/custom-protocol"]
|
|||||||
# To switch to the local path, run:
|
# To switch to the local path, run:
|
||||||
# scripts/tool/update_collab_source.sh
|
# scripts/tool/update_collab_source.sh
|
||||||
# ⚠️⚠️⚠️️
|
# ⚠️⚠️⚠️️
|
||||||
collab = { 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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
|
||||||
|
|
||||||
# Working directory: frontend
|
# Working directory: frontend
|
||||||
# To update the commit ID, run:
|
# To update the commit ID, run:
|
||||||
|
14
frontend/rust-lib/Cargo.lock
generated
14
frontend/rust-lib/Cargo.lock
generated
@ -824,7 +824,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab"
|
name = "collab"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -849,7 +849,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-database"
|
name = "collab-database"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -879,7 +879,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-document"
|
name = "collab-document"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -899,7 +899,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-entity"
|
name = "collab-entity"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@ -918,7 +918,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-folder"
|
name = "collab-folder"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -961,7 +961,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-plugins"
|
name = "collab-plugins"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-stream",
|
"async-stream",
|
||||||
@ -1041,7 +1041,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collab-user"
|
name = "collab-user"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"collab",
|
"collab",
|
||||||
|
@ -136,13 +136,13 @@ rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120
|
|||||||
# To switch to the local path, run:
|
# To switch to the local path, run:
|
||||||
# scripts/tool/update_collab_source.sh
|
# scripts/tool/update_collab_source.sh
|
||||||
# ⚠️⚠️⚠️️
|
# ⚠️⚠️⚠️️
|
||||||
collab = { 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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
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 = "f29a7f182da0f5a84bdc6cd0c7862934faab4afe" }
|
collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "2cc23e05010a7ed72e5c63c59dfa3db7d789620c" }
|
||||||
|
|
||||||
# Working directory: frontend
|
# Working directory: frontend
|
||||||
# To update the commit ID, run:
|
# To update the commit ID, run:
|
||||||
|
@ -26,7 +26,7 @@ collab-integrate = { workspace = true }
|
|||||||
flowy-search = { workspace = true }
|
flowy-search = { workspace = true }
|
||||||
flowy-search-pub = { workspace = true }
|
flowy-search-pub = { workspace = true }
|
||||||
collab-entity = { workspace = true }
|
collab-entity = { workspace = true }
|
||||||
collab-plugins = { workspace = true }
|
collab-plugins = { workspace = true, features = ["verbose_log"] }
|
||||||
collab = { workspace = true }
|
collab = { workspace = true }
|
||||||
diesel.workspace = true
|
diesel.workspace = true
|
||||||
uuid.workspace = true
|
uuid.workspace = true
|
||||||
|
@ -25,7 +25,7 @@ impl From<Calculation> for CalculationMap {
|
|||||||
CalculationMapBuilder::from([
|
CalculationMapBuilder::from([
|
||||||
(CALCULATION_ID.into(), data.id.into()),
|
(CALCULATION_ID.into(), data.id.into()),
|
||||||
(FIELD_ID.into(), data.field_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()),
|
(CALCULATION_VALUE.into(), data.value.into()),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ use std::str::FromStr;
|
|||||||
|
|
||||||
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, NaiveTime, Offset, TimeZone};
|
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, NaiveTime, Offset, TimeZone};
|
||||||
use chrono_tz::Tz;
|
use chrono_tz::Tz;
|
||||||
|
use collab::preclude::Any;
|
||||||
use collab::util::AnyMapExt;
|
use collab::util::AnyMapExt;
|
||||||
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
|
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
|
||||||
use collab_database::rows::Cell;
|
use collab_database::rows::Cell;
|
||||||
@ -55,8 +56,8 @@ impl From<TypeOptionData> for DateTypeOption {
|
|||||||
impl From<DateTypeOption> for TypeOptionData {
|
impl From<DateTypeOption> for TypeOptionData {
|
||||||
fn from(data: DateTypeOption) -> Self {
|
fn from(data: DateTypeOption) -> Self {
|
||||||
TypeOptionDataBuilder::from([
|
TypeOptionDataBuilder::from([
|
||||||
("date_format".into(), data.date_format.value().into()),
|
("date_format".into(), Any::BigInt(data.date_format.value())),
|
||||||
("time_format".into(), data.time_format.value().into()),
|
("time_format".into(), Any::BigInt(data.time_format.value())),
|
||||||
("timezone_id".into(), data.timezone_id.into()),
|
("timezone_id".into(), data.timezone_id.into()),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -96,8 +96,8 @@ impl From<TypeOptionData> for NumberTypeOption {
|
|||||||
impl From<NumberTypeOption> for TypeOptionData {
|
impl From<NumberTypeOption> for TypeOptionData {
|
||||||
fn from(data: NumberTypeOption) -> Self {
|
fn from(data: NumberTypeOption) -> Self {
|
||||||
TypeOptionDataBuilder::from([
|
TypeOptionDataBuilder::from([
|
||||||
("format".into(), data.format.value().into()),
|
("format".into(), Any::BigInt(data.format.value())),
|
||||||
("scale".into(), data.scale.into()),
|
("scale".into(), Any::BigInt(data.scale as i64)),
|
||||||
("name".into(), data.name.into()),
|
("name".into(), data.name.into()),
|
||||||
("symbol".into(), data.symbol.into()),
|
("symbol".into(), data.symbol.into()),
|
||||||
])
|
])
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
use std::cmp::Ordering;
|
use std::cmp::Ordering;
|
||||||
|
|
||||||
use chrono::{DateTime, Local, Offset};
|
use chrono::{DateTime, Local, Offset};
|
||||||
|
use collab::preclude::Any;
|
||||||
use collab::util::AnyMapExt;
|
use collab::util::AnyMapExt;
|
||||||
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
|
use collab_database::fields::{TypeOptionData, TypeOptionDataBuilder};
|
||||||
use collab_database::rows::Cell;
|
use collab_database::rows::Cell;
|
||||||
@ -68,10 +69,16 @@ impl From<TypeOptionData> for TimestampTypeOption {
|
|||||||
impl From<TimestampTypeOption> for TypeOptionData {
|
impl From<TimestampTypeOption> for TypeOptionData {
|
||||||
fn from(option: TimestampTypeOption) -> Self {
|
fn from(option: TimestampTypeOption) -> Self {
|
||||||
TypeOptionDataBuilder::from([
|
TypeOptionDataBuilder::from([
|
||||||
("date_format".into(), option.date_format.value().into()),
|
(
|
||||||
("time_format".into(), option.time_format.value().into()),
|
"date_format".into(),
|
||||||
("include_time".into(), option.include_time.into()),
|
Any::BigInt(option.date_format.value()),
|
||||||
("field_type".into(), option.field_type.value().into()),
|
),
|
||||||
|
(
|
||||||
|
"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())),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ impl From<TranslateTypeOption> for TypeOptionData {
|
|||||||
fn from(value: TranslateTypeOption) -> Self {
|
fn from(value: TranslateTypeOption) -> Self {
|
||||||
TypeOptionDataBuilder::from([
|
TypeOptionDataBuilder::from([
|
||||||
("auto_fill".into(), value.auto_fill.into()),
|
("auto_fill".into(), value.auto_fill.into()),
|
||||||
("language".into(), value.language_type.into()),
|
("language".into(), Any::BigInt(value.language_type)),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
use collab::preclude::Any;
|
||||||
use collab::util::AnyMapExt;
|
use collab::util::AnyMapExt;
|
||||||
use collab_database::views::{DatabaseLayout, FieldSettingsMap, FieldSettingsMapBuilder};
|
use collab_database::views::{DatabaseLayout, FieldSettingsMap, FieldSettingsMapBuilder};
|
||||||
|
|
||||||
@ -45,12 +46,12 @@ impl From<FieldSettings> for FieldSettingsMap {
|
|||||||
FieldSettingsMapBuilder::from([
|
FieldSettingsMapBuilder::from([
|
||||||
(
|
(
|
||||||
VISIBILITY.into(),
|
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(),
|
WRAP_CELL_CONTENT.into(),
|
||||||
field_settings.wrap_cell_content.into(),
|
Any::Bool(field_settings.wrap_cell_content),
|
||||||
),
|
),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
use std::collections::HashMap;
|
use collab::preclude::Any;
|
||||||
|
|
||||||
use collab_database::fields::Field;
|
use collab_database::fields::Field;
|
||||||
use collab_database::views::{
|
use collab_database::views::{
|
||||||
DatabaseLayout, FieldSettingsByFieldIdMap, FieldSettingsMap, FieldSettingsMapBuilder,
|
DatabaseLayout, FieldSettingsByFieldIdMap, FieldSettingsMap, FieldSettingsMapBuilder,
|
||||||
};
|
};
|
||||||
|
use std::collections::HashMap;
|
||||||
use strum::IntoEnumIterator;
|
use strum::IntoEnumIterator;
|
||||||
|
|
||||||
use crate::entities::FieldVisibility;
|
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() {
|
for layout_ty in DatabaseLayout::iter() {
|
||||||
let visibility = default_field_visibility(layout_ty);
|
let visibility = default_field_visibility(layout_ty);
|
||||||
let field_settings =
|
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);
|
map.insert(layout_ty, field_settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -320,7 +320,7 @@ impl<'a> From<&'a Filter> for FilterMap {
|
|||||||
fn from(filter: &'a Filter) -> Self {
|
fn from(filter: &'a Filter) -> Self {
|
||||||
let mut builder = FilterMapBuilder::from([
|
let mut builder = FilterMapBuilder::from([
|
||||||
(FILTER_ID.into(), filter.id.as_str().into()),
|
(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 {
|
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_ID.into(), field_id.as_str().into());
|
||||||
builder.insert(FIELD_TYPE.into(), i64::from(field_type).into());
|
builder.insert(FIELD_TYPE.into(), Any::BigInt(i64::from(field_type)));
|
||||||
builder.insert(FILTER_CONDITION.into(), (condition as i64).into());
|
builder.insert(FILTER_CONDITION.into(), Any::BigInt(condition as i64));
|
||||||
builder.insert(FILTER_CONTENT.into(), content.into());
|
builder.insert(FILTER_CONTENT.into(), content.into());
|
||||||
builder
|
builder
|
||||||
},
|
},
|
||||||
|
@ -58,7 +58,7 @@ impl From<GroupSetting> for GroupSettingMap {
|
|||||||
GroupSettingBuilder::from([
|
GroupSettingBuilder::from([
|
||||||
(GROUP_ID.into(), setting.id.into()),
|
(GROUP_ID.into(), setting.id.into()),
|
||||||
(FIELD_ID.into(), setting.field_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),
|
(GROUPS.into(), groups),
|
||||||
(CONTENT.into(), setting.content.into()),
|
(CONTENT.into(), setting.content.into()),
|
||||||
])
|
])
|
||||||
|
@ -27,13 +27,16 @@ impl From<LayoutSetting> for CalendarLayoutSetting {
|
|||||||
impl From<CalendarLayoutSetting> for LayoutSetting {
|
impl From<CalendarLayoutSetting> for LayoutSetting {
|
||||||
fn from(setting: CalendarLayoutSetting) -> Self {
|
fn from(setting: CalendarLayoutSetting) -> Self {
|
||||||
LayoutSettingBuilder::from([
|
LayoutSettingBuilder::from([
|
||||||
("layout_ty".into(), setting.layout_ty.value().into()),
|
("layout_ty".into(), Any::BigInt(setting.layout_ty.value())),
|
||||||
(
|
(
|
||||||
"first_day_of_week".into(),
|
"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()),
|
("field_id".into(), setting.field_id.into()),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
use std::cmp::Ordering;
|
use std::cmp::Ordering;
|
||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
|
use collab::preclude::Any;
|
||||||
use collab::util::AnyMapExt;
|
use collab::util::AnyMapExt;
|
||||||
use collab_database::rows::{RowDetail, RowId};
|
use collab_database::rows::{RowDetail, RowId};
|
||||||
use collab_database::views::{SortMap, SortMapBuilder};
|
use collab_database::views::{SortMap, SortMapBuilder};
|
||||||
@ -47,7 +48,7 @@ impl From<Sort> for SortMap {
|
|||||||
SortMapBuilder::from([
|
SortMapBuilder::from([
|
||||||
(SORT_ID.into(), data.id.into()),
|
(SORT_ID.into(), data.id.into()),
|
||||||
(FIELD_ID.into(), data.field_id.into()),
|
(FIELD_ID.into(), data.field_id.into()),
|
||||||
(SORT_CONDITION.into(), data.condition.value().into()),
|
(SORT_CONDITION.into(), Any::BigInt(data.condition.value())),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user