@qrvey/utils 1.2.10-9 → 1.3.0-2

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

@@ -1,8 +1,6 @@
 export * from './transformFilters';
-export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
-export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';

package/dist/filters/adapters/index.js

@@ -1,8 +1,6 @@
 export * from './transformFilters';
-export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
-export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';

package/dist/filters/adapters/logicToFlatUI.js

@@ -52,7 +52,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
     const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
@@ -67,18 +67,18 @@ function getFilterByExpression(expression, scopeItem) {
             qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
             aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) || ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
             calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) || ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
-            label: _get(uiExtras.column, 'text') || _get(uiExtras.column, 'label'),
+            label: _get(uiExtras.column, 'text') || ((_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.label),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
-            outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
-            type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
+            outputFormat: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.outputFormat,
+            type: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.type,
         },
         dateSection: uiExtras.dateSection,
         displayed: true,
         enabled: uiExtras.enabled,
         extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
             scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
+                collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -87,16 +87,15 @@ function getFilterByExpression(expression, scopeItem) {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
-                label: _get(uiExtras.column, 'dataset.name') || _get(uiExtras.column, 'label'),
-                linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
+                qrveyid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.qrveyid,
+                label: _get(uiExtras.column, 'dataset.name') || ((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.label),
+                linkid: (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
-        selectAll: uiExtras.selectAll,
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };

package/dist/filters/constants/builder/FILTER_BUILDER_SCOPE_LABEL.js

@@ -1,4 +1,4 @@
-import { FILTER_SCOPE } from "../common/FILTER_SCOPE";
+import { FILTER_SCOPE } from "..";
 export const FILTER_BUILDER_SCOPE_LABEL = {
     [FILTER_SCOPE.GLOBAL]: 'All pages',
     [FILTER_SCOPE.PAGE]: 'Current page',

package/dist/filters/constants/builder/STATIC_OPTION_COLUMNS.d.ts

@@ -1,2 +1,2 @@
-import { IColumnType } from "../../../columns/interfaces/IColumnType";
-export declare const STATIC_OPTION_COLUMNS: IColumnType[];
+import { COLUMN } from "../../../columns/constants/COLUMN";
+export declare const STATIC_OPTION_COLUMNS: COLUMN[];

package/dist/filters/constants/builder/index.d.ts

@@ -3,7 +3,6 @@ export * from './COLUMNS_FOR_EQUALS_LAYOUT';
 export * from './COLUMNS_FOR_EQUALS_NULL_LAYOUT';
 export * from './COLUMNS_FOR_NULL_LAYOUT';
 export * from './COLUMNS_FOR_TEXT_LAYOUT';
-export * from './FILTER_BUILDER_SCOPE_LABEL';
 export * from './FILTER_FLOW';
 export * from './FILTER_VALIDATORS_FOR_SLIDEBAR';
 export * from './FILTER_VALIDATORS_FOR_WINDOW';

package/dist/filters/constants/builder/index.js

@@ -3,7 +3,6 @@ export * from './COLUMNS_FOR_EQUALS_LAYOUT';
 export * from './COLUMNS_FOR_EQUALS_NULL_LAYOUT';
 export * from './COLUMNS_FOR_NULL_LAYOUT';
 export * from './COLUMNS_FOR_TEXT_LAYOUT';
-export * from './FILTER_BUILDER_SCOPE_LABEL';
 export * from './FILTER_FLOW';
 export * from './FILTER_VALIDATORS_FOR_SLIDEBAR';
 export * from './FILTER_VALIDATORS_FOR_WINDOW';

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

@@ -4,8 +4,8 @@ import { IFUChartSettings } from "../interfaces/ui/IFUChartSettings";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes the pair id/label scopes
- * @param currentScope the scope to be validated
- * @returns the chart settings
+ * @param scopes
+ * @param currentScope
+ * @returns
  */
 export declare function applyHierarchyForAggFilters(chartSettings: IFUChartSettings, scopes?: IFSScopeID[], currentScope?: IFScope): IFUChartSettings;

package/dist/filters/helpers/applyHierarchyForAggFilters.js

@@ -5,9 +5,9 @@ import { getScopesByHierarchy } from "./getScopesByHierarchy";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes the pair id/label scopes
- * @param currentScope the scope to be validated
- * @returns the chart settings
+ * @param scopes
+ * @param currentScope
+ * @returns
  */
 export function applyHierarchyForAggFilters(chartSettings, scopes = [], currentScope = FILTER_SCOPE.GLOBAL) {
     if (isEmpty(chartSettings))

package/dist/filters/helpers/backend/buildExpression.js

@@ -9,15 +9,14 @@ import { getBackendValues } from "./getBackendValues";
  * @returns a filter expression
  */
 export function buildExpression(filter) {
-    var _a;
     const expression = {
         groupValue: getBackendGroupValue(filter),
         questionid: filter.column.id,
         questionType: filter.column.type,
         property: getBackendProperty(filter),
-        validationType: getBackendValidator(filter),
+        validationType: getBackendValidator(filter.validator),
         value: getBackendValues(filter),
     };
-    expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
+    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
     return expression;
 }

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.d.ts

@@ -1,10 +1,8 @@
 import { IFBFilterAggregate } from "../../interfaces/backend/IFBFilterAggregate";
 /**
- * @todo Make a proper description for this function
  *
- * Gets the aggFilters structure by an index
- * @param aggFilters The aggFilter Structure
- * @param summaryIndex an index
- * @returns a new aggFilters structure
+ * @param aggFilters
+ * @param summaryIndex
+ * @returns
  */
 export declare function getAggFiltersBySummaryIndex(aggFilters: IFBFilterAggregate, summaryIndex: number): IFBFilterAggregate;

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js

@@ -1,11 +1,9 @@
 import { filterNestedTree } from "../../../general/array/filterNestedTree";
 /**
- * @todo Make a proper description for this function
  *
- * Gets the aggFilters structure by an index
- * @param aggFilters The aggFilter Structure
- * @param summaryIndex an index
- * @returns a new aggFilters structure
+ * @param aggFilters
+ * @param summaryIndex
+ * @returns
  */
 export function getAggFiltersBySummaryIndex(aggFilters, summaryIndex) {
     if (!aggFilters)

package/dist/filters/helpers/backend/getBackendValidator.d.ts

@@ -1,8 +1,8 @@
 import { IFBackendValidator } from "../../interfaces/backend/IFBackendValidator";
-import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFValidator } from "../../interfaces/IFValidator";
 /**
  * Gets the Validator that is used in requests
  * @param validator Filter Validator used in UI
  * @returns Filter Validator used in Backend
  */
-export declare function getBackendValidator(filter: IFSFilter): IFBackendValidator;
+export declare function getBackendValidator(validator: IFValidator): IFBackendValidator;

package/dist/filters/helpers/backend/getBackendValidator.js

@@ -5,12 +5,12 @@ import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
  * @param validator Filter Validator used in UI
  * @returns Filter Validator used in Backend
  */
-export function getBackendValidator(filter) {
-    switch (filter.validator) {
+export function getBackendValidator(validator) {
+    switch (validator) {
         case FILTER_VALIDATOR.EQUALS:
-            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.NOT_EQUAL : FILTER_BACKEND_VALIDATOR.EQUALS;
+            return FILTER_BACKEND_VALIDATOR.EQUALS;
         case FILTER_VALIDATOR.NOT_EQUAL:
-            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.EQUALS : FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+            return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
         case FILTER_VALIDATOR.CONTAINS:
             return FILTER_BACKEND_VALIDATOR.CONTAINS;
         case FILTER_VALIDATOR.NOT_CONTAIN:

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

@@ -9,68 +9,66 @@ import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_I
  * @returns A collection of backend expression value
  */
 export function getBackendValues(filter) {
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate))
-                return getRankingValues(values);
-            return getResultValues(values, filter);
+                return getRankingValues(filter.values);
+            return getResultValues(filter.values, filter);
         case FILTER_VALIDATOR.CONTAINS:
         case FILTER_VALIDATOR.NOT_CONTAIN:
         case FILTER_VALIDATOR.STARTS_WITH:
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case 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.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.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.BEFORE:
         case 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.BEFORE_ON:
         case 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.AFTER:
         case 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.AFTER_ON:
         case 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.IS_NULL:
         case 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[filter.validator].label] : [];
         }
         case 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 [];
     }
 }
 /**
  * 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.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
@@ -83,7 +81,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/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/filters/helpers/backend/index.js

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

package/dist/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/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/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';
@@ -12,17 +13,13 @@ 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';
@@ -12,18 +13,13 @@ 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;
 }