chore: bump collab (#1470)

Author: appflowy

Cargo.lock

@@ -307,14 +307,14 @@ lto = false
 [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 = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "21cda3bd0da5dcaaa8abea377c4dafc6bba3b04a" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d6209e07c2e160a1f5fdfd5b2bcef5edc1b190bb" }
 
 [features]
 history = []

Cargo.toml

@@ -64,7 +64,7 @@ pub async fn create_database_from_params(
       .encoded_row_collabs
       .into_iter()
       .map(|encoded_row_collab| TemplateData {
-        template_id: TemplateObjectId::DatabaseRow(encoded_row_collab.object_id),
+        template_id: TemplateObjectId::DatabaseRow(encoded_row_collab.object_id.to_string()),
         collab_type: CollabType::DatabaseRow,
         encoded_collab: encoded_row_collab.encoded_collab,
       });

libs/workspace-template/src/document/util.rs

@@ -238,7 +238,7 @@ async fn duplicate_database(
     let database = Database::open(database_id, database_context.clone())
       .await
       .map_err(|err| AppError::Internal(anyhow::anyhow!("Failed to open database: {}", err)))?;
-    let database_data = database.get_database_data().await;
+    let database_data = database.get_database_data(20, true).await;
     let params = duplicate_database_data_with_context(duplicate_context, &database_data);
     let duplicated_database = Database::create_with_view(params, database_context.clone())
       .await
@@ -272,9 +272,8 @@ async fn duplicate_database(
       updated_at: None,
     });
     for row in encoded_database.encoded_row_collabs {
-      let row_id = Uuid::parse_str(&row.object_id.clone())?;
       collab_params_list.push(CollabParams {
-        object_id: row_id,
+        object_id: row.object_id,
         encoded_collab_v1: row.encoded_collab.encode_to_bytes()?.into(),
         collab_type: CollabType::DatabaseRow,
         updated_at: None,

src/biz/workspace/duplicate.rs

@@ -1193,7 +1193,7 @@ async fn create_database_page(
     workspace_id,
   )
   .await?;
-  let database_id: Uuid = encoded_database.encoded_database_collab.object_id.parse()?;
+  let database_id = encoded_database.encoded_database_collab.object_id;
   let workspace_database_update =
     add_new_database_to_workspace(&mut workspace_database, &database_id, view_id).await?;
   let database_collab_params = CollabParams {
@@ -1211,7 +1211,7 @@ async fn create_database_page(
     .iter()
     .flat_map(|row_collab| {
       Some(CollabParams {
-        object_id: Uuid::parse_str(&row_collab.object_id).ok()?,
+        object_id: row_collab.object_id,
         encoded_collab_v1: row_collab.encoded_collab.encode_to_bytes().unwrap().into(),
         collab_type: CollabType::DatabaseRow,
         updated_at: None,

src/biz/workspace/page_view.rs

@@ -125,7 +125,7 @@ async fn import_project_and_task_zip_test() {
         .await;
       let inline_views = get_inline_view_id(&database).unwrap();
       let fields = database.get_fields_in_view(&inline_views, None);
-      let rows = database.collect_all_rows().await;
+      let rows = database.collect_all_rows(false).await;
       assert_eq!(rows.len(), 4);
       assert_eq!(fields.len(), 13);
 
@@ -146,7 +146,7 @@ async fn import_project_and_task_zip_test() {
         .await;
       let inline_views = get_inline_view_id(&database).unwrap();
       let fields = database.get_fields_in_view(&inline_views, None);
-      let rows = database.collect_all_rows().await;
+      let rows = database.collect_all_rows(false).await;
       assert_eq!(rows.len(), 17);
       assert_eq!(fields.len(), 13);
       continue;