@qrvey/utils 1.4.0-2 → 1.4.0-5

package/dist/cjs/filters/helpers/ui/getUIValues.js

@@ -9,6 +9,7 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
 const flattenDeep_1 = require("../../../general/array/flattenDeep");
 const RELATIVE_CURSOR_INFO_1 = require("../../../dates/relative/constants/RELATIVE_CURSOR_INFO");
 const getI18nDateGroupLabel_1 = require("../../../globalization/helpers/getI18nDateGroupLabel");
+const I18N_RELATIVE_CONTAINER_1 = require("../../../globalization/labels/filters/I18N_RELATIVE_CONTAINER");
 /**
  * Gets the UI Values generated depending on the validator
  * @param filter the filter structure
@@ -16,7 +17,6 @@ const getI18nDateGroupLabel_1 = require("../../../globalization/helpers/getI18nD
  * @returns an array of values
  */
 function getUIValues(filter, settings) {
-    var _a, _b;
     settings = getUiValuesSettings(settings);
     const values = filter.values || [];
     switch (filter.validator) {
@@ -24,92 +24,93 @@ function getUIValues(filter, settings) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map((value) => ({
-                value: getValueLabel(value.min, filter, settings),
-                displayed: value.displayed != null ? value.displayed : true,
-                enabled: settings.addEnableds
-                    ? value.enabled != null
-                        ? value.enabled
-                        : true
-                    : undefined,
-            }));
+            return getUiRangeAfterValues(values, filter, settings);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
-            return values.map((value) => ({
-                value: getValueLabel(value.max, filter, settings),
-                displayed: value.displayed != null ? value.displayed : true,
-                enabled: settings.addEnableds
-                    ? value.enabled != null
-                        ? value.enabled
-                        : true
-                    : undefined,
-            }));
+            return getUiRangeBeforeValues(values, filter, settings);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map((value) => ({
-                value: `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`,
-                displayed: value.displayed != null ? value.displayed : true,
-                enabled: settings.addEnableds
-                    ? value.enabled != null
-                        ? value.enabled
-                        : true
-                    : undefined,
-            }));
+            return getUiRangeBetweenValues(values, filter, settings);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
-            return [
-                {
-                    value: (settings === null || settings === void 0 ? void 0 : settings.translate)
-                        ? settings.translate("filter.validators." + filter.validator.toLowerCase() + "_label")
-                        : FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label,
-                    displayed: (_a = values[0]) === null || _a === void 0 ? void 0 : _a.displayed,
-                    enabled: settings.addEnableds
-                        ? (_b = values[0]) === null || _b === void 0 ? void 0 : _b.enabled
-                        : undefined,
-                },
-            ];
+            return getUiNullValues(values, filter, settings);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return values.map((value) => {
-                const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate)
-                    ? settings.translate(RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath)
-                    : RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
-                const from = (settings === null || settings === void 0 ? void 0 : settings.translate)
-                    ? settings.translate("filter.relative_container.from_label")
-                    : "from";
-                const anchor = (settings === null || settings === void 0 ? void 0 : settings.translate)
-                    ? settings === null || settings === void 0 ? void 0 : settings.translate("filter.relative_container.current_date")
-                    : "current date";
-                return {
-                    value: `${cursor} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1
-                        ? value.number
-                        : ""} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS
-                        ? `${from} ${value.anchor || anchor}`
-                        : ""}`,
-                    displayed: value.displayed != null ? value.displayed : true,
-                    enabled: settings.addEnableds ? value.enabled : undefined,
-                };
-            });
+            return getUiInValues(values, settings);
         default:
-            if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
-                (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
-                return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
-            }
-            return values.map((value) => ({
-                imageUrl: value.imageUrl,
-                value: getValueLabel(value.value, filter, settings),
-                displayed: value.displayed != null ? value.displayed : true,
-                enabled: settings.addEnableds
-                    ? value.enabled != null
-                        ? value.enabled
-                        : true
-                    : undefined,
-                valueid: value.valueid,
-            }));
+            return getUiEqualValues(values, filter, settings);
     }
 }
 exports.getUIValues = getUIValues;
