@qrvey/utils 1.2.10-9 → 1.3.0-10

package/dist/cjs/filters/helpers/backend/getBackendValues.js

@@ -12,55 +12,54 @@ const FILTER_VALIDATOR_INFO_1 = require("../../constants/common/FILTER_VALIDATOR
  * @returns A collection of backend expression value
  */
 function getBackendValues(filter) {
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL:
             if (filter.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(filter.column.aggregate))
-                return getRankingValues(values);
-            return getResultValues(values, filter);
+                return getRankingValues(filter.values);
+            return getResultValues(filter.values, filter);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH:
-            return values.map(value => value.enabled ? value.value : undefined);
+            return filter.values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lte: value.max, gte: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lt: value.max, gt: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lt: value.max }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lte: value.max }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { gt: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { gte: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && values.every(value => value.enabled);
+            const addValue = filter.values.length > 0 && filter.values.every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label] : [];
         }
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return filter.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -68,13 +67,12 @@ function getBackendValues(filter) {
 exports.getBackendValues = getBackendValues;
 /**
  * Gets the expression values. Depending on the column type
- * @private
  * @param values a collection of filter values
  * @param filter The filter structure
- * @returns Expression values
+ * @returns
  */
 function getResultValues(values, filter) {
-    return (values || []).map((value) => {
+    return values.map((value) => {
         if (value.enabled) {
             if (filter.column.type === COLUMN_1.COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
@@ -87,7 +85,6 @@ function getResultValues(values, filter) {
 }
 /**
  * Gets the Ranking values.
- * @private
  * @param values a collection of filter values in the ranking structure
  * @param rankingGroupIndex determine the value by this index to build and return it
  * @returns Expression values for ranking

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

@@ -6,5 +6,5 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
-export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';
+export * from './getLogicByScopes';

package/dist/cjs/filters/helpers/backend/index.js

@@ -22,6 +22,5 @@ __exportStar(require("./getBackendGroupValue"), exports);
 __exportStar(require("./getBackendProperty"), exports);
 __exportStar(require("./getBackendValidator"), exports);
 __exportStar(require("./getBackendValues"), exports);
-__exportStar(require("./getLogicByScopes"), exports);
 __exportStar(require("./getLogicByScopesHierarchy"), exports);
-// export * from './hasDatasetRelatedFilters';
+__exportStar(require("./getLogicByScopes"), exports);

package/dist/cjs/filters/helpers/builder/getFilterBuilderGeneralConfig.d.ts

@@ -1,7 +1,7 @@
-import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
+import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
 /**
  * Returns a filter builder config object by a any given config
  * @param config any config object
  * @returns The filter builder config object
  */
-export declare function getFilterBuilderGeneralConfig(config?: any): IFilterConfig;
+export declare function getFilterBuilderGeneralConfig(config?: any): IFilterBuilderGeneralConfig;

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

@@ -28,7 +28,7 @@ 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 => {
@@ -43,7 +43,7 @@ function excludeFiltersByParams(filterData, params) {
                                             }
                                         }).filter(Boolean) });
                                 }
-                            }).filter(filter => { var _a; return !(0, isEmpty_1.isEmpty)(filter) && (filter.selectAll && ((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0); }) });
+                            }).filter(filter => !(0, isEmpty_1.isEmpty)(filter) && filter.values.length > 0) });
                     }
                 }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0) });
         }
@@ -63,7 +63,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) &&
         ((0, isEmpty_1.isEmpty)(params.dateSection) || params.dateSection !== filter.dateSection) &&
         ((0, isEmpty_1.isEmpty)(params.panelid) || params.panelid !== filter.extras.panelid) &&
@@ -73,5 +73,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/cjs/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/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFiltersByDatasetsColumns = void 0;
+const isEmpty_1 = require("../../../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
+ */
+function getFiltersByDatasetsColumns(data, datasets = []) {
+    if ((0, isEmpty_1.isEmpty)(data) || (0, isEmpty_1.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 (!(0, isEmpty_1.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 (!(0, isEmpty_1.isEmpty)(column)) {
+                                return Object.assign({}, filter);
+                            }
+                        }).filter(Boolean) });
+                }
+            }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0) }))).filter(scope => !(0, isEmpty_1.isEmpty)(scope) && scope.datasets.length > 0) });
+}
+exports.getFiltersByDatasetsColumns = getFiltersByDatasetsColumns;

