@qrvey/utils 1.3.0-9 → 1.3.2

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

@@ -0,0 +1,52 @@
+import { filterNestedTree } from "../../../general/array/filterNestedTree";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFBExpression } from "../../interfaces/backend/IFBExpression";
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFFGetLogicByDatasetsColumns } from "../../interfaces/functions/IFFGetLogicByDatasetsColumns";
+
+/**
+ * @todo MODULE NO READY
+ * Filters the logic by a datasets array
+ * If an qrveyid is not provided in the expression a the filter passes normally
+ * @param logic The logic of the filter
+ * @param datasets The collection of datasets
+ * @returns a new filtered logic
+ */
+export function getLogicByDatasetsColumns(logic: IFBLogic[], datasets: IDataset[] = [], settings?: IFFGetLogicByDatasetsColumns): IFBLogic[] {
+    if (isEmpty(logic)) return;
+    if (isEmpty(datasets)) return logic;
+
+    settings = getGetLogicByDatasetsSettings(settings);
+
+    return logic.map(_l => ({
+        ..._l,
+        filters: filterNestedTree(_l.filters, 'expressions', (expression: IFBExpression) => {
+            const letQrveyidPass = settings.letPassUndefinedProperties.qrveyid || _hasProperty(expression, 'qrveyid');
+            let letQuestionidPass = settings.letPassUndefinedProperties.questionid || _hasProperty(expression, 'questionid');
+            const dataset = letQrveyidPass ? datasets.find(_data => _data.qrveyid === expression.qrveyid) : undefined;
+            if (!isEmpty(dataset)) {
+                const column = letQuestionidPass ? (dataset.options || []).find(option => option.id === expression.questionid) : undefined;
+                letQuestionidPass = letQuestionidPass || !isEmpty(column);
+            }
+            
+            return (letQrveyidPass && !isEmpty(dataset)) && letQuestionidPass;
+        })
+    }));
+}
+
+/**
+ * Gets the default settings for the getLogicByDatasetsColumn function
+ * @param settings the settings given by the implementer
+ * @returns an object with all properties set
+ */
+function getGetLogicByDatasetsSettings(settings?: IFFGetLogicByDatasetsColumns): IFFGetLogicByDatasetsColumns {
+    return {
+        filterEmptyArrays: settings?.filterEmptyArrays ?? true,
+        letPassUndefinedProperties: {
+            qrveyid: settings?.letPassUndefinedProperties?.qrveyid ?? true,
+            questionid: settings?.letPassUndefinedProperties?.questionid ?? true
+        }
+    };
+}

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

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

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

@@ -1,12 +1,12 @@
 import { getAttribute } from '../../../general/object/getAttribute';
-import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
+import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
 
 /**
  * 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 = {}): IFilterBuilderGeneralConfig {
+export function getFilterBuilderGeneralConfig(config: any = {}): IFilterConfig {
     return {
         apiKey: getAttribute(config, 'api_key') || config.apiKey,
         appid: getAttribute(config, 'app_id') || config.appid,

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

@@ -42,10 +42,10 @@ 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 => {
+                            return rankingValues.map(rValue => {
                               if (params.enableds == null || params.enableds === rValue.enabled) return rValue;
                             }).filter(Boolean);
                           } else {
@@ -54,7 +54,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                           }
                         }).filter(Boolean) };
                     }
-                  }).filter(filter => !isEmpty(filter) && filter.values.length > 0)
+                  }).filter(filter => !isEmpty(filter) && (filter.selectAll && 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

@@ -11,13 +11,14 @@ import { IFUData } from "../../interfaces/ui/IFUData";
  */
 export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
     if (isEmpty(data) || isEmpty(data.scopes)) return;
+    if (isEmpty(datasets)) return data;
 
-    return {
+    const newData = {
         ...data,
         scopes: data.scopes.map(scope => ({
             ...scope,
             datasets: scope.datasets.map(filterDataset => {
-                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
                 if (!isEmpty(dataset)) {
                     return {
                         ...filterDataset,
@@ -32,4 +33,8 @@ export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[]
             }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
         })).filter(scope => !isEmpty(scope) && scope.datasets.length > 0)
     };
+
+    if (!isEmpty(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
 }

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?: IFSParamsToGetFilterSettings): IFSData | IFUData {
+export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFFiltersParamsToGetFilter): 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.values.length > 0))
+                  }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || filter.values?.length > 0))
                 };  
               }  
             }).filter(dataset => !isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0))

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

