From 26a6dee5317b7e39085978f50c64b14f54ea612b Mon Sep 17 00:00:00 2001 From: Pavel Ashevskiy Date: Fri, 26 Feb 2021 17:13:25 +0400 Subject: [PATCH] Apply custom filters after selecting source Signed-off-by: Pavel Ashevskiy --- .../item-object-list/item-list-layout.tsx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx index adec4bef27..15c833d8aa 100644 --- a/src/renderer/components/item-object-list/item-list-layout.tsx +++ b/src/renderer/components/item-object-list/item-list-layout.tsx @@ -197,17 +197,12 @@ export class ItemListLayout extends React.Component { 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() { - const { allItems, filters, filterCallbacks } = this; - const filterItems: ItemsFilter[] = []; + const {filters, filterCallbacks } = this; const filterGroups = groupBy(filters, ({ type }) => type); + const filterItems: ItemsFilter[] = []; + Object.entries(filterGroups).forEach(([type, filtersGroup]) => { const filterCallback = filterCallbacks[type]; @@ -216,9 +211,9 @@ export class ItemListLayout extends React.Component { } }); - 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()