mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Apply custom filters after selecting source (#2241)
Signed-off-by: Pavel Ashevskiy <pavel.ashevskiy@ifellow.ru> Co-authored-by: Pavel Ashevskiy <pavel.ashevskiy@ifellow.ru>
This commit is contained in:
parent
20709d63e9
commit
805268a9d1
@ -197,17 +197,12 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
|
|||||||
return filters.reduce((items, filter) => filter(items), items);
|
return filters.reduce((items, filter) => filter(items), items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@computed get allItems() {
|
|
||||||
const { filterItems, store } = this.props;
|
|
||||||
|
|
||||||
return this.applyFilters(filterItems, store.items);
|
|
||||||
}
|
|
||||||
|
|
||||||
@computed get items() {
|
@computed get items() {
|
||||||
const { allItems, filters, filterCallbacks } = this;
|
const {filters, filterCallbacks } = this;
|
||||||
const filterItems: ItemsFilter[] = [];
|
|
||||||
const filterGroups = groupBy<Filter>(filters, ({ type }) => type);
|
const filterGroups = groupBy<Filter>(filters, ({ type }) => type);
|
||||||
|
|
||||||
|
const filterItems: ItemsFilter[] = [];
|
||||||
|
|
||||||
Object.entries(filterGroups).forEach(([type, filtersGroup]) => {
|
Object.entries(filterGroups).forEach(([type, filtersGroup]) => {
|
||||||
const filterCallback = filterCallbacks[type];
|
const filterCallback = filterCallbacks[type];
|
||||||
|
|
||||||
@ -216,9 +211,9 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const items = this.props.items ?? allItems;
|
const items = this.props.items ?? this.props.store.items;
|
||||||
|
|
||||||
return this.applyFilters(filterItems, items);
|
return this.applyFilters(filterItems.concat(this.props.filterItems), items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@autobind()
|
@autobind()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user