@qrvey/utils 1.3.0-7 → 1.3.0-8

package/src/filters/helpers/backend/getBackendValues.ts

@@ -19,55 +19,53 @@ import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
  * @returns A collection of backend expression value
  */
 export function getBackendValues(filter: IFSFilter): IFBackendExpressionValue[] {
-    const values = filter.values || [];
-
     switch (filter.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
-            if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) return getRankingValues(values as IFSValueRanking[][]);
-            return getResultValues(values as IFSValue[], filter);
+            if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) return getRankingValues(filter.values as IFSValueRanking[][]);
+            return getResultValues(filter.values as IFSValue[], filter);
         case FILTER_VALIDATOR.CONTAINS:
         case FILTER_VALIDATOR.NOT_CONTAIN:
         case FILTER_VALIDATOR.STARTS_WITH:
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR.NOT_END_WITH:
-            return (values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
+            return (filter.values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lte: value.max, gte: value.min }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lt: value.max, gt: value.min }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lt: value.max }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lte: value.max }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { gt: value.min }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { gte: value.min }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && (values as IFSValue[]).every(value => value.enabled);
+            const addValue = filter.values.length > 0 && (filter.values as IFSValue[]).every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[filter.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return (values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
+            return (filter.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -75,13 +73,12 @@ export function getBackendValues(filter: IFSFilter): IFBackendExpressionValue[]
 
 /**
  * Gets the expression values. Depending on the column type
- * @private
  * @param values a collection of filter values
  * @param filter The filter structure
- * @returns Expression values
+ * @returns 
  */
 function getResultValues(values: IFSValue[], filter: IFSFilter): IFBExpressionValue[] {
-  return (values || []).map((value: IFSValue) => {
+  return values.map((value: IFSValue) => {
     if (value.enabled) {
         if (filter.column.type === COLUMN.IMAGE) {
             return value.valueid || value.imageUrl || value.value;
@@ -94,7 +91,6 @@ function getResultValues(values: IFSValue[], filter: IFSFilter): IFBExpressionVa
 
 /**
  * Gets the Ranking values. 
- * @private
  * @param values a collection of filter values in the ranking structure
  * @param rankingGroupIndex determine the value by this index to build and return it
  * @returns Expression values for ranking

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

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

package/src/filters/helpers/builder/getFilterBuilderGeneralConfig.ts

@@ -1,12 +1,12 @@
 import { getAttribute } from '../../../general/object/getAttribute';
-import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
+import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
 
 /**
  * Returns a filter builder config object by a any given config
  * @param config any config object
  * @returns The filter builder config object
  */
-export function getFilterBuilderGeneralConfig(config: any = {}): IFilterConfig {
+export function getFilterBuilderGeneralConfig(config: any = {}): IFilterBuilderGeneralConfig {
     return {
         apiKey: getAttribute(config, 'api_key') || config.apiKey,
         appid: getAttribute(config, 'app_id') || config.appid,

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

@@ -42,7 +42,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                     if (resolveFilterConditions(filter, params)) {
                       return {
                         ...filter,
-                        values: (filter.values || []).map((value: IFValue) => {
+                        values: filter.values.map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
                             rankingValues.map(rValue => {
@@ -54,7 +54,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                           }
                         }).filter(Boolean) };
                     }
-                  }).filter(filter => !isEmpty(filter) && (filter.selectAll && filter.values?.length > 0))
+                  }).filter(filter => !isEmpty(filter) && filter.values.length > 0)
                 };  
               }  
             }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
@@ -88,5 +88,5 @@ function resolveFilterConditions(filter: IFSFilter, params: IFSParamsToGetFilter
         params.column?.qrveyid !== filter.column.qrveyid &&
         params.column?.linkid !== filter.column.linkid) &&
         params.column?.aggregate !== filter.column.aggregate) &&
-    filter.values?.length > 0;
+    filter.values.length > 0;
 }

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

@@ -0,0 +1,33 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFUData } from "../../interfaces/ui/IFUData";
+
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
+    return {
+        ...data,
+        scopes: data.scopes.map(scope => ({
+            ...scope,
+            datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+                if (!isEmpty(dataset)) {
+                    return {
+                        ...filterDataset,
+                        filters: filterDataset.filters.map(filter => {
+                            const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
+                            if (!isEmpty(column)) {
+                                return { ...filter };
+                            }
+                        }).filter(Boolean)
+                    };
+                }
+            }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
+        })).filter(scope => !isEmpty(scope) && scope.datasets.length > 0)
+    };
+}

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

@@ -5,12 +5,12 @@ import { IFSData } from "../../interfaces/common/IFSData";
 import { IFSDataset } from "../../interfaces/common/IFSDataset";
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 import { IFSScope } from "../../interfaces/common/IFSScope";
 import { IFSValue } from "../../interfaces/common/IFSValue";
 import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
 import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
 import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
 import { IFValue } from "../../interfaces/IFValue";
 import { IFUData } from "../../interfaces/ui/IFUData";
 import { getParamsToGetFilterSettings } from "./getParamsToGetFilterSettings";
@@ -33,7 +33,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * @param params given parameters to validate the dataset 
  * @returns a new Filter object structure
  */
-export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFFiltersParamsToGetFilter): IFSData | IFUData {
+export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFSParamsToGetFilterSettings): IFSData | IFUData {
     if (isEmpty(filterData) || isEmpty(filterData.scopes)) return;
     if (isEmpty(params)) return filterData;
     filterData = cloneDeep(filterData);
@@ -52,7 +52,7 @@ export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSPar
                     if (resolveFilterConditions(filter, params, settings.letPassUndefinedProperties.filter, settings.letPassUndefinedParams.filter)) {
                       return {
                         ...filter,
-                        values: (filter.values || []).map((value: IFValue) => {
+                        values: filter.values.map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
                             return rankingValues.map(rValue => {
@@ -64,7 +64,7 @@ export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSPar
                           }
                         }).filter(Boolean) };
                     }
-                  }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || filter.values?.length > 0))
+                  }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0))
                 };  
               }  
             }).filter(dataset => !isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0))

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

