@qrvey/utils 1.2.10-9 → 1.3.0-10

package/dist/filters/helpers/common/excludeFiltersByParams.js

@@ -25,7 +25,7 @@ export function excludeFiltersByParams(filterData, params) {
                     if (resolveDatasetConditions(dataset, params)) {
                         return Object.assign(Object.assign({}, dataset), { filters: dataset.filters.map((filter) => {
                                 if (resolveFilterConditions(filter, params)) {
-                                    return Object.assign(Object.assign({}, filter), { values: (filter.values || []).map((value) => {
+                                    return Object.assign(Object.assign({}, filter), { values: filter.values.map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
                                                 rankingValues.map(rValue => {
@@ -40,7 +40,7 @@ export function excludeFiltersByParams(filterData, params) {
                                             }
                                         }).filter(Boolean) });
                                 }
-                            }).filter(filter => { var _a; return !isEmpty(filter) && (filter.selectAll && ((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0); }) });
+                            }).filter(filter => !isEmpty(filter) && filter.values.length > 0) });
                     }
                 }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0) });
         }
@@ -59,7 +59,7 @@ function resolveDatasetConditions(dataset, params) {
         dataset.filters.length > 0;
 }
 function resolveFilterConditions(filter, params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     return (params.enableds == null || params.enableds !== filter.enabled) &&
         (isEmpty(params.dateSection) || params.dateSection !== filter.dateSection) &&
         (isEmpty(params.panelid) || params.panelid !== filter.extras.panelid) &&
@@ -69,5 +69,5 @@ function resolveFilterConditions(filter, params) {
             ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) !== filter.column.qrveyid &&
             ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) !== filter.column.linkid) &&
             ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) !== filter.column.aggregate) &&
-        ((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0;
+        filter.values.length > 0;
 }

package/dist/filters/helpers/common/getFiltersByDatasetsColumns.d.ts

@@ -0,0 +1,10 @@
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFUData } from "../../interfaces/ui/IFUData";
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export declare function getFiltersByDatasetsColumns(data: IFUData, datasets?: IDataset[]): IFUData;

package/dist/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -0,0 +1,23 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export function getFiltersByDatasetsColumns(data, datasets = []) {
+    if (isEmpty(data) || isEmpty(data.scopes))
+        return;
+    return Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+                if (!isEmpty(dataset)) {
+                    return Object.assign(Object.assign({}, filterDataset), { filters: filterDataset.filters.map(filter => {
+                            const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
+                            if (!isEmpty(column)) {
+                                return Object.assign({}, filter);
+                            }
+                        }).filter(Boolean) });
+                }
+            }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0) }))).filter(scope => !isEmpty(scope) && scope.datasets.length > 0) });
+}

package/dist/filters/helpers/common/getFiltersByParams.d.ts

@@ -1,6 +1,6 @@
 import { IFSData } from "../../interfaces/common/IFSData";
 import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Gets filters from the given params.
@@ -17,4 +17,4 @@ import { IFUData } from "../../interfaces/ui/IFUData";
  * @param params given parameters to validate the dataset
  * @returns a new Filter object structure
  */
-export declare function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFFiltersParamsToGetFilter): IFSData | IFUData;
+export declare function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFSParamsToGetFilterSettings): IFSData | IFUData;

package/dist/filters/helpers/common/getFiltersByParams.js

@@ -33,7 +33,7 @@ export function getFiltersByParams(filterData, params, settings) {
                     if (resolveDatasetConditions(dataset, params, settings.letPassUndefinedProperties.dataset, settings.letPassUndefinedParams.dataset)) {
                         return Object.assign(Object.assign({}, dataset), { filters: dataset.filters.map((filter) => {
                                 if (resolveFilterConditions(filter, params, settings.letPassUndefinedProperties.filter, settings.letPassUndefinedParams.filter)) {
-                                    return Object.assign(Object.assign({}, filter), { values: (filter.values || []).map((value) => {
+                                    return Object.assign(Object.assign({}, filter), { values: filter.values.map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
                                                 return rankingValues.map(rValue => {
@@ -48,7 +48,7 @@ export function getFiltersByParams(filterData, params, settings) {
                                             }
                                         }).filter(Boolean) });
                                 }
-                            }).filter(filter => { var _a; return !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || ((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0); }) });
+                            }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0)) });
                     }
                 }).filter(dataset => !isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0)) });
         }

