chore: update dep
This commit is contained in:
parent
3be80aac20
commit
dca438b794
|
|
@ -2092,7 +2092,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
|
@ -2117,7 +2117,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab-database"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
|
@ -2148,7 +2148,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab-document"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
|
@ -2168,7 +2168,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab-entity"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
|
|
@ -2187,7 +2187,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab-folder"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
|
@ -2272,7 +2272,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "collab-user"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4025b4f7d013dc0aec137152c7cbf7741e21c0ae#4025b4f7d013dc0aec137152c7cbf7741e21c0ae"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collab",
|
||||
|
|
|
|||
12
Cargo.toml
12
Cargo.toml
|
|
@ -288,12 +288,12 @@ debug = true
|
|||
[patch.crates-io]
|
||||
# It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate.
|
||||
# So using patch to workaround this issue.
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4025b4f7d013dc0aec137152c7cbf7741e21c0ae" }
|
||||
|
||||
[features]
|
||||
history = []
|
||||
|
|
|
|||
|
|
@ -752,13 +752,13 @@ impl PublishCollabDuplicator {
|
|||
let mut txn = db_row_collab.context.transact_mut();
|
||||
// update database_id
|
||||
db_row_body
|
||||
.data
|
||||
.get_data()
|
||||
.insert(&mut txn, ROW_DATABASE_ID, new_db_id.clone());
|
||||
{
|
||||
// handle document in database row
|
||||
let pub_is_doc_empty_key =
|
||||
meta_id_from_row_id(&pub_row_id.parse()?, RowMetaKey::IsDocumentEmpty);
|
||||
let pub_is_doc_empty = db_row_body.meta.get(&txn, &pub_is_doc_empty_key);
|
||||
let pub_is_doc_empty = db_row_body.get_meta().get(&txn, &pub_is_doc_empty_key);
|
||||
if let Some(Out::Any(Any::Bool(is_doc_empty))) = pub_is_doc_empty {
|
||||
if !is_doc_empty {
|
||||
let pub_row_doc_id =
|
||||
|
|
@ -812,7 +812,7 @@ impl PublishCollabDuplicator {
|
|||
// },
|
||||
// },
|
||||
let cells: MapRef = db_row_body
|
||||
.data
|
||||
.get_data()
|
||||
.get(&txn, ROW_CELLS)
|
||||
.ok_or_else(|| {
|
||||
AppError::RecordNotFound("no cells found in database row collab".to_string())
|
||||
|
|
|
|||
Loading…
Reference in New Issue