@@ -1,12 +1,13 @@
-import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
+import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
 
 /**
  * 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?: IFSMergeFiltersSettings): IFSMergeFiltersSettings {
+export function getMergeFiltersSettings(settings?: IFFiltersMergeFilters): IFFiltersMergeFilters {
     return {
+        overwriteFilterProps: settings?.overwriteFilterProps ?? true,
         overwriteValues: settings?.overwriteValues ?? false,
         setGroupedColumnOperator: settings?.setGroupedColumnOperator ?? true
     };

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

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

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

@@ -1,11 +1,11 @@
-import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
+import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
 
 /**
  * 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?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings {
+export function getParamsToGetFilterSettings(settings?: IFFiltersParamsToGetFilter): IFFiltersParamsToGetFilter {
     return {
         letPassUndefinedParams: {
             dataset: settings?.letPassUndefinedParams?.dataset ?? true,

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

@@ -0,0 +1,19 @@
+import { getDataAnswersByColumn } from "../../../qrvey/helpers/getDataAnswersByColumn";
+import { modelAnswerToFilterValue } from "../../adapters/modelAnswerToFilterValue";
+import { IFBData } from "../../interfaces/backend/IFBData";
+import { IFFiltersGetValuesFromDataset } from "../../interfaces/functions/IFFiltersGetValuesFromDataset";
+
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given dataset.
+ * @returns The values.
+ */
+export function getValuesFromDataset(props: IFFiltersGetValuesFromDataset): IFBData {
+    const answers = getDataAnswersByColumn({ column: props.column, dataset: props.dataset, property: props.property, lookupDisplay: props.lookupDisplay });
+    const data = modelAnswerToFilterValue(answers);
+    const values: IFBData = { data, total: data.length };
+    if (props.value) {
+      values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+    }
+    return values;
+}

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

@@ -0,0 +1,19 @@
+import { getDataAnswersByColumn } from "../../../qrvey/helpers/getDataAnswersByColumn";
+import { modelAnswerToFilterValue } from "../../adapters/modelAnswerToFilterValue";
+import { IFBData } from "../../interfaces/backend/IFBData";
+import { IFFiltersGetValuesFromModel } from "../../interfaces/functions/IFFiltersGetValuesFromModel";
+
+/**
+ * Gets the values from the model object that will be used to filter. Static values are values to belong from static values questions. Static values questions are questions that do not need request an info from backend, instead the info is got from Model object.
+ * @param props Configuration to get static values from the given model.
+ * @returns The values.
+ */
+export function getValuesFromModel(props: IFFiltersGetValuesFromModel): IFBData {
+    const answers = getDataAnswersByColumn({ column: props.column, model: props.model, property: props.property, lookupDisplay: props.lookupDisplay });
+    const data = modelAnswerToFilterValue(answers);
+    const values: IFBData = { data, total: data.length };
+    if (props.value) {
+      values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+    }
+    return values;
+}

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

@@ -1,8 +1,9 @@
 export * from './areFiltersEquals';
-export * from './isDateDistinctProperty';
+
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
+
 export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
@@ -14,13 +15,18 @@ 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,18 +4,12 @@ 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 { IFSValue } from "../../interfaces/common/IFSValue";
-import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
-import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
-import { IFValue } from "../../interfaces/IFValue";
+import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
 import { IFUData } from "../../interfaces/ui/IFUData";
+import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
-import { isInValidator } from "./isInValidator";
-import { isNullValidator } from "./isNullValidator";
-import { isRangeValidator } from "./isRangeValidator";
-import { isRegularValidator } from "./isRegularValidator";
+import { mergeValues } from "./mergeValues";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -24,10 +18,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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
-export function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData {
+export function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData {
     if (isEmpty(filterData1) || isEmpty(filterData1.scopes)) {
         if (isEmpty(filterData2) || isEmpty(filterData2.scopes)) return;
         return filterData2;
@@ -50,15 +44,15 @@ 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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new scope structure array
  */
-function mergeScopes(scopes1: IFSScope[] = [], scopes2: IFSScope[] = [], settings?: IFSMergeFiltersSettings): IFSScope[] {
+function mergeScopes(scopes1: IFSScope[] = [], scopes2: IFSScope[] = [], settings?: IFFiltersMergeFilters): 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) {
             scope1 = {
-                ...scope1,
+                ...scopes2[scope2Index],
                 datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings)
             };
             scopes2.splice(scope2Index, 1);
@@ -75,15 +69,15 @@ 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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new dataset structure array
  */
-function mergeDatasets(datasets1: IFSDataset[] = [], datasets2: IFSDataset[] = [], settings?: IFSMergeFiltersSettings): IFSDataset[] {
+function mergeDatasets(datasets1: IFSDataset[] = [], datasets2: IFSDataset[] = [], settings?: IFFiltersMergeFilters): 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) {
             dataset1 = {
-                ...dataset1,
+                ...datasets2[dataset2Index],
                 filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings)
             };
             datasets2.splice(dataset2Index, 1);
@@ -100,18 +94,20 @@ 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 overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter structure array
  */
-function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], settings?: IFSMergeFiltersSettings): IFSFilter[] {
+function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], settings?: IFFiltersMergeFilters): 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.overwriteValues) };
+            filter1 = { ...filter1, values: mergeValues(filter1, filters2[filter2Index], settings) };
+            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             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[]);
@@ -121,49 +117,27 @@ function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], s
 }
 
 /**
- * Gets a new value structure array by merging two value structures
+ * 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 overwrite Flag to overwrite or not the filter values
- * @returns a new value structure array
+ * @param settings configuration of the mergeFilter
+ * @returns a new filter structure with overwritted props
  */
