@qrvey/utils 1.5.0-0 → 1.5.0-11

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

@@ -22,14 +22,14 @@ export function mergeFilters(filterData1, filterData2, settings) {
     }
     if (isEmpty(filterData2) || isEmpty(filterData2.scopes))
         return filterData1;
-    filterData1 = cloneDeep(filterData1);
-    filterData2 = cloneDeep(filterData2);
-    settings = getMergeFiltersSettings(settings);
+    const _filterData1 = cloneDeep(filterData1);
+    const _filterData2 = cloneDeep(filterData2);
+    const defaultSettings = getMergeFiltersSettings(settings);
     return {
-        enabled: filterData1.enabled,
-        scopes: mergeScopes(filterData1.scopes, filterData2.scopes, settings),
-        section: filterData1.section,
-        version: filterData1.version,
+        enabled: _filterData1.enabled,
+        scopes: mergeScopes(_filterData1.scopes, _filterData2.scopes, defaultSettings),
+        section: _filterData1.section,
+        version: _filterData1.version,
     };
 }
 /**
@@ -45,11 +45,12 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
             scope: scope1.scope,
             scopeid: scope1.scopeid,
         }));
+        let _scope1 = scope1;
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            _scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
-        scopes.push(scope1);
+        scopes.push(_scope1);
         return scopes;
     }, []);
     if (scopes2.length > 0)
@@ -68,11 +69,12 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
         const dataset2Index = datasets2.findIndex((dataset2) => resolveDatasetConditions(dataset2, {
             qrveyid: dataset1.qrveyid,
         }));
+        let _dataset1 = dataset1;
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            _dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
-        datasets.push(dataset1);
+        datasets.push(_dataset1);
         return datasets;
     }, []);
     if (datasets2.length > 0)
@@ -95,18 +97,19 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
             property: filter1.property,
             validator: filter1.validator,
         }));
+        let _filter1 = filter1;
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings) });
-            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
+            _filter1 = Object.assign(Object.assign({}, _filter1), { values: mergeValues(_filter1, filters2[filter2Index], settings) });
+            _filter1 = mergeFilterProps(_filter1, filters2[filter2Index], settings);
             filters2.splice(filter2Index, 1);
         }
         else {
-            filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator
+            _filter1 = Object.assign(Object.assign({}, _filter1), { operator: settings.setGroupedColumnOperator
                     ? FILTER_GROUPED_COLUMN_OPERATOR
-                    : filter1.operator });
+                    : _filter1.operator });
         }
-        filter1.filterid = getFilterid(filter1);
-        filters.push(filter1);
+        _filter1.filterid = getFilterid(_filter1);
+        filters.push(_filter1);
         return filters;
     }, []);
     if (filters2.length > 0)
@@ -122,8 +125,9 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  */
 function mergeFilterProps(filter1, filter2, settings) {
     var _a, _b, _c;
+    let _filter1 = filter1;
     if (settings.overwriteFilterProps) {
-        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, operator: filter2.operator || filter1.operator, 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, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
     }
-    return filter1;
+    return _filter1;
 }

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

@@ -14,11 +14,11 @@ import { isRegularValidator } from "./isRegularValidator";
 export function mergeValues(filter1, filter2, settings) {
     if (isEmpty(filter1) && isEmpty(filter2))
         return [];
-    settings = getMergeValuesSettings(settings);
+    const defaultSettings = getMergeValuesSettings(settings);
     let newValues = [];
     let filter1Values = filter1.values || [];
     const filter2Values = filter2.values || [];
-    if (settings.overwriteValues) {
+    if (defaultSettings.overwriteValues) {
         filter1Values = filter2Values;
         newValues = filter1Values;
     }

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

@@ -22,5 +22,5 @@ export function resolveScopeConditions(scope, params, letPassUndefinedProperties
             (letPassUndefinedProperties && scope.scopeid == null) ||
             (letPassUndefinedParams && isEmpty(params.scopeid)) ||
             scope.scopeid === params.scopeid) &&
-        scope.datasets.filter.length > 0);
+        scope.datasets.length > 0);
 }