package/dist/cjs/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/cjs/filters/helpers/common/getFiltersByParams.js

@@ -36,7 +36,7 @@ function getFiltersByParams(filterData, params, settings) {
                     if ((0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset, params, settings.letPassUndefinedProperties.dataset, settings.letPassUndefinedParams.dataset)) {
                         return Object.assign(Object.assign({}, dataset), { filters: dataset.filters.map((filter) => {
                                 if ((0, resolveFilterConditions_1.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 => {
@@ -51,7 +51,7 @@ function getFiltersByParams(filterData, params, settings) {
                                             }
                                         }).filter(Boolean) });
                                 }
-                            }).filter(filter => { var _a; return !(0, isEmpty_1.isEmpty)(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || ((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0); }) });
+                            }).filter(filter => !(0, isEmpty_1.isEmpty)(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0)) });
                     }
                 }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0)) });
         }

package/dist/cjs/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/cjs/filters/helpers/common/getMergeFiltersSettings.js

@@ -7,11 +7,10 @@ exports.getMergeFiltersSettings = void 0;
  * @returns a new MergeFilters settings object.
  */
 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
     };
 }
 exports.getMergeFiltersSettings = getMergeFiltersSettings;

package/dist/cjs/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/cjs/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/cjs/filters/helpers/common/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./areFiltersEquals"), exports);
+__exportStar(require("./isDateDistinctProperty"), exports);
 __exportStar(require("./excludeFiltersByAggregateColumn"), exports);
 __exportStar(require("./excludeFiltersByParams"), exports);
 __exportStar(require("./excludeFiltersByScopes"), exports);
@@ -22,24 +23,20 @@ __exportStar(require("./getFilterColumnLabel"), exports);
 __exportStar(require("./getFilterid"), exports);
 __exportStar(require("./getFilterLabel"), exports);
 __exportStar(require("./getFiltersByAggregateColumn"), exports);
+__exportStar(require("./getFiltersByDatasetsColumns"), exports);
 __exportStar(require("./getFiltersByParams"), exports);
 __exportStar(require("./getFiltersByScopes"), exports);
 __exportStar(require("./getFiltersByScopesIds"), exports);
 __exportStar(require("./getFiltersByVisibility"), exports);
 __exportStar(require("./getMergeFiltersSettings"), exports);
 __exportStar(require("./getParamsToGetFilterSettings"), exports);
-__exportStar(require("./getValuesFromModel"), exports);
-__exportStar(require("./getValuesFromDataset"), exports);
 __exportStar(require("./haveFiltersByDataset"), exports);
 __exportStar(require("./isBetweenValidator"), exports);
-__exportStar(require("./isDateDistinctProperty"), exports);
 __exportStar(require("./isInValidator"), exports);
 __exportStar(require("./isNullValidator"), exports);
 __exportStar(require("./isRangeValidator"), exports);
 __exportStar(require("./isRegularValidator"), exports);
 __exportStar(require("./mergeFilters"), exports);
-__exportStar(require("./mergeValues"), exports);
 __exportStar(require("./resolveDatasetConditions"), exports);
 __exportStar(require("./resolveFilterConditions"), exports);
 __exportStar(require("./resolveScopeConditions"), exports);
-// export * from './validateFilterTextByColumn';

package/dist/cjs/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/cjs/filters/helpers/common/mergeFilters.js

@@ -4,9 +4,11 @@ exports.mergeFilters = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
 const FILTER_GROUPED_COLUMN_OPERATOR_1 = require("../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR");
-const getFilterid_1 = require("./getFilterid");
 const getMergeFiltersSettings_1 = require("./getMergeFiltersSettings");
-const mergeValues_1 = require("./mergeValues");
+const isInValidator_1 = require("./isInValidator");
+const isNullValidator_1 = require("./isNullValidator");
+const isRangeValidator_1 = require("./isRangeValidator");
+const isRegularValidator_1 = require("./isRegularValidator");
 const resolveDatasetConditions_1 = require("./resolveDatasetConditions");
 const resolveFilterConditions_1 = require("./resolveFilterConditions");
 const resolveScopeConditions_1 = require("./resolveScopeConditions");