-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;
+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,
+            operator: filter2.operator || filter1.operator,
+            filterid: filter2.filterid,
+            lookupDisplayIndex: filter2.lookupDisplayIndex,
+            nullValues: filter2.nullValues,
+            selectAll: filter2.selectAll,
+        };
     }
-
-    return newValues;
+    return filter1;
 }

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

@@ -0,0 +1,90 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSValue } from "../../interfaces/common/IFSValue";
+import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
+import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
+import { IFFiltersMergeValues } from "../../interfaces/functions/IFFiltersMergeValues";
+import { IFValue } from "../../interfaces/IFValue";
+import { getMergeValuesSettings } from "./getMergeValuesSettings";
+import { isInValidator } from "./isInValidator";
+import { isNullValidator } from "./isNullValidator";
+import { isRangeValidator } from "./isRangeValidator";
+import { isRegularValidator } from "./isRegularValidator";
+
+/**
+ * Gets a new value structure array by merging two value structures
+ * @param filter1 the target filter structure
+ * @param filter2 the filter to be used to merge the values
+ * @param settings configuration of the mergeFilter
+ * @returns a new value structure array
+ */
+export function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeValues): IFValue[] {
+    if (isEmpty(filter1) && isEmpty(filter2)) return [];
+
+    settings = getMergeValuesSettings(settings);
+
+    let newValues = [];
+    let filter1Values = filter1.values || [];
+    const filter2Values = filter2.values || [];
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    } else {
+        if (isInValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values: IFSValueRelativeDate[], value2: IFSValueRelativeDate) => {
+                const value1Index = (filter1Values 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);
+                } else {
+                    values[value1Index] = {
+                        anchor: value2.anchor,
+                        cursor: value2.cursor,
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
+                return values;
+            }, filter1Values as IFValue[]);
+        } else if (isRangeValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values: IFSValueRange[], value2: IFSValueRange) => {
+                const value1Index = (filter1Values as IFSValueRange[]).findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                } else {
+                    values[value1Index] = {
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
+                return values;
+            }, filter1Values as IFValue[]);
+        } else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values: IFSValue[], value2: IFSValue) => {
+                const value1Index = (filter1Values as IFSValue[]).findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                } else {
+                    values[value1Index] = {
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
+                return values;
+            }, filter1Values as IFValue[]);
+        } else {
+            filter1Values = filter1Values.concat(filter2Values);
+            newValues = filter1Values;
+        }
+    }
+
+    return newValues;
+}

package/src/filters/helpers/getAggFiltersFromFilterData.ts

@@ -4,12 +4,12 @@ import { IFSData } from "../interfaces/common/IFSData";
 import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColumn";
 
 /**
- * 
- * @param logics 
- * @param summaries 
- * @returns 
+ * @todo FIX AGGREGATE FILTERS
+ * @private
+ * @param filterData 
+ * @param _summaries 
+ * @returns the aggFilters structure
  */
-// [TODO: FILTERS - FIX AGGREGATE FILTERS]
 export function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate {
   filterData = { ...getFiltersByAggregateColumn(filterData) }; 
   if (isEmpty(filterData)) return;

package/src/filters/helpers/getAvailableScopes.ts

@@ -17,13 +17,13 @@ export function getAvailableScopes(config: IFSAvailableScope): IFSScopeID[] {
     if (!isEmpty(config.predefinedScopes)) scopes = config.predefinedScopes;
     scopes = [ ...scopes, { label: FILTER_SCOPE.GLOBAL, id: undefined } ];
 
-    if (config.tabid != null || config.pageid != null) {
+    if (config.tabid != null || config.pageid != null || config.panelid != null) {
         if (config.pageid) scopes = [...scopes, { label: FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid) scopes = [ ...scopes, { label: FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid) scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
-    } else {
-        if (config.defaultid) scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+        if (config.panelid || config.tabid || config.pageid) scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
+    } else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

package/src/filters/helpers/index.ts

@@ -4,6 +4,9 @@ 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 "./resolveUIFlatFiltersByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 
  /**
    * 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 "./resolveUIFlatFiltersByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 
 /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object