Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor filter utils

Browse Source
This commit is contained in:
Dan Percic 2021-08-06 03:42:38 +03:00
parent 1c0128c11a
commit cea28ebd6e
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/filtering/filter-utils.ts
View File

@ -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) {

2
src/lib/filtering/models/filter-group.model.ts
View File

@ -10,5 +10,5 @@ export interface FilterGroup {
readonly hide?: boolean;
readonly checker: Function;
readonly matchAll?: boolean;
readonly checkerArgs?: any;
readonly checkerArgs?: [];
}