+function getUiRangeAfterValues(values, filter, settings) {
+    return values.map((value) => getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(value.min, filter, settings) }), settings));
+}
+function getUiRangeBeforeValues(values, filter, settings) {
+    return values.map((value) => getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(value.max, filter, settings) }), settings));
+}
+function getUiRangeBetweenValues(values, filter, settings) {
+    return values.map((value) => {
+        const valueLabel = `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`;
+        return getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(valueLabel, filter, settings) }), settings);
+    });
+}
+function getUiNullValues(values, filter, settings) {
+    const value = values[0];
+    const valueLabel = (settings === null || settings === void 0 ? void 0 : settings.translate)
+        ? settings.translate("filter.validators." + filter.validator.toLowerCase() + "_label")
+        : FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label;
+    return [getRegularValue(Object.assign(Object.assign({}, value), { value: valueLabel }), settings)];
+}
+function getUiInValues(values, settings) {
+    return values.map((value) => {
+        const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate)
+            ? settings.translate(RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath)
+            : RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
+        const from = (settings === null || settings === void 0 ? void 0 : settings.translate)
+            ? settings.translate("filter.relative_container.from_label")
+            : I18N_RELATIVE_CONTAINER_1.I18N_RELATIVE_CONTAINER.from_label;
+        const anchor = (settings === null || settings === void 0 ? void 0 : settings.translate)
+            ? settings === null || settings === void 0 ? void 0 : settings.translate("filter.relative_container.current_date")
+            : I18N_RELATIVE_CONTAINER_1.I18N_RELATIVE_CONTAINER.current_date;
+        const valueLabel = `${cursor} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1
+            ? value.number
+            : ""} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS
+            ? `${from} ${value.anchor || anchor}`
+            : ""}`;
+        return getRegularValue(Object.assign(Object.assign({}, value), { value: valueLabel }), settings);
+    });
+}
+function getUiEqualValues(values, filter, settings) {
+    if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
+        (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
+        return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
+    }
+    return values.map((value) => getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(value.value, filter, settings) }), settings));
+}
+function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
+    const flattenValues = rankingGroupIndex == null ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
+    return flattenValues.map((rankingValue) => ({
+        rankingIndex: rankingGroupIndex,
+        value: `${rankingValue.value.value} - ${rankingValue.position}`,
+        valueid: rankingValue.value.valueid,
+        displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
+        enabled: addEnableds ? rankingValue.enabled : undefined,
+    }));
+}
+function getRegularValue(value, settings) {
+    let enabled;
+    if (settings.addEnableds) {
+        enabled = (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled;
+    }
+    return {
+        displayed: (0, isEmpty_1.isEmpty)(value.displayed) ? true : value.displayed,
+        enabled,
+        imageUrl: (0, isEmpty_1.isEmpty)(value.imageUrl) ? undefined : value.imageUrl,
+        value: value.value,
+        valueid: (0, isEmpty_1.isEmpty)(value.valueid) ? undefined : value.valueid,
+    };
+}
 function getValueLabel(value, filter, settings) {
     return settings.translate
         ? (0, getI18nDateGroupLabel_1.getI18nDateGroupLabel)(value, filter.property, settings.translate)
@@ -127,22 +128,12 @@ function getUiValuesSettings(settings) {
 }
 function getValueUiUnitRelativeDate(relative, settings) {
     const unit = settings.translate
-        ? `${settings.translate(`common.units.${relative.unit}`)}`
+        ? settings.translate(`common.units.${relative.unit}`)
         : relative.unit;
     return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1
         ? `${unit}s`
         : unit;
 }
-function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
-    const flattenValues = rankingGroupIndex == null ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
-    return flattenValues.map((rankingValue) => ({
-        rankingIndex: rankingGroupIndex,
-        value: `${rankingValue.value.value} - ${rankingValue.position}`,
-        valueid: rankingValue.value.valueid,
-        displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
-        enabled: addEnableds ? rankingValue.enabled : undefined,
-    }));
-}
 function getRangeSeparator(settings) {
     if (!(0, isEmpty_1.isEmpty)(settings.translate) && !(0, isEmpty_1.isEmpty)(settings.rangeSeparatorPath)) {
         return settings.translate(settings.rangeSeparatorPath);

package/dist/cjs/filters/interfaces/functions/IFFGetLogicByDatasetsColumns.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Object for the getLogicByDatasetsColumns Settings
+ */
 export interface IFFGetLogicByDatasetsColumns {
     letPassUndefinedProperties?: {
         qrveyid?: boolean;

package/dist/cjs/filters/services/UChartApi.d.ts

@@ -15,12 +15,26 @@ export default class UChartApi {
     getChartResult: (config: IFilterConfig, uFilter: IFUFlattenedFilter, filterLogic?: IFBLogic[], chartSettings?: IFUChartSettings, _resetApi?: boolean) => Promise<IFBData>;
     /**
      * Gets request body structure
-     * @param uFilter The filter Builder filter
-     * @param filterLogic Additional filter logic to apply in the preview
-     * @param chartSettings The settings of the chart. For Aggregate Columns.
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the request body structure
      */
     private _getPreviewRequestBody;
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    private _getSearchLogic;
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    private _getFilterCharts;
     /**
      * Gets chart body structure
      * @param uFilter The filter Builder filter

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

@@ -42,34 +42,14 @@ class UChartApi {
         };
         /**
          * Gets request body structure
-         * @param uFilter The filter Builder filter
-         * @param filterLogic Additional filter logic to apply in the preview
-         * @param chartSettings The settings of the chart. For Aggregate Columns.
+         * @param {IFUFlattenedFilter} uFilter The filter object
+         * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+         * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
          * @returns the request body structure
          */
         this._getPreviewRequestBody = (uFilter, filterLogic = [], chartSettings) => {
-            const { column, validator } = uFilter;
-            const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
-                ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
-            let searchLogic;
-            if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
-                searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
-                    Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
-                ]);
-            }
-            let filterCharts = [];
-            if (haveAggFilters) {
-                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
-                    if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
-                        return chart;
-                    const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
-                        s.aggregate === uFilter.column.aggregate);
-                    const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
-                    const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
-                    const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
-                    return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
-                }).filter((chart) => chart.summaries.length);
-            }
+            const searchLogic = this._getSearchLogic(uFilter);
+            const filterCharts = this._getFilterCharts(uFilter, searchLogic, chartSettings);
             const chartsBody = !filterCharts[0]
                 ? [this._getChartBody(uFilter)]
                 : [filterCharts[0]];
@@ -77,7 +57,11 @@ class UChartApi {
                 ...filterLogic,
                 ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
             ];
-            return { charts: chartsBody, logic: filters, qrveyid: column.qrveyid };
+            return {
+                charts: chartsBody,
+                logic: filters,
+                qrveyid: uFilter.column.qrveyid,
+            };
         };
         /**
          * Gets chart body structure
@@ -273,5 +257,44 @@ class UChartApi {
             return validation;
         };
     }
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    _getSearchLogic(uFilter) {
+        let searchLogic;
+        if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
+            searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+            ]);
+        }
+        return searchLogic;
+    }
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    _getFilterCharts(uFilter, searchLogic, chartSettings) {
+        let filterCharts = [];
+        const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
+            ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
+        if (haveAggFilters) {
+            filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
+                if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
+                    return chart;
+                const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
+                    s.aggregate === uFilter.column.aggregate);
+                const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
+                const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
+                const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
+                return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
+            }).filter((chart) => chart.summaries.length);
+        }
+        return filterCharts;
+    }
 }
 exports.default = UChartApi;

package/dist/cjs/filters/services/UChartPaginationApi.d.ts

@@ -23,12 +23,26 @@ export default class UChartPaginationApi {
     getChartResult: (config: IFilterConfig, uFilter: IFUFlattenedFilter, filterLogic?: IFBLogic[], chartSettings?: IFUChartSettings, resetApi?: boolean) => Promise<IFBData>;
     /**
      * Gets request body structure
-     * @param uFilter The filter Builder filter
-     * @param filterLogic Additional filter logic to apply in the preview
-     * @param chartSettings The settings of the chart. For Aggregate Columns.
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the request body structure
      */
     private _getPreviewRequestBody;
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    private _getSearchLogic;
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    private _getFilterCharts;
     /**
      * Gets dimension body structure
      * @param uFilter The filter Builder filter

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

@@ -52,39 +52,21 @@ class UChartPaginationApi {
         };
         /**
          * Gets request body structure
-         * @param uFilter The filter Builder filter
-         * @param filterLogic Additional filter logic to apply in the preview
-         * @param chartSettings The settings of the chart. For Aggregate Columns.
+         * @param {IFUFlattenedFilter} uFilter The filter object
+         * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+         * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
          * @returns the request body structure
          */
         this._getPreviewRequestBody = (uFilter, filterLogic = [], chartSettings, afterKey) => {
-            const { column, validator } = uFilter;
-            const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
-                ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
-            let searchLogic;
-            if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
-                searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
-                    Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
-                ]);
-            }
-            let filterCharts = [];
-            if (haveAggFilters) {
-                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
-                    const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
-                        s.aggregate === uFilter.column.aggregate);
-                    const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
-                    const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
-                    const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
-                    return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
-                }).filter((chart) => chart.summaries.length);
-            }
+            const searchLogic = this._getSearchLogic(uFilter);
+            const filterCharts = this._getFilterCharts(uFilter, searchLogic, chartSettings);
             const dimensions = !filterCharts[0]
                 ? this._getDimensionsBody(uFilter)
                 : this._getDimensionsBodyAdapter(filterCharts[0].dimensions);
             const summaries = !filterCharts[0]
                 ? this._getSummariesBody(uFilter)
                 : filterCharts[0].summaries;
