@qrvey/utils 1.11.0-7 → 1.11.0-9

package/dist/cjs/filters/constants/settings/FILTER_SETTINGS_DEFAULT.js

@@ -103,7 +103,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#C0C0C0",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,
@@ -126,7 +126,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#4FA6DA",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,
@@ -149,7 +149,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#7DC58C",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-page",
             iconsDisplayed: true,
@@ -172,7 +172,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#E6773D",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-tab",
             iconsDisplayed: true,
@@ -195,7 +195,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#FFB75D",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-chart",
             iconsDisplayed: true,
@@ -218,7 +218,7 @@ exports.FILTER_SETTINGS_DEFAULT = {
             color: "#C0C0C0",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,

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

@@ -7,11 +7,14 @@ exports.getMergeFiltersSettings = void 0;
  * @returns a new MergeFilters settings object.
  */
 function getMergeFiltersSettings(settings) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     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,
+        mergeFilterDataProps: (_a = settings === null || settings === void 0 ? void 0 : settings.mergeFilterDataProps) !== null && _a !== void 0 ? _a : true,
+        mergeScopeProps: (_b = settings === null || settings === void 0 ? void 0 : settings.mergeScopeProps) !== null && _b !== void 0 ? _b : true,
+        mergeDatasetProps: (_c = settings === null || settings === void 0 ? void 0 : settings.mergeDatasetProps) !== null && _c !== void 0 ? _c : true,
+        mergeFilterProps: (_d = settings === null || settings === void 0 ? void 0 : settings.mergeFilterProps) !== null && _d !== void 0 ? _d : true,
+        overwriteValues: (_e = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _e !== void 0 ? _e : false,
+        setGroupedColumnOperator: settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator,
     };
 }
 exports.getMergeFiltersSettings = getMergeFiltersSettings;

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

@@ -2,10 +2,13 @@ import { IFSData } from "../../interfaces/common/IFSData";
 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 settings configuration of the mergeFilter
- * @returns a new filter data structure
+ * Merges the second filter data into the first one; the first Filter Data passed in the argument has the priority.
+ * Conditions:
+ * - If the info in the second filter data does not exist in the first one, the info will be added
+ * - If the info in the second filter data exists in the first one, the info will be merged
+ * @param {IFUData} filterData1 The target filter data
+ * @param {IFUData} filterData2 the filter data to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUData} a new filter data structure
  */
-export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData;
+export declare function mergeFilters(filterData1: IFUData | IFSData, filterData2: IFUData | IFSData, settings?: IFFiltersMergeFilters): IFUData | IFSData;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 mergeDeep_1 = require("../../../general/object/mergeDeep");
+const objectCopy_1 = require("../../../general/object/objectCopy");
 const getFilterid_1 = require("./getFilterid");
 const getMergeFiltersSettings_1 = require("./getMergeFiltersSettings");
 const mergeValues_1 = require("./mergeValues");
