@qrvey/utils 1.2.9-32 → 1.2.9-35

package/dist/cjs/filters/adapters/adaptFilterValues.js

@@ -10,7 +10,7 @@ const COLUMN_1 = require("../../columns/constants/COLUMN");
  * @returns A new value array with the filled properties.
  */
 function adaptFilterValues(filter) {
-    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled }));
+    const setValue = value => (Object.assign(Object.assign({}, value), { value: (0, isEmpty_1.isEmpty)(value.value) ? undefined : value.value, enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled }));
     if (filter.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
         return filter.values.map(rValues => rValues.map(setValue));
     }

package/dist/cjs/filters/adapters/flatUIToFD.js

@@ -6,6 +6,7 @@ const isEmpty_1 = require("../../general/mix/isEmpty");
 const adaptFilterValues_1 = require("./adaptFilterValues");
 const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
 const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
 /**
  * Generates a filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -82,8 +83,11 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
     const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

package/dist/cjs/filters/adapters/flatUIToOldLogic.js

@@ -343,7 +343,7 @@ function getResultValues(values, props) {
     return values.map((value) => {
         if (value.enabled) {
             if (props.column.type === COLUMN_1.COLUMN.IMAGE) {
-                return value.valueid;
+                return value.valueid || value.imageUrl || value.value;
             }
             else {
                 return value.value;

package/dist/cjs/filters/adapters/flatUIToUI.js

@@ -7,6 +7,7 @@ const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
 const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
 const getLastIndexFromArray_1 = require("../../general/array/getLastIndexFromArray");
 const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -89,8 +90,11 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
     const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

package/dist/cjs/filters/helpers/backend/getBackendProperty.js

@@ -23,7 +23,7 @@ function getBackendProperty(filter) {
             return filter.property.concat('_').concat(filter.lookupDisplayIndex.toString());
         }
         else if (filter.column.type === COLUMN_1.COLUMN.IMAGE) {
-            return COLUMN_PROPERTY_1.COLUMN_PROPERTY.IMAGE_ANSWER_ID;
+            return filter.values.every(value => (0, isEmpty_1.isEmpty)(value.valueid)) ? undefined : COLUMN_PROPERTY_1.COLUMN_PROPERTY.IMAGE_ANSWER_ID;
         }
     }
     return filter.property;

package/dist/cjs/filters/helpers/backend/getBackendValues.js

@@ -75,7 +75,7 @@ function getResultValues(values, filter) {
     return values.map((value) => {
         if (value.enabled) {
             if (filter.column.type === COLUMN_1.COLUMN.IMAGE) {
-                return value.valueid;
+                return value.valueid || value.imageUrl || value.value;
             }
             else {
                 return value.value;

package/dist/cjs/filters/interfaces/common/IFSValue.d.ts

@@ -4,6 +4,6 @@
 export interface IFSValue {
     enabled?: boolean;
     imageUrl?: string;
-    value: string;
+    value?: string;
     valueid?: string;
 }

package/dist/cjs/filters/interfaces/ui/IFUValue.d.ts

@@ -4,6 +4,6 @@
 export interface IFUValue {
     enabled?: boolean;
     imageUrl?: string;
-    value: string;
+    value?: string;
     valueid?: string;
 }

package/dist/cjs/format/format.js

@@ -27,7 +27,8 @@ function formatDate(dateString, format) {
         return dateString;
     if (!isValidDateString(dateString))
         return dateString;
-    return (0, dayjs_1.default)(dateString.split('.')[0]).format(format.replace('HH24:', 'HH:').replace('MI:SS', 'mm:ss').replace('MM:SS', 'mm:ss'));
+    const dateValue = dateString === null || dateString === void 0 ? void 0 : dateString.replace(/Z$/i, '');
+    return (0, dayjs_1.default)(dateValue.split('.')[0]).format(format.replace('HH24:', 'HH:').replace('MI:SS', 'mm:ss').replace('MM:SS', 'mm:ss'));
 }
 exports.formatDate = formatDate;
 function formatAbbreviated(num, decimals) {
@@ -85,12 +86,13 @@ function formatFileSize(bytes) {
 }
 exports.formatFileSize = formatFileSize;
 const addFormat = (value, outputFormat = 'None', config) => {
+    var _a, _b;
     if ((0, isEmpty_1.isEmpty)(value) || typeof value === 'object' && (0, isEmpty_1.isEmpty)(value[0]))
         return value;
     switch (outputFormat.type) {
         case 'DATE':
         case 'DATETIME':
-            return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? (0, localization_1.formatWithLocale)(value, outputFormat, config) : formatDate(value, outputFormat.format);
+            return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? (0, localization_1.formatWithLocale)(value, outputFormat, config) : formatDate(value, (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === 'Default' && ((_a = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _a === void 0 ? void 0 : _a.format) ? (_b = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _b === void 0 ? void 0 : _b.format : outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format);
         case 'NUMERIC': {
             const parse = parseFloat(value);
             const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);

package/dist/cjs/format/localization.js

@@ -30,9 +30,11 @@ const formatWithLocale = (value, outputFormat, config = {}) => {
     }
 };
 exports.formatWithLocale = formatWithLocale;
+const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
-    const dateParam = new Date(value);
+    const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, '');
+    const dateParam = new Date(dateValue);
     let langOpts = options;
     if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
         const { format } = outputFormat.originalFormat;
@@ -40,18 +42,31 @@ function formatLocaleDate(value, outputFormat, config) {
             langOpts = definition_1.DATETIME_OPTIONS;
     }
     try {
-        return new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], langOpts).format(dateParam);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = DATE_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], langOpts);
+            DATE_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(dateParam);
     }
     catch (error) {
         return (0, isEmpty_1.isEmpty)(dateParam) ? value : new Intl.DateTimeFormat(definition_1.LANG_DEFAULT, langOpts).format(dateParam);
     }
 }
+const NUMBER_FORMAT_CACHE = [];
 function formatLocaleNumber(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
     const langOpts = options || getLocaleOptions(outputFormat);
     const valueToFormat = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Percentage" /* PERCENTAGE */ ? value / 100 : value;
     try {
-        return new Intl.NumberFormat([lang, definition_1.LANG_DEFAULT], langOpts).format(valueToFormat);
+        const key = lang + JSON.stringify(langOpts);
+        let formatter = NUMBER_FORMAT_CACHE[key];
+        if (!formatter) {
+            formatter = new Intl.NumberFormat([lang, definition_1.LANG_DEFAULT], langOpts);
+            NUMBER_FORMAT_CACHE[key] = formatter;
+        }
+        return formatter.format(valueToFormat);
     }
     catch (e) {
         return new Intl.NumberFormat(definition_1.LANG_DEFAULT, langOpts).format(valueToFormat);

package/dist/cjs/qrvey/helpers/transformValue.js

@@ -6,6 +6,7 @@ const isNumericalColumn_1 = require("../../columns/helpers/isNumericalColumn");
 const DATE_GROUPING_PROPERTY_1 = require("../../dates/constants/DATE_GROUPING_PROPERTY");
 const DATE_GROUPING_TIME_PROPERTY_1 = require("../../dates/constants/DATE_GROUPING_TIME_PROPERTY");
 const format_1 = require("../../format/format");
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const getI18nDateGroupLabel_1 = require("../../globalization/helpers/getI18nDateGroupLabel");
 const getValueWithSuffixes_1 = require("./getValueWithSuffixes");
 /**
@@ -15,6 +16,8 @@ const getValueWithSuffixes_1 = require("./getValueWithSuffixes");
  * @returns A transformed value
  */
 function transformValue(value, settings) {
+    if ((0, isEmpty_1.isEmpty)(value))
+        return value;
     const valueWithI18n = (0, getI18nDateGroupLabel_1.getI18nDateGroupLabel)(value, settings.property, settings.translate);
     const valueWithLocalization = (0, format_1.addFormat)(valueWithI18n, getOutputFormat(settings), getFormatConfig(settings));
     return (0, getValueWithSuffixes_1.getValueWithSuffixes)(valueWithLocalization, { suffixTranslateLabel: settings.suffixTranslateLabel, translate: settings.translate });

package/dist/filters/adapters/adaptFilterValues.js

@@ -7,7 +7,7 @@ import { COLUMN } from "../../columns/constants/COLUMN";
  * @returns A new value array with the filled properties.
  */
 export function adaptFilterValues(filter) {
-    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: isEmpty(value.enabled) ? true : value.enabled }));
+    const setValue = value => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled }));
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
         return filter.values.map(rValues => rValues.map(setValue));
     }

