@one-paragon/angular-utilities 0.0.28 → 0.0.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/table-builder/classes/data-filter.mjs +3 -3
- package/fesm2015/one-paragon-angular-utilities.mjs +1 -1
- package/fesm2015/one-paragon-angular-utilities.mjs.map +1 -1
- package/fesm2020/one-paragon-angular-utilities.mjs +1 -1
- package/fesm2020/one-paragon-angular-utilities.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { combineLatest, of } from 'rxjs';
|
|
2
2
|
import { map, shareReplay } from 'rxjs/operators';
|
|
3
3
|
import { combineArrays } from '../../rxjs/rxjs-operators';
|
|
4
|
-
import { createFilterFunc } from './filter-info';
|
|
4
|
+
import { createFilterFunc, isFilterInfo } from './filter-info';
|
|
5
5
|
export class DataFilter {
|
|
6
6
|
constructor(filters$) {
|
|
7
7
|
this.filters$ = filters$;
|
|
@@ -15,8 +15,8 @@ export class DataFilter {
|
|
|
15
15
|
appendFilters(filters$) {
|
|
16
16
|
return new DataFilter(combineArrays([
|
|
17
17
|
this.filters$ ?? of([]),
|
|
18
|
-
filters$.pipe(map(fltrs => fltrs.filter(f => f.active).map(filter => createFilterFunc(filter))))
|
|
18
|
+
filters$.pipe(map(fltrs => fltrs.filter(f => (isFilterInfo(f) && (f.active || f.active === undefined)) || f.active).map(filter => createFilterFunc(filter))))
|
|
19
19
|
]));
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YS1maWx0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLXV0aWxpdGllcy9zcmMvdGFibGUtYnVpbGRlci9jbGFzc2VzL2RhdGEtZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxhQUFhLEVBQUUsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3JELE9BQU8sRUFBRSxHQUFHLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzFELE9BQU8sRUFBRSxnQkFBZ0IsRUFBNEIsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXpGLE1BQU0sT0FBTyxVQUFVO0lBRXJCLFlBQW9CLFFBQW9EO1FBQXBELGFBQVEsR0FBUixRQUFRLENBQTRDO0lBQ3hFLENBQUM7SUFFRCxNQUFNLENBQUMsSUFBVyxFQUFFLE9BQXFDO1FBQ3ZELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBRSxDQUFDLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBRSxDQUFDO0lBQzdELENBQUM7SUFFRCxVQUFVLENBQUMsS0FBc0I7UUFDL0IsT0FBTyxhQUFhLENBQUMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUMvQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUMsRUFDcEQsV0FBVyxDQUFDLEVBQUMsVUFBVSxFQUFFLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFDLENBQUMsQ0FDN0MsQ0FBQztJQUNKLENBQUM7SUFFRCxhQUFhLENBQUMsUUFBb0Q7UUFDaEUsT0FBTyxJQUFJLFVBQVUsQ0FBQyxhQUFhLENBQUM7WUFDbEMsSUFBSSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ3ZCLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsTUFBTSxLQUFLLFNBQVMsQ0FBQyxDQUFFLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNqSyxDQUFDLENBQUMsQ0FBQztJQUNOLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9ic2VydmFibGUsIGNvbWJpbmVMYXRlc3QsIG9mIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBtYXAsIHNoYXJlUmVwbGF5IH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgY29tYmluZUFycmF5cyB9IGZyb20gJy4uLy4uL3J4anMvcnhqcy1vcGVyYXRvcnMnO1xuaW1wb3J0IHsgY3JlYXRlRmlsdGVyRnVuYywgQ3VzdG9tRmlsdGVyLCBGaWx0ZXJJbmZvLCBpc0ZpbHRlckluZm8gfSBmcm9tICcuL2ZpbHRlci1pbmZvJztcblxuZXhwb3J0IGNsYXNzIERhdGFGaWx0ZXI8VCA9IGFueT4ge1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgZmlsdGVycyQ6IE9ic2VydmFibGU8IEFycmF5PCAodmFsOiBhbnkpID0+IGJvb2xlYW4+PiApIHtcbiAgfVxuXG4gIGZpbHRlcihkYXRhOiBhbnlbXSwgZmlsdGVyczogQXJyYXk8KHZhbDogYW55KSA9PiBib29sZWFuPiApOiBhbnlbXSB7XG4gICAgcmV0dXJuIGRhdGEuZmlsdGVyKCByID0+IGZpbHRlcnMuZXZlcnkoIGZsdHIgPT4gZmx0cihyKSkgKTtcbiAgfVxuXG4gIGZpbHRlckRhdGEoZGF0YSQ6IE9ic2VydmFibGU8VFtdPikge1xuICAgIHJldHVybiBjb21iaW5lTGF0ZXN0KFtkYXRhJCwgdGhpcy5maWx0ZXJzJF0pLnBpcGUoXG4gICAgICBtYXAoKFtkYXRhLCBmaWx0ZXJzXSkgPT4gdGhpcy5maWx0ZXIoZGF0YSwgZmlsdGVycykpLFxuICAgICAgc2hhcmVSZXBsYXkoe2J1ZmZlclNpemU6IDEsIHJlZkNvdW50OiB0cnVlfSlcbiAgICApO1xuICB9XG5cbiAgYXBwZW5kRmlsdGVycyhmaWx0ZXJzJDogT2JzZXJ2YWJsZTwoRmlsdGVySW5mbyB8IEN1c3RvbUZpbHRlciApW10+KSA6IERhdGFGaWx0ZXIge1xuICAgIHJldHVybiBuZXcgRGF0YUZpbHRlcihjb21iaW5lQXJyYXlzKFtcbiAgICAgIHRoaXMuZmlsdGVycyQgPz8gb2YoW10pLFxuICAgICAgZmlsdGVycyQucGlwZShtYXAoZmx0cnMgPT4gZmx0cnMuZmlsdGVyKCBmID0+IChpc0ZpbHRlckluZm8oZikgJiYgKGYuYWN0aXZlIHx8IGYuYWN0aXZlID09PSB1bmRlZmluZWQpICkgfHwgZi5hY3RpdmUgKS5tYXAoZmlsdGVyID0+IGNyZWF0ZUZpbHRlckZ1bmMoZmlsdGVyKSkpKVxuICAgIF0pKTtcbiAgfVxufVxuIl19
|
|
@@ -2971,7 +2971,7 @@ class DataFilter {
|
|
|
2971
2971
|
var _a;
|
|
2972
2972
|
return new DataFilter(combineArrays([
|
|
2973
2973
|
(_a = this.filters$) !== null && _a !== void 0 ? _a : of([]),
|
|
2974
|
-
filters$.pipe(map(fltrs => fltrs.filter(f => f.active).map(filter => createFilterFunc(filter))))
|
|
2974
|
+
filters$.pipe(map(fltrs => fltrs.filter(f => (isFilterInfo(f) && (f.active || f.active === undefined)) || f.active).map(filter => createFilterFunc(filter))))
|
|
2975
2975
|
]));
|
|
2976
2976
|
}
|
|
2977
2977
|
}
|