@firestitch/filter 18.2.17 → 18.2.19
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/app/components/filter/filter.component.d.ts +5 -0
- package/app/helpers/create-filter-item.d.ts +1 -1
- package/app/interfaces/config.interface.d.ts +0 -3
- package/app/models/items/base-item.d.ts +12 -2
- package/esm2022/app/components/filter/filter.component.mjs +10 -1
- package/esm2022/app/interfaces/config.interface.mjs +1 -1
- package/esm2022/app/models/filter-config.mjs +3 -5
- package/esm2022/app/models/items/base-item.mjs +14 -2
- package/esm2022/app/models/items/select-item.mjs +4 -22
- package/esm2022/app/services/persistance-controller.service.mjs +11 -12
- package/esm2022/app/services/query-param-controller.service.mjs +4 -3
- package/fesm2022/firestitch-filter.mjs +40 -38
- package/fesm2022/firestitch-filter.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -23,17 +23,17 @@ export class PersistanceController {
|
|
|
23
23
|
}
|
|
24
24
|
init(filterController) {
|
|
25
25
|
this._filterController = filterController;
|
|
26
|
-
const
|
|
27
|
-
if (
|
|
28
|
-
this.enabled =
|
|
29
|
-
this._name =
|
|
26
|
+
const persistanceConfig = this._initConfig(filterController.config.persist);
|
|
27
|
+
if (persistanceConfig) {
|
|
28
|
+
this.enabled = !this.inDialog;
|
|
29
|
+
this._name = persistanceConfig.name;
|
|
30
30
|
this._data = this._get() || {};
|
|
31
|
+
this._filterController.change$
|
|
32
|
+
.pipe(takeUntilDestroyed(this._destroyRef))
|
|
33
|
+
.subscribe(() => {
|
|
34
|
+
this._set('query', this._filterController.values);
|
|
35
|
+
});
|
|
31
36
|
}
|
|
32
|
-
this._filterController.change$
|
|
33
|
-
.pipe(takeUntilDestroyed(this._destroyRef))
|
|
34
|
-
.subscribe(() => {
|
|
35
|
-
this._set('query', this._filterController.values);
|
|
36
|
-
});
|
|
37
37
|
return of(null);
|
|
38
38
|
}
|
|
39
39
|
setQuery(value) {
|
|
@@ -55,12 +55,11 @@ export class PersistanceController {
|
|
|
55
55
|
}
|
|
56
56
|
return {};
|
|
57
57
|
}
|
|
58
|
-
_initConfig(config
|
|
58
|
+
_initConfig(config) {
|
|
59
59
|
let persistanceConfig = this._getConfig(config);
|
|
60
60
|
if (persistanceConfig) {
|
|
61
61
|
persistanceConfig = {
|
|
62
62
|
name: persistanceConfig.name || getNormalizedPath(this._location),
|
|
63
|
-
persistQuery: !inDialog || !!persistanceConfig.name,
|
|
64
63
|
...persistanceConfig,
|
|
65
64
|
};
|
|
66
65
|
}
|
|
@@ -80,4 +79,4 @@ export class PersistanceController {
|
|
|
80
79
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersistanceController, decorators: [{
|
|
81
80
|
type: Injectable
|
|
82
81
|
}] });
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdGFuY2UtY29udHJvbGxlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwcC9zZXJ2aWNlcy9wZXJzaXN0YW5jZS1jb250cm9sbGVyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFeEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdkQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU1QyxPQUFPLEVBQWMsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRXRDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDOztBQVFoRSxNQUFNLE9BQU8scUJBQXFCO0lBRXpCLE9BQU8sR0FBRyxLQUFLLENBQUM7SUFFZixNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pCLGlCQUFpQixDQUFtQjtJQUNwQyxLQUFLLENBQVM7SUFDZCxLQUFLLEdBQVEsRUFBRSxDQUFDO0lBQ1AsU0FBUyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM3QixTQUFTLEdBQUcsbUJBQW1CLENBQUM7SUFDaEMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxZQUFZLEVBQUUsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN0RCxVQUFVLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ25E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O1FBQ0osQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQzt3R0F2RlUscUJBQXFCOzRHQUFyQixxQkFBcUI7OzRGQUFyQixxQkFBcUI7a0JBRGpDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMb2NhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5pbXBvcnQgeyBEZXN0cm95UmVmLCBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuaW1wb3J0IHsgTWF0RGlhbG9nUmVmIH0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwvZGlhbG9nJztcblxuaW1wb3J0IHsgZ2V0Tm9ybWFsaXplZFBhdGggfSBmcm9tICdAZmlyZXN0aXRjaC9jb21tb24nO1xuaW1wb3J0IHsgRHJhd2VyUmVmIH0gZnJvbSAnQGZpcmVzdGl0Y2gvZHJhd2VyJztcbmltcG9ydCB7IEZzU3RvcmUgfSBmcm9tICdAZmlyZXN0aXRjaC9zdG9yZSc7XG5cbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSAncnhqcyc7XG5cbmltcG9ydCB7IHRha2VVbnRpbERlc3Ryb3llZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUvcnhqcy1pbnRlcm9wJztcblxuaW1wb3J0IHsgRnNGaWx0ZXJQZXJzaXN0YW5jZSwgRnNGaWx0ZXJQZXJzaXN0YW5jZUNvbmZpZyB9IGZyb20gJy4uL2ludGVyZmFjZXMnO1xuXG5pbXBvcnQgeyBGaWx0ZXJDb250cm9sbGVyIH0gZnJvbSAnLi9maWx0ZXItY29udHJvbGxlci5zZXJ2aWNlJztcblxuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgUGVyc2lzdGFuY2VDb250cm9sbGVyIHtcbiAgXG4gIHB1YmxpYyBlbmFibGVkID0gZmFsc2U7XG5cbiAgcHJpdmF0ZSBfc3RvcmUgPSBpbmplY3QoRnNTdG9yZSk7XG4gIHByaXZhdGUgX2ZpbHRlckNvbnRyb2xsZXI6IEZpbHRlckNvbnRyb2xsZXI7XG4gIHByaXZhdGUgX25hbWU6IHN0cmluZztcbiAgcHJpdmF0ZSBfZGF0YTogYW55ID0ge307XG4gIHByaXZhdGUgcmVhZG9ubHkgX2xvY2F0aW9uID0gaW5qZWN0KExvY2F0aW9uKTtcbiAgcHJpdmF0ZSByZWFkb25seSBfc3RvcmVLZXkgPSAnZnMtZmlsdGVyLXBlcnNpc3QnO1xuICBwcml2YXRlIHJlYWRvbmx5IF9kaWFsb2dSZWYgPSBpbmplY3QoTWF0RGlhbG9nUmVmLCB7IG9wdGlvbmFsOiB0cnVlIH0pO1xuICBwcml2YXRlIHJlYWRvbmx5IF9kcmF3ZXJSZWYgPSBpbmplY3QoRHJhd2VyUmVmLCB7IG9wdGlvbmFsOiB0cnVlIH0pOyAgXG4gIHByaXZhdGUgcmVhZG9ubHkgX2Rlc3Ryb3lSZWYgPSBpbmplY3QoRGVzdHJveVJlZik7XG4gIFxuICBwdWJsaWMgZ2V0IGluRGlhbG9nKCkge1xuICAgIHJldHVybiAhIXRoaXMuX2RpYWxvZ1JlZiB8fCAhIXRoaXMuX2RyYXdlclJlZjtcbiAgfVxuXG4gIHB1YmxpYyBpbml0KGZpbHRlckNvbnRyb2xsZXI6IEZpbHRlckNvbnRyb2xsZXIpOiBPYnNlcnZhYmxlPGFueT4ge1xuICAgIHRoaXMuX2ZpbHRlckNvbnRyb2xsZXIgPSBmaWx0ZXJDb250cm9sbGVyO1xuICAgIFxuICAgIGNvbnN0IHBlcnNpc3RhbmNlQ29uZmlnID0gdGhpcy5faW5pdENvbmZpZyhmaWx0ZXJDb250cm9sbGVyLmNvbmZpZy5wZXJzaXN0KTtcblxuICAgIGlmKHBlcnNpc3RhbmNlQ29uZmlnKSB7XG4gICAgICB0aGlzLmVuYWJsZWQgPSAhdGhpcy5pbkRpYWxvZztcbiAgICAgIHRoaXMuX25hbWUgPSBwZXJzaXN0YW5jZUNvbmZpZy5uYW1lO1xuICAgICAgdGhpcy5fZGF0YSA9IHRoaXMuX2dldCgpIHx8IHt9O1xuICAgIFxuICAgICAgdGhpcy5fZmlsdGVyQ29udHJvbGxlci5jaGFuZ2UkXG4gICAgICAgIC5waXBlKFxuICAgICAgICAgIHRha2VVbnRpbERlc3Ryb3llZCh0aGlzLl9kZXN0cm95UmVmKSxcbiAgICAgICAgKVxuICAgICAgICAuc3Vic2NyaWJlKCgpID0+IHtcbiAgICAgICAgICB0aGlzLl9zZXQoJ3F1ZXJ5JywgdGhpcy5fZmlsdGVyQ29udHJvbGxlci52YWx1ZXMpO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICByZXR1cm4gb2YobnVsbCk7XG4gIH1cblxuICBwdWJsaWMgc2V0UXVlcnkodmFsdWU6IGFueSkge1xuICAgIHRoaXMuX3NldCgncXVlcnknLCB2YWx1ZSk7XG4gIH1cblxuICBwdWJsaWMgZ2V0UXVlcnkoKSB7XG4gICAgcmV0dXJuIHRoaXMuX2RhdGEucXVlcnkgfHwge307XG4gIH1cblxuICBwcml2YXRlIF9zZXQoa2V5OiBzdHJpbmcsIHZhbHVlOiBhbnkpIHtcbiAgICB0aGlzLl9kYXRhW2tleV0gPSB2YWx1ZTtcbiAgICBjb25zdCBzdG9yZURhdGEgPSB0aGlzLl9zdG9yZS5nZXQodGhpcy5fc3RvcmVLZXkpIHx8IHt9O1xuICAgIHN0b3JlRGF0YVt0aGlzLl9uYW1lXSA9IHRoaXMuX2RhdGE7XG5cbiAgICB0aGlzLl9zdG9yZS5zZXQodGhpcy5fc3RvcmVLZXksIHN0b3JlRGF0YSk7XG4gIH1cblxuICBwcml2YXRlIF9nZXQoKSB7XG4gICAgY29uc3Qgc3RvcmVEYXRhID0gdGhpcy5fc3RvcmUuZ2V0KHRoaXMuX3N0b3JlS2V5KTtcblxuICAgIGlmIChzdG9yZURhdGEpIHtcbiAgICAgIHJldHVybiBzdG9yZURhdGFbdGhpcy5fbmFtZV07XG4gICAgfVxuIFxuICAgIHJldHVybiB7fTtcbiAgfVxuXG4gIHByaXZhdGUgX2luaXRDb25maWcoY29uZmlnOiBGc0ZpbHRlclBlcnNpc3RhbmNlKTogRnNGaWx0ZXJQZXJzaXN0YW5jZUNvbmZpZyB7XG4gICAgbGV0IHBlcnNpc3RhbmNlQ29uZmlnID0gdGhpcy5fZ2V0Q29uZmlnKGNvbmZpZyk7XG5cbiAgICBpZihwZXJzaXN0YW5jZUNvbmZpZykge1xuICAgICAgcGVyc2lzdGFuY2VDb25maWcgPSB7XG4gICAgICAgIG5hbWU6IHBlcnNpc3RhbmNlQ29uZmlnLm5hbWUgfHwgZ2V0Tm9ybWFsaXplZFBhdGgodGhpcy5fbG9jYXRpb24pLFxuICAgICAgICAuLi5wZXJzaXN0YW5jZUNvbmZpZyxcbiAgICAgIH07XG4gICAgfVxuICBcbiAgICByZXR1cm4gcGVyc2lzdGFuY2VDb25maWc7XG4gIH1cblxuICBwcml2YXRlIF9nZXRDb25maWcoY29uZmlnOiBGc0ZpbHRlclBlcnNpc3RhbmNlKTogRnNGaWx0ZXJQZXJzaXN0YW5jZUNvbmZpZyB7XG4gICAgaWYoY29uZmlnKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICAuLi4oY29uZmlnID09PSB0cnVlID8ge30gOiBjb25maWcpLFxuICAgICAgfTtcbiAgICB9XG5cbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG59XG5cbiJdfQ==
|
|
@@ -43,7 +43,8 @@ export class QueryParamController {
|
|
|
43
43
|
}
|
|
44
44
|
updateQueryParams() {
|
|
45
45
|
const queryParams = {
|
|
46
|
-
...this._filterController.items
|
|
46
|
+
...this._filterController.items
|
|
47
|
+
.reduce((acc, item) => {
|
|
47
48
|
return {
|
|
48
49
|
...acc,
|
|
49
50
|
[item.name]: undefined,
|
|
@@ -64,7 +65,7 @@ export class QueryParamController {
|
|
|
64
65
|
url.searchParams.set(name, data[name]);
|
|
65
66
|
}
|
|
66
67
|
});
|
|
67
|
-
history.replaceState({}, null, url.pathname + url.search);
|
|
68
|
+
history.replaceState({}, null, url.pathname + decodeURIComponent(url.search));
|
|
68
69
|
}
|
|
69
70
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QueryParamController, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
70
71
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QueryParamController });
|
|
@@ -72,4 +73,4 @@ export class QueryParamController {
|
|
|
72
73
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QueryParamController, decorators: [{
|
|
73
74
|
type: Injectable
|
|
74
75
|
}] });
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktcGFyYW0tY29udHJvbGxlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwcC9zZXJ2aWNlcy9xdWVyeS1wYXJhbS1jb250cm9sbGVyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQy9ELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBYyxFQUFFLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTFELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWhFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUl4RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7O0FBSTNELE1BQU0sT0FBTyxvQkFBb0I7SUFDdkIsV0FBVyxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNqQyxRQUFRLEdBQUcsS0FBSyxDQUFDO0lBQ2pCLGVBQWUsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDekMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNoQyxpQkFBaUIsQ0FBbUI7SUFFNUMsSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUN2QixDQUFDO0lBRUQsSUFBVyxNQUFNO1FBQ2YsSUFBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7UUFFRCxNQUFNLEtBQUssR0FBRztZQUNaLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUs7U0FDaEM7YUFDRSxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUU1QixPQUFPLFlBQVksQ0FDakIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUNoQyxLQUFLLENBQ04sQ0FBQztJQUNKLENBQUM7SUFFTSxJQUFJLENBQUMsZ0JBQWtDO1FBQzVDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxnQkFBZ0IsQ0FBQztRQUMxQyxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDO1FBRXpELEtBQUssQ0FDSCxJQUFJLENBQUMsaUJBQWlCLENBQUMsT0FBTyxFQUM5QixJQUFJLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUM3QjthQUNFLElBQUksQ0FDSCxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUMxQixHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUMsRUFDbkMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUNyQzthQUNBLFNBQVMsRUFBRSxDQUFDO1FBRWYsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbEIsQ0FBQztJQUVNLFdBQVc7UUFDaEIsSUFBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7UUFFRCxPQUFPO1lBQ0wsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVTtZQUNwQyxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsVUFBVTtTQUNuQyxDQUFDO0lBQ0osQ0FBQztJQUVNLGlCQUFpQjtRQUN0QixNQUFNLFdBQVcsR0FBRztZQUNsQixHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLO2lCQUM1QixNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQ3BCLE9BQU87b0JBQ0wsR0FBRyxHQUFHO29CQUNOLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVM7aUJBQ3ZCLENBQUM7WUFDSixDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ1IsR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFO1NBQ3RCLENBQUM7UUFFRixJQUFJLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFTyxhQUFhLENBQUMsSUFBSTtRQUN4QixNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2FBQ2QsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDaEIsSUFBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssU0FBUyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztnQkFDbkQsR0FBRyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDaEMsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLEdBQUcsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUN4QyxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7UUFFTCxPQUFPLENBQUMsWUFBWSxDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLFFBQVEsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUNoRixDQUFDO3dHQXBGVSxvQkFBb0I7NEdBQXBCLG9CQUFvQjs7NEZBQXBCLG9CQUFvQjtrQkFEaEMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlc3Ryb3lSZWYsIGluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuXG5pbXBvcnQgeyBmaWx0ZXIsIG1lcmdlLCBPYnNlcnZhYmxlLCBvZiwgdGFwIH0gZnJvbSAncnhqcyc7XG5cbmltcG9ydCB7IHRha2VVbnRpbERlc3Ryb3llZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUvcnhqcy1pbnRlcm9wJztcblxuaW1wb3J0IHsgcmVzdG9yZUl0ZW1zIH0gZnJvbSAnLi4vaGVscGVycy9yZXN0b3JlLWl0ZW1zJztcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSAnLi4vaW50ZXJmYWNlcyc7XG5cbmltcG9ydCB7IEZpbHRlckNvbnRyb2xsZXIgfSBmcm9tICcuL2ZpbHRlci1jb250cm9sbGVyLnNlcnZpY2UnO1xuaW1wb3J0IHsgU29ydENvbnRyb2xsZXIgfSBmcm9tICcuL3NvcnQtY29udHJvbGxlci5zZXJ2aWNlJztcblxuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgUXVlcnlQYXJhbUNvbnRyb2xsZXIge1xuICBwcml2YXRlIF9kZXN0cm95UmVmID0gaW5qZWN0KERlc3Ryb3lSZWYpO1xuICBwcml2YXRlIF9lbmFibGVkID0gZmFsc2U7XG4gIHByaXZhdGUgX3NvcnRDb250cm9sbGVyID0gaW5qZWN0KFNvcnRDb250cm9sbGVyKTtcbiAgcHJpdmF0ZSBfcm91dGUgPSBpbmplY3QoQWN0aXZhdGVkUm91dGUpO1xuICBwcml2YXRlIF9maWx0ZXJDb250cm9sbGVyOiBGaWx0ZXJDb250cm9sbGVyO1xuXG4gIHB1YmxpYyBnZXQgZW5hYmxlZCgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gdGhpcy5fZW5hYmxlZDtcbiAgfVxuXG4gIHB1YmxpYyBnZXQgcGFyYW1zKCk6IFJlY29yZDxzdHJpbmcsIGFueT4ge1xuICAgIGlmKCF0aGlzLmVuYWJsZWQpIHtcbiAgICAgIHJldHVybiB7fTtcbiAgICB9XG5cbiAgICBjb25zdCBpdGVtcyA9IFtcbiAgICAgIC4uLnRoaXMuX2ZpbHRlckNvbnRyb2xsZXIuaXRlbXMsXG4gICAgXVxuICAgICAgLmZpbHRlcigoaXRlbSkgPT4gISFpdGVtKTtcbiAgICAgIFxuICAgIHJldHVybiByZXN0b3JlSXRlbXMoXG4gICAgICB0aGlzLl9yb3V0ZS5zbmFwc2hvdC5xdWVyeVBhcmFtcyxcbiAgICAgIGl0ZW1zLFxuICAgICk7XG4gIH1cblxuICBwdWJsaWMgaW5pdChmaWx0ZXJDb250cm9sbGVyOiBGaWx0ZXJDb250cm9sbGVyKTogT2JzZXJ2YWJsZTxhbnk+IHtcbiAgICB0aGlzLl9maWx0ZXJDb250cm9sbGVyID0gZmlsdGVyQ29udHJvbGxlcjtcbiAgICB0aGlzLl9lbmFibGVkID0gdGhpcy5fZmlsdGVyQ29udHJvbGxlci5jb25maWcucXVlcnlQYXJhbTtcblxuICAgIG1lcmdlKFxuICAgICAgdGhpcy5fZmlsdGVyQ29udHJvbGxlci5jaGFuZ2UkLCBcbiAgICAgIHRoaXMuX2ZpbHRlckNvbnRyb2xsZXIuaW5pdCQsXG4gICAgKVxuICAgICAgLnBpcGUoXG4gICAgICAgIGZpbHRlcigoKSA9PiB0aGlzLmVuYWJsZWQpLFxuICAgICAgICB0YXAoKCkgPT4gdGhpcy51cGRhdGVRdWVyeVBhcmFtcygpKSxcbiAgICAgICAgdGFrZVVudGlsRGVzdHJveWVkKHRoaXMuX2Rlc3Ryb3lSZWYpLFxuICAgICAgKVxuICAgICAgLnN1YnNjcmliZSgpO1xuXG4gICAgcmV0dXJuIG9mKG51bGwpO1xuICB9XG5cbiAgcHVibGljIHF1ZXJ5UGFyYW1zKCk6IEtleVZhbHVlIHtcbiAgICBpZighdGhpcy5lbmFibGVkKSB7XG4gICAgICByZXR1cm4ge307XG4gICAgfVxuXG4gICAgcmV0dXJuIHtcbiAgICAgIC4uLnRoaXMuX2ZpbHRlckNvbnRyb2xsZXIucXVlcnlQYXJhbSxcbiAgICAgIC4uLnRoaXMuX3NvcnRDb250cm9sbGVyLnF1ZXJ5UGFyYW0sXG4gICAgfTtcbiAgfVxuXG4gIHB1YmxpYyB1cGRhdGVRdWVyeVBhcmFtcygpIHtcbiAgICBjb25zdCBxdWVyeVBhcmFtcyA9IHtcbiAgICAgIC4uLnRoaXMuX2ZpbHRlckNvbnRyb2xsZXIuaXRlbXNcbiAgICAgICAgLnJlZHVjZSgoYWNjLCBpdGVtKSA9PiB7XG4gICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIC4uLmFjYyxcbiAgICAgICAgICAgIFtpdGVtLm5hbWVdOiB1bmRlZmluZWQsXG4gICAgICAgICAgfTtcbiAgICAgICAgfSwge30pLFxuICAgICAgLi4udGhpcy5xdWVyeVBhcmFtcygpLFxuICAgIH07XG5cbiAgICB0aGlzLl9yZXBsYWNlU3RhdGUocXVlcnlQYXJhbXMpO1xuICB9XG5cbiAgcHJpdmF0ZSBfcmVwbGFjZVN0YXRlKGRhdGEpIHtcbiAgICBjb25zdCB1cmwgPSBuZXcgVVJMKHdpbmRvdy5sb2NhdGlvbi5ocmVmKTtcblxuICAgIE9iamVjdC5rZXlzKGRhdGEpXG4gICAgICAuZm9yRWFjaCgobmFtZSkgPT4ge1xuICAgICAgICBpZihkYXRhW25hbWVdID09PSB1bmRlZmluZWQgfHwgZGF0YVtuYW1lXSA9PT0gbnVsbCkge1xuICAgICAgICAgIHVybC5zZWFyY2hQYXJhbXMuZGVsZXRlKG5hbWUpO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHVybC5zZWFyY2hQYXJhbXMuc2V0KG5hbWUsZGF0YVtuYW1lXSk7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuXG4gICAgaGlzdG9yeS5yZXBsYWNlU3RhdGUoe30sIG51bGwsIHVybC5wYXRobmFtZSArIGRlY29kZVVSSUNvbXBvbmVudCh1cmwuc2VhcmNoKSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -753,6 +753,12 @@ class BaseItem {
|
|
|
753
753
|
set value(value) {
|
|
754
754
|
this.setValue(value);
|
|
755
755
|
}
|
|
756
|
+
/**
|
|
757
|
+
* @deprecated Use value instead
|
|
758
|
+
*/
|
|
759
|
+
set model(value) {
|
|
760
|
+
this.value = value;
|
|
761
|
+
}
|
|
756
762
|
setValue(value, emitChange = true) {
|
|
757
763
|
this._value$.next({ value, emitChange });
|
|
758
764
|
}
|
|
@@ -799,7 +805,13 @@ class BaseItem {
|
|
|
799
805
|
return values instanceof Observable ? values : of(values);
|
|
800
806
|
}
|
|
801
807
|
return of(this.values);
|
|
802
|
-
}), tap((values) =>
|
|
808
|
+
}), tap((values) => {
|
|
809
|
+
this.values = (values || [])
|
|
810
|
+
.map((item) => ({
|
|
811
|
+
...item,
|
|
812
|
+
value: (item.value ?? null) === null ? null : `${item.value}`,
|
|
813
|
+
}));
|
|
814
|
+
}));
|
|
803
815
|
}
|
|
804
816
|
initValue(value) {
|
|
805
817
|
this.setValue(value === undefined ? this.defaultValue : value);
|
|
@@ -1340,22 +1352,14 @@ class SelectItem extends BaseItem {
|
|
|
1340
1352
|
this.value = this.multiple ? [] : null;
|
|
1341
1353
|
}
|
|
1342
1354
|
init(value) {
|
|
1343
|
-
return super.init(value)
|
|
1344
|
-
.pipe(tap$1(() => {
|
|
1345
|
-
if (this.isolate) {
|
|
1346
|
-
// this.values = this.values
|
|
1347
|
-
// .filter((item) => {
|
|
1348
|
-
// return !this.isolateValues.includes(item.value as never);
|
|
1349
|
-
// });
|
|
1350
|
-
}
|
|
1351
|
-
}));
|
|
1355
|
+
return super.init(value);
|
|
1352
1356
|
}
|
|
1353
1357
|
setValue(value, emitChange = true) {
|
|
1354
1358
|
if (this.multiple) {
|
|
1355
1359
|
value = Array.isArray(value) ? value : [];
|
|
1356
1360
|
}
|
|
1357
1361
|
else {
|
|
1358
|
-
value = Array.isArray(value) ?
|
|
1362
|
+
value = Array.isArray(value) ? value[0] : value;
|
|
1359
1363
|
}
|
|
1360
1364
|
super.setValue(value, emitChange);
|
|
1361
1365
|
}
|
|
@@ -1368,15 +1372,6 @@ class SelectItem extends BaseItem {
|
|
|
1368
1372
|
};
|
|
1369
1373
|
}
|
|
1370
1374
|
get query() {
|
|
1371
|
-
if (!this.hasValue && this.isolate) {
|
|
1372
|
-
return {
|
|
1373
|
-
[this.name]: this.values
|
|
1374
|
-
.map((item) => {
|
|
1375
|
-
return item.value;
|
|
1376
|
-
})
|
|
1377
|
-
.join(','),
|
|
1378
|
-
};
|
|
1379
|
-
}
|
|
1380
1375
|
if (!this.hasValue) {
|
|
1381
1376
|
return {};
|
|
1382
1377
|
}
|
|
@@ -1408,7 +1403,7 @@ class SelectItem extends BaseItem {
|
|
|
1408
1403
|
return true;
|
|
1409
1404
|
}
|
|
1410
1405
|
return this.multiple ? this.value
|
|
1411
|
-
.includes(item.value) :
|
|
1406
|
+
.includes(item.value) : `${this.value}` === `${item.value}`;
|
|
1412
1407
|
})
|
|
1413
1408
|
.map((item) => {
|
|
1414
1409
|
return item.name;
|
|
@@ -1616,17 +1611,17 @@ class PersistanceController {
|
|
|
1616
1611
|
}
|
|
1617
1612
|
init(filterController) {
|
|
1618
1613
|
this._filterController = filterController;
|
|
1619
|
-
const
|
|
1620
|
-
if (
|
|
1621
|
-
this.enabled =
|
|
1622
|
-
this._name =
|
|
1614
|
+
const persistanceConfig = this._initConfig(filterController.config.persist);
|
|
1615
|
+
if (persistanceConfig) {
|
|
1616
|
+
this.enabled = !this.inDialog;
|
|
1617
|
+
this._name = persistanceConfig.name;
|
|
1623
1618
|
this._data = this._get() || {};
|
|
1619
|
+
this._filterController.change$
|
|
1620
|
+
.pipe(takeUntilDestroyed(this._destroyRef))
|
|
1621
|
+
.subscribe(() => {
|
|
1622
|
+
this._set('query', this._filterController.values);
|
|
1623
|
+
});
|
|
1624
1624
|
}
|
|
1625
|
-
this._filterController.change$
|
|
1626
|
-
.pipe(takeUntilDestroyed(this._destroyRef))
|
|
1627
|
-
.subscribe(() => {
|
|
1628
|
-
this._set('query', this._filterController.values);
|
|
1629
|
-
});
|
|
1630
1625
|
return of(null);
|
|
1631
1626
|
}
|
|
1632
1627
|
setQuery(value) {
|
|
@@ -1648,12 +1643,11 @@ class PersistanceController {
|
|
|
1648
1643
|
}
|
|
1649
1644
|
return {};
|
|
1650
1645
|
}
|
|
1651
|
-
_initConfig(config
|
|
1646
|
+
_initConfig(config) {
|
|
1652
1647
|
let persistanceConfig = this._getConfig(config);
|
|
1653
1648
|
if (persistanceConfig) {
|
|
1654
1649
|
persistanceConfig = {
|
|
1655
1650
|
name: persistanceConfig.name || getNormalizedPath(this._location),
|
|
1656
|
-
persistQuery: !inDialog || !!persistanceConfig.name,
|
|
1657
1651
|
...persistanceConfig,
|
|
1658
1652
|
};
|
|
1659
1653
|
}
|
|
@@ -1894,7 +1888,8 @@ class QueryParamController {
|
|
|
1894
1888
|
}
|
|
1895
1889
|
updateQueryParams() {
|
|
1896
1890
|
const queryParams = {
|
|
1897
|
-
...this._filterController.items
|
|
1891
|
+
...this._filterController.items
|
|
1892
|
+
.reduce((acc, item) => {
|
|
1898
1893
|
return {
|
|
1899
1894
|
...acc,
|
|
1900
1895
|
[item.name]: undefined,
|
|
@@ -1915,7 +1910,7 @@ class QueryParamController {
|
|
|
1915
1910
|
url.searchParams.set(name, data[name]);
|
|
1916
1911
|
}
|
|
1917
1912
|
});
|
|
1918
|
-
history.replaceState({}, null, url.pathname + url.search);
|
|
1913
|
+
history.replaceState({}, null, url.pathname + decodeURIComponent(url.search));
|
|
1919
1914
|
}
|
|
1920
1915
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QueryParamController, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1921
1916
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QueryParamController });
|
|
@@ -2686,19 +2681,17 @@ class FsFilterConfig {
|
|
|
2686
2681
|
load: data.load ?? true,
|
|
2687
2682
|
persist: data.persist,
|
|
2688
2683
|
savedFilters: data.savedFilters,
|
|
2689
|
-
inline: data.inline ?? false,
|
|
2690
2684
|
autofocus: data.autofocus ?? false,
|
|
2691
2685
|
chips: data.chips ?? false,
|
|
2692
|
-
sortValues: data.sorts,
|
|
2693
2686
|
sort: data.sort,
|
|
2694
2687
|
queryParam: data.queryParam ?? false,
|
|
2695
2688
|
init: data.init,
|
|
2696
2689
|
change: data.change,
|
|
2697
2690
|
reload: data.reload,
|
|
2698
|
-
autoReload: {
|
|
2691
|
+
autoReload: data.autoReload ? {
|
|
2699
2692
|
...data.autoReload,
|
|
2700
2693
|
enabled: data.autoReload ? data.autoReload.enabled ?? true : false,
|
|
2701
|
-
},
|
|
2694
|
+
} : null,
|
|
2702
2695
|
clear: data.clear,
|
|
2703
2696
|
sortChange: data.sortChange,
|
|
2704
2697
|
case: data.case ?? 'camel',
|
|
@@ -3141,6 +3134,9 @@ class FilterComponent {
|
|
|
3141
3134
|
get items() {
|
|
3142
3135
|
return this._filterController.items;
|
|
3143
3136
|
}
|
|
3137
|
+
change() {
|
|
3138
|
+
this._filterController.change();
|
|
3139
|
+
}
|
|
3144
3140
|
get visibleItems() {
|
|
3145
3141
|
return this._filterController.items
|
|
3146
3142
|
.filter((item) => !item.hidden);
|
|
@@ -3296,6 +3292,12 @@ class FilterComponent {
|
|
|
3296
3292
|
return this.items
|
|
3297
3293
|
.find((item) => item.name === name);
|
|
3298
3294
|
}
|
|
3295
|
+
/**
|
|
3296
|
+
* @deprecated Use item(name).value$ instead
|
|
3297
|
+
*/
|
|
3298
|
+
getItemValueChange$(name) {
|
|
3299
|
+
return this.getItem(name).value$;
|
|
3300
|
+
}
|
|
3299
3301
|
/**
|
|
3300
3302
|
* Update filter actions config
|
|
3301
3303
|
*
|