@qrvey/utils 1.2.10-5 → 1.2.10-8

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

@@ -3,6 +3,7 @@ import { COLUMN_PROPERTY } from "../../../columns/constants/COLUMN_PROPERTY";
 import { isDateColumn } from "../../../columns/helpers/isDateColumn";
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSValue } from "../../interfaces/common/IFSValue";
 import { IFProperty } from "../../interfaces/IFProperty";
 import { isNullValidator } from "../common/isNullValidator";
 
@@ -20,7 +21,7 @@ export function getBackendProperty(filter: IFSFilter): IFProperty {
     } else if (filter.column.type === COLUMN.LOOKUP && filter.property === COLUMN_PROPERTY.LOOKUP_DISPLAY && filter.lookupDisplayIndex != null) {
       return filter.property.concat('_').concat(filter.lookupDisplayIndex.toString()) as any;
     } else if (filter.column.type === COLUMN.IMAGE) {
-      return COLUMN_PROPERTY.IMAGE_ANSWER_ID;
+      return (filter.values as IFSValue[]).every(value => isEmpty(value.valueid)) ? undefined : COLUMN_PROPERTY.IMAGE_ANSWER_ID;
     }
   }
   return filter.property;

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

@@ -84,7 +84,7 @@ function getResultValues(values: IFSValue[], filter: IFSFilter): IFBExpressionVa
   return (values || []).map((value: IFSValue) => {
     if (value.enabled) {
         if (filter.column.type === COLUMN.IMAGE) {
-            return value.valueid;
+            return value.valueid || value.imageUrl || value.value;
         } else {
             return value.value;
         }

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/index.ts

@@ -24,6 +24,7 @@ export * from './isNullValidator';
 export * from './isRangeValidator';
 export * from './isRegularValidator';
 export * from './mergeFilters';
+export * from './mergeValues';
 export * from './resolveDatasetConditions';
 export * from './resolveFilterConditions';
 export * from './resolveScopeConditions';

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

@@ -5,18 +5,11 @@ import { IFSData } from "../../interfaces/common/IFSData";
 import { IFSDataset } from "../../interfaces/common/IFSDataset";
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
 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 { 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";
-import { isRangeValidator } from "./isRangeValidator";
-import { isRegularValidator } from "./isRegularValidator";
+import { mergeValues } from "./mergeValues";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -134,8 +127,11 @@ function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFF
     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,
+            enabled: filter2.enabled ?? filter1.enabled,
             filterid: filter2.filterid,
             lookupDisplayIndex: filter2.lookupDisplayIndex,
             nullValues: filter2.nullValues,
@@ -144,53 +140,3 @@ function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFF
     }
     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 settings configuration of the mergeFilter
- * @returns a new value structure array
- */
-function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeFilters): IFValue[] {
-    if (isEmpty(filter1) && isEmpty(filter2)) return [];
-
-    let newValues = [];
-    let filter1Values = filter1.values || [];
-    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);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values as IFValue[]);
-        } else if (isRangeValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values: IFValue[], value2: IFSValueRange) => {
-                const value1Index = (filter1Values as IFSValueRange[]).findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values as IFValue[]);
-        } else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values: IFValue[], value2: IFSValue) => {
-                const value1Index = (filter1Values as IFSValue[]).findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values as IFValue[]);
-        } else {
-            filter1Values = filter1Values.concat(filter2Values);
-            newValues = filter1Values;
-        }
-    } else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
-
-    return newValues;
-}

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

