From cea28ebd6e3f4783653e0361f1714cc0035f2f5f Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 6 Aug 2021 03:42:38 +0300 Subject: [PATCH] refactor filter utils --- src/lib/filtering/filter-utils.ts | 13 ++----------- src/lib/filtering/models/filter-group.model.ts | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/lib/filtering/filter-utils.ts b/src/lib/filtering/filter-utils.ts index 90aeddc..2327bdb 100644 --- a/src/lib/filtering/filter-utils.ts +++ b/src/lib/filtering/filter-utils.ts @@ -38,19 +38,10 @@ export function handleCheckedValue(filter: NestedFilter) { } } -export function checkFilter(entity: any, filters: NestedFilter[], validate: Function, validateArgs: any = [], matchAll: boolean = false) { +export function checkFilter(entity: any, filters: NestedFilter[], validate: Function, validateArgs = [], matchAll: boolean = false) { const hasChecked = filters.find(f => f.checked); - if (validateArgs) { - if (!Array.isArray(validateArgs)) { - validateArgs = [validateArgs]; - } - } else { - validateArgs = []; - } - if (!hasChecked) { - return true; - } + if (!hasChecked) return true; let filterMatched = matchAll; for (const filter of filters) { diff --git a/src/lib/filtering/models/filter-group.model.ts b/src/lib/filtering/models/filter-group.model.ts index ab1e50e..b143416 100644 --- a/src/lib/filtering/models/filter-group.model.ts +++ b/src/lib/filtering/models/filter-group.model.ts @@ -10,5 +10,5 @@ export interface FilterGroup { readonly hide?: boolean; readonly checker: Function; readonly matchAll?: boolean; - readonly checkerArgs?: any; + readonly checkerArgs?: []; }