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

feat: save card orders (#3730)

Browse Source
This commit is contained in:
Richard Shiue 2023-10-26 10:05:43 +08:00 committed by GitHub
parent 74d9d427bd
commit 41e2c74b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,7 +958,7 @@ impl DatabaseEditor {
let mut row_changeset = RowChangeset::new(row_detail.row.id.clone()); let mut row_changeset = RowChangeset::new(row_detail.row.id.clone());
let view = self.database_views.get_view_editor(view_id).await?; let view = self.database_views.get_view_editor(view_id).await?;
view view
.v_move_group_row(&row_detail, &mut row_changeset, to_group, to_row) .v_move_group_row(&row_detail, &mut row_changeset, to_group, to_row.clone())
.await; .await;
tracing::trace!("Row data changed: {:?}", row_changeset); tracing::trace!("Row data changed: {:?}", row_changeset);
@ -966,6 +966,19 @@ impl DatabaseEditor {
row.set_cells(Cells::from(row_changeset.cell_by_field_id.clone())); row.set_cells(Cells::from(row_changeset.cell_by_field_id.clone()));
}); });
let to_row = if to_row.is_some() {
to_row
} else {
let row_details = self.get_rows(view_id).await?;
row_details
.last()
.map(|row_detail| row_detail.row.id.clone())
};
if let Some(row_id) = to_row {
self.move_row(view_id, from_row, row_id).await;
}
let cell_changesets = cell_changesets_from_cell_by_field_id( let cell_changesets = cell_changesets_from_cell_by_field_id(
view_id, view_id,
row_changeset.row_id, row_changeset.row_id,

4
frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
View File

@ -394,11 +394,11 @@ impl DatabaseViewEditor {
if let Some(result) = result { if let Some(result) = result {
if let Some(delete_group) = result.deleted_group { if let Some(delete_group) = result.deleted_group {
tracing::trace!("Delete group after moving the row: {:?}", delete_group); tracing::trace!("Delete group after moving the row: {:?}", delete_group);
let mut changes = GroupChangesPB { let changes = GroupChangesPB {
view_id: self.view_id.clone(), view_id: self.view_id.clone(),
deleted_groups: vec![delete_group.group_id],
..Default::default() ..Default::default()
}; };
changes.deleted_groups.push(delete_group.group_id);
notify_did_update_num_of_groups(&self.view_id, changes).await; notify_did_update_num_of_groups(&self.view_id, changes).await;
} }