@firestitch/filter 12.1.0 → 12.1.3

package/fesm2015/firestitch-filter.js

@@ -419,8 +419,8 @@ class SimpleSelectItem extends BaseSelectItem {
     }
 }
 
-const SORT_BY_FIELD = 'system_sort_by';
-const SORT_DIRECTION_FIELD = 'system_sort_direction';
+const SORT_BY_FIELD = 'sortName';
+const SORT_DIRECTION_FIELD = 'sortDirection';
 class FsFilterConfig extends Model {
     constructor(data = {}) {
         super();
@@ -1495,7 +1495,7 @@ class FsFilterItemsStore {
             .forEach((item) => {
             item.initValues(p[item.name]);
         });
-        this._createSortingItems(p);
+        this._initSortingItems(p);
         this.loadAsyncDefaults();
         this._subscribeToItemsChanges();
     }
@@ -1567,6 +1567,7 @@ class FsFilterItemsStore {
             this._itemsByName.set(item.name, filterItem);
             return filterItem;
         });
+        this._createSortingItems();
     }
     _subscribeToItemsChanges() {
         var _a;
@@ -1599,7 +1600,13 @@ class FsFilterItemsStore {
             this._setKeywordItem();
         });
     }
-    _createSortingItems(p) {
+    _initSortingItems(p) {
+        if (this.sortByItem && this.sortDirectionItem) {
+            this.sortByItem.initValues(p[this.sortByItem.name]);
+            this.sortDirectionItem.initValues(p[this.sortDirectionItem.name]);
+        }
+    }
+    _createSortingItems() {
         var _a;
         if (((_a = this._config.sortValues) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             const sortByItem = {
@@ -1612,7 +1619,6 @@ class FsFilterItemsStore {
                 sortByItem.default = this._config.sort.value;
             }
             this.sortByItem = new SimpleSelectItem(sortByItem, null);
-            this.sortByItem.initValues(p[this.sortByItem.name]);
             const sortDirectionItem = {
                 name: SORT_DIRECTION_FIELD,
                 type: ItemType.Select,
@@ -1626,7 +1632,6 @@ class FsFilterItemsStore {
                 sortDirectionItem.default = this._config.sort.direction;
             }
             this.sortDirectionItem = new SimpleSelectItem(sortDirectionItem, null);
-            this.sortDirectionItem.initValues(p[this.sortDirectionItem.name]);
         }
     }
     _setKeywordItem() {
@@ -1800,7 +1805,11 @@ class PersistanceParamsController extends FsPersistanceStore {
     restore() {
         super.restore();
         if (this._value) {
-            this._value.data = restoreItems(this._value.data, this._itemsStore.items, this._paramsCase);
+            this._value.data = restoreItems(this._value.data, [
+                ...this._itemsStore.items,
+                this._itemsStore.sortByItem,
+                this._itemsStore.sortDirectionItem,
+            ], this._paramsCase);
         }
     }
 }
@@ -1850,7 +1859,11 @@ class QueryParamsController {
      * Parse query and update filter values
      */
     fetchFromQueryParams() {
-        this._fetchedParams = restoreItems(this._route.snapshot.queryParams, this._itemsStore.items, this._paramsCase);
+        this._fetchedParams = restoreItems(this._route.snapshot.queryParams, [
+            ...this._itemsStore.items,
+            this._itemsStore.sortByItem,
+            this._itemsStore.sortDirectionItem,
+        ], 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 });
@@ -3974,7 +3987,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) {
@@ -4189,9 +4204,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();
         });