@@ -14,7 +16,7 @@ const resolveScopeConditions_1 = require("./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
  */
 function mergeFilters(filterData1, filterData2, settings) {
@@ -40,7 +42,7 @@ exports.mergeFilters = mergeFilters;
  * 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) {
@@ -61,7 +63,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) {
@@ -82,21 +84,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 => (0, resolveFilterConditions_1.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: (0, mergeValues_1.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_1.FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
         }
-        filter1.filterid = (0, getFilterid_1.getFilterid)(filter1);
         filters.push(filter1);
         return filters;
     }, []);
@@ -105,16 +105,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 ((0, isEmpty_1.isEmpty)(filter1) && (0, isEmpty_1.isEmpty)(filter2))
+        return [];
+    let newValues = [];
+    if (!overwrite) {
+        if ((0, isInValidator_1.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 ((0, isRangeValidator_1.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 ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.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/cjs/filters/helpers/common/resolveFilterConditions.js

@@ -12,15 +12,15 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  * @returns true: the condition is satisfied
  */
 function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     return (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'filters') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds.filters == null) || params.enableds.filters === filter.enabled) &&
         (!(0, hasProperty_1._hasProperty)(params, 'dateSection') || (letPassUndefinedProperties && filter.dateSection == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.dateSection)) || params.dateSection === filter.dateSection) &&
         (!(0, hasProperty_1._hasProperty)(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.panelid)) || params.panelid === filter.extras.panelid) &&
         (!(0, hasProperty_1._hasProperty)(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.property)) || params.property === filter.property) &&
         (!(0, hasProperty_1._hasProperty)(params, 'validator') || (letPassUndefinedProperties && filter.validator == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.validator)) || params.validator === filter.validator) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && (0, isEmpty_1.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));
+        (!(0, hasProperty_1._hasProperty)(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.column)) || ((letPassUndefinedParams && (0, isEmpty_1.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 && (0, isEmpty_1.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 && (0, isEmpty_1.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 && (0, isEmpty_1.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)));
 }
 exports.resolveFilterConditions = resolveFilterConditions;

package/dist/cjs/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/cjs/filters/helpers/getAggFiltersFromFilterData.js

@@ -4,12 +4,12 @@ exports.getAggFiltersFromFilterData = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const getFiltersByAggregateColumn_1 = require("./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]
 function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, (0, getFiltersByAggregateColumn_1.getFiltersByAggregateColumn)(filterData));
     if ((0, isEmpty_1.isEmpty)(filterData))

package/dist/cjs/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/cjs/filters/helpers/index.js

@@ -19,8 +19,6 @@ __exportStar(require("./builder/index"), exports);
 __exportStar(require("./common/index"), exports);
 __exportStar(require("./ui/index"), exports);
 __exportStar(require("./applyHierarchyForAggFilters"), exports);
-// export * from './getAggFiltersFromFilterData';
 __exportStar(require("./getAvailableScopes"), exports);
 __exportStar(require("./getAvailableScopesIDsByConfig"), exports);
 __exportStar(require("./getScopesByHierarchy"), exports);
-__exportStar(require("./OLD_getAggFilters"), exports);

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUIFlatFilterByParams = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
-const resolveUIFlatFilterByParams_1 = require("./resolveUIFlatFilterByParams");
+const resolveUIFlatFiltersByParams_1 = require("./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:
@@ -20,6 +20,6 @@ function getUIFlatFilterByParams(uFilters = [], params = {}, getIndex = false) {
     if ((0, isEmpty_1.isEmpty)(params))
         return;
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return getIndex ? uFilters.findIndex(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params)) : uFilters.find(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params));
+    return getIndex ? uFilters.findIndex(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params)) : uFilters.find(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params));
 }
 exports.getUIFlatFilterByParams = getUIFlatFilterByParams;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUIFlatFiltersByParams = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
-const resolveUIFlatFilterByParams_1 = require("./resolveUIFlatFilterByParams");
+const resolveUIFlatFiltersByParams_1 = require("./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:
@@ -21,6 +21,6 @@ function getUIFlatFiltersByParams(uFilters = [], params = {}) {
     if ((0, isEmpty_1.isEmpty)(params))
         return;
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return uFilters.filter(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params));
+    return uFilters.filter(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params));
 }
 exports.getUIFlatFiltersByParams = getUIFlatFiltersByParams;

package/dist/cjs/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[];