-            const maxDataPoints = this._getMaxDataPoints(column, chartSettings);
+            const maxDataPoints = this._getMaxDataPoints(uFilter.column, chartSettings);
             const filters = [
                 ...filterLogic,
                 ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
@@ -315,5 +297,44 @@ class UChartPaginationApi {
             return (0, isEmpty_1.isEmpty)(result);
         };
     }
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    _getSearchLogic(uFilter) {
+        let searchLogic;
+        if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
+            searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+            ]);
+        }
+        return searchLogic;
+    }
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    _getFilterCharts(uFilter, searchLogic, chartSettings) {
+        let filterCharts = [];
+        const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
+            ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
+        if (haveAggFilters) {
+            filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
+                if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
+                    return chart;
+                const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
+                    s.aggregate === uFilter.column.aggregate);
+                const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
+                const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
+                const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
+                return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
+            }).filter((chart) => chart.summaries.length);
+        }
+        return filterCharts;
+    }
 }
 exports.default = UChartPaginationApi;

package/dist/cjs/format/localization.js

@@ -15,7 +15,7 @@ const getLang = (locale) => {
 exports.getLang = getLang;
 const chooseLang = (config) => {
     var _a;
-    const lang = ((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) || config.lang;
+    const lang = ((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) || (config === null || config === void 0 ? void 0 : config.lang);
     return (lang === null || lang === void 0 ? void 0 : lang.lang) || lang || definition_1.LANG_DEFAULT;
 };
 exports.chooseLang = chooseLang;

package/dist/cjs/general/mix/isNaNV2.d.ts

@@ -1,8 +1,15 @@
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 export declare function isNaNV2(variable: any): boolean;

package/dist/cjs/general/mix/isNaNV2.js

@@ -4,12 +4,19 @@ exports.isNaNV2 = void 0;
 const _1 = require(".");
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 function isNaNV2(variable) {
-    return (0, _1.isEmpty)(variable) || isNaN(variable);
+    return (0, _1.isEmpty)(variable) || typeof variable == "boolean" || isNaN(variable);
 }
 exports.isNaNV2 = isNaNV2;

package/dist/cjs/general/string/parseUrl.js

@@ -11,9 +11,9 @@ const parseUrl = (url, transformer) => {
     if (!match)
         return url;
     return match.reduce((newUrl, curr) => {
-        const key = curr.substr(2);
+        const key = curr.substring(2);
         const value = typeof transformer === "function" ? transformer(key) : transformer[key];
-        return newUrl.replace(curr.substr(1), value);
+        return newUrl.replace(curr.substring(1), value);
     }, url);
 };
 exports.parseUrl = parseUrl;

package/dist/cjs/globalization/helpers/getI18nCalendar.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getI18nCalendar = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const i18nextBuilder_1 = require("../service/i18nextBuilder");
 function getI18nCalendar(locale) {
-    const localeOverride = locale instanceof i18nextBuilder_1.I18nService
-        ? locale
-        : typeof locale === "function"
-            ? { translate: locale }
-            : undefined;
-    if (!localeOverride)
-        return undefined;
+    let localeOverride;
+    if (locale instanceof i18nextBuilder_1.I18nService) {
+        localeOverride = locale;
+    }
+    else if (typeof locale === "function") {
+        localeOverride = { translate: locale };
+    }
+    if ((0, isEmpty_1.isEmpty)(localeOverride))
+        return;
     return {
         clear: localeOverride.translate("common.calendar.clear"),
         days: [

package/dist/cjs/globalization/interfaces/formula_builder/II18nFormulaBuilderListModal.d.ts

@@ -1,7 +1,8 @@
 export interface II18nFormulaBuilderListModal {
-    title_header: string;
     create_button: string;
+    create_button_tooltip: string;
     empty_message: string;
     information_text_link: string;
     information_text_text: string;
+    title_header: string;
 }

package/dist/cjs/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18N_FORMULA_BUILDER = void 0;
 exports.I18N_FORMULA_BUILDER = {
     list_modal: {
-        title_header: "Formulas",
         create_button: "Create Formula",
+        create_button_tooltip: "Add some records to create formulas",
         empty_message: "No Formulas Yet",
         information_text_link: "Learn how to",
         information_text_text: "create and work with formulas",
+        title_header: "Formulas",
     },
     list_table: {
         duplicate_copy: "Copy",

package/dist/cjs/globalization/service/i18nextBuilder.js

@@ -17,9 +17,7 @@ const i18next_1 = __importDefault(require("i18next"));
 const mergeDeep_1 = require("../../general/object/mergeDeep");
 class I18nServiceBuilder {
     static buildI18n(i18nDefault, i18nResource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._initI18n(i18nDefault, i18nResource);
-        });
+        return this._initI18n(i18nDefault, i18nResource);
     }
     static _initI18n(i18nDefault, i18nResource) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/cjs/globalization/service/initI18n.js

@@ -1,19 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initI18n = void 0;
 const i18nextBuilder_1 = require("../service/i18nextBuilder");
 function initI18n(i18nConfig = {}, i18nDefault = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield i18nextBuilder_1.I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
-    });
+    return i18nextBuilder_1.I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
 }
 exports.initI18n = initI18n;

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

@@ -50,9 +50,10 @@ function getDataAnswersByColumn(settings) {
 }
 exports.getDataAnswersByColumn = getDataAnswersByColumn;
 function getColumnFromData(settings) {
-    return !(0, isEmpty_1.isEmpty)(settings.dataset)
-        ? (0, getDatasetColumn_1.getDatasetColumn)(settings.column, settings.dataset)
-        : !(0, isEmpty_1.isEmpty)(settings.model)
-            ? (0, getModelColumn_1.getModelColumn)(settings.column, settings.model)
-            : undefined;
+    if (!(0, isEmpty_1.isEmpty)(settings.dataset)) {
+        return (0, getDatasetColumn_1.getDatasetColumn)(settings.column, settings.dataset);
+    }
+    else if (!(0, isEmpty_1.isEmpty)(settings.model)) {
+        return (0, getModelColumn_1.getModelColumn)(settings.column, settings.model);
+    }
 }