@firestitch/filter 13.4.0 → 13.4.1

package/fesm2020/firestitch-filter.mjs

@@ -521,85 +521,6 @@ function getRangeName(configCase, name, range) {
     }
 }
 
-class RangeItem extends BaseItem {
-    static create(config, additionalConfig, filter) {
-        return new RangeItem(config, additionalConfig, filter);
-    }
-    get value() {
-        let value = clone(this.model);
-        if (!isObject(this.model) ||
-            (isEmpty(this.model.max, { zero: true }) && isEmpty(this.model.min, { zero: true }))) {
-            value = undefined;
-        }
-        return value;
-    }
-    get queryObject() {
-        const value = this.value;
-        const name = this.name;
-        const params = {};
-        const paramMinName = getRangeName(this.case, name, 'min');
-        const paramMaxName = getRangeName(this.case, name, 'max');
-        if (isObject(value)) {
-            params[paramMinName] = value.min || undefined;
-            params[paramMaxName] = value.max || undefined;
-        }
-        else {
-            params[paramMinName] = undefined;
-            params[paramMaxName] = undefined;
-        }
-        return params;
-    }
-    get isChipVisible() {
-        return this.model && (this.model.min !== undefined || this.model.max !== undefined);
-    }
-    getChipsContent(type) {
-        if (type === 'from') {
-            const min = this.model.min;
-            return `${min}`;
-        }
-        else if (type === 'to') {
-            const max = this.model.max;
-            return `${max}`;
-        }
-    }
-    clearRange(type = null, defaultValue = undefined) {
-        if (type === 'from') {
-            delete this.model.min;
-            if (defaultValue?.min) {
-                this.model.min = defaultValue.min;
-            }
-            this.model = { ...this.model };
-        }
-        else if (type === 'to') {
-            delete this.model.max;
-            if (defaultValue?.max) {
-                this.model.max = defaultValue.max;
-            }
-            this.model = { ...this.model };
-        }
-        else {
-            this.model = defaultValue ? { ...defaultValue } : {};
-        }
-    }
-    _validateModel() {
-    }
-    _parseConfig(item) {
-        this.options = item.options;
-        this.prefix = item.prefix;
-        this.suffix = item.suffix;
-        this.case = this._additionalConfig?.case ?? 'camel';
-        super._parseConfig(item);
-    }
-    _init() {
-        if (!this.label) {
-            this.label = ['Min', 'Max'];
-        }
-        if (!this.model) {
-            this.model = this.defaultValue || {};
-        }
-    }
-}
-
 class BaseDateRangeItem extends BaseItem {
     get isTypeDateRange() {
         return this.type === ItemType.DateRange;
@@ -740,82 +661,83 @@ class DateTimeRangeItem extends BaseDateRangeItem {
     }
 }
 
-function parseItemValueFromStored(item, params, paramCase) {
-    const param = params[item.name];
-    switch (item.type) {
-        case ItemType.Range: {
-            const min = params[getRangeName(paramCase, item.name, 'min')];
-            const max = params[getRangeName(paramCase, item.name, 'max')];
-            return { min: min, max: max };
+class RangeItem extends BaseItem {
+    static create(config, additionalConfig, filter) {
+        return new RangeItem(config, additionalConfig, filter);
+    }
+    get value() {
+        let value = clone(this.model);
+        if (!isObject(this.model) ||
+            (isEmpty(this.model.max, { zero: true }) && isEmpty(this.model.min, { zero: true }))) {
+            value = undefined;
         }
-        case ItemType.DateRange:
-        case ItemType.DateTimeRange: {
-            const from = params[getRangeName(item.case, item.name, 'from')];
-            const to = params[getRangeName(item.case, item.name, 'to')];
-            return { from: from, to: to };
+        return value;
+    }
+    get queryObject() {
+        const value = this.value;
+        const name = this.name;
+        const params = {};
+        const paramMinName = getRangeName(this.case, name, 'min');
+        const paramMaxName = getRangeName(this.case, name, 'max');
+        if (isObject(value)) {
+            params[paramMinName] = value.min || undefined;
+            params[paramMaxName] = value.max || undefined;
         }
-        case ItemType.Week: {
-            const from = params[getRangeName('camel', item.name, 'from')];
-            const to = params[getRangeName('camel', item.name, 'to')];
-            const period = params[`${item.name}Period`];
-            return { from, to, period };
+        else {
+            params[paramMinName] = undefined;
+            params[paramMaxName] = undefined;
         }
-        case ItemType.Select: {
-            if (item.multiple && !!param) {
-                const values = param.split(',');
-                if (item.isolate) {
-                    const isolatedValue = Array.isArray(item.isolate.value)
-                        ? item.isolate.value
-                        : [item.isolate.value];
-                    item.isolate.enabled = arraysHaveSameElements(isolatedValue, values);
-                    return item.isolate.enabled
-                        ? isolatedValue
-                        : values;
-                }
-                return values;
-            }
-            else {
-                return param;
-            }
+        return params;
+    }
+    get isChipVisible() {
+        return this.model && (this.model.min !== undefined || this.model.max !== undefined);
+    }
+    getChipsContent(type) {
+        if (type === 'from') {
+            const min = this.model.min;
+            return `${min}`;
         }
-        case ItemType.Checkbox: {
-            if (param === 'true') {
-                return true === item.checked;
+        else if (type === 'to') {
+            const max = this.model.max;
+            return `${max}`;
+        }
+    }
+    clearRange(type = null, defaultValue = undefined) {
+        if (type === 'from') {
+            delete this.model.min;
+            if (defaultValue?.min) {
+                this.model.min = defaultValue.min;
             }
-            else {
-                return param === item.checked;
+            this.model = { ...this.model };
+        }
+        else if (type === 'to') {
+            delete this.model.max;
+            if (defaultValue?.max) {
+                this.model.max = defaultValue.max;
             }
+            this.model = { ...this.model };
         }
-        case ItemType.AutoComplete: {
-            const filterParts = filterFromQueryParam(param);
-            return {
-                name: filterParts[1],
-                value: filterParts[0]
-            };
+        else {
+            this.model = defaultValue ? { ...defaultValue } : {};
         }
-        case ItemType.AutoCompleteChips:
-        case ItemType.Chips: {
-            const filterParts = param.split(',');
-            return filterParts.reduce((arry, value) => {
-                const chipParts = filterFromQueryParam(value);
-                arry.push({
-                    name: chipParts[1],
-                    value: chipParts[0],
-                });
-                return arry;
-            }, []);
+    }
+    _validateModel() {
+    }
+    _parseConfig(item) {
+        this.options = item.options;
+        this.prefix = item.prefix;
+        this.suffix = item.suffix;
+        this.case = this._additionalConfig?.case ?? 'camel';
+        super._parseConfig(item);
+    }
+    _init() {
+        if (!this.label) {
+            this.label = ['Min', 'Max'];
         }
-        default: {
-            return param;
+        if (!this.model) {
+            this.model = this.defaultValue || {};
         }
     }
-}
-function arraysHaveSameElements(arr1, arr2) {
-    arr1 = [...arr1].sort();
-    arr2 = [...arr2].sort();
-    return arr1.some((item) => {
-        return arr2.includes(item);
-    });
 }
 
 function parseDate(value) {
@@ -911,6 +833,84 @@ class WeekItem extends BaseItem {
     }
 }
 
+function parseItemValueFromStored(item, params, paramCase) {
+    const param = params[item.name];
+    switch (item.type) {
+        case ItemType.Range: {
+            const min = params[getRangeName(paramCase, item.name, 'min')];
+            const max = params[getRangeName(paramCase, item.name, 'max')];
+            return { min: min, max: max };
+        }
+        case ItemType.DateRange:
+        case ItemType.DateTimeRange: {
+            const from = params[getRangeName(item.case, item.name, 'from')];
+            const to = params[getRangeName(item.case, item.name, 'to')];
+            return { from: from, to: to };
+        }
+        case ItemType.Week: {
+            const from = params[getRangeName('camel', item.name, 'from')];
+            const to = params[getRangeName('camel', item.name, 'to')];
+            const period = params[`${item.name}Period`];
+            return { from, to, period };
+        }
+        case ItemType.Select: {
+            if (item.multiple && !!param) {
+                const values = param.split(',');
+                if (item.isolate) {
+                    const isolatedValue = Array.isArray(item.isolate.value)
+                        ? item.isolate.value
+                        : [item.isolate.value];
+                    item.isolate.enabled = arraysHaveSameElements(isolatedValue, values);
+                    return item.isolate.enabled
+                        ? isolatedValue
+                        : values;
+                }
+                return values;
+            }
+            else {
+                return param;
+            }
+        }
+        case ItemType.Checkbox: {
+            if (param === 'true') {
+                return true === item.checked;
+            }
+            else {
+                return param === item.checked;
+            }
+        }
+        case ItemType.AutoComplete: {
+            const filterParts = filterFromQueryParam(param);
+            return {
+                name: filterParts[1],
+                value: filterParts[0]
+            };
+        }
+        case ItemType.AutoCompleteChips:
+        case ItemType.Chips: {
+            const filterParts = param.split(',');
+            return filterParts.reduce((arry, value) => {
+                const chipParts = filterFromQueryParam(value);
+                arry.push({
+                    name: chipParts[1],
+                    value: chipParts[0],
+                });
+                return arry;
+            }, []);
+        }
+        default: {
+            return param;
+        }
+    }
+}
+function arraysHaveSameElements(arr1, arr2) {
+    arr1 = [...arr1].sort();
+    arr2 = [...arr2].sort();
+    return arr1.some((item) => {
+        return arr2.includes(item);
+    });
+}
+
 /**
  * We need this function because when we store persisted/query/remote filter values
  * it stores with different format, ex.: Range will be stored as RangeFrom && RangeTo
@@ -1551,6 +1551,9 @@ class FsFilterItemsStore {
     get items() {
         return this._items;
     }
+    get itemNames() {
+        return this._items.map((item) => item.name);
+    }
     get visibleItems() {
         return this._visibleItems$.getValue();
     }
@@ -2158,15 +2161,32 @@ class ExternalParamsController {
         this._destroy$ = new Subject();
     }
     get params() {
-        const result = {};
+        let result = {};
         if (this._persistanceStore.enabled) {
-            Object.assign(result, this._persistanceStore.value?.data);
+            result = {
+                ...result,
+                ...this._persistanceStore.value?.data,
+            };
         }
         if (this._savedFilters.enabled && this._savedFilters.activeFilter) {
-            Object.assign(result, this._savedFilters.activeFilterData);
+            const query = Object.keys(result)
+                .filter((key) => !this._itemsStore.itemNames.includes(key))
+                .reduce((acc, key) => {
+                return {
+                    ...acc,
+                    [key]: result[key],
+                };
+            }, {});
+            result = {
+                ...query,
+                ...this._savedFilters.activeFilterData,
+            };
         }
-        if (this._queryParams.enabled) {
-            Object.assign(result, this._queryParams.fetchedParams);
+        else if (this._queryParams.enabled) {
+            result = {
+                ...result,
+                ...this._queryParams.fetchedParams,
+            };
         }
         return result;
     }