@qrvey/utils 1.2.10-6 → 1.2.10-9

package/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: node:16.14.1
+image: node:16.14
 
 pipelines:
   default:

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/index.d.ts

@@ -22,6 +22,7 @@ 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

@@ -38,6 +38,7 @@ __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);

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

@@ -6,10 +6,7 @@ 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");
@@ -92,7 +89,7 @@ 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) });
+            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);
         }
@@ -115,60 +112,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
+    var _a, _b, _c;
     if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+        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 filter1;
 }
-/**
- * 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 [];
-    let newValues = [];
-    let filter1Values = filter1.values || [];
-    const filter2Values = filter2.values || [];
-    if (!settings.overwriteValues) {
-        if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                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);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else {
-            filter1Values = filter1Values.concat(filter2Values);
-            newValues = filter1Values;
-        }
-    }
-    else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
-    return newValues;
-}

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,92 @@
+"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;
+                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,
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : 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;
+                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : 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;
+                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : 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;

package/dist/cjs/filters/interfaces/functions/IFFiltersMergeFilters.d.ts

@@ -1,8 +1,8 @@
+import { IFFiltersMergeValues } from "./IFFiltersMergeValues";
 /**
  * Structure for MergeFilters property settings
  */
-export interface IFFiltersMergeFilters {
+export interface IFFiltersMergeFilters extends IFFiltersMergeValues {
     overwriteFilterProps?: boolean;
-    overwriteValues?: boolean;
     setGroupedColumnOperator?: boolean;
 }

package/dist/cjs/filters/interfaces/functions/IFFiltersMergeValues.d.ts

@@ -0,0 +1,3 @@
+export interface IFFiltersMergeValues {
+    overwriteValues?: boolean;
+}

package/dist/cjs/filters/interfaces/functions/IFFiltersMergeValues.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/filters/interfaces/functions/index.d.ts

@@ -2,4 +2,5 @@ export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';
 export * from './IFFiltersMergeFilters';
+export * from './IFFiltersMergeValues';
 export * from './IFFiltersParamsToGetFilter';

package/dist/cjs/filters/interfaces/functions/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./IFFiltersGetData"), exports);
 __exportStar(require("./IFFiltersGetValuesFromDataset"), exports);
 __exportStar(require("./IFFiltersGetValuesFromModel"), exports);
 __exportStar(require("./IFFiltersMergeFilters"), exports);
+__exportStar(require("./IFFiltersMergeValues"), exports);
 __exportStar(require("./IFFiltersParamsToGetFilter"), exports);

package/dist/cjs/format/localization.js

@@ -30,6 +30,7 @@ const formatWithLocale = (value, outputFormat, config = {}) => {
     }
 };
 exports.formatWithLocale = formatWithLocale;
+const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
     const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, '');
@@ -41,18 +42,31 @@ function formatLocaleDate(value, outputFormat, config) {
             langOpts = definition_1.DATETIME_OPTIONS;
     }
     try {
-        return new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], langOpts).format(dateParam);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = DATE_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], langOpts);
+            DATE_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(dateParam);
     }
     catch (error) {
         return (0, isEmpty_1.isEmpty)(dateParam) ? value : new Intl.DateTimeFormat(definition_1.LANG_DEFAULT, langOpts).format(dateParam);
     }
 }
