diff --git a/Cargo.lock b/Cargo.lock index 2711ba2c..73db9b9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2092,7 +2092,7 @@ dependencies = [ [[package]] name = "collab" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" 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=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" 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=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" 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=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" 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=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" 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=4f25b18bad7f2580aad0d35b255b8024fe0cbf51#4f25b18bad7f2580aad0d35b255b8024fe0cbf51" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=386df5507d67931cdff5fc105daedff72a5df076#386df5507d67931cdff5fc105daedff72a5df076" dependencies = [ "anyhow", "collab", diff --git a/Cargo.toml b/Cargo.toml index 325dd4e0..1c50be0e 100644 --- a/Cargo.toml +++ b/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 = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4f25b18bad7f2580aad0d35b255b8024fe0cbf51" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "386df5507d67931cdff5fc105daedff72a5df076" } [features] history = [] diff --git a/src/biz/workspace/publish_dup.rs b/src/biz/workspace/publish_dup.rs index 2309e902..6004f046 100644 --- a/src/biz/workspace/publish_dup.rs +++ b/src/biz/workspace/publish_dup.rs @@ -745,7 +745,7 @@ impl PublishCollabDuplicator { // assign a new id for the row let dup_row_id = gen_view_id(); let mut db_row_collab = collab_from_doc_state(row_bin_data.clone(), &dup_row_id)?; - let mut db_row_body = DatabaseRowBody::open(dup_row_id.clone().into(), &mut db_row_collab) + let mut db_row_body = DatabaseRowBody::open(pub_row_id.clone().into(), &mut db_row_collab) .map_err(|e| AppError::Unhandled(e.to_string()))?; { @@ -857,8 +857,6 @@ impl PublishCollabDuplicator { } } - println!("{:#?}", db_row_collab.to_json_value()); - // write new row collab to storage let db_row_ec_bytes = tokio::task::spawn_blocking(move || collab_to_bin(&db_row_collab, CollabType::DatabaseRow))