package/dist/filters/helpers/getAggFiltersFromFilterData.js

@@ -8,7 +8,7 @@ import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColum
  * @returns the aggFilters structure
  */
 export function getAggFiltersFromFilterData(filterData, _summaries) {
-    filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
-    if (isEmpty(filterData))
+    const _filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
+    if (isEmpty(_filterData))
         return;
 }

package/dist/filters/helpers/getTokensFromFilters.js

@@ -9,7 +9,7 @@ import { isEmpty } from "../../general/mix/isEmpty";
  * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
  */
 export function getTokensFromFilters(filters, options) {
-    var _a, _b;
+    var _a, _b, _c;
     const tokens = [];
     const i18nService = options.i18nService;
     const settings = {
@@ -45,16 +45,21 @@ export function getTokensFromFilters(filters, options) {
                 });
             }
             for (const [index, filter] of Object.entries(database.filters)) {
-                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled))
+                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled)) {
+                    if (((_a = tokens[tokens.length - 1]) === null || _a === void 0 ? void 0 : _a.type) ===
+                        FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
+                        tokens.pop();
+                    }
                     continue;
+                }
                 const values = getUIValues(filter, settings);
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 let columnLabel = filter.column.label;
-                if ((_a = filter === null || filter === void 0 ? void 0 : filter.column) === null || _a === void 0 ? void 0 : _a.aggregate) {
+                if ((_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate) {
                     columnLabel +=
                         " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate.toLowerCase()}`) +
+                            i18nService.translate(`common.aggregate_labels.${(_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate.toLowerCase()}`) +
                             ")";
                 }
                 tokens.push({

package/dist/filters/helpers/ui/excludeUIFiltersByAggregate.js

@@ -5,6 +5,6 @@ import { cloneDeep } from "../../../general/object/cloneDeep";
  * @returns a new Flat UI Filters that were excluded the aggregate filters
  */
 export function excludeUIFiltersByAggregate(uFilters = []) {
-    uFilters = cloneDeep(uFilters);
-    return uFilters.filter((uFilter) => uFilter.column.aggregate == null);
+    const _uFilters = cloneDeep(uFilters);
+    return _uFilters.filter((uFilter) => uFilter.column.aggregate == null);
 }

package/dist/filters/helpers/ui/excludeUIFlatFiltersByScopes.js

@@ -9,6 +9,6 @@ import { cloneDeep } from "../../../general/object/cloneDeep";
 export function excludeUIFlatFiltersByScopes(uFilters = [], scopes = []) {
     if (isEmpty(uFilters))
         return [];
-    uFilters = cloneDeep(uFilters);
-    return uFilters.filter((uFilter) => !scopes.includes(uFilter.extras.scope));
+    const _uFilters = cloneDeep(uFilters);
+    return _uFilters.filter((uFilter) => !scopes.includes(uFilter.extras.scope));
 }

package/dist/filters/helpers/ui/getUIFlatFilterByParams.js

@@ -16,8 +16,8 @@ import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 export function getUIFlatFilterByParams(uFilters = [], params = {}, getIndex = false) {
     if (isEmpty(params))
         return;
-    uFilters = cloneDeep(uFilters);
+    const _uFilters = cloneDeep(uFilters);
     return getIndex
-        ? uFilters.findIndex((filter) => resolveUIFlatFilterByParams(filter, params))
-        : uFilters.find((filter) => resolveUIFlatFilterByParams(filter, params));
+        ? _uFilters.findIndex((filter) => resolveUIFlatFilterByParams(filter, params))
+        : _uFilters.find((filter) => resolveUIFlatFilterByParams(filter, params));
 }

package/dist/filters/helpers/ui/getUIFlatFiltersByParams.js

@@ -17,6 +17,6 @@ import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 export function getUIFlatFiltersByParams(uFilters = [], params = {}) {
     if (isEmpty(params))
         return;
-    uFilters = cloneDeep(uFilters);
-    return uFilters.filter((filter) => resolveUIFlatFilterByParams(filter, params));
+    const _uFilters = cloneDeep(uFilters);
+    return _uFilters.filter((filter) => resolveUIFlatFilterByParams(filter, params));
 }

package/dist/filters/helpers/ui/getUIFlatFiltersByScopes.js

@@ -9,6 +9,6 @@ import { cloneDeep } from "../../../general/object/cloneDeep";
 export function getUIFlatFiltersByScopes(uFilters = [], scopes = []) {
     if (isEmpty(uFilters))
         return [];
-    uFilters = cloneDeep(uFilters);
-    return uFilters.filter((uFilter) => scopes.includes(uFilter.extras.scope));
+    const _uFilters = cloneDeep(uFilters);
+    return _uFilters.filter((uFilter) => scopes.includes(uFilter.extras.scope));
 }

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

@@ -14,29 +14,29 @@ import { I18N_RELATIVE_CONTAINER } from "../../../globalization/labels/filters/I
  * @returns an array of values
  */
 export function getUIValues(filter, settings) {
-    settings = getUiValuesSettings(settings);
+    const defaultSettings = getUiValuesSettings(settings);
     const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return getUiRangeAfterValues(values, filter, settings);
+            return getUiRangeAfterValues(values, filter, defaultSettings);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return getUiRangeBeforeValues(values, filter, settings);
+            return getUiRangeBeforeValues(values, filter, defaultSettings);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return getUiRangeBetweenValues(values, filter, settings);
+            return getUiRangeBetweenValues(values, filter, defaultSettings);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
-            return getUiNullValues(values, filter, settings);
+            return getUiNullValues(values, filter, defaultSettings);
         case FILTER_VALIDATOR.IN:
-            return getUiInValues(values, settings);
+            return getUiInValues(values, defaultSettings);
         default:
-            return getUiEqualValues(values, filter, settings);
+            return getUiEqualValues(values, filter, defaultSettings);
     }
 }
 function getUiRangeAfterValues(values, filter, settings) {
@@ -54,7 +54,7 @@ function getUiRangeBetweenValues(values, filter, 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")
+        ? settings.translate(`filter.validators.${filter.validator.toLowerCase()}_label`)
         : FILTER_VALIDATOR_INFO[filter.validator].label;
     return [getRegularValue(Object.assign(Object.assign({}, value), { value: valueLabel }), settings)];
 }
@@ -134,7 +134,5 @@ function getRangeSeparator(settings) {
     if (!isEmpty(settings.translate) && !isEmpty(settings.rangeSeparatorPath)) {
         return settings.translate(settings.rangeSeparatorPath);
     }
-    else {
-        return settings.rangeSeparator;
-    }
+    return settings.rangeSeparator;
 }

package/dist/filters/helpers/ui/transformFilterValues.js

@@ -13,7 +13,5 @@ export function transformFilterValues(filter, settings) {
     else if (isRangeValidator(filter.validator)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
     }
-    else {
-        return values;
-    }
+    return values;
 }

package/dist/filters/services/Filters.api.d.ts

@@ -35,14 +35,14 @@ export declare class FiltersApi {
      * @returns a promise with a preview of resulting data.
      */
     private getDataValues;
-    private getLogic;
-    private getFilter;
-    private getChartRequest;
+    private static getLogic;
+    private static getFilter;
+    private static getChartRequest;
     /**
      * Gets the available scopes and scope IDs
      * @returns a collection of the pair Scopes and Scope IDs
      */
-    private getAvailableScopeIds;
+    private static getAvailableScopeIds;
     /**
      * Set the config into the Filter Builder Api class
      * @param config the config.

package/dist/filters/services/Filters.api.js

@@ -97,12 +97,12 @@ export class FiltersApi {
             else {
                 api = this.chartPaginationApi;
             }
-            return api.getChartResult(this.config, this.getFilter(config), this.getLogic(config), this.getChartRequest(config), resetApi);
+            return api.getChartResult(this.config, FiltersApi.getFilter(config), FiltersApi.getLogic(config), FiltersApi.getChartRequest(config), resetApi);
         });
     }
-    getLogic(config) {
+    static getLogic(config) {
         var _a;
-        const scopes = this.getAvailableScopeIds(config);
+        const scopes = FiltersApi.getAvailableScopeIds(config);
         let filterData = getFiltersByVisibility(config.filterData, scopes);
         const dataset = config.datasets.find((d) => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
         filterData = getFiltersByParams(filterData, { qrveyid: dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid }, {
@@ -117,21 +117,21 @@ export class FiltersApi {
             ...(getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || []),
         ];
     }
-    getFilter(config) {
+    static getFilter(config) {
         return Object.assign(Object.assign({}, config.filter), { values: !isEmpty(config.valueText)
                 ? [{ value: config.valueText, enabled: true }]
                 : undefined });
     }
-    getChartRequest(config) {
+    static getChartRequest(config) {
         var _a;
-        const scopes = this.getAvailableScopeIds(config);
+        const scopes = FiltersApi.getAvailableScopeIds(config);
         return applyHierarchyForAggFilters(config.chartRequest, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
     }
     /**
      * Gets the available scopes and scope IDs
      * @returns a collection of the pair Scopes and Scope IDs
      */
-    getAvailableScopeIds(config) {
+    static getAvailableScopeIds(config) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return getAvailableScopes(Object.assign(Object.assign({}, getAvailableScopesIDsByConfig(config)), { panelid: FILTER_SCOPE.CHART === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope)
                 ? (_b = config.filter) === null || _b === void 0 ? void 0 : _b.extras.scopeid

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

@@ -20,13 +20,13 @@ export default class UChartApi {
      * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the request body structure
      */
-    private _getPreviewRequestBody;
+    private static _getPreviewRequestBody;
     /**
      * Gets the filter object structure for the searching text
      * @param {IFUFlattenedFilter} uFilter The filter object
      * @returns the filter object structure
      */
-    private _getSearchLogic;
+    private static _getSearchLogic;
     /**
      * Gets the filters from the chart settings
      * @param {IFUFlattenedFilter} uFilter The filter object
@@ -34,54 +34,54 @@ export default class UChartApi {
      * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the filters from the chart settings
      */
-    private _getFilterCharts;
+    private static _getFilterCharts;
     /**
      * Gets chart body structure
      * @param uFilter The filter Builder filter
      * @param chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the chart body structure
      */
-    private _getChartBody;
+    private static _getChartBody;
     /**
      * Gets dimension body structure
      * @param uFilter The filter Builder filter
      * @param chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the dimension body structure
      */
-    private _getDimensionsBody;
+    private static _getDimensionsBody;
     /**
      * Gets max data point number
      * @param column The column to filter
      * @param chartSettings The settings of the chart. For Aggregate Columns.
      * @returns max data point number
      */
-    private _getMaxDataPoints;
+    private static _getMaxDataPoints;
     /**
      * Gets sort option structure
      * @param column The column to filter
      * @returns sort option structure
      */
-    private _getSortOption;
+    private static _getSortOption;
     /**
      * Gets summaries body structure
      * @param uFilter The filter Builder filter
      * @returns summaries body structure
      */
-    private _getSummariesBody;
+    private static _getSummariesBody;
     /**
      * Refines the body structure
      * @param bodies The body structure
      * @param uFilter The filter Builder filter
      * @returns the body structure
      */
-    private _refineBodies;
+    private static _refineBodies;
     /**
      * Gets the validation type for the preview request
      * @param column The column to filter
      * @param vaildator Validator Type
      * @returns the validator type for the preview request
      */
-    private _getValidationType;
+    private static _getValidationType;
     /**
      * Gets the Data from preview Response
      * @param response The preview presponse
@@ -96,5 +96,5 @@ export default class UChartApi {
      * @returns the sumaries
      */
     private _getResponseSummaries;
-    private isResultEmpty;
+    private static isResultEmpty;
 }