@qrvey/utils 1.2.10-1 → 1.2.10-2

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

@@ -11,6 +11,7 @@ import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDa
 import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
 import { IFValue } from "../../interfaces/IFValue";
 import { IFUData } from "../../interfaces/ui/IFUData";
+import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
 import { isInValidator } from "./isInValidator";
 import { isNullValidator } from "./isNullValidator";
@@ -24,7 +25,7 @@ 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?: IFFiltersMergeFilters): IFSData | IFUData {
@@ -50,7 +51,7 @@ 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?: IFFiltersMergeFilters): IFSScope[] {
@@ -75,7 +76,7 @@ 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?: IFFiltersMergeFilters): IFSDataset[] {
@@ -100,18 +101,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?: 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[]);
@@ -120,20 +123,42 @@ function mergeFilterss(filters1: IFSFilter[] = [], filters2: IFSFilter[] = [], s
     return newFilters;
 }
 
+/**
+ * Gets a new filter structure when the setting is configured
+ * @param filter1 the target filter structure
+ * @param filter2 the filter to be used to merge the values
+ * @param settings configuration of the mergeFilter
+ * @returns a new filter structure with overwritted props
+ */
+function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeFilters) {
+    if (settings.overwriteFilterProps) {
+        filter1 = {
+            ...filter1,
+            extras: filter2.extras,
+            enabled: filter2.enabled || filter1.enabled,
+            filterid: filter2.filterid,
+            lookupDisplayIndex: filter2.lookupDisplayIndex,
+            nullValues: filter2.nullValues,
+            selectAll: filter2.selectAll,
+        };
+    }
+    return filter1;
+}
+
 /**
  * Gets a new value structure array by merging two value structures
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param overwrite Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new value structure array
  */
-function mergeValues(filter1: IFSFilter, filter2: IFSFilter, overwrite = false): IFValue[] {
+function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeFilters): IFValue[] {
     if (isEmpty(filter1) && isEmpty(filter2)) return [];
 
     let newValues = [];
     let filter1Values = filter1.values || [];
-    const filter2Values = filter1.values || [];
-    if (!overwrite) {
+    const filter2Values = filter2.values || [];
+    if (!settings.overwriteValues) {
         if (isInValidator(filter1.validator)) {
             newValues = filter2Values.reduce((values: IFValue[], 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);

package/src/filters/interfaces/functions/IFFiltersMergeFilters.ts

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