@firestitch/filter 12.1.0 → 12.1.3

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

@@ -3,8 +3,8 @@ import { FilterButton, FilterConfig, FsFilterPersistance, IFilterConfigItem } fr
 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 = "system_sort_by";
-export declare const SORT_DIRECTION_FIELD = "system_sort_direction";
+export declare const SORT_BY_FIELD = "sortName";
+export declare const SORT_DIRECTION_FIELD = "sortDirection";
 export declare class FsFilterConfig extends Model {
     load: boolean;
     persist: FsFilterPersistance;

package/app/services/items-store.service.d.ts

@@ -57,6 +57,7 @@ export declare class FsFilterItemsStore implements OnDestroy {
     private _createItems;
     private _subscribeToItemsChanges;
     private _lazyInit;
+    private _initSortingItems;
     private _createSortingItems;
     private _setKeywordItem;
     static ɵfac: i0.ɵɵFactoryDeclaration<FsFilterItemsStore, never>;

package/bundles/firestitch-filter.umd.js

@@ -976,8 +976,8 @@
         return SimpleSelectItem;
     }(BaseSelectItem));
 
-    var SORT_BY_FIELD = 'system_sort_by';
-    var SORT_DIRECTION_FIELD = 'system_sort_direction';
+    var SORT_BY_FIELD = 'sortName';
+    var SORT_DIRECTION_FIELD = 'sortDirection';
     var FsFilterConfig = /** @class */ (function (_super) {
         __extends(FsFilterConfig, _super);
         function FsFilterConfig(data) {
@@ -2244,7 +2244,7 @@
                 .forEach(function (item) {
                 item.initValues(p[item.name]);
             });
-            this._createSortingItems(p);
+            this._initSortingItems(p);
             this.loadAsyncDefaults();
             this._subscribeToItemsChanges();
         };
@@ -2317,6 +2317,7 @@
                 _this._itemsByName.set(item.name, filterItem);
                 return filterItem;
             });
+            this._createSortingItems();
         };
         FsFilterItemsStore.prototype._subscribeToItemsChanges = function () {
             var _this = this;
@@ -2351,7 +2352,13 @@
                 _this._setKeywordItem();
             });
         };
-        FsFilterItemsStore.prototype._createSortingItems = function (p) {
+        FsFilterItemsStore.prototype._initSortingItems = function (p) {
+            if (this.sortByItem && this.sortDirectionItem) {
+                this.sortByItem.initValues(p[this.sortByItem.name]);
+                this.sortDirectionItem.initValues(p[this.sortDirectionItem.name]);
+            }
+        };
+        FsFilterItemsStore.prototype._createSortingItems = function () {
             var _a;
             if (((_a = this._config.sortValues) === null || _a === void 0 ? void 0 : _a.length) > 0) {
                 var sortByItem = {
@@ -2364,7 +2371,6 @@
                     sortByItem.default = this._config.sort.value;
                 }
                 this.sortByItem = new SimpleSelectItem(sortByItem, null);
-                this.sortByItem.initValues(p[this.sortByItem.name]);
                 var sortDirectionItem = {
                     name: SORT_DIRECTION_FIELD,
                     type: exports.ItemType.Select,
@@ -2378,7 +2384,6 @@
                     sortDirectionItem.default = this._config.sort.direction;
                 }
                 this.sortDirectionItem = new SimpleSelectItem(sortDirectionItem, null);
-                this.sortDirectionItem.initValues(p[this.sortDirectionItem.name]);
             }
         };
         FsFilterItemsStore.prototype._setKeywordItem = function () {
@@ -2549,7 +2554,10 @@
         PersistanceParamsController.prototype.restore = function () {
             _super.prototype.restore.call(this);
             if (this._value) {
-                this._value.data = restoreItems(this._value.data, this._itemsStore.items, this._paramsCase);
+                this._value.data = restoreItems(this._value.data, __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
+                    this._itemsStore.sortByItem,
+                    this._itemsStore.sortDirectionItem,
+                ]), this._paramsCase);
             }
         };
         return PersistanceParamsController;
@@ -2610,7 +2618,10 @@
          * Parse query and update filter values
          */
         QueryParamsController.prototype.fetchFromQueryParams = function () {
-            this._fetchedParams = restoreItems(this._route.snapshot.queryParams, this._itemsStore.items, this._paramsCase);
+            this._fetchedParams = restoreItems(this._route.snapshot.queryParams, __spreadArray(__spreadArray([], __read(this._itemsStore.items)), [
+                this._itemsStore.sortByItem,
+                this._itemsStore.sortDirectionItem,
+            ]), this._paramsCase);
         };
         return QueryParamsController;
     }());
@@ -5023,7 +5034,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) {
@@ -5250,9 +5263,7 @@
                 return !pendingParams && itemsReady;
             }), operators.takeUntil(this._destroy$))
                 .subscribe(function () {
-                if (_this.config.init) {
-                    _this.init();
-                }
+                _this.init();
                 _this._syncSearchInputWithKeyword();
                 _this.ready.emit();
             });