Skip to content

Commit 72dc0b8

Browse files
authored
fix: filter orders (#1535)
Co-authored-by: nathan <[email protected]>
1 parent 721781f commit 72dc0b8

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,12 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {
167167
);
168168
}
169169
}
170+
171+
class _FilterPannel extends StatelessWidget {
172+
const _FilterPannel({Key? key}) : super(key: key);
173+
174+
@override
175+
Widget build(BuildContext context) {
176+
return Container();
177+
}
178+
}

shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ impl GridViewRevisionPad {
6161
}
6262

6363
pub fn get_groups_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<GroupConfigurationRevision>> {
64-
self.groups
65-
.get_objects_by_field_revs(field_revs)
66-
.into_values()
67-
.flatten()
68-
.collect()
64+
self.groups.get_objects_by_field_revs(field_revs)
6965
}
7066

7167
pub fn get_all_groups(&self) -> Vec<Arc<GroupConfigurationRevision>> {
@@ -131,11 +127,7 @@ impl GridViewRevisionPad {
131127
}
132128

133129
pub fn get_all_filters(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<FilterRevision>> {
134-
self.filters
135-
.get_objects_by_field_revs(field_revs)
136-
.into_values()
137-
.flatten()
138-
.collect()
130+
self.filters.get_objects_by_field_revs(field_revs)
139131
}
140132

141133
pub fn get_filters(&self, field_id: &str, field_type_rev: &FieldTypeRevision) -> Vec<Arc<FilterRevision>> {

shared-lib/grid-rev-model/src/grid_setting_rev.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,21 @@ where
8383
.cloned()
8484
}
8585

86-
pub fn get_objects_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> HashMap<String, Vec<Arc<T>>> {
86+
pub fn get_objects_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<T>> {
8787
// Get the objects according to the FieldType, so we need iterate the field_revs.
88-
let objects_by_field_id = field_revs
88+
let objects = field_revs
8989
.iter()
9090
.flat_map(|field_rev| {
9191
let field_type = &field_rev.ty;
9292
let field_id = &field_rev.id;
9393

9494
let object_rev_map = self.inner.get(field_id)?;
9595
let objects: Vec<Arc<T>> = object_rev_map.get(field_type)?.clone();
96-
Some((field_rev.id.clone(), objects))
96+
Some(objects)
9797
})
98-
.collect::<HashMap<String, Vec<Arc<T>>>>();
99-
objects_by_field_id
98+
.flatten()
99+
.collect::<Vec<Arc<T>>>();
100+
objects
100101
}
101102

102103
pub fn get_all_objects(&self) -> Vec<Arc<T>> {

0 commit comments

Comments
 (0)