@qrvey/utils 1.2.10-4 → 1.2.10-7

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.10-2*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.10-6*
 
 > Helper, Utils for all Qrvey Projects
 

package/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: node:14.17.3
+image: node:16.14.1
 
 pipelines:
   default:

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

@@ -359,7 +359,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/OLD_getAggFilters.d.ts

@@ -4,6 +4,6 @@ import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
  * @deprecated soon
  * @param logics
  * @param summaries
- * @returns
+ * @returns the filter aggregate structure
  */
 export declare function getAggFilters(logics?: OLD_IFilterLogic[], summaries?: any[]): IFBFilterAggregate;

package/dist/cjs/filters/helpers/OLD_getAggFilters.js

@@ -10,7 +10,7 @@ const FILTER_OPERATOR_1 = require("../constants/common/FILTER_OPERATOR");
  * @deprecated soon
  * @param logics
  * @param summaries
- * @returns
+ * @returns the filter aggregate structure
  */
 function getAggFilters(logics = [], summaries = []) {
     const aggregateFilters = getAggregateFilters(logics);

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

@@ -77,7 +77,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/helpers/common/mergeFilters.js

@@ -115,8 +115,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
+    var _a, _b, _c;
     if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+        filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
     }
     return filter1;
 }
@@ -133,31 +134,64 @@ function mergeValues(filter1, filter2, settings) {
     let newValues = [];
     let filter1Values = filter1.values || [];
     const filter2Values = filter2.values || [];
-    if (!settings.overwriteValues) {
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    }
+    else {
         if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.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: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
         else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
         else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
@@ -166,9 +200,5 @@ function mergeValues(filter1, filter2, settings) {
             newValues = filter1Values;
         }
     }
-    else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
     return newValues;
 }

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/filters/services/UChartPaginationApi.d.ts