@@ -11,13 +11,17 @@ const resolveDatasetConditions_1 = require("./resolveDatasetConditions");
 const resolveFilterConditions_1 = require("./resolveFilterConditions");
 const resolveScopeConditions_1 = require("./resolveScopeConditions");
 /**
- * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
- * @param filterData1 The target filter data
- * @param filterData2 the filter data to be merged
- * @param settings configuration of the mergeFilter
- * @returns a new filter data structure
+ * Merges the second filter data into the first one; the first Filter Data passed in the argument has the priority.
+ * Conditions:
+ * - If the info in the second filter data does not exist in the first one, the info will be added
+ * - If the info in the second filter data exists in the first one, the info will be merged
+ * @param {IFUData} filterData1 The target filter data
+ * @param {IFUData} filterData2 the filter data to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUData} a new filter data structure
  */
 function mergeFilters(filterData1, filterData2, settings) {
+    var _a;
     if ((0, isEmpty_1.isEmpty)(filterData1) || (0, isEmpty_1.isEmpty)(filterData1.scopes)) {
         if ((0, isEmpty_1.isEmpty)(filterData2) || (0, isEmpty_1.isEmpty)(filterData2.scopes))
             return;
@@ -25,23 +29,29 @@ function mergeFilters(filterData1, filterData2, settings) {
     }
     if ((0, isEmpty_1.isEmpty)(filterData2) || (0, isEmpty_1.isEmpty)(filterData2.scopes))
         return filterData1;
-    const _filterData1 = (0, cloneDeep_1.cloneDeep)(filterData1);
-    const _filterData2 = (0, cloneDeep_1.cloneDeep)(filterData2);
+    const newFilterData1 = (0, objectCopy_1.objectCopy)(filterData1);
+    const newFilterData2 = (0, objectCopy_1.objectCopy)(filterData2);
     const defaultSettings = (0, getMergeFiltersSettings_1.getMergeFiltersSettings)(settings);
-    return {
-        enabled: _filterData1.enabled,
-        scopes: mergeScopes(_filterData1.scopes, _filterData2.scopes, defaultSettings),
-        section: _filterData1.section,
-        version: _filterData1.version,
-    };
+    const scopes = mergeScopes(newFilterData1.scopes, newFilterData2.scopes, defaultSettings);
+    if (defaultSettings.mergeFilterDataProps) {
+        return {
+            enabled: (_a = newFilterData2.enabled) !== null && _a !== void 0 ? _a : newFilterData1.enabled,
+            section: newFilterData2.section || newFilterData1.section,
+            scopes,
+            version: newFilterData2.version || newFilterData1.version,
+        };
+    }
+    return Object.assign(Object.assign({}, newFilterData1), { scopes });
 }
 exports.mergeFilters = mergeFilters;
 /**
- * Gets a new scope structure array by merging two scope structures
- * @param scopes1 the target scope structure
- * @param scopes2 the scope to be merged
- * @param settings configuration of the mergeFilter
- * @returns a new scope structure array
+ * Gets a new scope array structure by merging both scope structures
+ * - If the info in the second scope does not exist in the first one, the scope will be added
+ * - If the info in the second scope exists in the first one, the scope will be merged
+ * @param {IFUScope[]} scopes1 the target scope structure
+ * @param {IFUScope[]} scopes2 the scope to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUScope[]} a new scope array structure
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
@@ -51,7 +61,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
         }));
         let _scope1 = scope1;
         if (scope2Index > -1) {
-            _scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            _scope1 = Object.assign(Object.assign({}, mergeScopeProps(scope1, scopes2[scope2Index], settings)), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(_scope1);
@@ -62,11 +72,13 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     return newScopes;
 }
 /**
- * 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
- * @returns a new dataset structure array
+ * Gets a new dataset structure array by merging both dataset structures
+ * - If the info in the second dataset does not exist in the first one, the dataset will be added
+ * - If the info in the second dataset exists in the first one, the dataset will be merged
+ * @param {IFUDataset[]} datasets1 the target dataset structure
+ * @param {IFUDataset[]} datasets2 the dataset to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilter
+ * @returns {IFUDataset[]} a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
@@ -75,7 +87,7 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
         }));
         let _dataset1 = dataset1;
         if (dataset2Index > -1) {
-            _dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            _dataset1 = Object.assign(Object.assign({}, mergeDatasetProps(dataset1, datasets2[dataset2Index], settings)), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(_dataset1);
@@ -87,10 +99,10 @@ 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
- * @returns a new filter structure array
+ * @param {IFUFilter[]} filters1 the target filter structure
+ * @param {IFUFilter[]} filters2 the filter to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUFilter[]} a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
@@ -103,14 +115,11 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         }));
         let _filter1 = filter1;
         if (filter2Index > -1) {
-            _filter1 = Object.assign(Object.assign({}, _filter1), { values: (0, mergeValues_1.mergeValues)(_filter1, filters2[filter2Index], settings) });
-            _filter1 = mergeFilterProps(_filter1, filters2[filter2Index], settings);
+            _filter1 = Object.assign(Object.assign(Object.assign({}, _filter1), mergeFilterProps(_filter1, filters2[filter2Index], settings)), { values: (0, mergeValues_1.mergeValues)(_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 });
+        else if (!(0, isEmpty_1.isEmpty)(settings.setGroupedColumnOperator)) {
+            _filter1.operator = settings.setGroupedColumnOperator;
         }
         _filter1.filterid = (0, getFilterid_1.getFilterid)(_filter1);
         filters.push(_filter1);
@@ -121,17 +130,47 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
     return newFilters;
 }
 /**
- * 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 settings configuration of the mergeFilter
+ * Gets a new scope structure for the configured settings
+ * @param {IFUScope} scope1 the target scope structure
+ * @param {IFUScope} scope2 the scope to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUScope} a new filter structure with overwritted props
+ */
+function mergeScopeProps(scope1, scope2, settings) {
+    var _a, _b, _c;
+    let _scope1 = scope1;
+    if (settings.mergeScopeProps) {
+        _scope1 = Object.assign(Object.assign({}, scope1), { collapsed: (_a = scope2.collapsed) !== null && _a !== void 0 ? _a : scope1.collapsed, displayed: (_b = scope2.displayed) !== null && _b !== void 0 ? _b : scope1.displayed, enabled: (_c = scope2.enabled) !== null && _c !== void 0 ? _c : scope1.enabled, label: scope2.label || scope1.label, scope: scope2.scope || scope1.scope, scopeid: scope2.scopeid || scope1.scopeid });
+    }
+    return _scope1;
+}
+/**
+ * Gets a new dataset structure for the configured settings
+ * @param {IFUDataset} dataset1 the target dataset structure
+ * @param {IFUDataset} dataset2 the dataset to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUDataset} a new filter structure with overwritted props
+ */
+function mergeDatasetProps(dataset1, dataset2, settings) {
+    var _a, _b, _c;
+    let _dataset1 = dataset1;
+    if (settings.mergeDatasetProps) {
+        _dataset1 = Object.assign(Object.assign({}, dataset1), { collapsed: (_a = dataset2.collapsed) !== null && _a !== void 0 ? _a : dataset1.collapsed, displayed: (_b = dataset2.displayed) !== null && _b !== void 0 ? _b : dataset1.displayed, enabled: (_c = dataset2.enabled) !== null && _c !== void 0 ? _c : dataset1.enabled, label: dataset2.label || dataset1.label, qrveyid: dataset2.qrveyid || dataset1.qrveyid });
+    }
+    return _dataset1;
+}
+/**
+ * Gets a new filter structure for the configured settings
+ * @param {IFUFilter} filter1 the target filter structure
+ * @param {IFUFilter} filter2 the filter to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
     var _a, _b, _c;
     let _filter1 = filter1;
-    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, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+    if (settings.mergeFilterProps) {
+        _filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, column: (0, mergeDeep_1.mergeDeep)(filter2.column, filter1.column), 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, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, property: filter2.property || filter1.property, operator: filter2.operator || filter1.operator, selectAll: filter2.selectAll, validator: filter2.validator || filter1.validator });
     }
     return _filter1;
 }

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

@@ -4,8 +4,8 @@ import { IFSScope } from "../../interfaces/common/IFSScope";
  * Resolves the conditions by given params
  * @param filter The filter scope structure
  * @param params given parameters to validate the filter
- * @param letPassUndefinedProperties Flag to avoid applying the condition when the filter properties are undefined
- * @param letPassUndefinedParams Flag to avoid applying the condition when the param properties are explicit undefined.
+ * @param letPassUndefinedProperties Flag to avoid applying the condition when the properties of the properties are undefined
+ * @param letPassUndefinedParams Flag to avoid applying the condition when the properties of the params are explicit undefined.
  * @returns true: the condition is satisfied
  */
 export declare function resolveScopeConditions(scope: IFSScope, params: IFSParamsToGetFilter, letPassUndefinedProperties?: boolean, letPassUndefinedParams?: boolean): boolean;

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

@@ -7,8 +7,8 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  * Resolves the conditions by given params
  * @param filter The filter scope structure
  * @param params given parameters to validate the filter
- * @param letPassUndefinedProperties Flag to avoid applying the condition when the filter properties are undefined
- * @param letPassUndefinedParams Flag to avoid applying the condition when the param properties are explicit undefined.
+ * @param letPassUndefinedProperties Flag to avoid applying the condition when the properties of the properties are undefined
+ * @param letPassUndefinedParams Flag to avoid applying the condition when the properties of the params are explicit undefined.
  * @returns true: the condition is satisfied
  */
 function resolveScopeConditions(scope, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {

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

@@ -1,8 +1,27 @@
+import { IFOperator } from "../IFOperator";
 import { IFFiltersMergeValues } from "./IFFiltersMergeValues";
 /**
  * Structure for MergeFilters property settings
  */
 export interface IFFiltersMergeFilters extends IFFiltersMergeValues {
-    overwriteFilterProps?: boolean;
-    setGroupedColumnOperator?: boolean;
+    /**
+     * Flag to merge second filter data props to first one
+     */
+    mergeFilterDataProps?: boolean;
+    /**
+     * Flag to merge second scope props to first one
+     */
+    mergeScopeProps?: boolean;
+    /**
+     * Flag to merge second dataset props to first one
+     */
+    mergeDatasetProps?: boolean;
+    /**
+     * Flag to merge second filter props to first one
+     */
+    mergeFilterProps?: boolean;
+    /**
+     * Whet setting, the operator is overwritten on new added filters
+     */
+    setGroupedColumnOperator?: IFOperator;
 }

package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderLineStyleOptions.d.ts

@@ -12,6 +12,7 @@ export interface II18nChartBuilderLineStyleOptions {
     type_straight: string;
     type_monotone: string;
     type_cardinal: string;
+    type_smooth: string;
     type_step_before: string;
     type_step_after: string;
     fill: string;

package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -140,6 +140,7 @@ exports.I18N_CHART_BUILDER_STYLE_OPTIONS = {
         type_straight: "Straight",
         type_monotone: "Monotone",
         type_cardinal: "Cardinal",
+        type_smooth: "Smooth",
         type_step_before: "Step Before",
         type_step_after: "Step After",
         fill: "Fill",

package/dist/filters/constants/settings/FILTER_SETTINGS_DEFAULT.js

@@ -100,7 +100,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#C0C0C0",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,
@@ -123,7 +123,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#4FA6DA",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,
@@ -146,7 +146,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#7DC58C",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-page",
             iconsDisplayed: true,
@@ -169,7 +169,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#E6773D",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-tab",
             iconsDisplayed: true,
@@ -192,7 +192,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#FFB75D",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-chart",
             iconsDisplayed: true,
@@ -215,7 +215,7 @@ export const FILTER_SETTINGS_DEFAULT = {
             color: "#C0C0C0",
             colorized: true,
             colorPickerDisplayed: true,
-            displayed: false,
+            displayed: true,
             enabled: true,
             icon: "fp-global",
             iconsDisplayed: true,

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

@@ -4,10 +4,13 @@
  * @returns a new MergeFilters settings object.
  */
 export function getMergeFiltersSettings(settings) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     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,
+        mergeFilterDataProps: (_a = settings === null || settings === void 0 ? void 0 : settings.mergeFilterDataProps) !== null && _a !== void 0 ? _a : true,
+        mergeScopeProps: (_b = settings === null || settings === void 0 ? void 0 : settings.mergeScopeProps) !== null && _b !== void 0 ? _b : true,
+        mergeDatasetProps: (_c = settings === null || settings === void 0 ? void 0 : settings.mergeDatasetProps) !== null && _c !== void 0 ? _c : true,
+        mergeFilterProps: (_d = settings === null || settings === void 0 ? void 0 : settings.mergeFilterProps) !== null && _d !== void 0 ? _d : true,
+        overwriteValues: (_e = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _e !== void 0 ? _e : false,
+        setGroupedColumnOperator: settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator,
     };
 }

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

@@ -2,10 +2,13 @@ import { IFSData } from "../../interfaces/common/IFSData";
 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 settings configuration of the mergeFilter
- * @returns a new filter data structure
+ * Merges the second filter data into the first one; the first Filter Data passed in the argument has the priority.
+ * Conditions:
+ * - If the info in the second filter data does not exist in the first one, the info will be added
+ * - If the info in the second filter data exists in the first one, the info will be merged
+ * @param {IFUData} filterData1 The target filter data
+ * @param {IFUData} filterData2 the filter data to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUData} a new filter data structure
  */
-export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData;
+export declare function mergeFilters(filterData1: IFUData | IFSData, filterData2: IFUData | IFSData, settings?: IFFiltersMergeFilters): IFUData | IFSData;

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

@@ -1,6 +1,6 @@
 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 { mergeDeep } from "../../../general/object/mergeDeep";
+import { objectCopy } from "../../../general/object/objectCopy";
 import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
 import { mergeValues } from "./mergeValues";
@@ -8,13 +8,17 @@ import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 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
- * @returns a new filter data structure
+ * Merges the second filter data into the first one; the first Filter Data passed in the argument has the priority.
+ * Conditions:
+ * - If the info in the second filter data does not exist in the first one, the info will be added
+ * - If the info in the second filter data exists in the first one, the info will be merged
+ * @param {IFUData} filterData1 The target filter data
+ * @param {IFUData} filterData2 the filter data to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUData} a new filter data structure
  */
 export function mergeFilters(filterData1, filterData2, settings) {
+    var _a;
     if (isEmpty(filterData1) || isEmpty(filterData1.scopes)) {
         if (isEmpty(filterData2) || isEmpty(filterData2.scopes))
             return;
@@ -22,22 +26,28 @@ export function mergeFilters(filterData1, filterData2, settings) {
     }
     if (isEmpty(filterData2) || isEmpty(filterData2.scopes))
         return filterData1;
-    const _filterData1 = cloneDeep(filterData1);
-    const _filterData2 = cloneDeep(filterData2);
+    const newFilterData1 = objectCopy(filterData1);
+    const newFilterData2 = objectCopy(filterData2);
     const defaultSettings = getMergeFiltersSettings(settings);
-    return {
-        enabled: _filterData1.enabled,
-        scopes: mergeScopes(_filterData1.scopes, _filterData2.scopes, defaultSettings),
-        section: _filterData1.section,
-        version: _filterData1.version,
-    };
+    const scopes = mergeScopes(newFilterData1.scopes, newFilterData2.scopes, defaultSettings);
+    if (defaultSettings.mergeFilterDataProps) {
+        return {
+            enabled: (_a = newFilterData2.enabled) !== null && _a !== void 0 ? _a : newFilterData1.enabled,
+            section: newFilterData2.section || newFilterData1.section,
+            scopes,
+            version: newFilterData2.version || newFilterData1.version,
+        };
+    }
+    return Object.assign(Object.assign({}, newFilterData1), { scopes });
 }
 /**
- * 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
- * @returns a new scope structure array
+ * Gets a new scope array structure by merging both scope structures
+ * - If the info in the second scope does not exist in the first one, the scope will be added
+ * - If the info in the second scope exists in the first one, the scope will be merged
+ * @param {IFUScope[]} scopes1 the target scope structure
+ * @param {IFUScope[]} scopes2 the scope to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUScope[]} a new scope array structure
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
@@ -47,7 +57,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
         }));
         let _scope1 = scope1;
         if (scope2Index > -1) {
-            _scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            _scope1 = Object.assign(Object.assign({}, mergeScopeProps(scope1, scopes2[scope2Index], settings)), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(_scope1);
@@ -58,11 +68,13 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     return newScopes;
 }
 /**
- * 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
- * @returns a new dataset structure array
+ * Gets a new dataset structure array by merging both dataset structures
+ * - If the info in the second dataset does not exist in the first one, the dataset will be added
+ * - If the info in the second dataset exists in the first one, the dataset will be merged
+ * @param {IFUDataset[]} datasets1 the target dataset structure
+ * @param {IFUDataset[]} datasets2 the dataset to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilter
+ * @returns {IFUDataset[]} a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
@@ -71,7 +83,7 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
         }));
         let _dataset1 = dataset1;
         if (dataset2Index > -1) {
-            _dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            _dataset1 = Object.assign(Object.assign({}, mergeDatasetProps(dataset1, datasets2[dataset2Index], settings)), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(_dataset1);
@@ -83,10 +95,10 @@ 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
- * @returns a new filter structure array
+ * @param {IFUFilter[]} filters1 the target filter structure
+ * @param {IFUFilter[]} filters2 the filter to be merged
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUFilter[]} a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
@@ -99,14 +111,11 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         }));
         let _filter1 = filter1;
         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(Object.assign({}, _filter1), mergeFilterProps(_filter1, filters2[filter2Index], settings)), { values: mergeValues(_filter1, filters2[filter2Index], settings) });
             filters2.splice(filter2Index, 1);
         }
-        else {
-            _filter1 = Object.assign(Object.assign({}, _filter1), { operator: settings.setGroupedColumnOperator
-                    ? FILTER_GROUPED_COLUMN_OPERATOR
-                    : _filter1.operator });
+        else if (!isEmpty(settings.setGroupedColumnOperator)) {
+            _filter1.operator = settings.setGroupedColumnOperator;
         }
         _filter1.filterid = getFilterid(_filter1);
         filters.push(_filter1);
@@ -117,17 +126,47 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
     return newFilters;
 }
 /**
- * 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 settings configuration of the mergeFilter
+ * Gets a new scope structure for the configured settings
+ * @param {IFUScope} scope1 the target scope structure
+ * @param {IFUScope} scope2 the scope to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUScope} a new filter structure with overwritted props
+ */
+function mergeScopeProps(scope1, scope2, settings) {
+    var _a, _b, _c;
+    let _scope1 = scope1;
+    if (settings.mergeScopeProps) {
+        _scope1 = Object.assign(Object.assign({}, scope1), { collapsed: (_a = scope2.collapsed) !== null && _a !== void 0 ? _a : scope1.collapsed, displayed: (_b = scope2.displayed) !== null && _b !== void 0 ? _b : scope1.displayed, enabled: (_c = scope2.enabled) !== null && _c !== void 0 ? _c : scope1.enabled, label: scope2.label || scope1.label, scope: scope2.scope || scope1.scope, scopeid: scope2.scopeid || scope1.scopeid });
+    }
+    return _scope1;
+}
+/**
+ * Gets a new dataset structure for the configured settings
+ * @param {IFUDataset} dataset1 the target dataset structure
+ * @param {IFUDataset} dataset2 the dataset to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
+ * @returns {IFUDataset} a new filter structure with overwritted props
+ */
+function mergeDatasetProps(dataset1, dataset2, settings) {
+    var _a, _b, _c;
+    let _dataset1 = dataset1;
+    if (settings.mergeDatasetProps) {
+        _dataset1 = Object.assign(Object.assign({}, dataset1), { collapsed: (_a = dataset2.collapsed) !== null && _a !== void 0 ? _a : dataset1.collapsed, displayed: (_b = dataset2.displayed) !== null && _b !== void 0 ? _b : dataset1.displayed, enabled: (_c = dataset2.enabled) !== null && _c !== void 0 ? _c : dataset1.enabled, label: dataset2.label || dataset1.label, qrveyid: dataset2.qrveyid || dataset1.qrveyid });
+    }
+    return _dataset1;
+}
+/**
+ * Gets a new filter structure for the configured settings
+ * @param {IFUFilter} filter1 the target filter structure
+ * @param {IFUFilter} filter2 the filter to be used to merge the values
+ * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
     var _a, _b, _c;
     let _filter1 = filter1;
-    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, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+    if (settings.mergeFilterProps) {
+        _filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, column: mergeDeep(filter2.column, filter1.column), 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, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, property: filter2.property || filter1.property, operator: filter2.operator || filter1.operator, selectAll: filter2.selectAll, validator: filter2.validator || filter1.validator });
     }
     return _filter1;
 }

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

@@ -4,8 +4,8 @@ import { IFSScope } from "../../interfaces/common/IFSScope";
  * Resolves the conditions by given params
  * @param filter The filter scope structure
  * @param params given parameters to validate the filter
- * @param letPassUndefinedProperties Flag to avoid applying the condition when the filter properties are undefined
- * @param letPassUndefinedParams Flag to avoid applying the condition when the param properties are explicit undefined.
+ * @param letPassUndefinedProperties Flag to avoid applying the condition when the properties of the properties are undefined
+ * @param letPassUndefinedParams Flag to avoid applying the condition when the properties of the params are explicit undefined.
  * @returns true: the condition is satisfied
  */
 export declare function resolveScopeConditions(scope: IFSScope, params: IFSParamsToGetFilter, letPassUndefinedProperties?: boolean, letPassUndefinedParams?: boolean): boolean;

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

@@ -4,8 +4,8 @@ import { _hasProperty } from "../../../general/object/hasProperty";
  * Resolves the conditions by given params
  * @param filter The filter scope structure
  * @param params given parameters to validate the filter
- * @param letPassUndefinedProperties Flag to avoid applying the condition when the filter properties are undefined
- * @param letPassUndefinedParams Flag to avoid applying the condition when the param properties are explicit undefined.
+ * @param letPassUndefinedProperties Flag to avoid applying the condition when the properties of the properties are undefined
+ * @param letPassUndefinedParams Flag to avoid applying the condition when the properties of the params are explicit undefined.
  * @returns true: the condition is satisfied
  */
 export function resolveScopeConditions(scope, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {

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

@@ -1,8 +1,27 @@
+import { IFOperator } from "../IFOperator";
 import { IFFiltersMergeValues } from "./IFFiltersMergeValues";
 /**
  * Structure for MergeFilters property settings
  */
 export interface IFFiltersMergeFilters extends IFFiltersMergeValues {
-    overwriteFilterProps?: boolean;
-    setGroupedColumnOperator?: boolean;
+    /**
+     * Flag to merge second filter data props to first one
+     */
+    mergeFilterDataProps?: boolean;
+    /**
+     * Flag to merge second scope props to first one
+     */
+    mergeScopeProps?: boolean;
+    /**
+     * Flag to merge second dataset props to first one
+     */
+    mergeDatasetProps?: boolean;
+    /**
+     * Flag to merge second filter props to first one
+     */
+    mergeFilterProps?: boolean;
+    /**
+     * Whet setting, the operator is overwritten on new added filters
+     */
+    setGroupedColumnOperator?: IFOperator;
 }

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderLineStyleOptions.d.ts

@@ -12,6 +12,7 @@ export interface II18nChartBuilderLineStyleOptions {
     type_straight: string;
     type_monotone: string;
     type_cardinal: string;
+    type_smooth: string;
     type_step_before: string;
     type_step_after: string;
     fill: string;

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -137,6 +137,7 @@ export const I18N_CHART_BUILDER_STYLE_OPTIONS = {
         type_straight: "Straight",
         type_monotone: "Monotone",
         type_cardinal: "Cardinal",
+        type_smooth: "Smooth",
         type_step_before: "Step Before",
         type_step_after: "Step After",
         fill: "Fill",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.11.0-7",
+  "version": "1.11.0-9",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",