@qrvey/utils 1.2.10-5 → 1.2.10-8

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/getMergeValuesSettings.d.ts

@@ -0,0 +1,7 @@
+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 declare function getMergeValuesSettings(settings?: IFFiltersMergeValues): IFFiltersMergeValues;

package/dist/filters/helpers/common/getMergeValuesSettings.js

@@ -0,0 +1,11 @@
+/**
+ * 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) {
+    var _a;
+    return {
+        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+    };
+}

package/dist/filters/helpers/common/index.d.ts

@@ -22,6 +22,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/dist/filters/helpers/common/index.js

@@ -22,6 +22,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/dist/filters/helpers/common/mergeFilters.js

@@ -3,10 +3,7 @@ import { cloneDeep } from "../../../general/object/cloneDeep";
 import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
 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";
@@ -111,60 +108,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;
 }
-/**
- * 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, filter2, settings) {
-    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, value2) => {
-                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);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if (isRangeValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
-            newValues = filter2Values.reduce((values, value2) => {
-                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1Values);
-        }
-        else {
-            filter1Values = filter1Values.concat(filter2Values);
-            newValues = filter1Values;
-        }
-    }
-    else {
-        filter1Values = filter2Values;
-        newValues = filter1Values;
-    }
-    return newValues;
-}

package/dist/filters/helpers/common/mergeValues.d.ts

@@ -0,0 +1,11 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFFiltersMergeValues } from "../../interfaces/functions/IFFiltersMergeValues";
+import { IFValue } from "../../interfaces/IFValue";
+/**
+ * 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 declare function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeValues): IFValue[];

package/dist/filters/helpers/common/mergeValues.js

@@ -0,0 +1,88 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+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, filter2, settings) {
+    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, 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);
+        }
+        else {
+            filter1Values = filter1Values.concat(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/functions/IFFiltersMergeFilters.d.ts

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

package/dist/filters/interfaces/functions/IFFiltersMergeValues.d.ts

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

package/dist/filters/interfaces/functions/IFFiltersMergeValues.js

@@ -0,0 +1 @@
+export {};

package/dist/filters/interfaces/functions/index.d.ts

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

package/dist/filters/interfaces/functions/index.js

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

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

@@ -24,9 +24,10 @@ 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 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) {
@@ -35,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/globalization/interfaces/dashboard/II18nDashboardToast.d.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/dist/globalization/labels/dashboard/I18N_DASHBOARD.js

@@ -23,6 +23,7 @@ export const I18N_DASHBOARD = {
         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/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,33 +1,35 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.10-5",
+  "version": "1.2.10-8",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && tsc -m commonjs --outDir dist/cjs",
     "docs": "./node_modules/.bin/jsdoc -c ./jsdoc.config.json",
+    "doxs": "doxdox './dist/**/*.js' --ignore './dist/cjs/**/*.js' --output README.md --layout markdown --package ./package.json",
+    "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
+    "lint-dev": "eslint src --debug --ext .ts,.tsx",
     "publishing": "node prepareToPublish.js && np",
     "publishing-prerelease": "node prepareToPublish.js && np --any-branch --tag=$npm_config_tag",
     "publishing-v2": "node publishing.js --np-new-version=$npm_config_np_new_version --np-any-branch=$npm_config_np_any_branch --np-tag=$npm_config_np_tag",
     "test": "jest test",
-    "test:watch": "jest --watch test",
-    "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
-    "lint-dev": "eslint src --debug --ext .ts,.tsx"
+    "test:watch": "jest --watch test"
   },
   "author": "Qrvey Inc",
   "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');
@@ -129,6 +134,7 @@ async function startGeneratingDocs(settings) {
     console.log('==>>> Starting the Docs generation');
 
     await generatingDocument(settings);
+    await changingVersion(settings);
     await pushingChanges(settings);
 }
 
@@ -137,6 +143,13 @@ async function generatingDocument(settings) {
     await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
 }
 
+async function changingVersion(settings) {
+    console.log('==>>> Replacing the old version in the document');
+    const doc = await fs.readFileSync(settings.docsPath, 'utf8');
+    const replacedDoc = doc.replace(settings.currentVersion, settings.newVersion);
+    await fs.writeFileSync(settings.docsPath, replacedDoc, 'utf8');
+}
+
 async function pushingChanges(settings) {
     console.log('==>>> Commiting and Pushing Docs changes...');
 
@@ -176,8 +189,8 @@ async function init() {
 
         await cleaningProject(settings);
         await buildingBundle(settings);
-        await startPublishingVersion(settings);
         await startGeneratingDocs(settings);
+        await startPublishingVersion(settings);
         console.info('Finished Publishing');
     } catch (err) {
         console.error('Error: ', err);

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