@qrvey/utils 1.2.10-7 → 1.3.0-0

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

@@ -4,7 +4,6 @@ exports.mergeFilters = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
 const FILTER_GROUPED_COLUMN_OPERATOR_1 = require("../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR");
-const getFilterid_1 = require("./getFilterid");
 const getMergeFiltersSettings_1 = require("./getMergeFiltersSettings");
 const isInValidator_1 = require("./isInValidator");
 const isNullValidator_1 = require("./isNullValidator");
@@ -17,7 +16,7 @@ const resolveScopeConditions_1 = require("./resolveScopeConditions");
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
 function mergeFilters(filterData1, filterData2, settings) {
@@ -43,7 +42,7 @@ exports.mergeFilters = mergeFilters;
  * Gets a new scope structure array by merging two scope structures
  * @param scopes1 the target scope structure
  * @param scopes2 the scope to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new scope structure array
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
@@ -64,7 +63,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  * Gets a new dataset structure array by merging two dataset structures
  * @param datasets1 the target dataset structure
  * @param datasets2 the dataset to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
@@ -85,21 +84,19 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  * Gets a new filter structure array by merging two filter structures
  * @param filters1 the target filter structure
  * @param filters2 the filter to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex(filter2 => (0, resolveFilterConditions_1.resolveFilterConditions)(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings) });
-            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
+            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
             filters2.splice(filter2Index, 1);
         }
         else {
             filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR_1.FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
         }
-        filter1.filterid = (0, getFilterid_1.getFilterid)(filter1);
         filters.push(filter1);
         return filters;
     }, []);
@@ -107,98 +104,53 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         newFilters = newFilters.concat(filters2);
     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
- * @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), { 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
+ * @param overwrite Flag to overwrite or not the filter values
  * @returns a new value structure array
  */
-function mergeValues(filter1, filter2, settings) {
+function mergeValues(filter1, filter2, overwrite = false) {
     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) {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
-    else {
+    if (!overwrite) {
         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);
+            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);
                 }
-                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);
+            }, filter1.values);
         }
         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);
+            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);
                 }
-                else {
-                    values[value1Index] = {
-                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
-                        max: value2.max,
-                        min: value2.min,
-                    };
-                }
                 return values;
-            }, filter1Values);
+            }, filter1.values);
         }
         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);
+            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);
                 }
-                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);
+            }, filter1.values);
         }
         else {
-            filter1Values = filter1Values.concat(filter2Values);
-            newValues = filter1Values;
+            filter1.values = filter1.values.concat(filter2.values);
+            newValues = filter1.values;
         }
     }
+    else {
+        filter1.values = filter2.values;
+        newValues = filter1.values;
+    }
     return newValues;
 }

package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.d.ts

@@ -1,10 +1,9 @@
 import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
 import { IFSData } from "../interfaces/common/IFSData";
 /**
- * @todo FIX AGGREGATE FILTERS
- * @private
- * @param filterData
- * @param _summaries
- * @returns the aggFilters structure
+ *
+ * @param logics
+ * @param summaries
+ * @returns
  */
 export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;

package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js

@@ -4,12 +4,12 @@ exports.getAggFiltersFromFilterData = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const getFiltersByAggregateColumn_1 = require("./common/getFiltersByAggregateColumn");
 /**
- * @todo FIX AGGREGATE FILTERS
- * @private
- * @param filterData
- * @param _summaries
- * @returns the aggFilters structure
+ *
+ * @param logics
+ * @param summaries
+ * @returns
  */
+// [TODO: FILTERS - FIX AGGREGATE FILTERS]
 function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, (0, getFiltersByAggregateColumn_1.getFiltersByAggregateColumn)(filterData));
     if ((0, isEmpty_1.isEmpty)(filterData))

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