package/dist/filters/helpers/common/getMergeFiltersSettings.d.ts

@@ -1,7 +1,7 @@
-import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 /**
  * Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the MergeFilters settings
  * @returns a new MergeFilters settings object.
  */
-export declare function getMergeFiltersSettings(settings?: IFFiltersMergeFilters): IFFiltersMergeFilters;
+export declare function getMergeFiltersSettings(settings?: IFSMergeFiltersSettings): IFSMergeFiltersSettings;

package/dist/filters/helpers/common/getMergeFiltersSettings.js

@@ -4,10 +4,9 @@
  * @returns a new MergeFilters settings object.
  */
 export function getMergeFiltersSettings(settings) {
-    var _a, _b, _c;
+    var _a, _b;
     return {
-        overwriteFilterProps: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteFilterProps) !== null && _a !== void 0 ? _a : true,
-        overwriteValues: (_b = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _b !== void 0 ? _b : false,
-        setGroupedColumnOperator: (_c = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _c !== void 0 ? _c : true
+        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+        setGroupedColumnOperator: (_b = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _b !== void 0 ? _b : true
     };
 }

package/dist/filters/helpers/common/getParamsToGetFilterSettings.d.ts

@@ -1,7 +1,7 @@
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 /**
  * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the ParamsToGetFilter settings
  * @returns a new ParamsToGetFilter settings object.
  */
-export declare function getParamsToGetFilterSettings(settings?: IFFiltersParamsToGetFilter): IFFiltersParamsToGetFilter;
+export declare function getParamsToGetFilterSettings(settings?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings;

package/dist/filters/helpers/common/index.d.ts

@@ -1,4 +1,5 @@
 export * from './areFiltersEquals';
+export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
@@ -6,23 +7,20 @@ export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';
 export * from './getFiltersByVisibility';
 export * from './getMergeFiltersSettings';
 export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
 export * from './haveFiltersByDataset';
 export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
 export * from './isInValidator';
 export * from './isNullValidator';
 export * from './isRangeValidator';
 export * from './isRegularValidator';
 export * from './mergeFilters';
-export * from './mergeValues';
 export * from './resolveDatasetConditions';
 export * from './resolveFilterConditions';
 export * from './resolveScopeConditions';

package/dist/filters/helpers/common/index.js

@@ -1,4 +1,5 @@
 export * from './areFiltersEquals';
+export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
@@ -6,24 +7,20 @@ export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';
 export * from './getFiltersByVisibility';
 export * from './getMergeFiltersSettings';
 export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
 export * from './haveFiltersByDataset';
 export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
 export * from './isInValidator';
 export * from './isNullValidator';
 export * from './isRangeValidator';
 export * from './isRegularValidator';
 export * from './mergeFilters';
-export * from './mergeValues';
 export * from './resolveDatasetConditions';
 export * from './resolveFilterConditions';
 export * from './resolveScopeConditions';
-// export * from './validateFilterTextByColumn';

package/dist/filters/helpers/common/mergeFilters.d.ts

@@ -1,11 +1,11 @@
 import { IFSData } from "../../interfaces/common/IFSData";
-import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
-export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData;
+export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData;

package/dist/filters/helpers/common/mergeFilters.js

@@ -1,9 +1,11 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
-import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
-import { mergeValues } from "./mergeValues";
+import { isInValidator } from "./isInValidator";
+import { isNullValidator } from "./isNullValidator";
+import { isRangeValidator } from "./isRangeValidator";
+import { isRegularValidator } from "./isRegularValidator";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -11,7 +13,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
 export function mergeFilters(filterData1, filterData2, settings) {
@@ -36,7 +38,7 @@ export function mergeFilters(filterData1, filterData2, settings) {
  * Gets a new scope structure array by merging two scope structures
  * @param scopes1 the target scope structure
  * @param scopes2 the scope to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new scope structure array
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
@@ -57,7 +59,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  * Gets a new dataset structure array by merging two dataset structures
  * @param datasets1 the target dataset structure
  * @param datasets2 the dataset to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
@@ -78,21 +80,19 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  * Gets a new filter structure array by merging two filter structures
  * @param filters1 the target filter structure
  * @param filters2 the filter to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings) });
-            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
+            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
             filters2.splice(filter2Index, 1);
         }
         else {
             filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
         }
-        filter1.filterid = getFilterid(filter1);
         filters.push(filter1);
         return filters;
     }, []);
