@firestitch/filter 13.0.5 → 13.0.7
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/filters-item/autocomplete/autocomplete.component.d.ts +1 -1
- package/app/components/filters-item/chips/chips.component.d.ts +1 -1
- package/esm2020/app/components/filters-item/autocomplete/autocomplete.component.mjs +1 -1
- package/esm2020/app/components/filters-item/chips/chips.component.mjs +4 -4
- package/esm2020/app/helpers/parse-item-value-from-stored.mjs +4 -5
- package/esm2020/app/services/external-params/query-params-controller.service.mjs +7 -3
- package/fesm2015/firestitch-filter.mjs +11 -13
- package/fesm2015/firestitch-filter.mjs.map +1 -1
- package/fesm2020/firestitch-filter.mjs +11 -13
- package/fesm2020/firestitch-filter.mjs.map +1 -1
- package/package.json +1 -1
- package/app/helpers/try-convert-to-number.d.ts +0 -1
- package/esm2020/app/helpers/try-convert-to-number.mjs +0 -6
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ChangeDetectorRef, KeyValueDiffers } from '@angular/core';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
2
3
|
import { AutocompleteItem } from '../../../models/items/autocomplete-item';
|
|
3
4
|
import { BaseItemComponent } from '../base-item/base-item.component';
|
|
4
|
-
import { Observable } from 'rxjs';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
export declare class AutocompleteComponent extends BaseItemComponent<AutocompleteItem> {
|
|
7
7
|
protected _kvDiffers: KeyValueDiffers;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ChangeDetectorRef, KeyValueDiffers } from '@angular/core';
|
|
2
|
-
import { BaseItemComponent } from '../base-item/base-item.component';
|
|
3
2
|
import { ChipsItem } from '../../../models/items/chips-item';
|
|
3
|
+
import { BaseItemComponent } from '../base-item/base-item.component';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
export declare class ChipsComponent extends BaseItemComponent<ChipsItem> {
|
|
6
6
|
protected _kvDiffers: KeyValueDiffers;
|
|
@@ -24,4 +24,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
|
|
|
24
24
|
type: Component,
|
|
25
25
|
args: [{ selector: 'filter-item-autocomplete', changeDetection: ChangeDetectionStrategy.OnPush, template: "<fs-autocomplete\n [fsFilterFocusTrigger]=\"item\"\n [fetch]=\"fetch\"\n [displayWith]=\"displayWith\"\n [(ngModel)]=\"item.model\"\n [placeholder]=\"label\"\n [fetchOnFocus]=\"item.fetchOnFocus\"\n [showClear]=\"item.showClear\"\n name=\"item.name\">\n <ng-template fsAutocompleteTemplate let-data=\"data\">\n {{data.name}}\n </ng-template>\n</fs-autocomplete>\n" }]
|
|
26
26
|
}], ctorParameters: function () { return [{ type: i0.KeyValueDiffers }, { type: i0.ChangeDetectorRef }]; } });
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0b2NvbXBsZXRlLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcHAvY29tcG9uZW50cy9maWx0ZXJzLWl0ZW0vYXV0b2NvbXBsZXRlL2F1dG9jb21wbGV0ZS5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvbXBvbmVudHMvZmlsdGVycy1pdGVtL2F1dG9jb21wbGV0ZS9hdXRvY29tcGxldGUuY29tcG9uZW50Lmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHVCQUF1QixFQUN2QixpQkFBaUIsRUFDakIsU0FBUyxFQUNULGVBQWUsR0FDaEIsTUFBTSxlQUFlLENBQUM7QUFJdkIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7Ozs7OztBQVFyRSxNQUFNLE9BQU8scUJBQXNCLFNBQVEsaUJBQW1DO0lBRTVFLFlBQ1ksVUFBMkIsRUFDM0IsR0FBc0I7UUFFaEMsS0FBSyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUhiLGVBQVUsR0FBVixVQUFVLENBQWlCO1FBQzNCLFFBQUcsR0FBSCxHQUFHLENBQW1CO1FBSzNCLGdCQUFXLEdBQUcsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUM1QixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ2pDLENBQUMsQ0FBQztRQUVLLFVBQUssR0FBRyxDQUFDLE9BQU8sRUFBbUIsRUFBRTtZQUMxQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FBQztJQVJGLENBQUM7O2tIQVBVLHFCQUFxQjtzR0FBckIscUJBQXFCLHVGQ2pCbEMsMFlBYUE7MkZESWEscUJBQXFCO2tCQUxqQyxTQUFTOytCQUNFLDBCQUEwQixtQkFFbkIsdUJBQXVCLENBQUMsTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIENoYW5nZURldGVjdGlvblN0cmF0ZWd5LFxuICBDaGFuZ2VEZXRlY3RvclJlZixcbiAgQ29tcG9uZW50LFxuICBLZXlWYWx1ZURpZmZlcnMsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBBdXRvY29tcGxldGVJdGVtIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL2l0ZW1zL2F1dG9jb21wbGV0ZS1pdGVtJztcbmltcG9ydCB7IEJhc2VJdGVtQ29tcG9uZW50IH0gZnJvbSAnLi4vYmFzZS1pdGVtL2Jhc2UtaXRlbS5jb21wb25lbnQnO1xuXG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2ZpbHRlci1pdGVtLWF1dG9jb21wbGV0ZScsXG4gIHRlbXBsYXRlVXJsOiAnLi9hdXRvY29tcGxldGUuY29tcG9uZW50Lmh0bWwnLFxuICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaCxcbn0pXG5leHBvcnQgY2xhc3MgQXV0b2NvbXBsZXRlQ29tcG9uZW50IGV4dGVuZHMgQmFzZUl0ZW1Db21wb25lbnQ8QXV0b2NvbXBsZXRlSXRlbT4ge1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByb3RlY3RlZCBfa3ZEaWZmZXJzOiBLZXlWYWx1ZURpZmZlcnMsXG4gICAgcHJvdGVjdGVkIF9jZDogQ2hhbmdlRGV0ZWN0b3JSZWYsXG4gICkge1xuICAgIHN1cGVyKF9rdkRpZmZlcnMsIF9jZCk7XG4gIH1cblxuICBwdWJsaWMgZGlzcGxheVdpdGggPSAoZGF0YSkgPT4ge1xuICAgIHJldHVybiBkYXRhID8gZGF0YS5uYW1lIDogZGF0YTtcbiAgfTtcblxuICBwdWJsaWMgZmV0Y2ggPSAoa2V5d29yZCk6IE9ic2VydmFibGU8YW55PiA9PiB7XG4gICAgcmV0dXJuIHRoaXMuaXRlbS52YWx1ZXNGbihrZXl3b3JkLCB0aGlzLml0ZW0uZmlsdGVyKTtcbiAgfTtcbn1cbiIsIjxmcy1hdXRvY29tcGxldGVcbiAgICBbZnNGaWx0ZXJGb2N1c1RyaWdnZXJdPVwiaXRlbVwiXG4gICAgW2ZldGNoXT1cImZldGNoXCJcbiAgICBbZGlzcGxheVdpdGhdPVwiZGlzcGxheVdpdGhcIlxuICAgIFsobmdNb2RlbCldPVwiaXRlbS5tb2RlbFwiXG4gICAgW3BsYWNlaG9sZGVyXT1cImxhYmVsXCJcbiAgICBbZmV0Y2hPbkZvY3VzXT1cIml0ZW0uZmV0Y2hPbkZvY3VzXCJcbiAgICBbc2hvd0NsZWFyXT1cIml0ZW0uc2hvd0NsZWFyXCJcbiAgICBuYW1lPVwiaXRlbS5uYW1lXCI+XG4gIDxuZy10ZW1wbGF0ZSBmc0F1dG9jb21wbGV0ZVRlbXBsYXRlIGxldC1kYXRhPVwiZGF0YVwiPlxuICAgIHt7ZGF0YS5uYW1lfX1cbiAgPC9uZy10ZW1wbGF0ZT5cbjwvZnMtYXV0b2NvbXBsZXRlPlxuIl19
|
|
@@ -16,13 +16,13 @@ export class ChipsComponent extends BaseItemComponent {
|
|
|
16
16
|
this.itemChange();
|
|
17
17
|
}
|
|
18
18
|
compareFn(modelValue, chipValue) {
|
|
19
|
-
return modelValue.value === chipValue.value;
|
|
19
|
+
return String(modelValue.value) === String(chipValue.value);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
ChipsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ChipsComponent, deps: [{ token: i0.KeyValueDiffers }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
|
|
23
|
-
ChipsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: ChipsComponent, selector: "filter-item-chips", usesInheritance: true, ngImport: i0, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips [(ngModel)]=\"item.model\"\n
|
|
23
|
+
ChipsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: ChipsComponent, selector: "filter-item-chips", usesInheritance: true, ngImport: i0, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips \n [(ngModel)]=\"item.model\"\n [compare]=\"compareFn\"\n [multiple]=\"item.multiple\">\n <fs-chip \n *ngFor=\"let value of item.values\"\n [value]=\"value\"\n [selectable]=\"true\">\n {{ value.name }}\n </fs-chip>\n </fs-chips>\n </fs-label-field>\n</ng-template>\n\n<ng-template [ngIf]=\"item.loading\">{{ item.label }} loading...</ng-template>\n", styles: ["fs-chip{line-height:40px}\n"], components: [{ type: i1.FsLabelFieldComponent, selector: "fs-label-field", inputs: ["bottomMargin", "topMargin", "labelMargin"] }, { type: i1.FsLabelComponent, selector: "fs-label" }, { type: i2.FsChipsComponent, selector: "fs-chips", inputs: ["compare", "multiple"] }, { type: i2.FsChipComponent, selector: "fs-chip", inputs: ["size", "value", "backgroundColor", "borderColor", "color", "outlined", "removable", "selectable", "selected", "image"], outputs: ["selectedToggled", "removed"] }], directives: [{ type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { type: i4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { type: i5.FsFormNoFsValidatorsDirective, selector: "[ngModel]:not([required]):not([fsFormRequired]):not([fsFormCompare]):not([fsFormDateRange]):not([fsFormEmail]):not([fsFormEmails]):not([fsFormFunction]):not([fsFormGreater]):not([fsFormInteger]):not([fsFormLesser]):not([fsFormMax]):not([fsFormMaxLength]):not([fsFormMin]):not([fsFormMinLength]):not([fsFormNumeric]):not([fsFormPattern]):not([fsFormPhone]):not([fsFormUrl]):not([validate])" }, { type: i3.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
24
24
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ChipsComponent, decorators: [{
|
|
25
25
|
type: Component,
|
|
26
|
-
args: [{ selector: 'filter-item-chips', changeDetection: ChangeDetectionStrategy.OnPush, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips [(ngModel)]=\"item.model\"\n
|
|
26
|
+
args: [{ selector: 'filter-item-chips', changeDetection: ChangeDetectionStrategy.OnPush, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips \n [(ngModel)]=\"item.model\"\n [compare]=\"compareFn\"\n [multiple]=\"item.multiple\">\n <fs-chip \n *ngFor=\"let value of item.values\"\n [value]=\"value\"\n [selectable]=\"true\">\n {{ value.name }}\n </fs-chip>\n </fs-chips>\n </fs-label-field>\n</ng-template>\n\n<ng-template [ngIf]=\"item.loading\">{{ item.label }} loading...</ng-template>\n", styles: ["fs-chip{line-height:40px}\n"] }]
|
|
27
27
|
}], ctorParameters: function () { return [{ type: i0.KeyValueDiffers }, { type: i0.ChangeDetectorRef }]; } });
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hpcHMuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwcC9jb21wb25lbnRzL2ZpbHRlcnMtaXRlbS9jaGlwcy9jaGlwcy5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvbXBvbmVudHMvZmlsdGVycy1pdGVtL2NoaXBzL2NoaXBzLmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCx1QkFBdUIsRUFDdkIsaUJBQWlCLEVBQ2pCLFNBQVMsRUFDVCxlQUFlLEVBQ2hCLE1BQU0sZUFBZSxDQUFDO0FBR3ZCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOzs7Ozs7O0FBU3JFLE1BQU0sT0FBTyxjQUFlLFNBQVEsaUJBQTRCO0lBRTlELFlBQ1ksVUFBMkIsRUFDM0IsR0FBc0I7UUFFaEMsS0FBSyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUhiLGVBQVUsR0FBVixVQUFVLENBQWlCO1FBQzNCLFFBQUcsR0FBSCxHQUFHLENBQW1CO0lBR2xDLENBQUM7SUFFTSxXQUFXO1FBQ2hCLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBRU0sU0FBUyxDQUFDLFVBQVUsRUFBRSxTQUFTO1FBQ3BDLE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzlELENBQUM7OzJHQWZVLGNBQWM7K0ZBQWQsY0FBYyxnRkNqQjNCLDRoQkFrQkE7MkZERGEsY0FBYztrQkFOMUIsU0FBUzsrQkFDRSxtQkFBbUIsbUJBR1osdUJBQXVCLENBQUMsTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIENoYW5nZURldGVjdGlvblN0cmF0ZWd5LFxuICBDaGFuZ2VEZXRlY3RvclJlZixcbiAgQ29tcG9uZW50LFxuICBLZXlWYWx1ZURpZmZlcnNcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IENoaXBzSXRlbSB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9pdGVtcy9jaGlwcy1pdGVtJztcbmltcG9ydCB7IEJhc2VJdGVtQ29tcG9uZW50IH0gZnJvbSAnLi4vYmFzZS1pdGVtL2Jhc2UtaXRlbS5jb21wb25lbnQnO1xuXG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2ZpbHRlci1pdGVtLWNoaXBzJyxcbiAgdGVtcGxhdGVVcmw6ICcuL2NoaXBzLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbICcuL2NoaXBzLmNvbXBvbmVudC5zY3NzJyBdLFxuICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaCxcbn0pXG5leHBvcnQgY2xhc3MgQ2hpcHNDb21wb25lbnQgZXh0ZW5kcyBCYXNlSXRlbUNvbXBvbmVudDxDaGlwc0l0ZW0+IHtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm90ZWN0ZWQgX2t2RGlmZmVyczogS2V5VmFsdWVEaWZmZXJzLFxuICAgIHByb3RlY3RlZCBfY2Q6IENoYW5nZURldGVjdG9yUmVmXG4gICkge1xuICAgIHN1cGVyKF9rdkRpZmZlcnMsIF9jZCk7XG4gIH1cblxuICBwdWJsaWMgbW9kZWxDaGFuZ2UoKSB7XG4gICAgdGhpcy5pdGVtQ2hhbmdlKCk7XG4gIH1cblxuICBwdWJsaWMgY29tcGFyZUZuKG1vZGVsVmFsdWUsIGNoaXBWYWx1ZSkge1xuICAgIHJldHVybiBTdHJpbmcobW9kZWxWYWx1ZS52YWx1ZSkgPT09IFN0cmluZyhjaGlwVmFsdWUudmFsdWUpO1xuICB9XG59XG4iLCI8bmctdGVtcGxhdGUgW25nSWZdPVwiaXRlbS52YWx1ZXM/Lmxlbmd0aFwiPlxuICA8ZnMtbGFiZWwtZmllbGQ+XG4gICAgPGZzLWxhYmVsPnt7aXRlbS5sYWJlbH19PC9mcy1sYWJlbD5cbiAgICA8ZnMtY2hpcHMgXG4gICAgICAgIFsobmdNb2RlbCldPVwiaXRlbS5tb2RlbFwiXG4gICAgICAgIFtjb21wYXJlXT1cImNvbXBhcmVGblwiXG4gICAgICAgIFttdWx0aXBsZV09XCJpdGVtLm11bHRpcGxlXCI+XG4gICAgICA8ZnMtY2hpcCBcbiAgICAgICAgICAqbmdGb3I9XCJsZXQgdmFsdWUgb2YgaXRlbS52YWx1ZXNcIlxuICAgICAgICAgIFt2YWx1ZV09XCJ2YWx1ZVwiXG4gICAgICAgICAgW3NlbGVjdGFibGVdPVwidHJ1ZVwiPlxuICAgICAgICB7eyB2YWx1ZS5uYW1lIH19XG4gICAgICA8L2ZzLWNoaXA+XG4gICAgPC9mcy1jaGlwcz5cbiAgPC9mcy1sYWJlbC1maWVsZD5cbjwvbmctdGVtcGxhdGU+XG5cbjxuZy10ZW1wbGF0ZSBbbmdJZl09XCJpdGVtLmxvYWRpbmdcIj57eyBpdGVtLmxhYmVsIH19IGxvYWRpbmcuLi48L25nLXRlbXBsYXRlPlxuIl19
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ItemType } from '../enums/item-type.enum';
|
|
2
|
-
import { filterFromQueryParam } from './query-param-transformers';
|
|
3
|
-
import { tryConvertToNumber } from './try-convert-to-number';
|
|
4
2
|
import { getRangeName } from './get-range-name';
|
|
3
|
+
import { filterFromQueryParam } from './query-param-transformers';
|
|
5
4
|
export function parseItemValueFromStored(item, params, paramCase) {
|
|
6
5
|
const param = params[item.name];
|
|
7
6
|
switch (item.type) {
|
|
@@ -52,7 +51,7 @@ export function parseItemValueFromStored(item, params, paramCase) {
|
|
|
52
51
|
const filterParts = filterFromQueryParam(param);
|
|
53
52
|
return {
|
|
54
53
|
name: filterParts[1],
|
|
55
|
-
value:
|
|
54
|
+
value: filterParts[0]
|
|
56
55
|
};
|
|
57
56
|
}
|
|
58
57
|
case ItemType.AutoCompleteChips:
|
|
@@ -62,7 +61,7 @@ export function parseItemValueFromStored(item, params, paramCase) {
|
|
|
62
61
|
const chipParts = filterFromQueryParam(value);
|
|
63
62
|
arry.push({
|
|
64
63
|
name: chipParts[1],
|
|
65
|
-
value:
|
|
64
|
+
value: chipParts[0],
|
|
66
65
|
});
|
|
67
66
|
return arry;
|
|
68
67
|
}, []);
|
|
@@ -79,4 +78,4 @@ function arraysHaveSameElements(arr1, arr2) {
|
|
|
79
78
|
return arr2.includes(item);
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2UtaXRlbS12YWx1ZS1mcm9tLXN0b3JlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcHAvaGVscGVycy9wYXJzZS1pdGVtLXZhbHVlLWZyb20tc3RvcmVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFbEUsTUFBTSxVQUFVLHdCQUF3QixDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsU0FBNEI7SUFDakYsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVoQyxRQUFRLElBQUksQ0FBQyxJQUFJLEVBQUU7UUFDakIsS0FBSyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbkIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQzlELE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUU5RCxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUM7U0FDL0I7UUFFRCxLQUFLLFFBQVEsQ0FBQyxTQUFTLENBQUM7UUFBQyxLQUFLLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQztZQUNwRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2hFLE1BQU0s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Q2QsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1NBQ1A7UUFFRCxPQUFPLENBQUMsQ0FBQztZQUNQLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7S0FDRjtBQUNILENBQUM7QUFFRCxTQUFTLHNCQUFzQixDQUFDLElBQWUsRUFBRSxJQUFlO0lBRTlELElBQUksR0FBRyxDQUFFLEdBQUcsSUFBSSxDQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDMUIsSUFBSSxHQUFHLENBQUUsR0FBRyxJQUFJLENBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUUxQixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN4QixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSXRlbVR5cGUgfSBmcm9tICcuLi9lbnVtcy9pdGVtLXR5cGUuZW51bSc7XG5pbXBvcnQgeyBnZXRSYW5nZU5hbWUgfSBmcm9tICcuL2dldC1yYW5nZS1uYW1lJztcbmltcG9ydCB7IGZpbHRlckZyb21RdWVyeVBhcmFtIH0gZnJvbSAnLi9xdWVyeS1wYXJhbS10cmFuc2Zvcm1lcnMnO1xuXG5leHBvcnQgZnVuY3Rpb24gcGFyc2VJdGVtVmFsdWVGcm9tU3RvcmVkKGl0ZW0sIHBhcmFtcywgcGFyYW1DYXNlOiAnc25ha2UnIHwgJ2NhbWVsJykge1xuICBjb25zdCBwYXJhbSA9IHBhcmFtc1tpdGVtLm5hbWVdO1xuXG4gIHN3aXRjaCAoaXRlbS50eXBlKSB7XG4gICAgY2FzZSBJdGVtVHlwZS5SYW5nZToge1xuICAgICAgY29uc3QgbWluID0gcGFyYW1zW2dldFJhbmdlTmFtZShwYXJhbUNhc2UsIGl0ZW0ubmFtZSwgJ21pbicpXTtcbiAgICAgIGNvbnN0IG1heCA9IHBhcmFtc1tnZXRSYW5nZU5hbWUocGFyYW1DYXNlLCBpdGVtLm5hbWUsICdtYXgnKV07XG5cbiAgICAgIHJldHVybiB7IG1pbjogbWluLCBtYXg6IG1heCB9O1xuICAgIH1cblxuICAgIGNhc2UgSXRlbVR5cGUuRGF0ZVJhbmdlOiBjYXNlIEl0ZW1UeXBlLkRhdGVUaW1lUmFuZ2U6IHtcbiAgICAgIGNvbnN0IGZyb20gPSBwYXJhbXNbZ2V0UmFuZ2VOYW1lKGl0ZW0uY2FzZSwgaXRlbS5uYW1lLCAnZnJvbScpXTtcbiAgICAgIGNvbnN0IHRvID0gcGFyYW1zW2dldFJhbmdlTmFtZShpdGVtLmNhc2UsIGl0ZW0ubmFtZSwgJ3RvJyldO1xuXG4gICAgICByZXR1cm4geyBmcm9tOiBmcm9tLCB0bzogdG8gfTtcbiAgICB9XG5cbiAgICBjYXNlIEl0ZW1UeXBlLldlZWs6IHtcbiAgICAgIGNvbnN0IGZyb20gPSBwYXJhbXNbZ2V0UmFuZ2VOYW1lKCdjYW1lbCcsIGl0ZW0ubmFtZSwgJ2Zyb20nKV07XG4gICAgICBjb25zdCB0byA9IHBhcmFtc1tnZXRSYW5nZU5hbWUoJ2NhbWVsJywgaXRlbS5uYW1lLCAndG8nKV07XG4gICAgICBjb25zdCBwZXJpb2QgPSBwYXJhbXNbYCR7aXRlbS5uYW1lfVBlcmlvZGBdXG5cbiAgICAgIHJldHVybiB7IGZyb20sIHRvLCBwZXJpb2QgfTtcbiAgICB9XG5cbiAgICBjYXNlIEl0ZW1UeXBlLlNlbGVjdDoge1xuICAgICAgaWYgKGl0ZW0ubXVsdGlwbGUgJiYgISFwYXJhbSkge1xuICAgICAgICBjb25zdCB2YWx1ZXMgPSBwYXJhbS5zcGxpdCgnLCcpO1xuXG4gICAgICAgIGlmIChpdGVtLmlzb2xhdGUpIHtcbiAgICAgICAgICBjb25zdCBpc29sYXRlZFZhbHVlID0gQXJyYXkuaXNBcnJheShpdGVtLmlzb2xhdGUudmFsdWUpXG4gICAgICAgICAgICA/IGl0ZW0uaXNvbGF0ZS52YWx1ZVxuICAgICAgICAgICAgOiBbIGl0ZW0uaXNvbGF0ZS52YWx1ZSBdO1xuXG4gICAgICAgICAgaXRlbS5pc29sYXRlLmVuYWJsZWQgPSBhcnJheXNIYXZlU2FtZUVsZW1lbnRzKGlzb2xhdGVkVmFsdWUsIHZhbHVlcyk7XG5cbiAgICAgICAgICByZXR1cm4gaXRlbS5pc29sYXRlLmVuYWJsZWRcbiAgICAgICAgICAgID8gaXNvbGF0ZWRWYWx1ZVxuICAgICAgICAgICAgOiB2YWx1ZXM7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gdmFsdWVzO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHBhcmFtO1xuICAgICAgfVxuICAgIH1cblxuICAgIGNhc2UgSXRlbVR5cGUuQ2hlY2tib3g6IHtcbiAgICAgIGlmIChwYXJhbSA9PT0gJ3RydWUnKSB7XG4gICAgICAgIHJldHVybiB0cnVlID09PSBpdGVtLmNoZWNrZWQ7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gcGFyYW0gPT09IGl0ZW0uY2hlY2tlZDtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBjYXNlIEl0ZW1UeXBlLkF1dG9Db21wbGV0ZToge1xuICAgICAgY29uc3QgZmlsdGVyUGFydHMgPSBmaWx0ZXJGcm9tUXVlcnlQYXJhbShwYXJhbSk7XG5cbiAgICAgIHJldHVybiB7XG4gICAgICAgIG5hbWU6IGZpbHRlclBhcnRzWzFdLFxuICAgICAgICB2YWx1ZTogZmlsdGVyUGFydHNbMF1cbiAgICAgIH1cbiAgICB9XG5cbiAgICBjYXNlIEl0ZW1UeXBlLkF1dG9Db21wbGV0ZUNoaXBzOiBcbiAgICBjYXNlIEl0ZW1UeXBlLkNoaXBzOiB7XG4gICAgICBjb25zdCBmaWx0ZXJQYXJ0cyA9IHBhcmFtLnNwbGl0KCcsJyk7XG5cbiAgICAgIHJldHVybiBmaWx0ZXJQYXJ0cy5yZWR1Y2UoKGFycnksIHZhbHVlKSA9PiB7XG5cbiAgICAgICAgY29uc3QgY2hpcFBhcnRzID0gZmlsdGVyRnJvbVF1ZXJ5UGFyYW0odmFsdWUpO1xuXG4gICAgICAgIGFycnkucHVzaCh7XG4gICAgICAgICAgbmFtZTogY2hpcFBhcnRzWzFdLFxuICAgICAgICAgIHZhbHVlOiBjaGlwUGFydHNbMF0sXG4gICAgICAgIH0pO1xuXG4gICAgICAgIHJldHVybiBhcnJ5O1xuICAgICAgfSwgW10pXG4gICAgfVxuXG4gICAgZGVmYXVsdDoge1xuICAgICAgcmV0dXJuIHBhcmFtO1xuICAgIH1cbiAgfVxufVxuXG5mdW5jdGlvbiBhcnJheXNIYXZlU2FtZUVsZW1lbnRzKGFycjE6IHVua25vd25bXSwgYXJyMjogdW5rbm93bltdKTogYm9vbGVhbiB7XG5cbiAgYXJyMSA9IFsgLi4uYXJyMSBdLnNvcnQoKTtcbiAgYXJyMiA9IFsgLi4uYXJyMiBdLnNvcnQoKTtcblxuICByZXR1cm4gYXJyMS5zb21lKChpdGVtKSA9PiB7XG4gICAgcmV0dXJuIGFycjIuaW5jbHVkZXMoaXRlbSk7XG4gIH0pO1xufVxuIl19
|
|
@@ -43,9 +43,13 @@ export class QueryParamsController {
|
|
|
43
43
|
_replaceState(data) {
|
|
44
44
|
const url = new URL(window.location.href);
|
|
45
45
|
Object.keys(data)
|
|
46
|
-
.filter((name) => data[name] !== undefined && data[name] !== null)
|
|
47
46
|
.forEach((name) => {
|
|
48
|
-
|
|
47
|
+
if (data[name] === undefined || data[name] === null) {
|
|
48
|
+
url.searchParams.delete(name);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
url.searchParams.set(name, data[name]);
|
|
52
|
+
}
|
|
49
53
|
});
|
|
50
54
|
history.replaceState({}, null, url.pathname + url.search);
|
|
51
55
|
}
|
|
@@ -55,4 +59,4 @@ QueryParamsController.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0"
|
|
|
55
59
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: QueryParamsController, decorators: [{
|
|
56
60
|
type: Injectable
|
|
57
61
|
}], ctorParameters: function () { return [{ type: i1.ActivatedRoute }, { type: i2.FsFilterItemsStore }]; } });
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktcGFyYW1zLWNvbnRyb2xsZXIuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9hcHAvc2VydmljZXMvZXh0ZXJuYWwtcGFyYW1zL3F1ZXJ5LXBhcmFtcy1jb250cm9sbGVyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFakQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDOzs7O0FBSTVELE1BQU0sT0FBTyxxQkFBcUI7SUFNaEMsWUFDVSxNQUFzQixFQUN0QixXQUErQjtRQUQvQixXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUN0QixnQkFBVyxHQUFYLFdBQVcsQ0FBb0I7UUFOakMsYUFBUSxHQUFHLEtBQUssQ0FBQztJQU90QixDQUFDO0lBRUosSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUN2QixDQUFDO0lBRUQsSUFBVyxhQUFhO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQztJQUM3QixDQUFDO0lBRU0sSUFBSSxDQUFDLE9BQWdCLEVBQUUsVUFBNkI7UUFDekQsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUM7UUFFOUIsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ2hCLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1NBQzdCO0lBQ0gsQ0FBQztJQUVNLHVCQUF1QixDQUFDLE1BQU07UUFDbkMsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2pCLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDNUI7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxvQkFBb0I7UUFDekIsTUFBTSxLQUFLLEdBQUc7WUFDWixHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSztZQUN6QixJQUFJLENBQUMsV0FBVyxDQUFDLFVBQVU7WUFDM0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBaUI7U0FDbkMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUUzQixJQUFJLENBQUMsY0FBYyxHQUFHLFlBQVksQ0FDaEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUNoQyxLQUFLLEVBQ0wsSUFBSSxDQUFDLFdBQVcsQ0FDakIsQ0FBQztJQUNKLENBQUM7SUFFTyxhQUFhLENBQUMsSUFBSTtRQUN4QixNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2FBQ2QsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDaEIsSUFBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssU0FBUyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7Z0JBQ2xELEdBQUcsQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQy9CO2lCQUFNO2dCQUNMLEdBQUcsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQzthQUN2QztRQUNILENBQUMsQ0FBQyxDQUFDO1FBRUwsT0FBTyxDQUFDLFlBQVksQ0FBQyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxRQUFRLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzVELENBQUM7O2tIQWhFVSxxQkFBcUI7c0hBQXJCLHFCQUFxQjsyRkFBckIscUJBQXFCO2tCQURqQyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuXG5pbXBvcnQgeyByZXN0b3JlSXRlbXMgfSBmcm9tICcuLi8uLi9oZWxwZXJzL3Jlc3RvcmUtaXRlbXMnO1xuaW1wb3J0IHsgRnNGaWx0ZXJJdGVtc1N0b3JlIH0gZnJvbSAnLi4vaXRlbXMtc3RvcmUuc2VydmljZSc7XG5cblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFF1ZXJ5UGFyYW1zQ29udHJvbGxlciB7XG5cbiAgcHJpdmF0ZSBfZW5hYmxlZCA9IGZhbHNlO1xuICBwcml2YXRlIF9wYXJhbXNDYXNlOiAnc25ha2UnIHwgJ2NhbWVsJztcbiAgcHJpdmF0ZSBfZmV0Y2hlZFBhcmFtczogUmVjb3JkPHN0cmluZywgYW55PjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIF9yb3V0ZTogQWN0aXZhdGVkUm91dGUsXG4gICAgcHJpdmF0ZSBfaXRlbXNTdG9yZTogRnNGaWx0ZXJJdGVtc1N0b3JlXG4gICkge31cblxuICBwdWJsaWMgZ2V0IGVuYWJsZWQoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuX2VuYWJsZWQ7XG4gIH1cblxuICBwdWJsaWMgZ2V0IGZldGNoZWRQYXJhbXMoKSB7XG4gICAgcmV0dXJuIHRoaXMuX2ZldGNoZWRQYXJhbXM7XG4gIH1cblxuICBwdWJsaWMgaW5pdChlbmFibGVkOiBib29sZWFuLCBwYXJhbXNDYXNlOiAnc25ha2UnIHwgJ2NhbWVsJykge1xuICAgIHRoaXMuX2VuYWJsZWQgPSBlbmFibGVkO1xuICAgIHRoaXMuX3BhcmFtc0Nhc2UgPSBwYXJhbXNDYXNlO1xuXG4gICAgaWYgKHRoaXMuZW5hYmxlZCkge1xuICAgICAgdGhpcy5mZXRjaEZyb21RdWVyeVBhcmFtcygpO1xuICAgIH1cbiAgfVxuXG4gIHB1YmxpYyB3cml0ZVN0YXRlVG9RdWVyeVBhcmFtcyhwYXJhbXMpIHtcbiAgICBpZiAodGhpcy5fZW5hYmxlZCkgeyBcbiAgICAgIHRoaXMuX3JlcGxhY2VTdGF0ZShwYXJhbXMpO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBQYXJzZSBxdWVyeSBhbmQgdXBkYXRlIGZpbHRlciB2YWx1ZXNcbiAgICovXG4gIHB1YmxpYyBmZXRjaEZyb21RdWVyeVBhcmFtcygpIHtcbiAgICBjb25zdCBpdGVtcyA9IFtcbiAgICAgIC4uLnRoaXMuX2l0ZW1zU3RvcmUuaXRlbXMsXG4gICAgICB0aGlzLl9pdGVtc1N0b3JlLnNvcnRCeUl0ZW0sXG4gICAgICB0aGlzLl9pdGVtc1N0b3JlLnNvcnREaXJlY3Rpb25JdGVtLFxuICAgIF0uZmlsdGVyKChpdGVtKSA9PiAhIWl0ZW0pO1xuXG4gICAgdGhpcy5fZmV0Y2hlZFBhcmFtcyA9IHJlc3RvcmVJdGVtcyhcbiAgICAgIHRoaXMuX3JvdXRlLnNuYXBzaG90LnF1ZXJ5UGFyYW1zLFxuICAgICAgaXRlbXMsXG4gICAgICB0aGlzLl9wYXJhbXNDYXNlXG4gICAgKTtcbiAgfVxuXG4gIHByaXZhdGUgX3JlcGxhY2VTdGF0ZShkYXRhKSB7XG4gICAgY29uc3QgdXJsID0gbmV3IFVSTCh3aW5kb3cubG9jYXRpb24uaHJlZik7XG5cbiAgICBPYmplY3Qua2V5cyhkYXRhKVxuICAgICAgLmZvckVhY2goKG5hbWUpID0+IHtcbiAgICAgICAgaWYoZGF0YVtuYW1lXSA9PT0gdW5kZWZpbmVkIHx8IGRhdGFbbmFtZV0gPT09IG51bGwpIHtcbiAgICAgICAgICB1cmwuc2VhcmNoUGFyYW1zLmRlbGV0ZShuYW1lKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICB1cmwuc2VhcmNoUGFyYW1zLnNldChuYW1lLGRhdGFbbmFtZV0pO1xuICAgICAgICB9XG4gICAgICB9KTtcblxuICAgIGhpc3RvcnkucmVwbGFjZVN0YXRlKHt9LCBudWxsLCB1cmwucGF0aG5hbWUgKyB1cmwuc2VhcmNoKTtcbiAgfVxufVxuIl19
|
|
@@ -1737,12 +1737,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
|
|
|
1737
1737
|
type: Injectable
|
|
1738
1738
|
}], ctorParameters: function () { return []; } });
|
|
1739
1739
|
|
|
1740
|
-
function tryConvertToNumber(val) {
|
|
1741
|
-
return isNaN(val)
|
|
1742
|
-
? val
|
|
1743
|
-
: +val;
|
|
1744
|
-
}
|
|
1745
|
-
|
|
1746
1740
|
function parseItemValueFromStored(item, params, paramCase) {
|
|
1747
1741
|
const param = params[item.name];
|
|
1748
1742
|
switch (item.type) {
|
|
@@ -1793,7 +1787,7 @@ function parseItemValueFromStored(item, params, paramCase) {
|
|
|
1793
1787
|
const filterParts = filterFromQueryParam(param);
|
|
1794
1788
|
return {
|
|
1795
1789
|
name: filterParts[1],
|
|
1796
|
-
value:
|
|
1790
|
+
value: filterParts[0]
|
|
1797
1791
|
};
|
|
1798
1792
|
}
|
|
1799
1793
|
case ItemType.AutoCompleteChips:
|
|
@@ -1803,7 +1797,7 @@ function parseItemValueFromStored(item, params, paramCase) {
|
|
|
1803
1797
|
const chipParts = filterFromQueryParam(value);
|
|
1804
1798
|
arry.push({
|
|
1805
1799
|
name: chipParts[1],
|
|
1806
|
-
value:
|
|
1800
|
+
value: chipParts[0],
|
|
1807
1801
|
});
|
|
1808
1802
|
return arry;
|
|
1809
1803
|
}, []);
|
|
@@ -1945,9 +1939,13 @@ class QueryParamsController {
|
|
|
1945
1939
|
_replaceState(data) {
|
|
1946
1940
|
const url = new URL(window.location.href);
|
|
1947
1941
|
Object.keys(data)
|
|
1948
|
-
.filter((name) => data[name] !== undefined && data[name] !== null)
|
|
1949
1942
|
.forEach((name) => {
|
|
1950
|
-
|
|
1943
|
+
if (data[name] === undefined || data[name] === null) {
|
|
1944
|
+
url.searchParams.delete(name);
|
|
1945
|
+
}
|
|
1946
|
+
else {
|
|
1947
|
+
url.searchParams.set(name, data[name]);
|
|
1948
|
+
}
|
|
1951
1949
|
});
|
|
1952
1950
|
history.replaceState({}, null, url.pathname + url.search);
|
|
1953
1951
|
}
|
|
@@ -2950,14 +2948,14 @@ class ChipsComponent extends BaseItemComponent {
|
|
|
2950
2948
|
this.itemChange();
|
|
2951
2949
|
}
|
|
2952
2950
|
compareFn(modelValue, chipValue) {
|
|
2953
|
-
return modelValue.value === chipValue.value;
|
|
2951
|
+
return String(modelValue.value) === String(chipValue.value);
|
|
2954
2952
|
}
|
|
2955
2953
|
}
|
|
2956
2954
|
ChipsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ChipsComponent, deps: [{ token: i0.KeyValueDiffers }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
|
|
2957
|
-
ChipsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: ChipsComponent, selector: "filter-item-chips", usesInheritance: true, ngImport: i0, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips [(ngModel)]=\"item.model\"\n
|
|
2955
|
+
ChipsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: ChipsComponent, selector: "filter-item-chips", usesInheritance: true, ngImport: i0, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips \n [(ngModel)]=\"item.model\"\n [compare]=\"compareFn\"\n [multiple]=\"item.multiple\">\n <fs-chip \n *ngFor=\"let value of item.values\"\n [value]=\"value\"\n [selectable]=\"true\">\n {{ value.name }}\n </fs-chip>\n </fs-chips>\n </fs-label-field>\n</ng-template>\n\n<ng-template [ngIf]=\"item.loading\">{{ item.label }} loading...</ng-template>\n", styles: ["fs-chip{line-height:40px}\n"], components: [{ type: i1$4.FsLabelFieldComponent, selector: "fs-label-field", inputs: ["bottomMargin", "topMargin", "labelMargin"] }, { type: i1$4.FsLabelComponent, selector: "fs-label" }, { type: i2$3.FsChipsComponent, selector: "fs-chips", inputs: ["compare", "multiple"] }, { type: i2$3.FsChipComponent, selector: "fs-chip", inputs: ["size", "value", "backgroundColor", "borderColor", "color", "outlined", "removable", "selectable", "selected", "image"], outputs: ["selectedToggled", "removed"] }], directives: [{ type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { type: i4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { type: i7.FsFormNoFsValidatorsDirective, selector: "[ngModel]:not([required]):not([fsFormRequired]):not([fsFormCompare]):not([fsFormDateRange]):not([fsFormEmail]):not([fsFormEmails]):not([fsFormFunction]):not([fsFormGreater]):not([fsFormInteger]):not([fsFormLesser]):not([fsFormMax]):not([fsFormMaxLength]):not([fsFormMin]):not([fsFormMinLength]):not([fsFormNumeric]):not([fsFormPattern]):not([fsFormPhone]):not([fsFormUrl]):not([validate])" }, { type: i3.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
2958
2956
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ChipsComponent, decorators: [{
|
|
2959
2957
|
type: Component,
|
|
2960
|
-
args: [{ selector: 'filter-item-chips', changeDetection: ChangeDetectionStrategy.OnPush, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips [(ngModel)]=\"item.model\"\n
|
|
2958
|
+
args: [{ selector: 'filter-item-chips', changeDetection: ChangeDetectionStrategy.OnPush, template: "<ng-template [ngIf]=\"item.values?.length\">\n <fs-label-field>\n <fs-label>{{item.label}}</fs-label>\n <fs-chips \n [(ngModel)]=\"item.model\"\n [compare]=\"compareFn\"\n [multiple]=\"item.multiple\">\n <fs-chip \n *ngFor=\"let value of item.values\"\n [value]=\"value\"\n [selectable]=\"true\">\n {{ value.name }}\n </fs-chip>\n </fs-chips>\n </fs-label-field>\n</ng-template>\n\n<ng-template [ngIf]=\"item.loading\">{{ item.label }} loading...</ng-template>\n", styles: ["fs-chip{line-height:40px}\n"] }]
|
|
2961
2959
|
}], ctorParameters: function () { return [{ type: i0.KeyValueDiffers }, { type: i0.ChangeDetectorRef }]; } });
|
|
2962
2960
|
|
|
2963
2961
|
class RangeComponent extends BaseItemComponent {
|