@@ -6,4 +6,3 @@ export * from './applyHierarchyForAggFilters';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
-export * from './OLD_getAggFilters';

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

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

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUIFlatFilterByParams = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
-const resolveUIFlatFilterByParams_1 = require("./resolveUIFlatFilterByParams");
+const resolveUIFlatFiltersByParams_1 = require("./resolveUIFlatFiltersByParams");
 /**
   * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
   * The validation to filter the stored filter is depending on:
@@ -20,6 +20,6 @@ function getUIFlatFilterByParams(uFilters = [], params = {}, getIndex = false) {
     if ((0, isEmpty_1.isEmpty)(params))
         return;
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return getIndex ? uFilters.findIndex(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params)) : uFilters.find(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params));
+    return getIndex ? uFilters.findIndex(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params)) : uFilters.find(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params));
 }
 exports.getUIFlatFilterByParams = getUIFlatFilterByParams;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUIFlatFiltersByParams = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
-const resolveUIFlatFilterByParams_1 = require("./resolveUIFlatFilterByParams");
+const resolveUIFlatFiltersByParams_1 = require("./resolveUIFlatFiltersByParams");
 /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
    * The validation to filter the stored filter is depending on:
@@ -21,6 +21,6 @@ function getUIFlatFiltersByParams(uFilters = [], params = {}) {
     if ((0, isEmpty_1.isEmpty)(params))
         return;
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return uFilters.filter(filter => (0, resolveUIFlatFilterByParams_1.resolveUIFlatFilterByParams)(filter, params));
+    return uFilters.filter(filter => (0, resolveUIFlatFiltersByParams_1.resolveUIFlatFilterByParams)(filter, params));
 }
 exports.getUIFlatFiltersByParams = getUIFlatFiltersByParams;

package/dist/cjs/filters/helpers/ui/getUIValues.d.ts

@@ -2,9 +2,9 @@ import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFUValue } from "../../interfaces/ui/IFUValue";
 import { IFUUIValueSettings } from "../../interfaces/ui/IFUUIValueSettings";
 /**
- * Gets the UI Values generated depending on the validator
- * @param filter the filter structure
- * @param settings a settings for this function
- * @returns the UI Values
+ * Gets the UI Values from the filter object
+ * @param filter The filter object
+ * @param settings configuration for this function
+ * @returns an array of values
  */
 export declare function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[];

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

@@ -8,23 +8,22 @@ const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const flattenDeep_1 = require("../../../general/array/flattenDeep");
 const RELATIVE_CURSOR_INFO_1 = require("../../../dates/relative/constants/RELATIVE_CURSOR_INFO");