@@ -101,16 +101,52 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
     return newFilters;
 }
 /**
- * Gets a new filter structure when the setting is configured
+ * Gets a new value structure array by merging two value structures
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param settings configuration of the mergeFilter
- * @returns a new filter structure with overwritted props
+ * @param overwrite Flag to overwrite or not the filter values
+ * @returns a new value structure array
  */
-function mergeFilterProps(filter1, filter2, settings) {
-    var _a, _b, _c;
-    if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+function mergeValues(filter1, filter2, overwrite = false) {
+    if (isEmpty(filter1) && isEmpty(filter2))
+        return [];
+    let newValues = [];
+    if (!overwrite) {
+        if (isInValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values);
+        }
+        else if (isRangeValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values);
+        }
+        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values);
+        }
+        else {
+            filter1.values = filter1.values.concat(filter2.values);
+            newValues = filter1.values;
+        }
+    }
+    else {
+        filter1.values = filter2.values;
+        newValues = filter1.values;
     }
-    return filter1;
+    return newValues;
 }

package/dist/filters/helpers/common/resolveFilterConditions.js

@@ -9,14 +9,14 @@ import { _hasProperty } from "../../../general/object/hasProperty";
  * @returns true: the condition is satisfied
  */
 export function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     return (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'filters') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds.filters == null) || params.enableds.filters === filter.enabled) &&
         (!_hasProperty(params, 'dateSection') || (letPassUndefinedProperties && filter.dateSection == null) || (letPassUndefinedParams && isEmpty(params.dateSection)) || params.dateSection === filter.dateSection) &&
         (!_hasProperty(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && isEmpty(params.panelid)) || params.panelid === filter.extras.panelid) &&
         (!_hasProperty(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && isEmpty(params.property)) || params.property === filter.property) &&
         (!_hasProperty(params, 'validator') || (letPassUndefinedProperties && filter.validator == null) || (letPassUndefinedParams && isEmpty(params.validator)) || params.validator === filter.validator) &&
