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

Add board group test (#1376)

Browse Source
This commit is contained in:
Nathan.fooo
2022-10-26 22:36:34 +08:00
committed by GitHub
parent c8044a92d1
commit 3bbf91ab2b
19 changed files with 291 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs
View File

@ -36,7 +36,7 @@ pub trait FolderPersistenceTransaction {
fn read_view(&self, view_id: &str) -> FlowyResult<ViewRevision>;
fn read_views(&self, belong_to_id: &str) -> FlowyResult<Vec<ViewRevision>>;
fn update_view(&self, changeset: ViewChangeset) -> FlowyResult<()>;
fn delete_view(&self, view_id: &str) -> FlowyResult<()>;
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision>;
fn move_view(&self, view_id: &str, from: usize, to: usize) -> FlowyResult<()>;
fn create_trash(&self, trashes: Vec<TrashRevision>) -> FlowyResult<()>;

7
frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs
View File

@ -84,9 +84,10 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
Ok(())
}
fn delete_view(&self, view_id: &str) -> FlowyResult<()> {
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision> {
let view_revision: ViewRevision = ViewTableSql::read_view(view_id, &*self.0)?.into();
let _ = ViewTableSql::delete_view(view_id, &*self.0)?;
Ok(())
Ok(view_revision)
}
fn move_view(&self, _view_id: &str, _from: usize, _to: usize) -> FlowyResult<()> {
@ -182,7 +183,7 @@ where
(**self).update_view(changeset)
}
fn delete_view(&self, view_id: &str) -> FlowyResult<()> {
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision> {
(**self).delete_view(view_id)
}

9
frontend/rust-lib/flowy-folder/src/services/persistence/version_2/v2_impl.rs
View File

@ -113,11 +113,12 @@ impl FolderPersistenceTransaction for FolderEditor {
Ok(())
}
fn delete_view(&self, view_id: &str) -> FlowyResult<()> {
if let Some(change) = self.folder.write().delete_view(view_id)? {
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision> {
let view = self.folder.read().read_view(view_id)?;
if let Some(change) = self.folder.write().delete_view(&view.app_id, view_id)? {
let _ = self.apply_change(change)?;
}
Ok(())
Ok(view)
}
fn move_view(&self, view_id: &str, from: usize, to: usize) -> FlowyResult<()> {
@ -207,7 +208,7 @@ where
(**self).update_view(changeset)
}
fn delete_view(&self, view_id: &str) -> FlowyResult<()> {
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision> {
(**self).delete_view(view_id)
}

12
frontend/rust-lib/flowy-folder/src/services/view/controller.rs
View File

@ -462,10 +462,10 @@ async fn handle_trash_event(
let mut notify_ids = HashSet::new();
let mut views = vec![];
for identifier in identifiers.items {
let view = transaction.read_view(&identifier.id)?;
let _ = transaction.delete_view(&view.id)?;
notify_ids.insert(view.app_id.clone());
views.push(view);
if let Ok(view_rev) = transaction.delete_view(&identifier.id) {
notify_ids.insert(view_rev.app_id.clone());
views.push(view_rev);
}
}
for notify_id in notify_ids {
let _ = notify_views_changed(&notify_id, trash_can.clone(), &transaction)?;
@ -480,9 +480,7 @@ async fn handle_trash_event(
Ok(processor) => {
let _ = processor.close_view(&view.id).await?;
}
Err(e) => {
tracing::error!("{}", e)
}
Err(e) => tracing::error!("{}", e),
}
}
Ok(())

2
frontend/rust-lib/flowy-grid/src/event_handler.rs
View File

@ -136,7 +136,7 @@ pub(crate) async fn switch_to_field_handler(
.switch_to_field_type(&params.field_id, &params.field_type)
.await?;
// Get the field_rev with field_id, if it doesn't exist, we create the default FieldMeta from the FieldType.
// Get the field_rev with field_id, if it doesn't exist, we create the default FieldRevision from the FieldType.
let field_rev = editor
.get_field_rev(&params.field_id)
.await