@qrvey/utils 1.2.10-9 → 1.3.0-10

package/src/filters/helpers/common/mergeFilters.ts

@@ -4,12 +4,18 @@ import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GR
 import { IFSData } from "../../interfaces/common/IFSData";
 import { IFSDataset } from "../../interfaces/common/IFSDataset";
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 import { IFSScope } from "../../interfaces/common/IFSScope";
-import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
+import { IFSValue } from "../../interfaces/common/IFSValue";
+import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
+import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
+import { IFValue } from "../../interfaces/IFValue";
 import { IFUData } from "../../interfaces/ui/IFUData";
-import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
-import { mergeValues } from "./mergeValues";
+import { isInValidator } from "./isInValidator";
+import { isNullValidator } from "./isNullValidator";
+import { isRangeValidator } from "./isRangeValidator";
+import { isRegularValidator } from "./isRegularValidator";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -18,10 +24,10 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param settings configuration of the mergeFilter
+ * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
-export function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData {
+export function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData {
     if (isEmpty(filterData1) || isEmpty(filterData1.scopes)) {
         if (isEmpty(filterData2) || isEmpty(filterData2.scopes)) return;
         return filterData2;
@@ -44,10 +50,10 @@ export function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSDat
  * 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: IFSScope[] = [], scopes2: IFSScope[] = [], settings?: IFFiltersMergeFilters): IFSScope[] {
+function mergeScopes(scopes1: IFSScope[] = [], scopes2: IFSScope[] = [], settings?: IFSMergeFiltersSettings): IFSScope[] {
     let newScopes = scopes1.reduce((scopes: IFSScope[], scope1: IFSScope) => {
         const scope2Index = scopes2.findIndex(scope2 => resolveScopeConditions(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
         if (scope2Index > -1) {
@@ -69,10 +75,10 @@ function mergeScopes(scopes1: IFSScope[] = [], scopes2: IFSScope[] = [], setting
  * 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: IFSDataset[] = [], datasets2: IFSDataset[] = [], settings?: IFFiltersMergeFilters): IFSDataset[] {
+function mergeDatasets(datasets1: IFSDataset[] = [], datasets2: IFSDataset[] = [], settings?: IFSMergeFiltersSettings): IFSDataset[] {
     let newDatasets = datasets1.reduce((datasets: IFSDataset[], dataset1: IFSDataset) => {
         const dataset2Index = datasets2.findIndex(dataset2 => resolveDatasetConditions(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
         if (dataset2Index > -1) {
@@ -94,20 +100,18 @@ function mergeDatasets(datasets1: IFSDataset[] = [], datasets2: IFSDataset[] = [
  * 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: IFSFilter[] = [], filters2: IFSFilter[] = [], settings?: IFFiltersMergeFilters): IFSFilter[] {
+function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], settings?: IFSMergeFiltersSettings): IFSFilter[] {
     let newFilters = filters1.reduce((filters: IFSFilter[], filter1: IFSFilter) => {
         const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = { ...filter1, values: mergeValues(filter1, filters2[filter2Index], settings) };
-            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
+            filter1 = { ...filter1, values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) };
             filters2.splice(filter2Index, 1);
         } else {
             filter1 = { ...filter1, operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator };
         }
-        filter1.filterid = getFilterid(filter1);
         filters.push(filter1);
         return filters;
     }, [] as IFSFilter[]);
@@ -117,26 +121,49 @@ function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], s
 }
 
 /**
- * Gets a new filter structure when the setting is configured
+ * Gets a new value structure array by merging two value structures
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param settings configuration of the mergeFilter
- * @returns a new filter structure with overwritted props
+ * @param overwrite Flag to overwrite or not the filter values
+ * @returns a new value structure array
  */
-function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeFilters) {
-    if (settings.overwriteFilterProps) {
-        filter1 = {
-            ...filter1,
-            collapsed: filter2.collapsed ?? filter1.collapsed,
-            displayed: filter2.displayed ?? filter1.displayed,
-            dateSection: filter2.dateSection,
-            extras: filter2.extras,
-            enabled: filter2.enabled ?? filter1.enabled,
-            filterid: filter2.filterid,
-            lookupDisplayIndex: filter2.lookupDisplayIndex,
-            nullValues: filter2.nullValues,
-            selectAll: filter2.selectAll,
-        };
+function mergeValues(filter1: IFSFilter, filter2: IFSFilter, overwrite = false): IFValue[] {
+    if (isEmpty(filter1) && isEmpty(filter2)) return [];
+
+    let newValues = [];
+    if (!overwrite) {
+        if (isInValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values: IFValue[], value2: IFSValueRelativeDate) => {
+                const value1Index = (filter1.values as IFSValueRelativeDate[]).findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values as IFValue[]);
+        } else if (isRangeValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values: IFValue[], value2: IFSValueRange) => {
+                const value1Index = (filter1.values as IFSValueRange[]).findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values as IFValue[]);
+        } else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
+            newValues = filter2.values.reduce((values: IFValue[], value2: IFSValue) => {
+                const value1Index = (filter1.values as IFSValue[]).findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                return values;
+            }, filter1.values as IFValue[]);
+        } else {
+            filter1.values = filter1.values.concat(filter2.values);
+            newValues = filter1.values;
+        }
+    } else {
+        filter1.values = filter2.values;
+        newValues = filter1.values;
     }
-    return filter1;
+
+    return newValues;
 }

package/src/filters/helpers/common/resolveFilterConditions.ts

@@ -17,8 +17,8 @@ export function resolveFilterConditions(filter: IFSFilter, params: IFSParamsToGe
     (!_hasProperty(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && isEmpty(params.panelid)) || params.panelid === filter.extras.panelid) &&
     (!_hasProperty(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && isEmpty(params.property)) || params.property === filter.property) &&
     (!_hasProperty(params, 'validator') || (letPassUndefinedProperties && filter.validator == null) || (letPassUndefinedParams && isEmpty(params.validator)) || params.validator === filter.validator) &&
-    (!_hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && isEmpty(params.column)) || (params.column?.id === filter.column.id &&
-        params.column?.qrveyid === filter.column.qrveyid &&
-        params.column?.linkid === filter.column.linkid &&
-        params.column?.aggregate === filter.column.aggregate));
+    (!_hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && isEmpty(params.column)) || ((letPassUndefinedParams && isEmpty(params.column?.id) || params.column?.id === filter.column.id) &&
+        (letPassUndefinedParams && isEmpty(params.column?.qrveyid) || params.column?.qrveyid === filter.column.qrveyid) &&
+        (letPassUndefinedParams && isEmpty(params.column?.linkid) || params.column?.linkid === filter.column.linkid) &&
+        (letPassUndefinedParams && isEmpty(params.column?.aggregate) || params.column?.aggregate === filter.column.aggregate)));
 }

package/src/filters/helpers/getAggFiltersFromFilterData.ts

@@ -4,12 +4,12 @@ import { IFSData } from "../interfaces/common/IFSData";
 import { getFiltersByAggregateColumn } from "./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]
 export function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate {
   filterData = { ...getFiltersByAggregateColumn(filterData) }; 
   if (isEmpty(filterData)) return;

package/src/filters/helpers/index.ts

@@ -4,9 +4,6 @@ export * from './common/index';
 export * from './ui/index';
 
 export * from './applyHierarchyForAggFilters';
-// export * from './getAggFiltersFromFilterData';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
-
-export * from './OLD_getAggFilters';

package/src/filters/helpers/ui/getUIFlatFilterByParams.ts

@@ -2,7 +2,7 @@ import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
 import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 
  /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object

package/src/filters/helpers/ui/getUIFlatFiltersByParams.ts

@@ -2,7 +2,7 @@ import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
 import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 
 /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object

package/src/filters/helpers/ui/getUIValues.ts

@@ -12,25 +12,22 @@ import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
 import { flattenDeep } from "../../../general/array/flattenDeep";
 import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
 import { IFUUIValueSettings } from "../../interfaces/ui/IFUUIValueSettings";
-import { getI18nDateGroupLabel } from "../../../globalization/helpers/getI18nDateGroupLabel";
-import { IDateColumnPropertyType } from "../../../columns/interfaces/IDateColumnPropertyType";
+import { getI18nDateGroupLabel, IDateColumnPropertyType } from "../../..";
 
 /**
- * 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 function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[] {
     settings = getUiValuesSettings(settings);
-
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return (values as IFSValueRange[]).map(value => ({
+            return (filter.values as IFSValueRange[]).map(value => ({
                 value: getValueLabel(value.min, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
@@ -38,24 +35,24 @@ export function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): I
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return (values as IFSValueRange[]).map(value => ({
+            return (filter.values as IFSValueRange[]).map(value => ({
                 value: getValueLabel(value.max, filter, settings),
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return (values as IFSValueRange[]).map(value => ({
-                value: `${getValueLabel(value.min, filter, settings)} - ${getValueLabel(value.max, filter, settings)}`,
+            return (filter.values as IFSValueRange[]).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.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
                 value: settings?.translate ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO[filter.validator].label,
-                enabled: settings.addEnableds ? (values as IFSValue[])[0]?.enabled : undefined,
+                enabled: settings.addEnableds ? (filter.values as IFSValue[])[0]?.enabled : undefined,
             }];
         case FILTER_VALIDATOR.IN:
-            return (values as IFSValueRelativeDate[]).map(value => {
+            return (filter.values as IFSValueRelativeDate[]).map(value => {
                 const cursor = settings?.translate ? settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
                 const from = settings?.translate ? settings.translate('filter.relative_container.from_label') : 'from';
                 const anchor = settings?.translate ?  settings?.translate('filter.relative_container.current_date') : 'current date';
@@ -67,9 +64,9 @@ export function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): I
             });
         default:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-                return getRankingUIValues(values as IFSValueRanking[][], settings.addEnableds, settings.rankingGroupIndex);
+                return getRankingUIValues(filter.values as IFSValueRanking[][], settings.addEnableds, settings.rankingGroupIndex);
             }
-            return (values as IFSValue[]).map(val => ({
+            return ((filter.values || []) as IFSValue[]).map(val => ({
                 imageUrl: val.imageUrl,
                 value: getValueLabel(val.value, filter, settings),
                 enabled: settings.addEnableds ? val.enabled != null ? val.enabled : true : undefined,
@@ -85,6 +82,8 @@ function getValueLabel(value, filter, settings: IFUUIValueSettings): string {
 function getUiValuesSettings(settings: IFUUIValueSettings): IFUUIValueSettings {
     return {
         addEnableds: settings?.addEnableds ?? false,
+        rangeSeparator: settings?.rangeSeparator || '-',
+        rangeSeparatorPath: settings?.rangeSeparatorPath,
         rankingGroupIndex: settings?.rankingGroupIndex,
         translate: settings?.translate,
     };
@@ -104,3 +103,11 @@ function getRankingUIValues(values: IFSValueRanking[][], addEnableds = false, ra
         enabled: addEnableds ? rankingValue.enabled : undefined
     }));
 }
+
+function getRangeSeparator(settings: IFUUIValueSettings): string {
+    if (!isEmpty(settings.translate) && !isEmpty(settings.rangeSeparatorPath)) {
+        return settings.translate(settings.rangeSeparatorPath);
+    } else {
+        return settings.rangeSeparator;
+    }
+}

package/src/filters/helpers/ui/index.ts

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

package/src/filters/helpers/ui/{resolveUIFlatFilterByParams.ts → resolveUIFlatFiltersByParams.ts}

@@ -1,6 +1,5 @@
-import { isEmpty } from "../../../general/mix/isEmpty";
-import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
-import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
+import { isEmpty } from "../../../general";
+import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
 
 /**
  * Resolves conditions between UI flattened filter and given parameters

package/src/filters/helpers/ui/transformFilterValues.ts

@@ -1,30 +1,29 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { transformValue } from "../../../qrvey/helpers/transformValue";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFSValue } from "../../interfaces/common/IFSValue";
 import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
 import { IFValue } from "../../interfaces/IFValue";
-import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { IFUTransformFilterValuesSettings } from "../../interfaces/ui/IFUTransformFilterValuesSettings";
 import { isRangeValidator } from "../common/isRangeValidator";
 import { isRegularValidator } from "../common/isRegularValidator";
 
-export function transformFilterValues(filter: IFUFilter, settings: IFUTransformFilterValuesSettings): IFValue[] {
+export function transformFilterValues(filter: IFSFilter, settings: IFUTransformFilterValuesSettings): IFValue[] {
     const transformValueSettings = { ...settings, column: filter.column, property: filter.property };
     if (isEmpty(filter)) return [];
 
-    const values = filter.values || [];
     if (isRegularValidator(filter.validator)) {
-        return (values as IFSValue[]).map((value: IFSValue) => ({
+        return (filter.values as IFSValue[]).map((value: IFSValue) => ({
             ...value,
             value: transformValue(value.value, transformValueSettings),
          }));
     } else if (isRangeValidator(filter.validator)) {
-        return (values as IFSValueRange[]).map((value: IFSValueRange) => ({
+        return (filter.values as IFSValueRange[]).map((value: IFSValueRange) => ({
             ...value,
             min: transformValue(value.min, transformValueSettings),
             max: transformValue(value.max, transformValueSettings)
          }));
     } else {
-        return values;
+        return filter.values;
     }
 }

package/src/filters/index.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/src/filters/interfaces/OLD_IFilterDetail.ts

@@ -12,14 +12,13 @@ import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 
 export interface OLD_IFilterDetail {
-    column?: Omit<IColumn, 'label'> & { dataset: IDataset } & { text: string };
+    column?: IColumn & { dataset: IDataset };
     dateSection?: IFDateSection;
     enabled?: boolean;
     lookupDisplayIndex?: number;
     nullValues?: boolean;
     operator?: IFOperator;
     property?: IFProperty;
-    selectAll?: boolean;
     validator?: IFValidator;
     values?: IFValue[];
   

package/src/filters/interfaces/backend/index.ts

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

package/src/filters/interfaces/builder/IFilterBuilderConfig.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,13 +8,14 @@ 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
  */
 export interface IFilterBuilderConfig {
-    datasets?: string[]; // Qrvey IDs for displaying their columns in the colum selector. If there is not qrveyids, the column list will not render
+    datasets?: string[]; // Qrvey IDs for displaying their columns in the colum selector. No qrveyids, the column list is not render
     filterData?: IFSData; // The Filter Data structure
     filterLabel?: string; // A label for the filter. If filterLabel is provided the old filterLabel is replaced by the new one
     onApplied?: (filter: IFSData | IFUData | OLD_IFilterData | IFBLogic[]) => void;
@@ -31,5 +31,5 @@ export interface IFilterBuilderConfig {
     tokenBoxConfig?: any; // Configuration for the TokenBox.
     userFilters?: IFBUserFilters; // Backend Filter structure assinged by users
     validator?: IFValidator; // Filter Validator type
-    widgetConfig: IFilterConfig; // General config for the Filter Builder Widget
+    widgetConfig: IFilterBuilderGeneralConfig; // General config for the Filter Builder Widget
 }

package/src/filters/interfaces/builder/IFilterBuilderGeneralConfig.ts

@@ -0,0 +1,14 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
+
+/**
+ * Structure for the Fiter Builder General config
+ */
+export interface IFilterBuilderGeneralConfig {
+    apiKey?: string; // Api Key to get access from servers. Optional if qv_token is set
+    appid: string; // App ID
+    domain: string; // The domain of the environment
+    qv_token?: string; // Qrvey Token for RLS
+    timezoneControl?: string; // Offset number for Timezone
+    i18n?: II18nConfig; // The i18n configuration;
+    userid: string; // User ID
+}

package/src/filters/interfaces/builder/index.ts

@@ -14,5 +14,6 @@
  */
 
 export * from './IFilterBuilderConfig';
+export * from './IFilterBuilderGeneralConfig';
 export * from './IFilterBuilderSettings';
 export * from './IFilterBuilderSettingsScopes';

package/src/filters/interfaces/common/IFSColumn.ts

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

package/src/filters/interfaces/common/IFSFilter.ts

@@ -21,7 +21,6 @@ export interface IFSFilter {
   nullValues: boolean; // True: Add values including Null Values; False: Not including Null values.
   operator: IFOperator; // Related operator for this filter. i.e: F1 AND...
   property?: IFProperty; // Related property for some columns (Date group|Complex Data types).
-  selectAll?: boolean; // Flag to determine the complete selection of the data
   validator: IFValidator; // Related Validator for this filter.
-  values?: IFValue[]; // Values structure. Depending on the selected validator it changes. Activated Select All could recieve an empty or undefined values
+  values: IFValue[]; // Values structure. Depending on the selected validator it changes.
 }

package/src/filters/interfaces/common/IFSFilterExtras.ts

@@ -1,6 +1,5 @@
 import { IFScope } from "../IFScope";
 import { IFSection } from "../IFSection";
-import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSFilterExtrasInfo } from "./IFSFilterExtrasInfo";
 
 /**
@@ -13,7 +12,6 @@ export interface IFSFilterExtras {
     scopeid?: string; // The scope ID. This is set depending on the scope type. Global: undefined; Tab: tabid; Page: pageid; DATA: qrveyid
     section?: IFSection; // The section when the filter is applied.
     info?: IFSFilterExtrasInfo; // Extra filter info
-    chart?: IFUChartSettings; // Chart Settings
 
     [x: string]: any; // Specific case for those filters that need to store something else
 }

package/src/filters/interfaces/common/IFSMergeFiltersSettings.ts

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

package/src/filters/interfaces/common/IFSParamsToGetFilter.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";
 
@@ -10,10 +9,9 @@ import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
  * Structure for filter properties
  */
 export interface IFSParamsToGetFilter {
-    column?: IFSColumn;
+    column?: Partial<IFSColumn>;
     dateSection?: IFDateSection;
     enableds?: IFSParamsToGetFilterEnableds;
-    chart?: IFUChartSettings;
     linkid?: string;
     panelid?: string;
     property?: IFProperty;
@@ -21,4 +19,4 @@ export interface IFSParamsToGetFilter {
     scope?: IFScope;
     scopeid?: string;
     validator?: IFValidator;
-}
+}

package/src/filters/interfaces/{functions/IFFiltersParamsToGetFilter.ts → common/IFSParamsToGetFilterSettings.ts}

@@ -1,7 +1,7 @@
 /**
  * Structure for filter properties
  */
- export interface IFFiltersParamsToGetFilter {
+ export interface IFSParamsToGetFilterSettings {
     letPassUndefinedProperties?: {
         scope?: boolean;
         dataset?: boolean;

package/src/filters/interfaces/common/index.ts

@@ -13,7 +13,6 @@
  * IFP-: Structures to Filter Panel
  */
  
-export * from './IFilterConfig';
 export * from './IFSAvailableScope';
 export * from './IFSColumn';
 export * from './IFSData';
@@ -22,9 +21,10 @@ export * from './IFSDataStore';
 export * from './IFSFilter';
 export * from './IFSFilterExtras';
 export * from './IFSFilterExtrasInfo';
-export * from './IFSGetDataValues';
+export * from './IFSMergeFiltersSettings';
 export * from './IFSParamsToGetFilter';
 export * from './IFSParamsToGetFilterEnableds';
+export * from './IFSParamsToGetFilterSettings';
 export * from './IFSScope';
 export * from './IFSScopeID';
 export * from './IFSValue';

package/src/filters/interfaces/ui/IFUColumn.ts

@@ -1,9 +1,9 @@
-import { IColumn } from "../../../columns/interfaces/IColumn";
+import { IFSColumn } from "../common/IFSColumn";
 
 /**
  * Structure for visualizing a column.
  */
-export interface IFUColumn extends IColumn {
+export interface IFUColumn extends IFSColumn {
     label: string; // The label/name of the column
     uniqueid?: string; // The unique ID for this column.
 }

package/src/filters/interfaces/ui/IFUUIValueSettings.ts

@@ -3,5 +3,7 @@ import { II18nServiceTranslate } from "../../../globalization/interfaces/II18nSe
 export interface IFUUIValueSettings {
     addEnableds?: boolean;
     rankingGroupIndex?: number;
+    rangeSeparator?: string; // The string to separate the min and max values from range validator
+    rangeSeparatorPath?: string; // Prioriteze over rangeSeparator. Path for translate the range separator
     translate?: II18nServiceTranslate;
 }

package/src/filters/interfaces/ui/index.ts

@@ -14,8 +14,8 @@
 export * from './IFUChartSettings';
 export * from './IFUColumn';
 export * from './IFUData';
-export * from './IFUDataset';
 export * from './IFUDataStore';
+export * from './IFUDataset';
 export * from './IFUFilter';
 export * from './IFUFilterExtras';
 export * from './IFUFlattenedFilter';

package/src/format/format.ts

@@ -6,8 +6,9 @@ import { isEmpty } from '../general/mix/isEmpty';
 import { _get } from '../general/object/get';
 import { COLUMN } from '../columns/constants/COLUMN';
 import { FORMULA } from '../formulas/constants/FORMULA';
-import { IFormatConfig } from '..';
 import { formatWithLocale } from './localization';
+import { isObject } from '../general/object/isObject';
+import { IFormatConfig } from '../interfaces/format/IFormatConfig.Interface';
 
 dayjs.extend(advancedFormat); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
 
@@ -21,6 +22,7 @@ function isValidDateString(dateString = '') {
 }
 
 export function formatDate(dateString, format) {
+    if(isObject(format)) format = format.format || "";
     if (isEmpty(dateString) || !isNaN(dateString) || format === 'Default') return dateString;
     if (!isValidDateString(dateString)) return dateString;
     const dateValue = dateString?.replace(/Z$/i, '');