-const getI18nDateGroupLabel_1 = require("../../../globalization/helpers/getI18nDateGroupLabel");
+const __1 = require("../../..");
 /**
- * Gets the UI Values generated depending on the validator
- * @param filter the filter structure
- * @param settings a settings for this function
- * @returns the UI Values
+ * Gets the UI Values from the filter object
+ * @param filter The filter object
+ * @param settings configuration for this function
+ * @returns an array of values
  */
 function getUIValues(filter, settings) {
     var _a;
     settings = getUiValuesSettings(settings);
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => ({
+            return filter.values.map(value => ({
                 value: getValueLabel(value.min, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
@@ -32,24 +31,24 @@ function getUIValues(filter, settings) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => ({
+            return filter.values.map(value => ({
                 value: getValueLabel(value.max, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => ({
-                value: `${getValueLabel(value.min, filter, settings)} - ${getValueLabel(value.max, filter, settings)}`,
+            return filter.values.map(value => ({
+                value: `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
                     value: (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label,
-                    enabled: settings.addEnableds ? (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
+                    enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return values.map(value => {
+            return filter.values.map(value => {
                 const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate(RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
                 const from = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.relative_container.from_label') : 'from';
                 const anchor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings === null || settings === void 0 ? void 0 : settings.translate('filter.relative_container.current_date') : 'current date';
@@ -60,9 +59,9 @@ function getUIValues(filter, settings) {
             });
         default:
             if (filter.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
-                return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
+                return getRankingUIValues(filter.values, settings.addEnableds, settings.rankingGroupIndex);
             }
-            return values.map(val => ({
+            return (filter.values || []).map(val => ({
                 imageUrl: val.imageUrl,
                 value: getValueLabel(val.value, filter, settings),
                 enabled: settings.addEnableds ? val.enabled != null ? val.enabled : true : undefined,
@@ -72,12 +71,14 @@ function getUIValues(filter, settings) {
 }
 exports.getUIValues = getUIValues;
 function getValueLabel(value, filter, settings) {
-    return settings.translate ? (0, getI18nDateGroupLabel_1.getI18nDateGroupLabel)(value, filter.property, settings.translate) : value;
+    return settings.translate ? (0, __1.getI18nDateGroupLabel)(value, filter.property, settings.translate) : value;
 }
 function getUiValuesSettings(settings) {
     var _a;
     return {
         addEnableds: (_a = settings === null || settings === void 0 ? void 0 : settings.addEnableds) !== null && _a !== void 0 ? _a : false,
+        rangeSeparator: (settings === null || settings === void 0 ? void 0 : settings.rangeSeparator) || '-',
+        rangeSeparatorPath: settings === null || settings === void 0 ? void 0 : settings.rangeSeparatorPath,
         rankingGroupIndex: settings === null || settings === void 0 ? void 0 : settings.rankingGroupIndex,
         translate: settings === null || settings === void 0 ? void 0 : settings.translate,
     };
@@ -95,3 +96,11 @@ function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
         enabled: addEnableds ? rankingValue.enabled : undefined
     }));
 }
+function getRangeSeparator(settings) {
+    if (!(0, isEmpty_1.isEmpty)(settings.translate) && !(0, isEmpty_1.isEmpty)(settings.rangeSeparatorPath)) {
+        return settings.translate(settings.rangeSeparatorPath);
+    }
+    else {
+        return settings.rangeSeparator;
+    }
+}

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

@@ -8,5 +8,4 @@ export * from './getUIFlatFiltersByParams';
 export * from './getUIFlatFiltersByScopes';
 export * from './getUIValues';
 export * from './getUpdatedUIFilters';
-export * from './resolveUIFlatFilterByParams';
 export * from './transformFilterValues';

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

@@ -24,5 +24,4 @@ __exportStar(require("./getUIFlatFiltersByParams"), exports);
 __exportStar(require("./getUIFlatFiltersByScopes"), exports);
 __exportStar(require("./getUIValues"), exports);
 __exportStar(require("./getUpdatedUIFilters"), exports);
-__exportStar(require("./resolveUIFlatFilterByParams"), exports);
 __exportStar(require("./transformFilterValues"), exports);

package/dist/cjs/filters/helpers/ui/{resolveUIFlatFilterByParams.d.ts → resolveUIFlatFiltersByParams.d.ts}

@@ -1,5 +1,4 @@
-import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
-import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
+import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter

package/dist/cjs/filters/helpers/ui/{resolveUIFlatFilterByParams.js → resolveUIFlatFiltersByParams.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUIFlatFilterByParams = void 0;
-const isEmpty_1 = require("../../../general/mix/isEmpty");
+const general_1 = require("../../../general");
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter
@@ -10,14 +10,14 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  */
 function resolveUIFlatFilterByParams(filter, params) {
     var _a, _b, _c, _d;
-    return ((0, isEmpty_1.isEmpty)(params.column) || (filter.column.id === ((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) &&
+    return ((0, general_1.isEmpty)(params.column) || (filter.column.id === ((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) &&
         filter.column.qrveyid === ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) &&
         filter.column.linkid === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid)) &&
         filter.column.aggregate === ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate)) &&
-        ((0, isEmpty_1.isEmpty)(params.scope) || filter.extras.scope === params.scope) &&
-        ((0, isEmpty_1.isEmpty)(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
-        ((0, isEmpty_1.isEmpty)(params.panelid) || filter.extras.panelid === params.panelid) &&
-        ((0, isEmpty_1.isEmpty)(params.validator) || filter.validator === params.validator) &&
-        ((0, isEmpty_1.isEmpty)(params.property) || filter.property === params.property);
+        ((0, general_1.isEmpty)(params.scope) || filter.extras.scope === params.scope) &&
+        ((0, general_1.isEmpty)(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
+        ((0, general_1.isEmpty)(params.panelid) || filter.extras.panelid === params.panelid) &&
+        ((0, general_1.isEmpty)(params.validator) || filter.validator === params.validator) &&
+        ((0, general_1.isEmpty)(params.property) || filter.property === params.property);
 }
 exports.resolveUIFlatFilterByParams = resolveUIFlatFilterByParams;

package/dist/cjs/filters/helpers/ui/transformFilterValues.d.ts

@@ -1,4 +1,4 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFValue } from "../../interfaces/IFValue";
-import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { IFUTransformFilterValuesSettings } from "../../interfaces/ui/IFUTransformFilterValuesSettings";
-export declare function transformFilterValues(filter: IFUFilter, settings: IFUTransformFilterValuesSettings): IFValue[];
+export declare function transformFilterValues(filter: IFSFilter, settings: IFUTransformFilterValuesSettings): IFValue[];

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

@@ -9,15 +9,14 @@ function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
     if ((0, isEmpty_1.isEmpty)(filter))
         return [];
-    const values = filter.values || [];
     if ((0, isRegularValidator_1.isRegularValidator)(filter.validator)) {
-        return values.map((value) => (Object.assign(Object.assign({}, value), { value: (0, transformValue_1.transformValue)(value.value, transformValueSettings) })));
+        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { value: (0, transformValue_1.transformValue)(value.value, transformValueSettings) })));
     }
     else if ((0, isRangeValidator_1.isRangeValidator)(filter.validator)) {
-        return values.map((value) => (Object.assign(Object.assign({}, value), { min: (0, transformValue_1.transformValue)(value.min, transformValueSettings), max: (0, transformValue_1.transformValue)(value.max, transformValueSettings) })));
+        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { min: (0, transformValue_1.transformValue)(value.min, transformValueSettings), max: (0, transformValue_1.transformValue)(value.max, transformValueSettings) })));
     }
     else {
-        return values;
+        return filter.values;
     }
 }
 exports.transformFilterValues = transformFilterValues;

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

@@ -3,4 +3,3 @@ export * from './classes/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
-export * from './services/index';

package/dist/cjs/filters/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./classes/index"), exports);
 __exportStar(require("./constants/index"), exports);
 __exportStar(require("./helpers/index"), exports);
 __exportStar(require("./interfaces/index"), exports);
-__exportStar(require("./services/index"), exports);

package/dist/cjs/filters/interfaces/OLD_IFilterDetail.d.ts

@@ -11,10 +11,8 @@ import { IFValue } from "./IFValue";
 import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 export interface OLD_IFilterDetail {
-    column?: Omit<IColumn, 'label'> & {
+    column?: IColumn & {
         dataset: IDataset;
-    } & {
-        text: string;
     };
     dateSection?: IFDateSection;
     enabled?: boolean;
@@ -22,7 +20,6 @@ export interface OLD_IFilterDetail {
     nullValues?: boolean;
     operator?: IFOperator;
     property?: IFProperty;
-    selectAll?: boolean;
     validator?: IFValidator;
     values?: IFValue[];
     chartSettings?: IFUChartSettings;

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

@@ -14,7 +14,6 @@
  */
 export * from './IFBackendExpressionValue';
 export * from './IFBackendValidator';
-export * from './IFBData';
 export * from './IFBExpression';
 export * from './IFBExpressionAggregate';
 export * from './IFBExpressionRelativeDate';

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

@@ -30,7 +30,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IFBackendExpressionValue"), exports);
 __exportStar(require("./IFBackendValidator"), exports);
-__exportStar(require("./IFBData"), exports);
 __exportStar(require("./IFBExpression"), exports);
 __exportStar(require("./IFBExpressionAggregate"), exports);
 __exportStar(require("./IFBExpressionRelativeDate"), exports);

package/dist/cjs/filters/interfaces/builder/IFilterBuilderConfig.d.ts

@@ -1,6 +1,5 @@
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
-import { IFilterConfig } from "../common/IFilterConfig";
 import { IFSColumn } from "../common/IFSColumn";
 import { IFSData } from "../common/IFSData";
 import { IFProperty } from "../IFProperty";
@@ -9,6 +8,7 @@ import { IFSection } from "../IFSection";
 import { IFValidator } from "../IFValidator";
 import { OLD_IFilterData } from "../OLD_IFilterData";
 import { IFUData } from "../ui/IFUData";
+import { IFilterBuilderGeneralConfig } from "./IFilterBuilderGeneralConfig";
 import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
 /**
  * Structure for the configuration of the Filter Builder
@@ -30,5 +30,5 @@ export interface IFilterBuilderConfig {
     tokenBoxConfig?: any;
     userFilters?: IFBUserFilters;
     validator?: IFValidator;
-    widgetConfig: IFilterConfig;
+    widgetConfig: IFilterBuilderGeneralConfig;
 }

package/dist/cjs/filters/interfaces/builder/IFilterBuilderGeneralConfig.d.ts

@@ -0,0 +1,13 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
+/**
+ * Structure for the Fiter Builder General config
+ */
+export interface IFilterBuilderGeneralConfig {
+    apiKey?: string;
+    appid: string;
+    domain: string;
+    qv_token?: string;
+    timezoneControl?: string;
+    i18n?: II18nConfig;
+    userid: string;
+}

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

@@ -13,5 +13,6 @@
  * IFP-: Structures to Filter Panel
  */
 export * from './IFilterBuilderConfig';
+export * from './IFilterBuilderGeneralConfig';
 export * from './IFilterBuilderSettings';
 export * from './IFilterBuilderSettingsScopes';

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

@@ -29,5 +29,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IFilterBuilderConfig"), exports);
+__exportStar(require("./IFilterBuilderGeneralConfig"), exports);
 __exportStar(require("./IFilterBuilderSettings"), exports);
 __exportStar(require("./IFilterBuilderSettingsScopes"), exports);

package/dist/cjs/filters/interfaces/common/IFSColumn.d.ts

@@ -1,2 +1,2 @@
 import { IColumn } from "../../../columns/interfaces/IColumn";
-export declare type IFSColumn = Omit<IColumn, 'expressionCategory' | 'expressionNegative' | 'expressionPositive' | 'expressionWords' | 'label' | 'lookupValue' | 'slidebarValue'>;
+export declare type IFSColumn = IColumn;

package/dist/cjs/filters/interfaces/common/IFSFilter.d.ts

@@ -20,7 +20,6 @@ export interface IFSFilter {
     nullValues: boolean;
     operator: IFOperator;
     property?: IFProperty;
-    selectAll?: boolean;
     validator: IFValidator;
-    values?: IFValue[];
+    values: IFValue[];
 }

package/dist/cjs/filters/interfaces/common/IFSFilterExtras.d.ts

@@ -1,6 +1,5 @@
 import { IFScope } from "../IFScope";
 import { IFSection } from "../IFSection";
-import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSFilterExtrasInfo } from "./IFSFilterExtrasInfo";
 /**
  * Structure for extra properties of the Filter.
@@ -12,6 +11,5 @@ export interface IFSFilterExtras {
     scopeid?: string;
     section?: IFSection;
     info?: IFSFilterExtrasInfo;
-    chart?: IFUChartSettings;
     [x: string]: any;
 }

package/dist/cjs/filters/interfaces/{functions/IFFiltersMergeFilters.d.ts → common/IFSMergeFiltersSettings.d.ts}

@@ -1,8 +1,7 @@
 /**
  * Structure for MergeFilters property settings
  */
-export interface IFFiltersMergeFilters {
-    overwriteFilterProps?: boolean;
+export interface IFSMergeFiltersSettings {
     overwriteValues?: boolean;
     setGroupedColumnOperator?: boolean;
 }

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts

@@ -2,7 +2,6 @@ import { IFDateSection } from "../IFDateSection";
 import { IFProperty } from "../IFProperty";
 import { IFScope } from "../IFScope";
 import { IFValidator } from "../IFValidator";
-import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSColumn } from "./IFSColumn";
 import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
 /**
@@ -12,7 +11,6 @@ export interface IFSParamsToGetFilter {
     column?: IFSColumn;
     dateSection?: IFDateSection;
     enableds?: IFSParamsToGetFilterEnableds;
-    chart?: IFUChartSettings;
     linkid?: string;
     panelid?: string;
     property?: IFProperty;