@recursyve/nice-data-filter-kit 14.3.4 → 14.3.6
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/lib/components/nice-filter-view/components/advanced-filters/button/advanced-filters-button.component.mjs +6 -3
- package/esm2020/lib/components/nice-filter-view/components/advanced-filters/utils/advanced-filters.utils.mjs +2 -6
- package/fesm2015/recursyve-nice-data-filter-kit.mjs +7 -4
- package/fesm2015/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/fesm2020/recursyve-nice-data-filter-kit.mjs +6 -7
- package/fesm2020/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, Component, Inject, Optional, ViewEncapsulation } from "@angular/core";
|
|
2
|
-
import { map } from "rxjs/operators";
|
|
2
|
+
import { map, withLatestFrom } from "rxjs/operators";
|
|
3
3
|
import { NiceFilterViewQuery } from "../../../store/nice-filter-view.query";
|
|
4
4
|
import { NiceFilterViewService } from "../../../store/nice-filter-view.service";
|
|
5
5
|
import { AdvancedFiltersUtils } from "../utils/advanced-filters.utils";
|
|
@@ -17,7 +17,10 @@ export class NiceAdvancedFiltersButtonComponent {
|
|
|
17
17
|
this.query = query;
|
|
18
18
|
this.service = service;
|
|
19
19
|
this.shouldShowAdvancedFilters$ = this.query.selectSubState("showAdvancedFilters");
|
|
20
|
-
this.hasParameters$ = this.query.selectFilterParameters().pipe(map((parameter) => !!parameter
|
|
20
|
+
this.hasParameters$ = this.query.selectFilterParameters().pipe(withLatestFrom(this.query.selectFilterConfig()), map(([parameter, config]) => !!parameter
|
|
21
|
+
.rules
|
|
22
|
+
?.filter((rule) => config.some((conf) => conf?.id === rule.rules[0]?.id))
|
|
23
|
+
?.length));
|
|
21
24
|
}
|
|
22
25
|
clickToggleShowAdvancedFilters() {
|
|
23
26
|
this.service.updateSubState("showAdvancedFilters", !this.query.getSubState("showAdvancedFilters"));
|
|
@@ -39,4 +42,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImpor
|
|
|
39
42
|
type: Inject,
|
|
40
43
|
args: [ADVANCED_FILTER_ICONS]
|
|
41
44
|
}] }, { type: i1.NiceFilterViewQuery }, { type: i2.NiceFilterViewService }]; } });
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZWQtZmlsdGVycy1idXR0b24uY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmljZS1kYXRhLWZpbHRlci1raXQvc3JjL2xpYi9jb21wb25lbnRzL25pY2UtZmlsdGVyLXZpZXcvY29tcG9uZW50cy9hZHZhbmNlZC1maWx0ZXJzL2J1dHRvbi9hZHZhbmNlZC1maWx0ZXJzLWJ1dHRvbi5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uaWNlLWRhdGEtZmlsdGVyLWtpdC9zcmMvbGliL2NvbXBvbmVudHMvbmljZS1maWx0ZXItdmlldy9jb21wb25lbnRzL2FkdmFuY2VkLWZpbHRlcnMvYnV0dG9uL2FkdmFuY2VkLWZpbHRlcnMtYnV0dG9uLnRlbXBsYXRlLmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hHLE9BQU8sRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFHckQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDNUUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdkUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sOEJBQThCLENBQUM7Ozs7Ozs7O0FBVXJFLE1BQU0sT0FBTyxrQ0FBa0M7SUFZM0MsWUFDc0QsS0FBb0MsRUFDOUUsS0FBMEIsRUFDMUIsT0FBOEI7UUFGWSxVQUFLLEdBQUwsS0FBSyxDQUErQjtRQUM5RSxVQUFLLEdBQUwsS0FBSyxDQUFxQjtRQUMxQixZQUFPLEdBQVAsT0FBTyxDQUF1QjtRQWRuQywrQkFBMEIsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBVSxxQkFBcUIsQ0FBQyxDQUFDO1FBQ3ZGLG1CQUFjLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsRUFBRSxDQUFDLElBQUksQ0FDNUQsY0FBYyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxFQUMvQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQ3hCLENBQUMsQ0FBQyxTQUFTO2FBQ04sS0FBSztZQUNOLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxLQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQzdGLEVBQUUsTUFBTSxDQUNmLENBQ0osQ0FBQztJQU1DLENBQUM7SUFFRyw4QkFBOEI7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7SUFDdkcsQ0FBQztJQUVNLGdCQUFnQixDQUFDLE1BQWdDO1FBQ3BELE1BQU0sSUFBSSxHQUFHLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxxQkFBcUIsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3RCxDQUFDOzsrSEExQlEsa0NBQWtDLGtCQWFuQixxQkFBcUI7bUhBYnBDLGtDQUFrQyxvRUNqQi9DLG1sQ0FxQkE7MkZESmEsa0NBQWtDO2tCQVA5QyxTQUFTOytCQUNJLDhCQUE4QixpQkFHekIsaUJBQWlCLENBQUMsSUFBSSxtQkFDcEIsdUJBQXVCLENBQUMsTUFBTTs7MEJBZTFDLFFBQVE7OzBCQUFJLE1BQU07MkJBQUMscUJBQXFCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgSW5qZWN0LCBPcHRpb25hbCwgVmlld0VuY2Fwc3VsYXRpb24gfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xuaW1wb3J0IHsgbWFwLCB3aXRoTGF0ZXN0RnJvbSB9IGZyb20gXCJyeGpzL29wZXJhdG9yc1wiO1xuaW1wb3J0IHsgRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsIH0gZnJvbSBcIi4uLy4uLy4uLy4uLy4uL21vZGVscy9maWx0ZXIubW9kZWxcIjtcbmltcG9ydCB7IFF1ZXJ5UnVsZU1vZGVsIH0gZnJvbSBcIi4uLy4uLy4uLy4uLy4uL21vZGVscy9xdWVyeS5tb2RlbFwiO1xuaW1wb3J0IHsgTmljZUZpbHRlclZpZXdRdWVyeSB9IGZyb20gXCIuLi8uLi8uLi9zdG9yZS9uaWNlLWZpbHRlci12aWV3LnF1ZXJ5XCI7XG5pbXBvcnQgeyBOaWNlRmlsdGVyVmlld1NlcnZpY2UgfSBmcm9tIFwiLi4vLi4vLi4vc3RvcmUvbmljZS1maWx0ZXItdmlldy5zZXJ2aWNlXCI7XG5pbXBvcnQgeyBBZHZhbmNlZEZpbHRlcnNVdGlscyB9IGZyb20gXCIuLi91dGlscy9hZHZhbmNlZC1maWx0ZXJzLnV0aWxzXCI7XG5pbXBvcnQgeyBBRFZBTkNFRF9GSUxURVJfSUNPTlMgfSBmcm9tIFwiLi4vYWR2YW5jZWQtZmlsdGVycy5jb25zdGFudFwiO1xuaW1wb3J0IHsgTmljZUFkdmFuY2VkRmlsdGVySWNvbk9wdGlvbnMgfSBmcm9tIFwiLi4vbW9kZWxzL2ljb25zLm1vZGVsXCI7XG5cbkBDb21wb25lbnQoe1xuICAgIHNlbGVjdG9yOiBcIm5pY2UtYWR2YW5jZWQtZmlsdGVycy1idXR0b25cIixcbiAgICB0ZW1wbGF0ZVVybDogXCJhZHZhbmNlZC1maWx0ZXJzLWJ1dHRvbi50ZW1wbGF0ZS5odG1sXCIsXG4gICAgc3R5bGVVcmxzOiBbXCJhZHZhbmNlZC1maWx0ZXJzLWJ1dHRvbi5zdHlsZS5zY3NzXCJdLFxuICAgIGVuY2Fwc3VsYXRpb246IFZpZXdFbmNhcHN1bGF0aW9uLk5vbmUsXG4gICAgY2hhbmdlRGV0ZWN0aW9uOiBDaGFuZ2VEZXRlY3Rpb25TdHJhdGVneS5PblB1c2hcbn0pXG5leHBvcnQgY2xhc3MgTmljZUFkdmFuY2VkRmlsdGVyc0J1dHRvbkNvbXBvbmVudCB7XG4gICAgcHVibGljIHNob3VsZFNob3dBZHZhbmNlZEZpbHRlcnMkID0gdGhpcy5xdWVyeS5zZWxlY3RTdWJTdGF0ZTxib29sZWFuPihcInNob3dBZHZhbmNlZEZpbHRlcnNcIik7XG4gICAgcHVibGljIGhhc1BhcmFtZXRlcnMkID0gdGhpcy5xdWVyeS5zZWxlY3RGaWx0ZXJQYXJhbWV0ZXJzKCkucGlwZShcbiAgICAgICAgd2l0aExhdGVzdEZyb20odGhpcy5xdWVyeS5zZWxlY3RGaWx0ZXJDb25maWcoKSksXG4gICAgICAgIG1hcCgoW3BhcmFtZXRlciwgY29uZmlnXSkgPT5cbiAgICAgICAgICAgICEhcGFyYW1ldGVyXG4gICAgICAgICAgICAgICAgLnJ1bGVzXG4gICAgICAgICAgICAgICAgPy5maWx0ZXIoKHJ1bGUpID0+IGNvbmZpZy5zb21lKChjb25mKSA9PiBjb25mPy5pZCA9PT0gKHJ1bGUucnVsZXNbMF0gYXMgUXVlcnlSdWxlTW9kZWwpPy5pZCkpXG4gICAgICAgICAgICAgICAgPy5sZW5ndGhcbiAgICAgICAgKVxuICAgICk7XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgQE9wdGlvbmFsKCkgQEluamVjdChBRFZBTkNFRF9GSUxURVJfSUNPTlMpIHB1YmxpYyBpY29uczogTmljZUFkdmFuY2VkRmlsdGVySWNvbk9wdGlvbnMsXG4gICAgICAgIHByaXZhdGUgcXVlcnk6IE5pY2VGaWx0ZXJWaWV3UXVlcnksXG4gICAgICAgIHByaXZhdGUgc2VydmljZTogTmljZUZpbHRlclZpZXdTZXJ2aWNlXG4gICAgKSB7fVxuXG4gICAgcHVibGljIGNsaWNrVG9nZ2xlU2hvd0FkdmFuY2VkRmlsdGVycygpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5zZXJ2aWNlLnVwZGF0ZVN1YlN0YXRlKFwic2hvd0FkdmFuY2VkRmlsdGVyc1wiLCAhdGhpcy5xdWVyeS5nZXRTdWJTdGF0ZShcInNob3dBZHZhbmNlZEZpbHRlcnNcIikpO1xuICAgIH1cblxuICAgIHB1YmxpYyBvblNlbGVjdGVkRmlsdGVyKGZpbHRlcjogRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsKTogdm9pZCB7XG4gICAgICAgIGNvbnN0IHJ1bGUgPSBBZHZhbmNlZEZpbHRlcnNVdGlscy5jcmVhdGVSdWxlKGZpbHRlcik7XG4gICAgICAgIHRoaXMuc2VydmljZS5zZXRSdWxlcyhbeyBjb25kaXRpb246IFwiYW5kXCIsIHJ1bGVzOiBbcnVsZV0gfV0pO1xuICAgICAgICB0aGlzLnNlcnZpY2UudXBkYXRlU3ViU3RhdGUoXCJzaG93QWR2YW5jZWRGaWx0ZXJzXCIsIHRydWUpO1xuICAgIH1cbn1cbiIsIjxkaXYgY2xhc3M9XCJyZWxhdGl2ZVwiPlxuICAgIDxuZy1jb250YWluZXIgKm5nSWY9XCIoaGFzUGFyYW1ldGVycyQgfCBhc3luYykgJiYgKHNob3VsZFNob3dBZHZhbmNlZEZpbHRlcnMkIHwgYXN5bmMpICE9PSB0cnVlXCI+XG4gICAgICAgIDxkaXYgY2xhc3M9XCJhYnNvbHV0ZSB0b3AtMiByaWdodC0yIHctMSBoLTEgcm91bmRlZCBiZy1hY2NlbnRcIj48L2Rpdj5cblxuICAgICAgICA8YnV0dG9uIG1hdC1pY29uLWJ1dHRvbiAoY2xpY2spPVwiY2xpY2tUb2dnbGVTaG93QWR2YW5jZWRGaWx0ZXJzKClcIj5cbiAgICAgICAgICAgIDxtYXQtaWNvbiBbc3ZnSWNvbl09XCJpY29ucy5xdWVyeUJ1aWxkZXIuc3ZnSWNvblwiPnt7IGljb25zLnF1ZXJ5QnVpbGRlci5tYXRJY29uIH19PC9tYXQtaWNvbj5cbiAgICAgICAgPC9idXR0b24+XG4gICAgPC9uZy1jb250YWluZXI+XG5cbiAgICA8bmctY29udGFpbmVyICpuZ0lmPVwic2hvdWxkU2hvd0FkdmFuY2VkRmlsdGVycyQgfCBhc3luY1wiPlxuICAgICAgICA8YnV0dG9uIG1hdC1pY29uLWJ1dHRvbiAoY2xpY2spPVwiY2xpY2tUb2dnbGVTaG93QWR2YW5jZWRGaWx0ZXJzKClcIj5cbiAgICAgICAgICAgIDxtYXQtaWNvbiBbc3ZnSWNvbl09XCJpY29ucy5jbG9zZS5zdmdJY29uXCI+e3sgaWNvbnMuY2xvc2UubWF0SWNvbiB9fTwvbWF0LWljb24+XG4gICAgICAgIDwvYnV0dG9uPlxuICAgIDwvbmctY29udGFpbmVyPlxuXG4gICAgPG5nLWNvbnRhaW5lciAqbmdJZj1cIihoYXNQYXJhbWV0ZXJzJCB8IGFzeW5jKSAhPT0gdHJ1ZSAmJiAoc2hvdWxkU2hvd0FkdmFuY2VkRmlsdGVycyQgfCBhc3luYykgIT09IHRydWVcIj5cbiAgICAgICAgPGJ1dHRvbiBtYXQtaWNvbi1idXR0b24gbmljZUFkdmFuY2VkRmlsdGVyc1RyaWdnZXIgKGFkdmFuY2VkRmlsdGVyU2VsZWN0ZWQpPVwib25TZWxlY3RlZEZpbHRlcigkZXZlbnQpXCI+XG4gICAgICAgICAgICA8bWF0LWljb24gW3N2Z0ljb25dPVwiaWNvbnMucXVlcnlCdWlsZGVyLnN2Z0ljb25cIj57eyBpY29ucy5xdWVyeUJ1aWxkZXIubWF0SWNvbiB9fTwvbWF0LWljb24+XG4gICAgICAgIDwvYnV0dG9uPlxuICAgIDwvbmctY29udGFpbmVyPlxuPC9kaXY+XG4iXX0=
|
|
@@ -30,6 +30,7 @@ export class AdvancedFiltersUtils {
|
|
|
30
30
|
...base,
|
|
31
31
|
value: AdvancedFiltersUtils.isDoubleInput(operator) ? ["", ""] : ""
|
|
32
32
|
};
|
|
33
|
+
case FilterType.Number:
|
|
33
34
|
case FilterType.Select:
|
|
34
35
|
return {
|
|
35
36
|
...base,
|
|
@@ -47,11 +48,6 @@ export class AdvancedFiltersUtils {
|
|
|
47
48
|
? [config.options?.[0].key, config.options?.[0].key]
|
|
48
49
|
: config.options?.[0].key
|
|
49
50
|
};
|
|
50
|
-
case FilterType.Number:
|
|
51
|
-
return {
|
|
52
|
-
...base,
|
|
53
|
-
value: AdvancedFiltersUtils.isDoubleInput(operator) ? [0, 0] : 0
|
|
54
|
-
};
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
53
|
}
|
|
@@ -80,4 +76,4 @@ AdvancedFiltersUtils.doubleInputOperators = [
|
|
|
80
76
|
FilterOperatorTypes.Between,
|
|
81
77
|
FilterOperatorTypes.NotBetween
|
|
82
78
|
];
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZWQtZmlsdGVycy51dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25pY2UtZGF0YS1maWx0ZXIta2l0L3NyYy9saWIvY29tcG9uZW50cy9uaWNlLWZpbHRlci12aWV3L2NvbXBvbmVudHMvYWR2YW5jZWQtZmlsdGVycy91dGlscy9hZHZhbmNlZC1maWx0ZXJzLnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBNEIsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDMUYsT0FBTyxFQUFtQixtQkFBbUIsRUFBOEIsTUFBTSxtQ0FBbUMsQ0FBQztBQUVySCxNQUFNLE9BQU8sb0JBQW9CO0lBNkJ0QixNQUFNLENBQUMsYUFBYSxDQUFDLGNBQWdDO1FBQ3hELElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7U0FDaEI7UUFDRCxPQUFPLG9CQUFvQixDQUFDLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxjQUFnQztRQUN4RCxJQUFJLENBQUMsY0FBYyxFQUFFO1lBQ2pCLE9BQU8sS0FBSyxDQUFDO1NBQ2hCO1FBQ0QsT0FBTyxvQkFBb0IsQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUVNLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBZ0M7UUFDcEQsSUFBSSxDQUFDLGNBQWMsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQztTQUNoQjtRQUNELE9BQU8sb0JBQW9CLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzFFLENBQUM7SUFFTSxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWdDLEVBQUUsUUFBMEI7UUFDakYsTUFBTSxJQUFJLEdBQUc7WUFDVCxFQUFFLEVBQUUsTUFBTSxDQUFDLEVBQUU7WUFDYixTQUFTLEVBQUUsUUFBUSxJQUFLLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBc0I7U0FDckUsQ0FBQztRQUNGLFFBQVEsTUFBTSxDQUFDLElBQUksRUFBRTtZQUNqQixLQUFLLFVBQVUsQ0FBQyxJQUFJO2dCQUNoQixPQUFPO29CQUNILEdBQUcsSUFBSTtvQkFDUCxLQUFLLEVBQUUsb0JBQW9CLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtpQkFDdEUsQ0FBQztZQUNOLEtBQUssVUFBVSxDQUFDLE1BQU0sQ0FBQztZQUN2QixLQUFLLFVBQVUsQ0FBQyxNQUFNO2dCQUNsQixPQUFPO29CQUNILEdBQUcsSUFBSTtvQkFDUCxLQUFLLEVBQUUsb0JBQW9CLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSTtpQkFDNUUsQ0FBQztZQUNOLEtBQUssVUFBVSxDQUFDLElBQUk7Z0JBQ2hCLE9BQU87b0JBQ0gsR0FBRyxJQUFJO29CQUNQLEtBQUssRUFBRSxvQkFBb0IsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLEVBQUUsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxFQUFFO2lCQUM5RixDQUFDO1lBQ04sS0FBSyxVQUFVLENBQUMsS0FBSztnQkFDakIsT0FBTztvQkFDSCxHQUFHLElBQUk7b0JBQ1AsS0FBSyxFQUFFLG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUM7d0JBQy9DLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQzt3QkFDcEQsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHO2lCQUNoQyxDQUFDO1NBQ1Q7SUFDTCxDQUFDOztBQS9FYSxxQ0FBZ0IsR0FBc0I7SUFDaEQsbUJBQW1CLENBQUMsT0FBTztJQUMzQixtQkFBbUIsQ0FBQyxVQUFVO0lBQzlCLG1CQUFtQixDQUFDLE1BQU07SUFDMUIsbUJBQW1CLENBQUMsU0FBUztJQUM3QixtQkFBbUIsQ0FBQyxJQUFJO0NBQzNCLENBQUM7QUFFWSx5Q0FBb0IsR0FBc0I7SUFDcEQsbUJBQW1CLENBQUMsS0FBSztJQUN6QixtQkFBbUIsQ0FBQyxRQUFRO0lBQzVCLG1CQUFtQixDQUFDLElBQUk7SUFDeEIsbUJBQW1CLENBQUMsV0FBVztJQUMvQixtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLGNBQWM7SUFDbEMsbUJBQW1CLENBQUMsVUFBVTtJQUM5QixtQkFBbUIsQ0FBQyxhQUFhO0lBQ2pDLG1CQUFtQixDQUFDLFFBQVE7SUFDNUIsbUJBQW1CLENBQUMsV0FBVztJQUMvQixtQkFBbUIsQ0FBQyxRQUFRO0lBQzVCLG1CQUFtQixDQUFDLFdBQVc7Q0FDbEMsQ0FBQztBQUVZLHlDQUFvQixHQUFzQjtJQUNwRCxtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLFVBQVU7Q0FDakMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZpbHRlckNvbmZpZ3VyYXRpb25Nb2RlbCwgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi8uLi8uLi8uLi8uLi9tb2RlbHMvZmlsdGVyLm1vZGVsXCI7XG5pbXBvcnQgeyBGaWx0ZXJPcGVyYXRvcnMsIEZpbHRlck9wZXJhdG9yVHlwZXMsIFF1ZXJ5TW9kZWwsIFF1ZXJ5UnVsZU1vZGVsIH0gZnJvbSBcIi4uLy4uLy4uLy4uLy4uL21vZGVscy9xdWVyeS5tb2RlbFwiO1xuXG5leHBvcnQgY2xhc3MgQWR2YW5jZWRGaWx0ZXJzVXRpbHMge1xuICAgIHB1YmxpYyBzdGF0aWMgbm9JbnB1dE9wZXJhdG9yczogRmlsdGVyT3BlcmF0b3JzW10gPSBbXG4gICAgICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuSXNFbXB0eSxcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Jc05vdEVtcHR5LFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLklzTnVsbCxcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Jc05vdE51bGwsXG4gICAgICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuTm9uZVxuICAgIF07XG5cbiAgICBwdWJsaWMgc3RhdGljIHNpbmdsZUlucHV0T3BlcmF0b3JzOiBGaWx0ZXJPcGVyYXRvcnNbXSA9IFtcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5FcXVhbCxcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFcXVhbCxcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5MZXNzLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkxlc3NPckVxdWFsLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkdyZWF0ZXIsXG4gICAgICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuR3JlYXRlck9yRXF1YWwsXG4gICAgICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuQmVnaW5zV2l0aCxcbiAgICAgICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RCZWdpbnNXaXRoLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkVuZHNXaXRoLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLk5vdEVuZHNXaXRoLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkNvbnRhaW5zLFxuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLk5vdENvbnRhaW5zXG4gICAgXTtcblxuICAgIHB1YmxpYyBzdGF0aWMgZG91YmxlSW5wdXRPcGVyYXRvcnM6IEZpbHRlck9wZXJhdG9yc1tdID0gW1xuICAgICAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkJldHdlZW4sXG4gICAgICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuTm90QmV0d2VlblxuICAgIF07XG5cbiAgICBwdWJsaWMgc3RhdGljIGlzU2luZ2xlSW5wdXQoZmlsdGVyT3BlcmF0b3I/OiBGaWx0ZXJPcGVyYXRvcnMpOiBib29sZWFuIHtcbiAgICAgICAgaWYgKCFmaWx0ZXJPcGVyYXRvcikge1xuICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBBZHZhbmNlZEZpbHRlcnNVdGlscy5zaW5nbGVJbnB1dE9wZXJhdG9ycy5pbmNsdWRlcyhmaWx0ZXJPcGVyYXRvcik7XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBpc0RvdWJsZUlucHV0KGZpbHRlck9wZXJhdG9yPzogRmlsdGVyT3BlcmF0b3JzKTogYm9vbGVhbiB7XG4gICAgICAgIGlmICghZmlsdGVyT3BlcmF0b3IpIHtcbiAgICAgICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gQWR2YW5jZWRGaWx0ZXJzVXRpbHMuZG91YmxlSW5wdXRPcGVyYXRvcnMuaW5jbHVkZXMoZmlsdGVyT3BlcmF0b3IpO1xuICAgIH1cblxuICAgIHB1YmxpYyBzdGF0aWMgaXNOb0lucHV0KGZpbHRlck9wZXJhdG9yPzogRmlsdGVyT3BlcmF0b3JzKTogYm9vbGVhbiB7XG4gICAgICAgIGlmICghZmlsdGVyT3BlcmF0b3IpIHtcbiAgICAgICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gQWR2YW5jZWRGaWx0ZXJzVXRpbHMubm9JbnB1dE9wZXJhdG9ycy5pbmNsdWRlcyhmaWx0ZXJPcGVyYXRvcik7XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBjcmVhdGVSdWxlKGNvbmZpZzogRmlsdGVyQ29uZmlndXJhdGlvbk1vZGVsLCBvcGVyYXRvcj86IEZpbHRlck9wZXJhdG9ycyk6IFF1ZXJ5UnVsZU1vZGVsIHtcbiAgICAgICAgY29uc3QgYmFzZSA9IHtcbiAgICAgICAgICAgIGlkOiBjb25maWcuaWQsXG4gICAgICAgICAgICBvcGVyYXRpb246IG9wZXJhdG9yIHx8IChjb25maWcub3BlcmF0b3JzWzBdLmlkIGFzIEZpbHRlck9wZXJhdG9ycylcbiAgICAgICAgfTtcbiAgICAgICAgc3dpdGNoIChjb25maWcudHlwZSkge1xuICAgICAgICAgICAgY2FzZSBGaWx0ZXJUeXBlLlRleHQ6XG4gICAgICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgICAgICAgLi4uYmFzZSxcbiAgICAgICAgICAgICAgICAgICAgdmFsdWU6IEFkdmFuY2VkRmlsdGVyc1V0aWxzLmlzRG91YmxlSW5wdXQob3BlcmF0b3IpID8gW1wiXCIsIFwiXCJdIDogXCJcIlxuICAgICAgICAgICAgICAgIH07XG4gICAgICAgICAgICBjYXNlIEZpbHRlclR5cGUuTnVtYmVyOlxuICAgICAgICAgICAgY2FzZSBGaWx0ZXJUeXBlLlNlbGVjdDpcbiAgICAgICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAgICAgICAuLi5iYXNlLFxuICAgICAgICAgICAgICAgICAgICB2YWx1ZTogQWR2YW5jZWRGaWx0ZXJzVXRpbHMuaXNEb3VibGVJbnB1dChvcGVyYXRvcikgPyBbbnVsbCwgbnVsbF0gOiBudWxsXG4gICAgICAgICAgICAgICAgfTtcbiAgICAgICAgICAgIGNhc2UgRmlsdGVyVHlwZS5EYXRlOlxuICAgICAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgICAgICAgIC4uLmJhc2UsXG4gICAgICAgICAgICAgICAgICAgIHZhbHVlOiBBZHZhbmNlZEZpbHRlcnNVdGlscy5pc0RvdWJsZUlucHV0KG9wZXJhdG9yKSA/IFtuZXcgRGF0ZSgpLCBuZXcgRGF0ZSgpXSA6IG5ldyBEYXRlKClcbiAgICAgICAgICAgICAgICB9O1xuICAgICAgICAgICAgY2FzZSBGaWx0ZXJUeXBlLlJhZGlvOlxuICAgICAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgICAgICAgIC4uLmJhc2UsXG4gICAgICAgICAgICAgICAgICAgIHZhbHVlOiBBZHZhbmNlZEZpbHRlcnNVdGlscy5pc0RvdWJsZUlucHV0KG9wZXJhdG9yKVxuICAgICAgICAgICAgICAgICAgICAgICAgPyBbY29uZmlnLm9wdGlvbnM/LlswXS5rZXksIGNvbmZpZy5vcHRpb25zPy5bMF0ua2V5XVxuICAgICAgICAgICAgICAgICAgICAgICAgOiBjb25maWcub3B0aW9ucz8uWzBdLmtleVxuICAgICAgICAgICAgICAgIH07XG4gICAgICAgIH1cbiAgICB9XG59XG4iXX0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { plainToInstance } from 'class-transformer';
|
|
2
|
-
import { map, takeUntil, debounceTime, switchMap, distinctUntilChanged } from 'rxjs/operators';
|
|
2
|
+
import { map, takeUntil, debounceTime, switchMap, distinctUntilChanged, withLatestFrom } from 'rxjs/operators';
|
|
3
3
|
import { HttpParams } from '@angular/common/http';
|
|
4
4
|
import * as i5 from '@recursyve/nice-ui-kit.v2';
|
|
5
5
|
import { isNullOrUndefined, ObjectUtils, FileUtils, ArrayUtils, ExportBottomSheetComponent, NiceLoadingSpinnerModule, NiceTypeaheadModule, NiceExportBottomSheetModule, NiceAsyncTypeaheadProvider, NICE_ASYNC_TYPEAHEAD_PROVIDER, NiceAsyncTypeaheadModule } from '@recursyve/nice-ui-kit.v2';
|
|
@@ -2775,6 +2775,7 @@ class AdvancedFiltersUtils {
|
|
|
2775
2775
|
switch (config.type) {
|
|
2776
2776
|
case FilterType.Text:
|
|
2777
2777
|
return Object.assign(Object.assign({}, base), { value: AdvancedFiltersUtils.isDoubleInput(operator) ? ["", ""] : "" });
|
|
2778
|
+
case FilterType.Number:
|
|
2778
2779
|
case FilterType.Select:
|
|
2779
2780
|
return Object.assign(Object.assign({}, base), { value: AdvancedFiltersUtils.isDoubleInput(operator) ? [null, null] : null });
|
|
2780
2781
|
case FilterType.Date:
|
|
@@ -2783,8 +2784,6 @@ class AdvancedFiltersUtils {
|
|
|
2783
2784
|
return Object.assign(Object.assign({}, base), { value: AdvancedFiltersUtils.isDoubleInput(operator)
|
|
2784
2785
|
? [(_a = config.options) === null || _a === void 0 ? void 0 : _a[0].key, (_b = config.options) === null || _b === void 0 ? void 0 : _b[0].key]
|
|
2785
2786
|
: (_c = config.options) === null || _c === void 0 ? void 0 : _c[0].key });
|
|
2786
|
-
case FilterType.Number:
|
|
2787
|
-
return Object.assign(Object.assign({}, base), { value: AdvancedFiltersUtils.isDoubleInput(operator) ? [0, 0] : 0 });
|
|
2788
2787
|
}
|
|
2789
2788
|
}
|
|
2790
2789
|
}
|
|
@@ -3345,7 +3344,11 @@ class NiceAdvancedFiltersButtonComponent {
|
|
|
3345
3344
|
this.query = query;
|
|
3346
3345
|
this.service = service;
|
|
3347
3346
|
this.shouldShowAdvancedFilters$ = this.query.selectSubState("showAdvancedFilters");
|
|
3348
|
-
this.hasParameters$ = this.query.selectFilterParameters().pipe(
|
|
3347
|
+
this.hasParameters$ = this.query.selectFilterParameters().pipe(withLatestFrom(this.query.selectFilterConfig()), map(([parameter, config]) => {
|
|
3348
|
+
var _a, _b;
|
|
3349
|
+
return !!((_b = (_a = parameter
|
|
3350
|
+
.rules) === null || _a === void 0 ? void 0 : _a.filter((rule) => config.some((conf) => { var _a; return (conf === null || conf === void 0 ? void 0 : conf.id) === ((_a = rule.rules[0]) === null || _a === void 0 ? void 0 : _a.id); }))) === null || _b === void 0 ? void 0 : _b.length);
|
|
3351
|
+
}));
|
|
3349
3352
|
}
|
|
3350
3353
|
clickToggleShowAdvancedFilters() {
|
|
3351
3354
|
this.service.updateSubState("showAdvancedFilters", !this.query.getSubState("showAdvancedFilters"));
|