-        (!_hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && isEmpty(params.column)) || (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) === filter.column.id &&
-            ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) === filter.column.qrveyid &&
-            ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) === filter.column.linkid &&
-            ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) === filter.column.aggregate));
+        (!_hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && isEmpty(params.column)) || ((letPassUndefinedParams && isEmpty((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) || ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
+            (letPassUndefinedParams && isEmpty((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid) || ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
+            (letPassUndefinedParams && isEmpty((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid) || ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
+            (letPassUndefinedParams && isEmpty((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate) || ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate)));
 }

package/dist/filters/helpers/getAggFiltersFromFilterData.d.ts

@@ -1,10 +1,9 @@
 import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
 import { IFSData } from "../interfaces/common/IFSData";
 /**
- * @todo FIX AGGREGATE FILTERS
- * @private
- * @param filterData
- * @param _summaries
- * @returns the aggFilters structure
+ *
+ * @param logics
+ * @param summaries
+ * @returns
  */
 export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;

package/dist/filters/helpers/getAggFiltersFromFilterData.js

@@ -1,12 +1,12 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColumn";
 /**
- * @todo FIX AGGREGATE FILTERS
- * @private
- * @param filterData
- * @param _summaries
- * @returns the aggFilters structure
+ *
+ * @param logics
+ * @param summaries
+ * @returns
  */
+// [TODO: FILTERS - FIX AGGREGATE FILTERS]
 export function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
     if (isEmpty(filterData))

package/dist/filters/helpers/index.d.ts

@@ -6,4 +6,3 @@ export * from './applyHierarchyForAggFilters';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
-export * from './OLD_getAggFilters';

package/dist/filters/helpers/index.js

@@ -3,8 +3,6 @@ export * from './builder/index';
 export * from './common/index';
 export * from './ui/index';
 export * from './applyHierarchyForAggFilters';
-// export * from './getAggFiltersFromFilterData';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
-export * from './OLD_getAggFilters';

package/dist/filters/helpers/ui/getUIFlatFilterByParams.js

@@ -1,6 +1,6 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 /**
   * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
   * The validation to filter the stored filter is depending on:

package/dist/filters/helpers/ui/getUIFlatFiltersByParams.js

@@ -1,6 +1,6 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
    * The validation to filter the stored filter is depending on:

package/dist/filters/helpers/ui/getUIValues.d.ts

@@ -2,9 +2,9 @@ import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFUValue } from "../../interfaces/ui/IFUValue";
 import { IFUUIValueSettings } from "../../interfaces/ui/IFUUIValueSettings";
 /**
- * Gets the UI Values generated depending on the validator
- * @param filter the filter structure
- * @param settings a settings for this function
- * @returns the UI Values
+ * Gets the UI Values from the filter object
+ * @param filter The filter object
+ * @param settings configuration for this function
+ * @returns an array of values
  */
 export declare function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[];

package/dist/filters/helpers/ui/getUIValues.js

@@ -5,23 +5,22 @@ import { COLUMN } from "../../../columns/constants/COLUMN";
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { flattenDeep } from "../../../general/array/flattenDeep";
 import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
-import { getI18nDateGroupLabel } from "../../../globalization/helpers/getI18nDateGroupLabel";
+import { getI18nDateGroupLabel } from "../../..";
 /**
- * Gets the UI Values generated depending on the validator
- * @param filter the filter structure
- * @param settings a settings for this function
- * @returns the UI Values
+ * Gets the UI Values from the filter object
+ * @param filter The filter object
+ * @param settings configuration for this function
+ * @returns an array of values
  */
 export function getUIValues(filter, settings) {
     var _a;
     settings = getUiValuesSettings(settings);
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => ({
+            return filter.values.map(value => ({
                 value: getValueLabel(value.min, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
@@ -29,24 +28,24 @@ export function getUIValues(filter, settings) {
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => ({
+            return filter.values.map(value => ({
                 value: getValueLabel(value.max, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => ({
-                value: `${getValueLabel(value.min, filter, settings)} - ${getValueLabel(value.max, filter, settings)}`,
+            return filter.values.map(value => ({
+                value: `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
                     value: (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO[filter.validator].label,
-                    enabled: settings.addEnableds ? (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
+                    enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR.IN:
-            return values.map(value => {
+            return filter.values.map(value => {
                 const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
                 const from = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.relative_container.from_label') : 'from';
                 const anchor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings === null || settings === void 0 ? void 0 : settings.translate('filter.relative_container.current_date') : 'current date';
@@ -57,9 +56,9 @@ export function getUIValues(filter, settings) {
             });
         default:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-                return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
+                return getRankingUIValues(filter.values, settings.addEnableds, settings.rankingGroupIndex);
             }
-            return values.map(val => ({
+            return (filter.values || []).map(val => ({
                 imageUrl: val.imageUrl,
                 value: getValueLabel(val.value, filter, settings),
                 enabled: settings.addEnableds ? val.enabled != null ? val.enabled : true : undefined,
@@ -74,6 +73,8 @@ function getUiValuesSettings(settings) {
     var _a;
     return {
         addEnableds: (_a = settings === null || settings === void 0 ? void 0 : settings.addEnableds) !== null && _a !== void 0 ? _a : false,
+        rangeSeparator: (settings === null || settings === void 0 ? void 0 : settings.rangeSeparator) || '-',
+        rangeSeparatorPath: settings === null || settings === void 0 ? void 0 : settings.rangeSeparatorPath,
         rankingGroupIndex: settings === null || settings === void 0 ? void 0 : settings.rankingGroupIndex,
         translate: settings === null || settings === void 0 ? void 0 : settings.translate,
     };
@@ -91,3 +92,11 @@ function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
         enabled: addEnableds ? rankingValue.enabled : undefined
     }));
 }
+function getRangeSeparator(settings) {
+    if (!isEmpty(settings.translate) && !isEmpty(settings.rangeSeparatorPath)) {
+        return settings.translate(settings.rangeSeparatorPath);
+    }
+    else {
+        return settings.rangeSeparator;
+    }
+}

package/dist/filters/helpers/ui/index.d.ts

@@ -8,5 +8,4 @@ export * from './getUIFlatFiltersByParams';
 export * from './getUIFlatFiltersByScopes';
 export * from './getUIValues';
 export * from './getUpdatedUIFilters';
-export * from './resolveUIFlatFilterByParams';
 export * from './transformFilterValues';

package/dist/filters/helpers/ui/index.js

@@ -8,5 +8,4 @@ export * from './getUIFlatFiltersByParams';
 export * from './getUIFlatFiltersByScopes';
 export * from './getUIValues';
 export * from './getUpdatedUIFilters';
-export * from './resolveUIFlatFilterByParams';
 export * from './transformFilterValues';

package/dist/filters/helpers/ui/{resolveUIFlatFilterByParams.d.ts → resolveUIFlatFiltersByParams.d.ts}

@@ -1,5 +1,4 @@
-import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
-import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
+import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter

package/dist/filters/helpers/ui/{resolveUIFlatFilterByParams.js → resolveUIFlatFiltersByParams.js}

@@ -1,4 +1,4 @@
-import { isEmpty } from "../../../general/mix/isEmpty";
+import { isEmpty } from "../../../general";
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter

package/dist/filters/helpers/ui/transformFilterValues.d.ts

@@ -1,4 +1,4 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFValue } from "../../interfaces/IFValue";
-import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { IFUTransformFilterValuesSettings } from "../../interfaces/ui/IFUTransformFilterValuesSettings";
-export declare function transformFilterValues(filter: IFUFilter, settings: IFUTransformFilterValuesSettings): IFValue[];
+export declare function transformFilterValues(filter: IFSFilter, settings: IFUTransformFilterValuesSettings): IFValue[];

package/dist/filters/helpers/ui/transformFilterValues.js

@@ -6,14 +6,13 @@ export function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
     if (isEmpty(filter))
         return [];
-    const values = filter.values || [];
     if (isRegularValidator(filter.validator)) {
-        return values.map((value) => (Object.assign(Object.assign({}, value), { value: transformValue(value.value, transformValueSettings) })));
+        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { value: transformValue(value.value, transformValueSettings) })));
     }
     else if (isRangeValidator(filter.validator)) {
-        return values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
+        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
     }
     else {
-        return values;
+        return filter.values;
     }
 }

package/dist/filters/index.d.ts

@@ -3,4 +3,3 @@ export * from './classes/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
-export * from './services/index';

package/dist/filters/index.js

@@ -3,4 +3,3 @@ export * from './classes/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
-export * from './services/index';