Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: hide editing rows from groups when filters are applied (#6409)
Richard Shiueedeec4912123
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dartindex 43f0c398d8..48d24614fe 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart@@ -222,7 +222,7 @@ class FilterEditorState with _$FilterEditorState {List<FieldInfo> _getCreatableFilter(List<FieldInfo> fieldInfos) {final List<FieldInfo> creatableFields = List.from(fieldInfos);creatableFields.retainWhere(- (field) => field.fieldType.canCreateFilter,+ (field) => field.fieldType.canCreateFilter && !field.isGroupField,);return creatableFields;}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rsindex 3f60c322ee..6481cd7b8b 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs@@ -307,33 +307,46 @@ impl DatabaseViewEditor {let rows = vec![Arc::new(row.clone())];let mut rows = self.v_filter_rows(rows).await;- if let Some(row) = rows.pop() {- let result = controller.did_update_group_row(old_row, &row, &field);-- if let Ok(result) = result {- let mut group_changes = GroupChangesPB {- view_id: self.view_id.clone(),- ..Default::default()- };- if let Some(inserted_group) = result.inserted_group {- tracing::trace!("Create group after editing the row: {:?}", inserted_group);- group_changes.inserted_groups.push(inserted_group);- }- if let Some(delete_group) = result.deleted_group {- tracing::trace!("Delete group after editing the row: {:?}", delete_group);- group_changes.deleted_groups.push(delete_group.group_id);- }+ let mut group_changes = GroupChangesPB {+ view_id: self.view_id.clone(),+ ..Default::default()+ };- if !group_changes.is_empty() {- notify_did_update_num_of_groups(&self.view_id, group_changes).await;- }+ let (inserted_group, deleted_group, row_changesets) = if let Some(row) = rows.pop() {+ if let Ok(result) = controller.did_update_group_row(old_row, &row, &field) {+ (+ result.inserted_group,+ result.deleted_group,+ result.row_changesets,+ )+ } else {+ (None, None, vec![])+ }+ } else {+ if let Ok(result) = controller.did_delete_row(&row) {+ (None, result.deleted_group, result.row_changesets)+ } else {+ (None, None, vec![])+ }+ };- for changeset in result.row_changesets {- if !changeset.is_empty() {- tracing::trace!("Group change after editing the row: {:?}", changeset);- notify_did_update_group_rows(changeset).await;- }- }+ if let Some(inserted_group) = inserted_group {+ tracing::trace!("Create group after editing the row: {:?}", inserted_group);+ group_changes.inserted_groups.push(inserted_group);+ }+ if let Some(delete_group) = deleted_group {+ tracing::trace!("Delete group after editing the row: {:?}", delete_group);+ group_changes.deleted_groups.push(delete_group.group_id);+ }++ if !group_changes.is_empty() {+ notify_did_update_num_of_groups(&self.view_id, group_changes).await;+ }++ for changeset in row_changesets {+ if !changeset.is_empty() {+ tracing::trace!("Group change after editing the row: {:?}", changeset);+ notify_did_update_group_rows(changeset).await;}}}