@@ -9,7 +9,7 @@ export default class UChartPaginationApi {
     uFilter: IFUFlattenedFilter;
     /**
      * Gets afterKey object
-     * @returns
+     * @returns the afterKey object
      */
     getAfterKey: () => any;
     /**
@@ -38,7 +38,7 @@ export default class UChartPaginationApi {
     /**
      * Get a dimension body structure foor pagination endpoint
      * @param dimensions
-     * @returns
+     * @returns the dimension body structure
      */
     private _getDimensionsBodyAdapter;
     /**

package/dist/cjs/filters/services/UChartPaginationApi.js

@@ -21,7 +21,7 @@ class UChartPaginationApi {
     constructor() {
         /**
          * Gets afterKey object
-         * @returns
+         * @returns the afterKey object
          */
         this.getAfterKey = () => {
             return this.afterKey;
@@ -100,7 +100,7 @@ class UChartPaginationApi {
         /**
          * Get a dimension body structure foor pagination endpoint
          * @param dimensions
-         * @returns
+         * @returns the dimension body structure
          */
         this._getDimensionsBodyAdapter = (dimensions = []) => {
             return dimensions.map(dimension => ({

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

@@ -32,7 +32,7 @@ const formatWithLocale = (value, outputFormat, config = {}) => {
 exports.formatWithLocale = formatWithLocale;
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
-    const dateValue = value === null || value === void 0 ? void 0 : value.replace('.000Z', '');
+    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) {

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/cjs/services/adapters/BBranchesMapToUIBranchesMap.adapter.d.ts

@@ -1,8 +1,8 @@
 import { IBModelBranchesMap } from "../../qrvey/interfaces/IBModelBranchesMap";
 import { IModelBranchesMap } from "../../qrvey/interfaces/IModelBranchesMap";
 /**
- *
- * @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 declare function BBranchesMapToUIBranchesMap(branchesMap: IBModelBranchesMap[]): IModelBranchesMap[];

package/dist/cjs/services/adapters/BBranchesMapToUIBranchesMap.adapter.js

@@ -4,9 +4,9 @@ exports.BBranchesMapToUIBranchesMap = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const BColumnsToUIColumns_adapter_1 = require("./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
  */
 function BBranchesMapToUIBranchesMap(branchesMap) {
     if ((0, isEmpty_1.isEmpty)(branchesMap))

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

@@ -353,7 +353,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/OLD_getAggFilters.d.ts

@@ -4,6 +4,6 @@ import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
  * @deprecated soon
  * @param logics
  * @param summaries
- * @returns
+ * @returns the filter aggregate structure
  */
 export declare function getAggFilters(logics?: OLD_IFilterLogic[], summaries?: any[]): IFBFilterAggregate;

package/dist/filters/helpers/OLD_getAggFilters.js

@@ -7,7 +7,7 @@ import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
  * @deprecated soon
  * @param logics
  * @param summaries
- * @returns
+ * @returns the filter aggregate structure
  */
 export function getAggFilters(logics = [], summaries = []) {
     const aggregateFilters = getAggregateFilters(logics);

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

@@ -73,7 +73,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/helpers/common/mergeFilters.js

@@ -111,8 +111,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
+    var _a, _b, _c;
     if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+        filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
     }
     return filter1;
 }
@@ -129,31 +130,64 @@ function mergeValues(filter1, filter2, settings) {
     let newValues = [];
     let filter1Values = filter1.values || [];
     const filter2Values = filter2.values || [];
-    if (!settings.overwriteValues) {
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    }
+    else {
         if (isInValidator(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.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: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
         else if (isRangeValidator(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
         else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
+                var _a;
                 const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
+                else {
+                    values[value1Index] = {
+                        enabled: (_a = value2.enabled) !== null && _a !== void 0 ? _a : values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
                 return values;
             }, filter1Values);
         }
@@ -162,9 +196,5 @@ function mergeValues(filter1, filter2, settings) {
             newValues = filter1Values;
         }
     }
-    else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
     return newValues;
 }

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/filters/services/UChartPaginationApi.d.ts

@@ -9,7 +9,7 @@ export default class UChartPaginationApi {
     uFilter: IFUFlattenedFilter;
     /**
      * Gets afterKey object
-     * @returns
+     * @returns the afterKey object
      */
     getAfterKey: () => any;
     /**
@@ -38,7 +38,7 @@ export default class UChartPaginationApi {
     /**
      * Get a dimension body structure foor pagination endpoint
      * @param dimensions
-     * @returns
+     * @returns the dimension body structure
      */
     private _getDimensionsBodyAdapter;
     /**

package/dist/filters/services/UChartPaginationApi.js

@@ -16,7 +16,7 @@ export default class UChartPaginationApi {
     constructor() {
         /**
          * Gets afterKey object
-         * @returns
+         * @returns the afterKey object
          */
         this.getAfterKey = () => {
             return this.afterKey;
@@ -95,7 +95,7 @@ export default class UChartPaginationApi {
         /**
          * Get a dimension body structure foor pagination endpoint
          * @param dimensions
-         * @returns
+         * @returns the dimension body structure
          */
         this._getDimensionsBodyAdapter = (dimensions = []) => {
             return dimensions.map(dimension => ({

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

@@ -26,7 +26,7 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
 };
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
-    const dateValue = value === null || value === void 0 ? void 0 : value.replace('.000Z', '');
+    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) {

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/dist/services/adapters/BBranchesMapToUIBranchesMap.adapter.d.ts

@@ -1,8 +1,8 @@
 import { IBModelBranchesMap } from "../../qrvey/interfaces/IBModelBranchesMap";
 import { IModelBranchesMap } from "../../qrvey/interfaces/IModelBranchesMap";
 /**
- *
- * @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 declare function BBranchesMapToUIBranchesMap(branchesMap: IBModelBranchesMap[]): IModelBranchesMap[];

package/dist/services/adapters/BBranchesMapToUIBranchesMap.adapter.js

@@ -1,9 +1,9 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 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) {
     if (isEmpty(branchesMap))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.10-4",
+  "version": "1.2.10-7",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
@@ -19,15 +19,16 @@
   "license": "MIT",
   "devDependencies": {
     "@types/jest": "27.4.1",
+    "@typescript-eslint/eslint-plugin": "5.15.0",
+    "@typescript-eslint/parser": "5.15.0",
     "doxdox": "3.0.0",
+    "eslint": "8.11.0",
     "jest": "27.5.1",
+    "jsdoc": "3.6.10",
     "np": "7.6.0",
     "ts-jest": "27.1.3",
     "typedoc": "0.22.13",
-    "typescript": "4.6.2",
-    "@typescript-eslint/eslint-plugin": "5.15.0",
-    "@typescript-eslint/parser": "5.15.0",
-    "eslint": "8.11.0"
+    "typescript": "4.6.2"
   },
   "dependencies": {
     "d3": "6.3.1",

package/publishing.js

@@ -1,4 +1,9 @@
-// IN DEVELOPMENT
+/**
+ * New version for publishing a new version of Qrvey Utils
+ * 1- Publish the version with np
+ * 2- Update the README.md doc with doxdox
+ */
+
 const fs = require('fs');
 const util = require('util');
 const childProcess = require('child_process');
@@ -17,7 +22,6 @@ const question = util.promisify(rl.question).bind(rl);
 async function execute(command) {
     console.log(command);
     const response = await exec(command);
-    console.log('response', response);
     if (response.error != null) {
         throw new Error(response.error);
     }
@@ -61,66 +65,57 @@ async function spawning(command, sArguments) {
                 reject();
             }
             resolve();
-            
         });
     });
 }
 
-async function openingPackageJson(settings) {
-    console.log('>>> Opening package.json file...');
+async function getPackageJson(settings) {
+    console.log('==>>> Opening package.json file...');
     const packageJson = await fs.readFileSync(settings.packagePath, 'utf8');
     const packageObject = JSON.parse(packageJson);
     if (packageObject != null) {
-        console.log(`The current version is ${packageObject.version}`);
+        console.log(`**** The current version is ${packageObject.version}`);
         return packageObject.version;
     }
     return '';
 }
 
+async function getNewVersion() {
+    console.log('==>>> Checking the new version provided...');
+    let newVersion;
+    const versionIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-new-version='); });
+    if (versionIndex > -1) {
+        const versionArg = proc.argv[versionIndex].split('--np-new-version=');
+        newVersion = versionArg[1] == null || versionArg[1] === '' ? undefined : versionArg[1];
+    }
+    if (newVersion == null) {
+        newVersion = question('No version provided. Type the new version: ');
+    }
+    console.log('**** Version to publish: ' + newVersion);
+    return newVersion;
+}
+
 async function cleaningProject(settings) {
-    console.log('>>> Cleaning project...');
+    console.log('==>>> Cleaning project...');
     await execute(`rm -f ${settings.packageLockPath}`);
     await execute(`rm -f -R ${settings.nodeModulesPath}`);
     await execute(`rm -f -R ${settings.distPath}`);
 }
 
 async function buildingBundle(_settings) {
-    console.log('>>> Installing Dependencies...');
+    console.log('==>>> Installing Dependencies...');
     await execute('npm install');
 
-    console.log('>>> Generating Build...');
+    console.log('==>>> Generating Build...');
     await execute('npm run build');
 }
 
-async function generatingDocument(settings) {
-    console.log('>>> Generating Document...');
-    await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
-}
-
-async function pushingChanges(settings) {
-    console.log('>>> Commiting and Pushing Docs changes...');
-
-    const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
-    console.log('gitStdout', gitStdout);
-    await execute(`git add ${settings.docsPath}`);
-    await execute(`git commit -m "📝 docs: Updated docs${settings.packageVersion !== '' ? ' for ' + settings.packageVersion : ''}"`);
-    await execute(`git push -u origin ${gitStdout}`);
-}
-
-async function revertChanges(settings) {
-    console.log('>>> Checking for modifications...');
-    console.warn(`>>> Unstaging posible changes from ${settings.docsFileName} file`);
-    await execute(`git restore --staged ${settings.docsPath}`);
-    console.warn(`>>> Discarting posible changes of ${settings.docsFileName} file`);
-    await execute(`git checkout -- ${settings.docsPath}`);
-}
-
 async function startPublishingVersion(settings) {
     await callingPublisher(settings);
 }
 
 async function callingPublisher(settings) {
-    console.log('>>> Calling Publisher');
+    console.log('==>>> Calling Publisher');
     let anyBranch = '', tag = '';
     const anyBranchIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-any-branch='); });
     const tagIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-tag='); });
@@ -132,49 +127,60 @@ async function callingPublisher(settings) {
         const tagArg = proc.argv[tagIndex].split('--np-tag=');
         tag = tagArg[1] == null || tagArg[1] === '' ? '' : proc.argv[tagIndex].replace('--np-tag=', '--tag=');
     }
-    // await execute(`np ${settings.newVersion} ${anyBranch} ${tag}`);
     await spawning(`np ${settings.newVersion}`, [anyBranch, tag]);
 }
 
 async function startGeneratingDocs(settings) {
-    console.log('>>> Starting of the Docs generation.');
+    console.log('==>>> Starting the Docs generation');
 
     await generatingDocument(settings);
     await pushingChanges(settings);
 }
 
-async function getNewVersion() {
-    let newVersion;
-    const versionIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-new-version='); });
-    if (versionIndex > -1) {
-        const versionArg = proc.argv[versionIndex].split('--np-new-version=');
-        newVersion = versionArg[1] == null || versionArg[1] === '' ? undefined : versionArg[1];
-    }
-    if (newVersion == null) {
-        newVersion = question('No version provided. Type the new version: ');
-    }
-    return newVersion;
+async function generatingDocument(settings) {
+    console.log('==>>> Generating Document...');
+    await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
+}
+
+async function pushingChanges(settings) {
+    console.log('==>>> Commiting and Pushing Docs changes...');
+
+    const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
+    console.log('gitStdout', gitStdout);
+    await execute(`git add ${settings.docsPath}`);
+    await execute(`git commit -m "📝 docs: Updated docs${settings.newVersion != null || settings.newVersion !== '' ? ' for ' + settings.newVersion : ''}"`);
+    await execute(`git push -u origin ${gitStdout.stdout}`);
+}
+
+async function revertChanges(settings) {
+    console.log('>>> Checking for modifications...');
+    console.warn(`>>> Unstaging posible changes from ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git restore --staged ${settings.docsPath} ${settings.packagePath}`);
+    console.warn(`>>> Discarting posible changes of ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git checkout -- ${settings.docsPath} ${settings.packagePath}`);
 }
 
 async function init() {
     let settings = {
+        currentVersion: '',
         distPath: './dist',
         docsPath: './README.md',
         docsFileName: 'README.md',
         newVersion: undefined,
         nodeModulesPath: './node_modules',
+        packageFileName: 'package.json',
         packageLockPath: './package-lock.json',
         packagePath: './package.json',
-        packageVersion: '',
+        
     };
 
     console.log('Welcome. The publishing operationg will begin.');
     try {
-        settings["packageVersion"] = await openingPackageJson(settings);
+        settings["currentVersion"] = await getPackageJson(settings);
         settings["newVersion"] = await getNewVersion();
 
-        // await cleaningProject(settings);
-        // await buildingBundle(settings);
+        await cleaningProject(settings);
+        await buildingBundle(settings);
         await startPublishingVersion(settings);
         await startGeneratingDocs(settings);
         console.info('Finished Publishing');

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

@@ -410,7 +410,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/OLD_getAggFilters.ts

@@ -13,7 +13,7 @@ import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
  * @deprecated soon
  * @param logics 
  * @param summaries 
- * @returns 
+ * @returns the filter aggregate structure
  */
 export function getAggFilters(logics: OLD_IFilterLogic[] = [], summaries: any[] = []): IFBFilterAggregate {
     const aggregateFilters: OLD_IFilterLogic[] = getAggregateFilters(logics) as OLD_IFilterLogic[];

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

@@ -134,8 +134,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,
@@ -158,28 +161,54 @@ function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFilter
     let newValues = [];
     let filter1Values = filter1.values || [];
     const filter2Values = filter2.values || [];
-    if (!settings.overwriteValues) {
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    } else {
         if (isInValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values: IFValue[], value2: IFSValueRelativeDate) => {
+            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: IFValue[], value2: IFSValueRange) => {
+            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: IFValue[], value2: IFSValue) => {
+            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[]);
@@ -187,9 +216,6 @@ function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFilter
             filter1Values = filter1Values.concat(filter2Values);
             newValues = filter1Values;
         }
-    } else {
-        filter1Values = 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/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

@@ -29,7 +29,7 @@ export const formatWithLocale = (value: any, outputFormat: IFormatOutputFormat,
 
 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) {

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 [];