diff --git a/src/lib/filtering/filter-utils.ts b/src/lib/filtering/filter-utils.ts index 5d7391b..2184158 100644 --- a/src/lib/filtering/filter-utils.ts +++ b/src/lib/filtering/filter-utils.ts @@ -24,11 +24,11 @@ function copySettings(oldFilters: INestedFilter[], newFilters: INestedFilter[]) export function handleCheckedValue(filter: INestedFilter): void { if (filter.children && filter.children.length) { - filter.checked = filter.children.reduce((acc, next) => acc && !!next.checked, true); + filter.checked = filter.children.reduce((acc, next) => acc && next.checked, true); if (filter.checked) { filter.indeterminate = false; } else { - filter.indeterminate = filter.children.reduce((acc, next) => acc || !!next.checked, false); + filter.indeterminate = filter.children.reduce((acc, next) => acc || next.checked, false); } } else { filter.indeterminate = false; diff --git a/src/lib/filtering/models/filter.model.ts b/src/lib/filtering/models/filter.model.ts index c44e9f8..46ac80f 100644 --- a/src/lib/filtering/models/filter.model.ts +++ b/src/lib/filtering/models/filter.model.ts @@ -1,6 +1,7 @@ export interface IFilter { checked?: boolean; matches?: number; + readonly skipTranslation?: boolean; readonly id: string; readonly label: string; readonly icon?: string; @@ -9,4 +10,5 @@ export interface IFilter { readonly required?: boolean; readonly disabled?: boolean; readonly helpModeKey?: string; + readonly color?: string; } diff --git a/src/lib/filtering/models/nested-filter.ts b/src/lib/filtering/models/nested-filter.ts index e035c82..2962811 100644 --- a/src/lib/filtering/models/nested-filter.ts +++ b/src/lib/filtering/models/nested-filter.ts @@ -1,4 +1,4 @@ -import { IListable } from '../../listing/models/listable'; +import { IListable } from '../../listing'; import { Filter } from './filter'; import { INestedFilter } from './nested-filter.model'; @@ -8,6 +8,8 @@ export class NestedFilter extends Filter implements INestedFilter, IListable { disabled?: boolean; helpModeKey?: string; readonly children: Filter[]; + readonly skipTranslation?: boolean; + readonly color?: string; constructor(nestedFilter: INestedFilter) { super(nestedFilter); @@ -16,5 +18,7 @@ export class NestedFilter extends Filter implements INestedFilter, IListable { this.disabled = !!nestedFilter.disabled; this.helpModeKey = nestedFilter.helpModeKey; this.children = nestedFilter.children ?? []; + this.skipTranslation = nestedFilter.skipTranslation; + this.color = nestedFilter.color; } }