package/dist/filters/adapters/flatUIToFD.js

@@ -3,6 +3,7 @@ import { isEmpty } from "../../general/mix/isEmpty";
 import { adaptFilterValues } from "./adaptFilterValues";
 import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { cloneDeep } from "../../general/object/cloneDeep";
 /**
  * Generates a filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -78,8 +79,11 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    uFilter = cloneDeep(uFilter);
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -337,7 +337,7 @@ function getResultValues(values, props) {
     return values.map((value) => {
         if (value.enabled) {
             if (props.column.type === COLUMN.IMAGE) {
-                return value.valueid;
+                return value.valueid || value.imageUrl || value.value;
             }
             else {
                 return value.value;

package/dist/filters/adapters/flatUIToUI.js

@@ -4,6 +4,7 @@ import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
 import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
 import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -85,8 +86,11 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    uFilter = cloneDeep(uFilter);
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

package/dist/filters/helpers/backend/getBackendProperty.js

@@ -20,7 +20,7 @@ export function getBackendProperty(filter) {
             return filter.property.concat('_').concat(filter.lookupDisplayIndex.toString());
         }
         else if (filter.column.type === COLUMN.IMAGE) {
-            return COLUMN_PROPERTY.IMAGE_ANSWER_ID;
+            return filter.values.every(value => isEmpty(value.valueid)) ? undefined : COLUMN_PROPERTY.IMAGE_ANSWER_ID;
         }
     }
     return filter.property;

package/dist/filters/helpers/backend/getBackendValues.js

@@ -71,7 +71,7 @@ function getResultValues(values, filter) {
     return values.map((value) => {
         if (value.enabled) {
             if (filter.column.type === COLUMN.IMAGE) {
-                return value.valueid;
+                return value.valueid || value.imageUrl || value.value;
             }
             else {
                 return value.value;

package/dist/filters/interfaces/common/IFSValue.d.ts

@@ -4,6 +4,6 @@
 export interface IFSValue {
     enabled?: boolean;
     imageUrl?: string;
-    value: string;
+    value?: string;
     valueid?: string;
 }

package/dist/filters/interfaces/ui/IFUValue.d.ts

@@ -4,6 +4,6 @@
 export interface IFUValue {
     enabled?: boolean;
     imageUrl?: string;
-    value: string;
+    value?: string;
     valueid?: string;
 }

package/dist/format/format.js

@@ -21,7 +21,8 @@ export function formatDate(dateString, format) {
         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 === null || dateString === void 0 ? void 0 : 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) {
     if (num == 0)
@@ -76,12 +77,13 @@ export function formatFileSize(bytes) {
     return megaBytes < 10 ? `${fixDecimals(megaBytes)} MB` : `${Math.round(megaBytes)} MB`;
 }
 export const addFormat = (value, outputFormat = 'None', config) => {
+    var _a, _b;
     if (isEmpty(value) || typeof value === 'object' && isEmpty(value[0]))
         return value;
     switch (outputFormat.type) {
         case 'DATE':
         case 'DATETIME':
-            return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat.format);
+            return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === 'Default' && ((_a = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _a === void 0 ? void 0 : _a.format) ? (_b = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _b === void 0 ? void 0 : _b.format : outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format);
         case 'NUMERIC': {
             const parse = parseFloat(value);
             const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);

package/dist/format/localization.js

@@ -24,9 +24,11 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
             return formatLocaleNumber(value, outputFormat, config);
     }
 };
+const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
-    const dateParam = new Date(value);
+    const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, '');
+    const dateParam = new Date(dateValue);
     let langOpts = options;
     if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
         const { format } = outputFormat.originalFormat;
@@ -34,18 +36,31 @@ function formatLocaleDate(value, outputFormat, config) {
             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, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
     const langOpts = options || getLocaleOptions(outputFormat);
     const valueToFormat = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Percentage" /* 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/dist/qrvey/helpers/transformValue.js

@@ -3,6 +3,7 @@ import { isNumericalColumn } from "../../columns/helpers/isNumericalColumn";
 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 { getValueWithSuffixes } from "./getValueWithSuffixes";
 /**
@@ -12,6 +13,8 @@ import { getValueWithSuffixes } from "./getValueWithSuffixes";
  * @returns A transformed value
  */
 export function transformValue(value, settings) {
+    if (isEmpty(value))
+        return value;
     const valueWithI18n = getI18nDateGroupLabel(value, settings.property, settings.translate);
     const valueWithLocalization = addFormat(valueWithI18n, getOutputFormat(settings), getFormatConfig(settings));
     return getValueWithSuffixes(valueWithLocalization, { suffixTranslateLabel: settings.suffixTranslateLabel, translate: settings.translate });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.9-32",
+  "version": "1.2.9-35",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/src/filters/adapters/adaptFilterValues.ts

@@ -15,7 +15,7 @@ import { IFSValueRelativeDate } from "../interfaces/common/IFSValueRelativeDate"
  * @returns A new value array with the filled properties.
  */
 export function adaptFilterValues(filter: IFSFilter): IFValue[] {
-    const setValue = value => ({ ...value, enabled: isEmpty(value.enabled) ? true : value.enabled });
+    const setValue = value => ({ ...value, value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled });
 
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
         return (filter.values as IFSValueRanking[][]).map(rValues => rValues.map(setValue));

package/src/filters/adapters/flatUIToFD.ts

@@ -9,6 +9,7 @@ import { IFSData } from "../interfaces/common/IFSData";
 import { IFSScope } from "../interfaces/common/IFSScope";
 import { IFSFilter } from "../interfaces/common/IFSFilter";
 import { IFSDataset } from "../interfaces/common/IFSDataset";
+import { cloneDeep } from "../../general/object/cloneDeep";
 
 /**
  * Generates a filter data structure from the flatttened UI filters.
@@ -90,9 +91,13 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFSDataset {
  * @returns an filter structure
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
+    uFilter = cloneDeep(uFilter);
+
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
 
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -406,7 +406,7 @@ function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: numbe
     return values.map((value: IFSValue) => {
       if (value.enabled) {
           if (props.column.type === COLUMN.IMAGE) {
-              return value.valueid;
+              return value.valueid || value.imageUrl || value.value;
           } else {
               return value.value;
           }

package/src/filters/adapters/flatUIToUI.ts

@@ -10,6 +10,7 @@ import { IFUFilter } from "../interfaces/ui/IFUFilter";
 import { IFUDataset } from "../interfaces/ui/IFUDataset";
 import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
 import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
 
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
@@ -96,9 +97,13 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFUDataset {
  * @returns an filter structure
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
+    uFilter = cloneDeep(uFilter);
+
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
 
+    delete uFilter.extras.scopeInfo;
+    delete uFilter.extras.dataset;
     return {
         collapsed: uFilter.collapsed,
         column: {

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

@@ -81,7 +81,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/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/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/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,27 +27,42 @@ 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 dateParam = new Date(value);
+    const dateValue = value?.replace(/Z$/i, '');
+    const dateParam = new Date(dateValue);
     let langOpts = options;
     if (outputFormat?.originalFormat) {
         const { format } = outputFormat.originalFormat;
         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/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));