@firestitch/filter 12.1.2 → 12.2.1

package/app/interfaces/config.interface.d.ts

@@ -18,8 +18,8 @@ export interface FilterConfig {
     queryParam?: boolean;
     namespace?: string;
     persist?: FsFilterPersistance;
-    reload?: ChangeFn | boolean;
-    clear?: ChangeFn | boolean;
+    reload?: ChangeFn;
+    clear?: ChangeFn;
     items?: IFilterConfigItem[];
     init?: ChangeFn;
     change?: ChangeFn;

package/app/models/filter-config.d.ts

@@ -1,11 +1,10 @@
-import { Model } from 'tsmodels';
 import { FilterButton, FilterConfig, FsFilterPersistance, IFilterConfigItem } from './../interfaces/config.interface';
 import { ChangeFn, Sort } from '../interfaces/config.interface';
 import { IFilterSavedFiltersConfig } from '../interfaces/saved-filters.interface';
 import { FsFilterAction } from '../interfaces/action.interface';
 export declare const SORT_BY_FIELD = "sortName";
 export declare const SORT_DIRECTION_FIELD = "sortDirection";
-export declare class FsFilterConfig extends Model {
+export declare class FsFilterConfig {
     load: boolean;
     persist: FsFilterPersistance;
     savedFilters: IFilterSavedFiltersConfig;
@@ -14,7 +13,6 @@ export declare class FsFilterConfig extends Model {
     chips: boolean;
     sortValues: any[];
     sort: Sort;
-    sortDirection: any;
     queryParam: boolean;
     init: ChangeFn;
     change: ChangeFn;
@@ -29,5 +27,4 @@ export declare class FsFilterConfig extends Model {
     namespace: string;
     constructor(data?: FilterConfig);
     private _init;
-    _fromJSON(value: any): void;
 }

package/bundles/firestitch-filter.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@firestitch/common'), require('date-fns'), require('lodash-es'), require('tsmodels'), require('@firestitch/date'), require('@firestitch/datepicker'), require('@firestitch/store'), require('@angular/router'), require('@angular/common'), require('@angular/material/dialog'), require('@firestitch/drawer'), require('@angular/material/form-field'), require('@angular/material/select'), require('@angular/material/core'), require('@angular/material/button'), require('@angular/forms'), require('@firestitch/form'), require('@angular/material/input'), require('@angular/material/autocomplete'), require('@angular/material/checkbox'), require('@angular/material/chips'), require('@angular/material/icon'), require('@angular/cdk/portal'), require('@angular/flex-layout'), require('@firestitch/chip'), require('@firestitch/label'), require('@firestitch/scroll'), require('@firestitch/autocomplete'), require('@firestitch/autocomplete-chips'), require('@firestitch/mask'), require('@firestitch/menu'), require('@firestitch/skeleton'), require('@firestitch/file'), require('@angular/cdk/overlay'), require('@angular/flex-layout/extended'), require('@angular/flex-layout/flex'), require('@angular/cdk/layout')) :
-    typeof define === 'function' && define.amd ? define('@firestitch/filter', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@firestitch/common', 'date-fns', 'lodash-es', 'tsmodels', '@firestitch/date', '@firestitch/datepicker', '@firestitch/store', '@angular/router', '@angular/common', '@angular/material/dialog', '@firestitch/drawer', '@angular/material/form-field', '@angular/material/select', '@angular/material/core', '@angular/material/button', '@angular/forms', '@firestitch/form', '@angular/material/input', '@angular/material/autocomplete', '@angular/material/checkbox', '@angular/material/chips', '@angular/material/icon', '@angular/cdk/portal', '@angular/flex-layout', '@firestitch/chip', '@firestitch/label', '@firestitch/scroll', '@firestitch/autocomplete', '@firestitch/autocomplete-chips', '@firestitch/mask', '@firestitch/menu', '@firestitch/skeleton', '@firestitch/file', '@angular/cdk/overlay', '@angular/flex-layout/extended', '@angular/flex-layout/flex', '@angular/cdk/layout'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.filter = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.common, global.dateFns, global.lodashEs, global.tsmodels, global.date, global.i3, global.i1, global.ng.router, global.ng.common, global.ng.material.dialog, global.i6, global.ng.material.formField, global.ng.material.select, global.ng.material.core, global.ng.material.button, global.ng.forms, global.i7, global.ng.material.input, global.ng.material.autocomplete, global.ng.material.checkbox, global.ng.material.chips, global.ng.material.icon, global.ng.cdk.portal, global.ng.flexLayout, global.i2$1, global.i1$5, global.scroll, global.i4$1, global.i5, global.i6$2, global.i3$4, global.i6$3, global.i4$3, global.ng.cdk.overlay, global.ng.flexLayout.extended, global.ng.flexLayout.flex, global.ng.cdk.layout));
-})(this, (function (exports, i0, rxjs, operators, common, dateFns, lodashEs, tsmodels, date, i3, i1, i1$1, i3$1, i1$2, i6, i1$3, i2, i3$2, i1$4, i4, i7, i3$3, autocomplete, i4$2, chips, i2$3, portal, flexLayout, i2$1, i1$5, scroll, i4$1, i5, i6$2, i3$4, i6$3, i4$3, i1$6, i6$1, i2$2, i1$7) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@firestitch/common'), require('date-fns'), require('lodash-es'), require('@firestitch/date'), require('@firestitch/datepicker'), require('@firestitch/store'), require('@angular/router'), require('@angular/common'), require('@angular/material/dialog'), require('@firestitch/drawer'), require('@angular/material/form-field'), require('@angular/material/select'), require('@angular/material/core'), require('@angular/material/button'), require('@angular/forms'), require('@firestitch/form'), require('@angular/material/input'), require('@angular/material/autocomplete'), require('@angular/material/checkbox'), require('@angular/material/chips'), require('@angular/material/icon'), require('@angular/cdk/portal'), require('@angular/flex-layout'), require('@firestitch/chip'), require('@firestitch/label'), require('@firestitch/scroll'), require('@firestitch/autocomplete'), require('@firestitch/autocomplete-chips'), require('@firestitch/mask'), require('@firestitch/menu'), require('@firestitch/skeleton'), require('@firestitch/file'), require('@angular/cdk/overlay'), require('@angular/flex-layout/extended'), require('@angular/flex-layout/flex'), require('@angular/cdk/layout')) :
+    typeof define === 'function' && define.amd ? define('@firestitch/filter', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@firestitch/common', 'date-fns', 'lodash-es', '@firestitch/date', '@firestitch/datepicker', '@firestitch/store', '@angular/router', '@angular/common', '@angular/material/dialog', '@firestitch/drawer', '@angular/material/form-field', '@angular/material/select', '@angular/material/core', '@angular/material/button', '@angular/forms', '@firestitch/form', '@angular/material/input', '@angular/material/autocomplete', '@angular/material/checkbox', '@angular/material/chips', '@angular/material/icon', '@angular/cdk/portal', '@angular/flex-layout', '@firestitch/chip', '@firestitch/label', '@firestitch/scroll', '@firestitch/autocomplete', '@firestitch/autocomplete-chips', '@firestitch/mask', '@firestitch/menu', '@firestitch/skeleton', '@firestitch/file', '@angular/cdk/overlay', '@angular/flex-layout/extended', '@angular/flex-layout/flex', '@angular/cdk/layout'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.filter = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.common, global.dateFns, global.lodashEs, global.date, global.i3, global.i1, global.ng.router, global.ng.common, global.ng.material.dialog, global.i6, global.ng.material.formField, global.ng.material.select, global.ng.material.core, global.ng.material.button, global.ng.forms, global.i7, global.ng.material.input, global.ng.material.autocomplete, global.ng.material.checkbox, global.ng.material.chips, global.ng.material.icon, global.ng.cdk.portal, global.ng.flexLayout, global.i2$1, global.i1$5, global.scroll, global.i4$1, global.i5, global.i6$2, global.i3$4, global.i6$3, global.i4$3, global.ng.cdk.overlay, global.ng.flexLayout.extended, global.ng.flexLayout.flex, global.ng.cdk.layout));
+})(this, (function (exports, i0, rxjs, operators, common, dateFns, lodashEs, date, i3, i1, i1$1, i3$1, i1$2, i6, i1$3, i2, i3$2, i1$4, i4, i7, i3$3, autocomplete, i4$2, chips, i2$3, portal, flexLayout, i2$1, i1$5, scroll, i4$1, i5, i6$2, i3$4, i6$3, i4$3, i1$6, i6$1, i2$2, i1$7) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -978,26 +978,51 @@
 
     var SORT_BY_FIELD = 'sortName';
     var SORT_DIRECTION_FIELD = 'sortDirection';
-    var FsFilterConfig = /** @class */ (function (_super) {
-        __extends(FsFilterConfig, _super);
+    var FsFilterConfig = /** @class */ (function () {
         function FsFilterConfig(data) {
             if (data === void 0) { data = {}; }
-            var _this = _super.call(this) || this;
-            _this.load = true;
-            _this.persist = false;
-            _this.inline = false;
-            _this.autofocus = false;
-            _this.chips = false;
-            _this.sortValues = null;
-            _this.sort = null;
-            _this.sortDirection = null;
-            _this.queryParam = false;
-            _this.case = 'camel';
-            _this._fromJSON(data);
-            _this._init();
-            return _this;
+            this.load = true;
+            this.persist = false;
+            this.inline = false;
+            this.autofocus = false;
+            this.chips = false;
+            this.sortValues = null;
+            this.sort = null;
+            // public sortDirection = null;
+            this.queryParam = false;
+            this.case = 'camel';
+            this._init(data);
         }
-        FsFilterConfig.prototype._init = function () {
+        FsFilterConfig.prototype._init = function (data) {
+            if (data === void 0) { 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 = {};
             }
@@ -1017,100 +1042,8 @@
                 this.clear = function () { };
             }
         };
-        FsFilterConfig.prototype._fromJSON = function (value) {
-            var _a;
-            _super.prototype._fromJSON.call(this, 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;
-                    }
-                }
-            }
-        };
         return FsFilterConfig;
-    }(tsmodels.Model));
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "load", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "persist", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "savedFilters", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "inline", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "autofocus", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "chips", void 0);
-    __decorate([
-        tsmodels.Alias('sorts'),
-        __metadata("design:type", Array)
-    ], FsFilterConfig.prototype, "sortValues", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "sort", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "sortDirection", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "queryParam", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], FsFilterConfig.prototype, "init", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], FsFilterConfig.prototype, "change", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], FsFilterConfig.prototype, "reload", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], FsFilterConfig.prototype, "clear", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], FsFilterConfig.prototype, "sortChange", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], FsFilterConfig.prototype, "case", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Boolean)
-    ], FsFilterConfig.prototype, "reloadWhenConfigChanged", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], FsFilterConfig.prototype, "button", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Array)
-    ], FsFilterConfig.prototype, "items", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Array)
-    ], FsFilterConfig.prototype, "actions", void 0);
+    }());
 
     var SelectItem = /** @class */ (function () {
         function SelectItem() {
@@ -2553,11 +2486,12 @@
         };
         PersistanceParamsController.prototype.restore = function () {
             _super.prototype.restore.call(this);
+            var items = __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
+                this._itemsStore.sortByItem,
+                this._itemsStore.sortDirectionItem,
+            ]).filter(function (item) { return !!item; });
             if (this._value) {
-                this._value.data = restoreItems(this._value.data, __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
-                    this._itemsStore.sortByItem,
-                    this._itemsStore.sortDirectionItem,
-                ]), this._paramsCase);
+                this._value.data = restoreItems(this._value.data, items, this._paramsCase);
             }
         };
         return PersistanceParamsController;
@@ -2618,10 +2552,11 @@
          * Parse query and update filter values
          */
         QueryParamsController.prototype.fetchFromQueryParams = function () {
-            this._fetchedParams = restoreItems(this._route.snapshot.queryParams, __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
+            var items = __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
                 this._itemsStore.sortByItem,
                 this._itemsStore.sortDirectionItem,
-            ]), this._paramsCase);
+            ]).filter(function (item) { return !!item; });
+            this._fetchedParams = restoreItems(this._route.snapshot.queryParams, items, this._paramsCase);
         };
         return QueryParamsController;
     }());
@@ -5034,7 +4969,9 @@
         FilterComponent.prototype.init = function () {
             var 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();
         };
         FilterComponent.prototype.clear = function (event) {
@@ -5261,9 +5198,7 @@
                 return !pendingParams && itemsReady;
             }), operators.takeUntil(this._destroy$))
                 .subscribe(function () {
-                if (_this.config.init) {
-                    _this.init();
-                }
+                _this.init();
                 _this._syncSearchInputWithKeyword();
                 _this.ready.emit();
             });