@qrvey/utils 1.3.0-4 → 1.3.0-7

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

@@ -12,54 +12,55 @@ 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(filter.values);
-            return getResultValues(filter.values, filter);
+                return getRankingValues(values);
+            return getResultValues(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 filter.values.map(value => value.enabled ? value.value : undefined);
+            return values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return filter.values.map(value => value.enabled ?
+            return values.map(value => value.enabled ?
                 { lte: value.max, gte: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return filter.values.map(value => value.enabled ?
+            return 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 filter.values.map(value => value.enabled ?
+            return 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 filter.values.map(value => value.enabled ?
+            return 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 filter.values.map(value => value.enabled ?
+            return 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 filter.values.map(value => value.enabled ?
+            return 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 = filter.values.length > 0 && filter.values.every(value => value.enabled);
+            const addValue = values.length > 0 && 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 filter.values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -67,12 +68,13 @@ 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
+ * @returns Expression values
  */
 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;
@@ -85,6 +87,7 @@ 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 './getLogicByScopesHierarchy';
 export * from './getLogicByScopes';
+export * from './getLogicByScopesHierarchy';

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

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

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

@@ -1,7 +1,7 @@
-import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
+import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
 /**
  * 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): IFilterBuilderGeneralConfig;
+export declare function getFilterBuilderGeneralConfig(config?: any): IFilterConfig;

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 => !(0, isEmpty_1.isEmpty)(filter) && filter.values.length > 0) });
+                            }).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(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;
+    var _a, _b, _c, _d, _e;
     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) &&
-        filter.values.length > 0;
+        ((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0;
 }

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 { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
+import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
 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?: IFSParamsToGetFilterSettings): IFSData | IFUData;
+export declare function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFFiltersParamsToGetFilter): 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 => !(0, isEmpty_1.isEmpty)(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0)) });
+                            }).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(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 { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
+import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
 /**
  * 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?: IFSMergeFiltersSettings): IFSMergeFiltersSettings;
+export declare function getMergeFiltersSettings(settings?: IFFiltersMergeFilters): IFFiltersMergeFilters;

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

@@ -7,10 +7,11 @@ exports.getMergeFiltersSettings = void 0;
  * @returns a new MergeFilters settings object.
  */
 function getMergeFiltersSettings(settings) {
-    var _a, _b;
+    var _a, _b, _c;
     return {
-        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
+        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
     };
 }
 exports.getMergeFiltersSettings = getMergeFiltersSettings;

package/dist/cjs/filters/helpers/common/getMergeValuesSettings.d.ts

@@ -0,0 +1,7 @@
+import { IFFiltersMergeValues } from "../../interfaces/functions/IFFiltersMergeValues";
+/**
+ * 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 getMergeValuesSettings(settings?: IFFiltersMergeValues): IFFiltersMergeValues;

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMergeValuesSettings = void 0;
+/**
+ * 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.
+ */
+function getMergeValuesSettings(settings) {
+    var _a;
+    return {
+        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+    };
+}
+exports.getMergeValuesSettings = getMergeValuesSettings;

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

@@ -1,7 +1,7 @@
-import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
+import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
 /**
  * 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?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings;
+export declare function getParamsToGetFilterSettings(settings?: IFFiltersParamsToGetFilter): IFFiltersParamsToGetFilter;

package/dist/cjs/filters/helpers/common/getValuesFromDataset.d.ts

@@ -0,0 +1,8 @@
+import { IFBData } from "../../interfaces/backend/IFBData";
+import { IFFiltersGetValuesFromDataset } from "../../interfaces/functions/IFFiltersGetValuesFromDataset";
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given dataset.
+ * @returns The values.
+ */
+export declare function getValuesFromDataset(props: IFFiltersGetValuesFromDataset): IFBData;

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getValuesFromDataset = void 0;
+const getDataAnswersByColumn_1 = require("../../../qrvey/helpers/getDataAnswersByColumn");
+const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterValue");
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given dataset.
+ * @returns The values.
+ */
+function getValuesFromDataset(props) {
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, dataset: props.dataset, property: props.property, lookupDisplay: props.lookupDisplay });
+    const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
+    const values = { data, total: data.length };
+    if (props.value) {
+        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+    }
+    return values;
+}
+exports.getValuesFromDataset = getValuesFromDataset;

package/dist/cjs/filters/helpers/common/getValuesFromModel.d.ts

@@ -0,0 +1,8 @@
+import { IFBData } from "../../interfaces/backend/IFBData";
+import { IFFiltersGetValuesFromModel } from "../../interfaces/functions/IFFiltersGetValuesFromModel";
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given model.
+ * @returns The values.
+ */
+export declare function getValuesFromModel(props: IFFiltersGetValuesFromModel): IFBData;

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getValuesFromModel = void 0;
+const getDataAnswersByColumn_1 = require("../../../qrvey/helpers/getDataAnswersByColumn");
+const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterValue");
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given model.
+ * @returns The values.
+ */
+function getValuesFromModel(props) {
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, model: props.model, property: props.property, lookupDisplay: props.lookupDisplay });
+    const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
+    const values = { data, total: data.length };
+    if (props.value) {
+        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+    }
+    return values;
+}
+exports.getValuesFromModel = getValuesFromModel;

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

@@ -1,5 +1,4 @@
 export * from './areFiltersEquals';
-export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
@@ -13,13 +12,17 @@ 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,7 +15,6 @@ 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);
@@ -29,13 +28,18 @@ __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 { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
+import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
 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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
-export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData;
+export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData;

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

@@ -4,11 +4,9 @@ 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 isInValidator_1 = require("./isInValidator");
-const isNullValidator_1 = require("./isNullValidator");
-const isRangeValidator_1 = require("./isRangeValidator");
-const isRegularValidator_1 = require("./isRegularValidator");
+const mergeValues_1 = require("./mergeValues");
 const resolveDatasetConditions_1 = require("./resolveDatasetConditions");
 const resolveFilterConditions_1 = require("./resolveFilterConditions");
 const resolveScopeConditions_1 = require("./resolveScopeConditions");
@@ -16,7 +14,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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
 function mergeFilters(filterData1, filterData2, settings) {
@@ -42,7 +40,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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new scope structure array
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
@@ -63,7 +61,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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
@@ -84,19 +82,21 @@ 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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @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: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
+            filter1 = Object.assign(Object.assign({}, filter1), { values: (0, mergeValues_1.mergeValues)(filter1, filters2[filter2Index], settings) });
+            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             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,52 +105,16 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
     return newFilters;
 }
 /**
- * Gets a new value structure array by merging two value structures
+ * Gets a new filter structure when the setting is configured
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param overwrite Flag to overwrite or not the filter values
- * @returns a new value structure array
+ * @param settings configuration of the mergeFilter
+ * @returns a new filter structure with overwritted props
  */
-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;
+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 });
     }
-    return newValues;
+    return filter1;
 }

package/dist/cjs/filters/helpers/common/mergeValues.d.ts

@@ -0,0 +1,11 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFFiltersMergeValues } from "../../interfaces/functions/IFFiltersMergeValues";
+import { IFValue } from "../../interfaces/IFValue";
+/**
+ * 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 value structure array
+ */
+export declare function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeValues): IFValue[];

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

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeValues = void 0;
+const isEmpty_1 = require("../../../general/mix/isEmpty");
+const getMergeValuesSettings_1 = require("./getMergeValuesSettings");
+const isInValidator_1 = require("./isInValidator");
+const isNullValidator_1 = require("./isNullValidator");
+const isRangeValidator_1 = require("./isRangeValidator");
+const isRegularValidator_1 = require("./isRegularValidator");
+/**
+ * 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 value structure array
+ */
+function mergeValues(filter1, filter2, settings) {
+    if ((0, isEmpty_1.isEmpty)(filter1) && (0, isEmpty_1.isEmpty)(filter2))
+        return [];
+    settings = (0, getMergeValuesSettings_1.getMergeValuesSettings)(settings);
+    let newValues = [];
+    let filter1Values = filter1.values || [];
+    const filter2Values = filter2.values || [];
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    }
+    else {
+        if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.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);
+                }
+                else {
+                    values[value1Index] = {
+                        anchor: value2.anchor,
+                        cursor: value2.cursor,
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else {
+            filter1Values = filter1Values.concat(filter2Values);
+            newValues = filter1Values;
+        }
+    }
+    return newValues;
+}
+exports.mergeValues = mergeValues;