@@ -1,13 +1,12 @@
-import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 
 /**
  * Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the MergeFilters settings
  * @returns a new MergeFilters settings object.
  */
-export function getMergeFiltersSettings(settings?: IFFiltersMergeFilters): IFFiltersMergeFilters {
+export function getMergeFiltersSettings(settings?: IFSMergeFiltersSettings): IFSMergeFiltersSettings {
     return {
-        overwriteFilterProps: settings?.overwriteFilterProps ?? true,
         overwriteValues: settings?.overwriteValues ?? false,
         setGroupedColumnOperator: settings?.setGroupedColumnOperator ?? true
     };

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

@@ -1,11 +1,11 @@
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 
 /**
  * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the ParamsToGetFilter settings
  * @returns a new ParamsToGetFilter settings object.
  */
-export function getParamsToGetFilterSettings(settings?: IFFiltersParamsToGetFilter): IFFiltersParamsToGetFilter {
+export function getParamsToGetFilterSettings(settings?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings {
     return {
         letPassUndefinedParams: {
             dataset: settings?.letPassUndefinedParams?.dataset ?? true,

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

@@ -1,31 +1,26 @@
 export * from './areFiltersEquals';
-
+export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
-
 export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';
 export * from './getFiltersByVisibility';
 export * from './getMergeFiltersSettings';
 export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
 export * from './haveFiltersByDataset';
 export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
 export * from './isInValidator';
 export * from './isNullValidator';
 export * from './isRangeValidator';
 export * from './isRegularValidator';
 export * from './mergeFilters';
-export * from './mergeValues';
 export * from './resolveDatasetConditions';
 export * from './resolveFilterConditions';
 export * from './resolveScopeConditions';
-// export * from './validateFilterTextByColumn';

package/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/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,74 +12,65 @@ 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
+ * 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),
-                displayed: value.displayed != null ? value.displayed : true,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.BEFORE_ON:
         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),
-                displayed: value.displayed != null ? value.displayed : true,
                 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 => ({
+            return (filter.values as IFSValueRange[]).map(value => ({
                 value: `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`,
-                displayed: value.displayed != null ? value.displayed : true,
                 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,
-                displayed: (values as IFSValue[])[0]?.displayed,
-                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';
                 return {
                     value: 
                     `${cursor} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `${from} ${value.anchor || anchor}`: ''}`,
-                    displayed: value.displayed != null ? value.displayed : true,
-                    enabled: settings.addEnableds ? value.enabled : undefined,
+                    enabled: settings.addEnableds ? filter.enabled : undefined,
                 };
             });
         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(value => ({
-                imageUrl: value.imageUrl,
-                value: getValueLabel(value.value, filter, settings),
-                displayed: value.displayed != null ? value.displayed : true,
-                enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
-                valueid: value.valueid,
+            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,
+                valueid: val.valueid,
             }));
     }
 }
@@ -109,7 +100,6 @@ function getRankingUIValues(values: IFSValueRanking[][], addEnableds = false, ra
         rankingIndex: rankingGroupIndex,
         value: `${rankingValue.value.value} - ${rankingValue.position}`,
         valueid: rankingValue.value.valueid,
-        displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
         enabled: addEnableds ? rankingValue.enabled : undefined
     }));
 }

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