@@ -0,0 +1,87 @@
+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,
+                        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] = {
+                        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] = {
+                        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/interfaces/common/IFSValue.ts

@@ -4,6 +4,6 @@
 export interface IFSValue {
     enabled?: boolean; // True: the value is enabled; False: the value is disabled
     imageUrl?: string; // URL for a image. This is common for images column type.
-    value: string; // The value to filter
+    value?: string; // The value to filter
     valueid?: string; // Mostly for webform columns that need an ID. Alias for answerid in the model object.
 }

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

@@ -1,9 +1,9 @@
+import { IFFiltersMergeValues } from "./IFFiltersMergeValues";
 
 /**
  * Structure for MergeFilters property settings
  */
-export interface IFFiltersMergeFilters {
+export interface IFFiltersMergeFilters extends IFFiltersMergeValues{
     overwriteFilterProps?: boolean;
-    overwriteValues?: boolean;
     setGroupedColumnOperator?: boolean;
 }

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

@@ -0,0 +1,3 @@
+export interface IFFiltersMergeValues {
+    overwriteValues?: boolean;
+}

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

@@ -2,4 +2,5 @@ export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';
 export * from './IFFiltersMergeFilters';
+export * from './IFFiltersMergeValues';
 export * from './IFFiltersParamsToGetFilter';

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

@@ -4,6 +4,6 @@
 export interface IFUValue {
     enabled?: boolean; // Optional flag to enabled the value
     imageUrl?: string; // URL from Image type
-    value: string; // A string value
+    value?: string; // A string value
     valueid?: string; // For values that need a value ID or answer ID
 }

package/src/filters/services/UChartPaginationApi.ts

@@ -1,5 +1,3 @@
-
-
 import { isNumericalColumn } from "../../columns/helpers/isNumericalColumn";
 import { isDateColumn } from "../../columns/helpers/isDateColumn";
 import { getAggFilters } from "../helpers/OLD_getAggFilters";
@@ -31,7 +29,7 @@ export default class UChartPaginationApi {
 
     /**
      * Gets afterKey object
-     * @returns 
+     * @returns the afterKey object
      */
     getAfterKey = (): any => {
         return this.afterKey;
@@ -127,7 +125,7 @@ export default class UChartPaginationApi {
     /**
      * Get a dimension body structure foor pagination endpoint
      * @param dimensions 
-     * @returns 
+     * @returns the dimension body structure
      */
     private _getDimensionsBodyAdapter = (dimensions = []) => {
         return dimensions.map(dimension => ({

package/src/format/format.ts

@@ -23,7 +23,8 @@ function isValidDateString(dateString = '') {
 export function formatDate(dateString, format) {
     if (isEmpty(dateString) || !isNaN(dateString) || format === 'Default') return dateString;
     if (!isValidDateString(dateString)) return dateString;
-    return dayjs(dateString.split('.')[0]).format(format.replace('HH24:', 'HH:').replace('MI:SS', 'mm:ss').replace('MM:SS', 'mm:ss'));
+    const dateValue = dateString?.replace(/Z$/i, '');
+    return dayjs(dateValue.split('.')[0]).format(format.replace('HH24:', 'HH:').replace('MI:SS', 'mm:ss').replace('MM:SS', 'mm:ss'));
 }
 
 export function formatAbbreviated(num, decimals) {
@@ -89,7 +90,7 @@ export const addFormat = (value: any, outputFormat: any = 'None', config?: IForm
   switch (outputFormat.type) {
     case 'DATE':
     case 'DATETIME':
-      return config?.lang && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat.format);
+      return config?.lang && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat?.format === 'Default' && outputFormat?.originalFormat?.format ? outputFormat?.originalFormat?.format : outputFormat?.format);
     case 'NUMERIC': {
       const parse = parseFloat(value);
       const withLocale = outputFormat !== 'None' && config?.lang;

package/src/format/localization.ts

@@ -27,9 +27,10 @@ export const formatWithLocale = (value: any, outputFormat: IFormatOutputFormat,
     }
 };
 
+const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value: any, outputFormat: IFormatOutputFormat, config: IFormatConfig) {
     const { lang = LANG_DEFAULT, options } = config;
-    const dateValue = value?.replace('.000Z', '');
+    const dateValue = value?.replace(/Z$/i, '');
     const dateParam = new Date(dateValue);
     let langOpts = options;
     if (outputFormat?.originalFormat) {
@@ -37,18 +38,31 @@ function formatLocaleDate(value: any, outputFormat: IFormatOutputFormat, config:
         if (DATETIME_COLUMN_FORMAT.includes(format)) langOpts = DATETIME_OPTIONS;
     }
     try {
-        return new Intl.DateTimeFormat([lang, LANG_DEFAULT], langOpts).format(dateParam);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = DATE_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.DateTimeFormat([lang, LANG_DEFAULT], langOpts);
+            DATE_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(dateParam);
     } catch (error) {
         return isEmpty(dateParam) ? value : new Intl.DateTimeFormat(LANG_DEFAULT, langOpts).format(dateParam);
     }
 }
 
+const NUMBER_FORMAT_CACHE = [];
 function formatLocaleNumber(value: any, outputFormat: IFormatOutputFormat, config: IFormatConfig,) {
     const { lang = LANG_DEFAULT, options } = config;
     const langOpts = options || getLocaleOptions(outputFormat);
     const valueToFormat = outputFormat?.format === LOCALE_FORMATS.PERCENTAGE ? value/100 : value;
     try {
-        return new Intl.NumberFormat([lang, LANG_DEFAULT], langOpts).format(valueToFormat);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = NUMBER_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.NumberFormat([lang, LANG_DEFAULT], langOpts);
+            NUMBER_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(valueToFormat);
     } catch (e) {
         return new Intl.NumberFormat(LANG_DEFAULT, langOpts).format(valueToFormat);
     }

package/src/globalization/interfaces/dashboard/II18nDashboardToast.ts

@@ -3,4 +3,5 @@ export interface II18nDashboardToast {
     delete_record_message: string;
     add_record_message: string;
     data_views_updated_message: string;
+    failed_download: string;
 }

package/src/globalization/labels/dashboard/I18N_DASHBOARD.ts

@@ -25,6 +25,7 @@ export const I18N_DASHBOARD: II18nDashboard = {
         data_views_updated_message: 'Data views updated successfully.',
         delete_record_message: 'Record Successfully Deleted.',
         refresh_table_message: 'Record Successfully Edited.',
+        failed_download: 'The file(s) could not be exported at this time.',
     },
     tooltips: {
         buckets: "Buckets",

package/src/qrvey/helpers/transformValue.ts

@@ -4,6 +4,7 @@ import { IDateColumnPropertyType } from "../../columns/interfaces/IDateColumnPro
 import { DATE_GROUPING_PROPERTY } from "../../dates/constants/DATE_GROUPING_PROPERTY";
 import { DATE_GROUPING_TIME_PROPERTY } from "../../dates/constants/DATE_GROUPING_TIME_PROPERTY";
 import { addFormat } from "../../format/format";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { getI18nDateGroupLabel } from "../../globalization/helpers/getI18nDateGroupLabel";
 import { ITransformValueSettings } from "../interfaces/ITransformValueSettings";
 import { getValueWithSuffixes } from "./getValueWithSuffixes";
@@ -15,6 +16,8 @@ import { getValueWithSuffixes } from "./getValueWithSuffixes";
  * @returns A transformed value
  */
 export function transformValue(value: string, settings: ITransformValueSettings): string {
+    if (isEmpty(value)) return value;
+
     const valueWithI18n = getI18nDateGroupLabel(value, settings.property as IDateColumnPropertyType, settings.translate);
 
     const valueWithLocalization = addFormat(valueWithI18n, getOutputFormat(settings), getFormatConfig(settings));

package/src/services/adapters/BBranchesMapToUIBranchesMap.adapter.ts

@@ -4,9 +4,9 @@ import { IModelBranchesMap } from "../../qrvey/interfaces/IModelBranchesMap";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 
 /**
- * 
- * @param branchesMap 
- * @returns 
+ * Adapts the branches map from backend to the UI branches map
+ * @param branchesMap the backend branches map
+ * @returns The Branches map array
  */
 export function BBranchesMapToUIBranchesMap(branchesMap: IBModelBranchesMap[]): IModelBranchesMap[] {
     if (isEmpty(branchesMap)) return [];