Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: modify same database by duplicate view (#2121)

Browse Source
This commit is contained in:
Nathan.fooo 2023-03-28 12:57:35 +08:00 committed by GitHub
parent 69dfb4a11a
commit 9dc8e9d934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/.vscode/launch.json vendored
View File

@ -12,8 +12,8 @@
"type": "dart",
"preLaunchTask": "AF: Build Appflowy Core",
"env": {
// "RUST_LOG": "trace",
"RUST_LOG": "debug"
"RUST_LOG": "trace",
// "RUST_LOG": "debug"
},
"cwd": "${workspaceRoot}/appflowy_flutter"
},

1
frontend/rust-lib/flowy-database/src/manager.rs
View File

@ -417,7 +417,6 @@ pub async fn create_new_database(
DatabaseViewRevision::from_json(database_view_data)?
};
tracing::trace!("Initial calendar layout setting: {:?}", layout_setting);
database_view_rev.layout_settings = layout_setting;
let database_view_ops = make_database_view_operations(&database_view_rev);
let database_view_bytes = database_view_ops.json_bytes();

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

@ -888,9 +888,12 @@ impl DatabaseEditor {
Ok(())
}
pub async fn duplicate_database(&self, view_id: &str) -> FlowyResult<BuildDatabaseContext> {
pub async fn duplicate_database(&self, _view_id: &str) -> FlowyResult<BuildDatabaseContext> {
let database_pad = self.database_pad.read().await;
let database_view_data = self.database_views.duplicate_database_view(view_id).await?;
// let database_view_data = self
// .database_views
// .duplicate_database_view_setting(view_id)
// .await?;
let original_blocks = database_pad.get_block_meta_revs();
let (duplicated_fields, duplicated_blocks) = database_pad.duplicate_database_block_meta().await;
@ -919,7 +922,7 @@ impl DatabaseEditor {
block_metas: duplicated_blocks,
blocks: blocks_meta_data,
layout_setting: Default::default(),
database_view_data,
database_view_data: "".to_string(),
})
}

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

@ -238,7 +238,7 @@ impl DatabaseViewEditor {
self.filter_controller.filter_row_revs(rows).await;
}
pub async fn v_duplicate_data(&self) -> FlowyResult<String> {
pub async fn v_duplicate_view_setting(&self) -> FlowyResult<String> {
let json_str = self.pad.read().await.json_str()?;
Ok(json_str)
}

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

@ -101,9 +101,9 @@ impl DatabaseViews {
Ok(row_revs)
}
pub async fn duplicate_database_view(&self, view_id: &str) -> FlowyResult<String> {
pub async fn duplicate_database_view_setting(&self, view_id: &str) -> FlowyResult<String> {
let editor = self.get_view_editor(view_id).await?;
let view_data = editor.v_duplicate_data().await?;
let view_data = editor.v_duplicate_view_setting().await?;
Ok(view_data)
}