@qrvey/utils 1.1.4 → 1.1.8

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

@@ -124,26 +124,26 @@ function mergeValues(filter1: IFSFilter, filter2: IFSFilter, overwrite = false):
     let newValues = [];
     if (!overwrite) {
         if (isInValidator(filter1.validator)) {
-            newValues = filter1.values.reduce((values: IFValue[], value1: IFSValueRelativeDate) => {
-                const value2Index = (filter2.values as IFSValueRelativeDate[]).findIndex(value2 => 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 (value2Index === -1) {
-                    values.push(filter2.values[value2Index]);
+            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 = filter1.values.reduce((values: IFValue[], value1: IFSValueRange) => {
-                const value2Index = (filter2.values as IFSValueRange[]).findIndex(value2 => value2.max === value1.max && value2.min === value1.min);
-                if (value2Index === -1) {
-                    values.push(filter2.values[value2Index]);
+            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 = filter1.values.reduce((values: IFValue[], value1: IFSValue) => {
-                const value2Index = (filter2.values as IFSValue[]).findIndex(value2 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value2Index === -1) {
-                    values.push(filter2.values[value2Index]);
+            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[]);

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

@@ -1,3 +1,3 @@
 import { RelativeStatement } from "../../../date";
 
-export type IFSValueRelativeDate = { enabled: boolean; } & RelativeStatement;
+export type IFSValueRelativeDate = { enabled?: boolean; } & RelativeStatement;

package/src/qrvey/getPropertyLabel.ts

@@ -3,7 +3,7 @@ import { COLUMN_PROPERTY, COLUMN_PROPERTY_VALUE, IQrveyColumn, isEmpty } from ".
 
 export function getPropertyLabel(column: IQrveyColumn, property: COLUMN_PROPERTY): string {
     let propertyLabel;
-    const propertyValues = COLUMN_PROPERTY_VALUE[isDateColumn(column) ? column.type + '-complete' : column.type];
+    const propertyValues = COLUMN_PROPERTY_VALUE[isDateColumn(column) ? 'DATE-complete' : column.type];
     if (!isEmpty(propertyValues)) propertyLabel = propertyValues.find(pValue => pValue.value === property)?.label;
     return propertyLabel;
 }