+const NUMBER_FORMAT_CACHE = [];
 function formatLocaleNumber(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
     const langOpts = options || getLocaleOptions(outputFormat);
     const valueToFormat = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Percentage" /* PERCENTAGE */ ? value / 100 : value;
     try {
-        return new Intl.NumberFormat([lang, definition_1.LANG_DEFAULT], langOpts).format(valueToFormat);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = NUMBER_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.NumberFormat([lang, definition_1.LANG_DEFAULT], langOpts);
+            NUMBER_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(valueToFormat);
     }
     catch (e) {
         return new Intl.NumberFormat(definition_1.LANG_DEFAULT, langOpts).format(valueToFormat);

package/dist/cjs/globalization/interfaces/dashboard/II18nDashboardToast.d.ts

@@ -3,4 +3,5 @@ export interface II18nDashboardToast {
     delete_record_message: string;
     add_record_message: string;
     data_views_updated_message: string;
+    failed_download: string;
 }

package/dist/cjs/globalization/interfaces/filters/II18nFilterPanel.d.ts

@@ -8,6 +8,7 @@ export interface II18nFilterPanel {
     aggregated_filters_label: string;
     aggregated_filters_tooltip: string;
     card_action: II18nFilterPanelCardAction;
+    card_all_except: string;
     card_all_selected: string;
     card_none_selected: string;
     collapsed_title: string;

package/dist/cjs/globalization/interfaces/filters/II18nValueContainer.d.ts

@@ -1,7 +1,8 @@
 import { II18nValueContainerSearchInput } from "./II18nValueContainerSearchInput";
 export interface II18nValueContainer {
-    search_input: II18nValueContainerSearchInput;
+    all_except: string;
+    all_selected: string;
     no_label: string;
     no_records_message: string;
-    all_selected: string;
+    search_input: II18nValueContainerSearchInput;
 }

package/dist/cjs/globalization/labels/dashboard/I18N_DASHBOARD.js

@@ -26,6 +26,7 @@ exports.I18N_DASHBOARD = {
         data_views_updated_message: 'Data views updated successfully.',
         delete_record_message: 'Record Successfully Deleted.',
         refresh_table_message: 'Record Successfully Edited.',
+        failed_download: 'The file(s) could not be exported at this time.',
     },
     tooltips: {
         buckets: "Buckets",

package/dist/cjs/globalization/labels/filters/I18N_FILTER_PANEL.js

@@ -5,6 +5,7 @@ exports.I18N_FILTER_PANEL = {
     collapsed_title: 'Filters',
     aggregated_filters_label: 'Aggregated Filters',
     aggregated_filters_tooltip: 'Logic is not editable for aggregated filters',
+    card_all_except: 'All Except:',
     card_all_selected: 'All Selected',
     card_none_selected: 'None',
     empty_state: {

package/dist/cjs/globalization/labels/filters/I18N_VALUE_CONTAINER.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18N_VALUE_CONTAINER = void 0;
 exports.I18N_VALUE_CONTAINER = {
+    all_except: 'All Except:',
+    all_selected: 'All Selected',
     no_label: 'No Label',
     no_records_message: 'No records found',
     search_input: {
@@ -10,5 +12,4 @@ exports.I18N_VALUE_CONTAINER = {
         enter_value_third_label: "to Insert",
         placeholder: 'Search or type values separated by commas. Use {{ for tokens.',
     },
-    all_selected: 'All Selected',
 };

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

@@ -0,0 +1,11 @@
+/**
+ * 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 function getMergeValuesSettings(settings) {
+    var _a;
+    return {
+        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+    };
+}

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

@@ -22,6 +22,7 @@ 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

@@ -22,6 +22,7 @@ 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/mergeFilters.js

@@ -3,10 +3,7 @@ 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 { isInValidator } from "./isInValidator";
-import { isNullValidator } from "./isNullValidator";
-import { isRangeValidator } from "./isRangeValidator";
-import { isRegularValidator } from "./isRegularValidator";
+import { mergeValues } from "./mergeValues";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -111,60 +108,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
+    var _a, _b, _c;
     if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+        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 filter1;
 }
-/**
- * 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 (isEmpty(filter1) && isEmpty(filter2))
-        return [];
-    let newValues = [];
-    let filter1Values = filter1.values || [];
-    const filter2Values = filter2.values || [];
-    if (!settings.overwriteValues) {
-        if (isInValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                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);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if (isRangeValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else {
-            filter1Values = filter1Values.concat(filter2Values);
-            newValues = filter1Values;
-        }
-    }
-    else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
-    return newValues;
-}

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

@@ -0,0 +1,88 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { getMergeValuesSettings } from "./getMergeValuesSettings";
+import { isInValidator } from "./isInValidator";
+import { isNullValidator } from "./isNullValidator";
+import { isRangeValidator } from "./isRangeValidator";
+import { isRegularValidator } from "./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
+ */
+export function mergeValues(filter1, filter2, settings) {
+    if (isEmpty(filter1) && isEmpty(filter2))
+        return [];
+    settings = getMergeValuesSettings(settings);
+    let newValues = [];
+    let filter1Values = filter1.values || [];
+    const filter2Values = filter2.values || [];
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    }
+    else {
+        if (isInValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a;
+                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,
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if (isRangeValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a;
+                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a;
+                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else {
+            filter1Values = filter1Values.concat(filter2Values);
+            newValues = filter1Values;
+        }
+    }
+    return newValues;
+}

package/dist/filters/interfaces/functions/IFFiltersMergeFilters.d.ts

@@ -1,8 +1,8 @@
+import { IFFiltersMergeValues } from "./IFFiltersMergeValues";
 /**
  * Structure for MergeFilters property settings
  */
-export interface IFFiltersMergeFilters {
+export interface IFFiltersMergeFilters extends IFFiltersMergeValues {
     overwriteFilterProps?: boolean;
-    overwriteValues?: boolean;
     setGroupedColumnOperator?: boolean;
 }

package/dist/filters/interfaces/functions/IFFiltersMergeValues.d.ts

@@ -0,0 +1,3 @@
+export interface IFFiltersMergeValues {
+    overwriteValues?: boolean;
+}

package/dist/filters/interfaces/functions/IFFiltersMergeValues.js

@@ -0,0 +1 @@
+export {};

package/dist/filters/interfaces/functions/index.d.ts

@@ -2,4 +2,5 @@ export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';
 export * from './IFFiltersMergeFilters';
+export * from './IFFiltersMergeValues';
 export * from './IFFiltersParamsToGetFilter';

package/dist/filters/interfaces/functions/index.js

@@ -2,4 +2,5 @@ export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';
 export * from './IFFiltersMergeFilters';
+export * from './IFFiltersMergeValues';
 export * from './IFFiltersParamsToGetFilter';