@firestitch/filter 12.1.2 → 12.2.1

package/fesm2015/firestitch-filter.js

@@ -5,8 +5,6 @@ import { RouterModule } from '@angular/router';
 import { BehaviorSubject, Subject, isObservable, forkJoin, of, fromEvent, merge, timer, combineLatest } from 'rxjs';
 import { tap, finalize, take, takeUntil, debounceTime, filter as filter$1, distinctUntilChanged, switchMap, delay, skip, mapTo, startWith, map } from 'rxjs/operators';
 import { isFunction, clone, isObject, isString, toString, pickBy } from 'lodash-es';
-import { __decorate, __metadata } from 'tslib';
-import { Model, Alias } from 'tsmodels';
 import { filter, isEmpty, getNormalizedPath, list, remove, FsCommonModule } from '@firestitch/common';
 import { simpleFormat, format } from '@firestitch/date';
 import { parseISO, isValid, isDate, isEqual } from 'date-fns';
@@ -421,9 +419,8 @@ class SimpleSelectItem extends BaseSelectItem {
 
 const SORT_BY_FIELD = 'sortName';
 const SORT_DIRECTION_FIELD = 'sortDirection';
-class FsFilterConfig extends Model {
+class FsFilterConfig {
     constructor(data = {}) {
-        super();
         this.load = true;
         this.persist = false;
         this.inline = false;
@@ -431,13 +428,40 @@ class FsFilterConfig extends Model {
         this.chips = false;
         this.sortValues = null;
         this.sort = null;
-        this.sortDirection = null;
+        // public sortDirection = null;
         this.queryParam = false;
         this.case = 'camel';
-        this._fromJSON(data);
-        this._init();
-    }
-    _init() {
+        this._init(data);
+    }
+    _init(data = {}) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        this.load = (_a = data.load) !== null && _a !== void 0 ? _a : true;
+        this.persist = data.persist;
+        this.savedFilters = data.savedFilters;
+        this.inline = (_b = data.inline) !== null && _b !== void 0 ? _b : false;
+        this.autofocus = (_c = data.autofocus) !== null && _c !== void 0 ? _c : false;
+        this.chips = (_d = data.chips) !== null && _d !== void 0 ? _d : false;
+        this.sortValues = data.sorts;
+        this.sort = data.sort;
+        this.queryParam = (_e = data.queryParam) !== null && _e !== void 0 ? _e : false;
+        this.init = data.init;
+        this.change = data.change;
+        this.reload = data.reload;
+        this.clear = data.clear;
+        this.sortChange = data.sortChange;
+        this.case = (_f = data.case) !== null && _f !== void 0 ? _f : 'camel';
+        this.reloadWhenConfigChanged = data.reloadWhenConfigChanged;
+        this.button = data.button;
+        this.items = data.items;
+        this.actions = data.actions;
+        this.case = (_g = data.case) !== null && _g !== void 0 ? _g : 'camel';
+        if (this.persist) {
+            if (typeof this.persist === 'object') {
+                if (this.persist.name) {
+                    this.namespace = this.persist.name;
+                }
+            }
+        }
         if (!this.button) {
             this.button = {};
         }
@@ -457,99 +481,7 @@ class FsFilterConfig extends Model {
             this.clear = () => { };
         }
     }
-    _fromJSON(value) {
-        var _a;
-        super._fromJSON(value);
-        this.case = (_a = value.case) !== null && _a !== void 0 ? _a : 'camel';
-        if (this.persist) {
-            if (typeof this.persist === 'object') {
-                if (this.persist.name) {
-                    this.namespace = this.persist.name;
-                }
-            }
-        }
-    }
 }
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "load", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "persist", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "savedFilters", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "inline", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "autofocus", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "chips", void 0);
-__decorate([
-    Alias('sorts'),
-    __metadata("design:type", Array)
-], FsFilterConfig.prototype, "sortValues", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "sort", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "sortDirection", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "queryParam", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Function)
-], FsFilterConfig.prototype, "init", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Function)
-], FsFilterConfig.prototype, "change", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Function)
-], FsFilterConfig.prototype, "reload", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Function)
-], FsFilterConfig.prototype, "clear", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Function)
-], FsFilterConfig.prototype, "sortChange", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", String)
-], FsFilterConfig.prototype, "case", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Boolean)
-], FsFilterConfig.prototype, "reloadWhenConfigChanged", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Object)
-], FsFilterConfig.prototype, "button", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Array)
-], FsFilterConfig.prototype, "items", void 0);
-__decorate([
-    Alias(),
-    __metadata("design:type", Array)
-], FsFilterConfig.prototype, "actions", void 0);
 
 class MultipleSelectItem extends BaseSelectItem {
     constructor(itemConfig, _persistedValues) {
@@ -1804,12 +1736,13 @@ class PersistanceParamsController extends FsPersistanceStore {
     }
     restore() {
         super.restore();
+        const items = [
+            ...this._itemsStore.items,
+            this._itemsStore.sortByItem,
+            this._itemsStore.sortDirectionItem,
+        ].filter((item) => !!item);
         if (this._value) {
-            this._value.data = restoreItems(this._value.data, [
-                ...this._itemsStore.items,
-                this._itemsStore.sortByItem,
-                this._itemsStore.sortDirectionItem,
-            ], this._paramsCase);
+            this._value.data = restoreItems(this._value.data, items, this._paramsCase);
         }
     }
 }
@@ -1859,11 +1792,12 @@ class QueryParamsController {
      * Parse query and update filter values
      */
     fetchFromQueryParams() {
-        this._fetchedParams = restoreItems(this._route.snapshot.queryParams, [
+        const items = [
             ...this._itemsStore.items,
             this._itemsStore.sortByItem,
             this._itemsStore.sortDirectionItem,
-        ], this._paramsCase);
+        ].filter((item) => !!item);
+        this._fetchedParams = restoreItems(this._route.snapshot.queryParams, items, this._paramsCase);
     }
 }
 QueryParamsController.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: QueryParamsController, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: FsFilterItemsStore }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -3987,7 +3921,9 @@ class FilterComponent {
     init() {
         const data = this._filterItems.valuesAsQuery();
         this._sort = this._filterItems.getSort();
-        this.config.init(data, this._sort);
+        if (this.config.init) {
+            this.config.init(data, this._sort);
+        }
         this._updateChipsVisibility();
     }
     clear(event = null) {
@@ -4202,9 +4138,7 @@ class FilterComponent {
         ])
             .pipe(filter$1(([pendingParams, itemsReady]) => !pendingParams && itemsReady), takeUntil(this._destroy$))
             .subscribe(() => {
-            if (this.config.init) {
-                this.init();
-            }
+            this.init();
             this._syncSearchInputWithKeyword();
             this.ready.emit();
         });