Skip to content

Commit 8f66246

Browse files
committed
fix: modify same database by duplicate view (#2121)
1 parent 063ec18 commit 8f66246

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

frontend/.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"type": "dart",
1313
"preLaunchTask": "AF: Build Appflowy Core",
1414
"env": {
15-
// "RUST_LOG": "trace",
16-
"RUST_LOG": "debug"
15+
"RUST_LOG": "trace",
16+
// "RUST_LOG": "debug"
1717
},
1818
"cwd": "${workspaceRoot}/appflowy_flutter"
1919
},

frontend/rust-lib/flowy-database/src/manager.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ pub async fn create_new_database(
417417
DatabaseViewRevision::from_json(database_view_data)?
418418
};
419419

420-
tracing::trace!("Initial calendar layout setting: {:?}", layout_setting);
421420
database_view_rev.layout_settings = layout_setting;
422421
let database_view_ops = make_database_view_operations(&database_view_rev);
423422
let database_view_bytes = database_view_ops.json_bytes();

frontend/rust-lib/flowy-database/src/services/database/database_editor.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,9 +888,12 @@ impl DatabaseEditor {
888888
Ok(())
889889
}
890890

891-
pub async fn duplicate_database(&self, view_id: &str) -> FlowyResult<BuildDatabaseContext> {
891+
pub async fn duplicate_database(&self, _view_id: &str) -> FlowyResult<BuildDatabaseContext> {
892892
let database_pad = self.database_pad.read().await;
893-
let database_view_data = self.database_views.duplicate_database_view(view_id).await?;
893+
// let database_view_data = self
894+
// .database_views
895+
// .duplicate_database_view_setting(view_id)
896+
// .await?;
894897
let original_blocks = database_pad.get_block_meta_revs();
895898
let (duplicated_fields, duplicated_blocks) = database_pad.duplicate_database_block_meta().await;
896899

@@ -919,7 +922,7 @@ impl DatabaseEditor {
919922
block_metas: duplicated_blocks,
920923
blocks: blocks_meta_data,
921924
layout_setting: Default::default(),
922-
database_view_data,
925+
database_view_data: "".to_string(),
923926
})
924927
}
925928

frontend/rust-lib/flowy-database/src/services/database_view/editor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl DatabaseViewEditor {
238238
self.filter_controller.filter_row_revs(rows).await;
239239
}
240240

241-
pub async fn v_duplicate_data(&self) -> FlowyResult<String> {
241+
pub async fn v_duplicate_view_setting(&self) -> FlowyResult<String> {
242242
let json_str = self.pad.read().await.json_str()?;
243243
Ok(json_str)
244244
}

frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ impl DatabaseViews {
101101
Ok(row_revs)
102102
}
103103

104-
pub async fn duplicate_database_view(&self, view_id: &str) -> FlowyResult<String> {
104+
pub async fn duplicate_database_view_setting(&self, view_id: &str) -> FlowyResult<String> {
105105
let editor = self.get_view_editor(view_id).await?;
106-
let view_data = editor.v_duplicate_data().await?;
106+
let view_data = editor.v_duplicate_view_setting().await?;
107107
Ok(view_data)
108108
}
109109

0 commit comments

Comments
 (0)