@qrvey/utils 1.3.3 → 1.4.0-2

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

@@ -7,26 +7,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import UChartPaginationApi from './UChartPaginationApi';
-import UChartApi from './UChartApi';
-import { isRangeValidator } from '../helpers/common/isRangeValidator';
-import { getFiltersByVisibility } from '../helpers/common/getFiltersByVisibility';
-import { excludeFiltersByAggregateColumn } from '../helpers/common/excludeFiltersByAggregateColumn';
-import { FDToLogic } from '../adapters/FDToLogic';
-import { getLogicByScopesHierarchy } from '../helpers/backend/getLogicByScopesHierarchy';
-import { buildUserFilters } from '../helpers/backend/buildUserFilters';
-import { applyHierarchyForAggFilters } from '../helpers/applyHierarchyForAggFilters';
-import { getAvailableScopes } from '../helpers/getAvailableScopes';
-import { getAvailableScopesIDsByConfig } from '../helpers/getAvailableScopesIDsByConfig';
-import { FILTER_SCOPE } from '../constants/common/FILTER_SCOPE';
-import { getAllDatasets } from '../../services/api/getAllDatasets.api';
-import { isEmpty } from '../../general/mix/isEmpty';
-import { getModel } from '../../services/api/getModel.api';
-import { areStaticColumnValues } from '../../qrvey/helpers/areStaticColumnValues';
-import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
-import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
-import { getLogicByDatasets } from '../helpers/backend/getLogicByDatasets';
-import { getFiltersByParams } from '../helpers/common/getFiltersByParams';
+import UChartPaginationApi from "./UChartPaginationApi";
+import UChartApi from "./UChartApi";
+import { isRangeValidator } from "../helpers/common/isRangeValidator";
+import { getFiltersByVisibility } from "../helpers/common/getFiltersByVisibility";
+import { excludeFiltersByAggregateColumn } from "../helpers/common/excludeFiltersByAggregateColumn";
+import { FDToLogic } from "../adapters/FDToLogic";
+import { getLogicByScopesHierarchy } from "../helpers/backend/getLogicByScopesHierarchy";
+import { buildUserFilters } from "../helpers/backend/buildUserFilters";
+import { applyHierarchyForAggFilters } from "../helpers/applyHierarchyForAggFilters";
+import { getAvailableScopes } from "../helpers/getAvailableScopes";
+import { getAvailableScopesIDsByConfig } from "../helpers/getAvailableScopesIDsByConfig";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { getAllDatasets } from "../../services/api/getAllDatasets.api";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { getModel } from "../../services/api/getModel.api";
+import { areStaticColumnValues } from "../../qrvey/helpers/areStaticColumnValues";
+import { getValuesFromDataset } from "../helpers/common/getValuesFromDataset";
+import { getDatasetByColumn } from "../../qrvey/helpers/getDatasetByColumn";
+import { getLogicByDatasets } from "../helpers/backend/getLogicByDatasets";
+import { getFiltersByParams } from "../helpers/common/getFiltersByParams";
 export class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -39,8 +39,16 @@ export class FiltersApi {
      * @returns a promise with the resulting model
      */
     getModel(qrveyid) {
-        const config = isEmpty(qrveyid) ? Object.assign({}, this.config) : Object.assign(Object.assign({}, this.config), { qrveyid });
-        return getModel(config, { includeInfo: ['datalinkInfo', 'bucketsInfo', 'formulaInfo', 'componentPreferences'] });
+        const config = isEmpty(qrveyid)
+            ? Object.assign({}, this.config) : Object.assign(Object.assign({}, this.config), { qrveyid });
+        return getModel(config, {
+            includeInfo: [
+                "datalinkInfo",
+                "bucketsInfo",
+                "formulaInfo",
+                "componentPreferences",
+            ],
+        });
     }
     /**
      * Get a dataset list from a collection of Qrvey IDs
@@ -56,7 +64,8 @@ export class FiltersApi {
     getData(config, resetApi = false) {
         var _a, _b, _c, _d, _e, _f;
         let promise;
-        if (areStaticColumnValues((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) && isEmpty((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
+        if (areStaticColumnValues((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) &&
+            isEmpty((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
             promise = getValuesFromDataset({
                 column: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.column,
                 property: (_d = config.filter) === null || _d === void 0 ? void 0 : _d.property,
@@ -95,18 +104,23 @@ export class FiltersApi {
         var _a;
         const scopes = this.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 }, { letPassUndefinedProperties: { filter: true }, filterEmptyArrays: { filter: false } });
+        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 }, {
+            letPassUndefinedProperties: { filter: true },
+            filterEmptyArrays: { filter: false },
+        });
         filterData = excludeFiltersByAggregateColumn(filterData);
         const logics = FDToLogic(filterData);
         const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
         return [
             ...hierarchyLogic,
-            ...getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || [],
+            ...(getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || []),
         ];
     }
     getFilter(config) {
-        return Object.assign(Object.assign({}, config.filter), { values: !isEmpty(config.valueText) ? [{ value: config.valueText, enabled: true }] : undefined });
+        return Object.assign(Object.assign({}, config.filter), { values: !isEmpty(config.valueText)
+                ? [{ value: config.valueText, enabled: true }]
+                : undefined });
     }
     getChartRequest(config) {
         var _a;
@@ -114,13 +128,15 @@ export class FiltersApi {
         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
-    */
+     * Gets the available scopes and scope IDs
+     * @returns a collection of the pair Scopes and Scope IDs
+     */
     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 : undefined, scopeid: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scopeid, qrveyid: (_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid, defaultid: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid, scope: undefined, predefinedScopes: [
-                { label: FILTER_SCOPE.DATA, id: (_j = (_h = config.filter) === null || _h === void 0 ? void 0 : _h.column) === null || _j === void 0 ? void 0 : _j.qrveyid }
+        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
+                : undefined, scopeid: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scopeid, qrveyid: (_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid, defaultid: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid, scope: undefined, predefinedScopes: [
+                { label: FILTER_SCOPE.DATA, id: (_j = (_h = config.filter) === null || _h === void 0 ? void 0 : _h.column) === null || _j === void 0 ? void 0 : _j.qrveyid },
             ] }));
     }
     /**

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

@@ -1,8 +1,8 @@
-import { IFBData } from '../interfaces/backend/IFBData';
-import { IFilterConfig } from '../interfaces/common/IFilterConfig';
-import { IFUFlattenedFilter } from '../interfaces/ui/IFUFlattenedFilter';
-import { IFBLogic } from '../interfaces/backend/IFBLogic';
-import { IFUChartSettings } from '../interfaces/ui/IFUChartSettings';
+import { IFBData } from "../interfaces/backend/IFBData";
+import { IFilterConfig } from "../interfaces/common/IFilterConfig";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFBLogic } from "../interfaces/backend/IFBLogic";
+import { IFUChartSettings } from "../interfaces/ui/IFUChartSettings";
 export default class UChartApi {
     /**
      * Gets a promise with a resulting data

package/dist/filters/services/UChartApi.js

@@ -1,16 +1,16 @@
-import { isDateColumn } from '../../columns/helpers/isDateColumn';
-import { isNumericalColumn } from '../../columns/helpers/isNumericalColumn';
-import { isRangeValidator } from '../helpers/common/isRangeValidator';
-import { cloneDeep } from '../../general/object/cloneDeep';
-import { isEmpty } from '../../general/mix/isEmpty';
-import { COLUMN } from '../../columns/constants/COLUMN';
-import { getAggFiltersBySummaryIndex } from '../helpers/backend/getAggFiltersBySummaryIndex';
-import { _get } from '../../general/object/get';
-import { AGGREGATE } from '../../charts/constants/AGGREGATE';
-import { FILTER_VALIDATOR } from '../constants/common/FILTER_VALIDATOR';
-import { flatUIToOldLogic } from '../adapters/flatUIToOldLogic';
-import ChartsApi from '../../services/api/Charts.api';
-import { getAggFilters } from '../helpers/OLD_getAggFilters';
+import { isDateColumn } from "../../columns/helpers/isDateColumn";
+import { isNumericalColumn } from "../../columns/helpers/isNumericalColumn";
+import { isRangeValidator } from "../helpers/common/isRangeValidator";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { getAggFiltersBySummaryIndex } from "../helpers/backend/getAggFiltersBySummaryIndex";
+import { _get } from "../../general/object/get";
+import { AGGREGATE } from "../../charts/constants/AGGREGATE";
+import { FILTER_VALIDATOR } from "../constants/common/FILTER_VALIDATOR";
+import { flatUIToOldLogic } from "../adapters/flatUIToOldLogic";
+import ChartsApi from "../../services/api/Charts.api";
+import { getAggFilters } from "../helpers/OLD_getAggFilters";
 export default class UChartApi {
     constructor() {
         /**
@@ -23,10 +23,15 @@ export default class UChartApi {
          */
         this.getChartResult = (config, uFilter, filterLogic = [], chartSettings, _resetApi = false) => {
             const requestBody = this._getPreviewRequestBody(uFilter, filterLogic, chartSettings);
-            const customChartApi = new ChartsApi(Object.assign(Object.assign({}, config), { qrvey_id: isEmpty(uFilter.column.aggregate) ? uFilter.column.qrveyid : chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.qrveyid }));
-            return customChartApi.getResults(requestBody, false, true).then(response => {
+            const customChartApi = new ChartsApi(Object.assign(Object.assign({}, config), { qrvey_id: isEmpty(uFilter.column.aggregate)
+                    ? uFilter.column.qrveyid
+                    : chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.qrveyid }));
+            return customChartApi
+                .getResults(requestBody, false, true)
+                .then((response) => {
                 return this._getDataFromResponse(response, uFilter);
-            }).catch(_ => {
+            })
+                .catch((_) => {
                 return { data: [] };
             });
         };
@@ -39,27 +44,33 @@ export default class UChartApi {
          */
         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;
+            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 (!isEmpty(uFilter.values)) {
-                searchLogic = flatUIToOldLogic([Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) })]);
+                searchLogic = 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 => {
+                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
                     if (uFilter.column.type === COLUMN.AGGREGATED_FORMULA)
                         return chart;
-                    const summaryIndex = (chart.summaries || []).findIndex(s => s.questionid === uFilter.column.id && s.aggregate === uFilter.column.aggregate);
+                    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 = getAggFiltersBySummaryIndex(chart.aggFilters, summaryIndex);
                     const searchAggFilters = 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);
+                }).filter((chart) => chart.summaries.length);
             }
-            const chartsBody = !filterCharts[0] ? [this._getChartBody(uFilter)] : [filterCharts[0]];
+            const chartsBody = !filterCharts[0]
+                ? [this._getChartBody(uFilter)]
+                : [filterCharts[0]];
             const filters = [
                 ...filterLogic,
-                ...!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []
+                ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
             ];
             return { charts: chartsBody, logic: filters, qrveyid: column.qrveyid };
         };
@@ -84,15 +95,17 @@ export default class UChartApi {
             const { column, validator } = uFilter;
             let dimensions;
             if (!isRangeValidator(validator)) {
-                dimensions = [{
+                dimensions = [
+                    {
                         questionid: column.id,
                         qrveyid: column.qrveyid,
                         // linkid: column.linkid,
                         maxDataPoints: this._getMaxDataPoints(column, chartSettings),
                         type: column.type,
-                        formulaType: column.type === 'FORMULA' ? column.formulaType : undefined,
-                        sortOption: this._getSortOption(column)
-                    }];
+                        formulaType: column.type === "FORMULA" ? column.formulaType : undefined,
+                        sortOption: this._getSortOption(column),
+                    },
+                ];
                 dimensions = this._refineBodies([...dimensions], uFilter);
             }
             return dimensions;
@@ -104,7 +117,9 @@ export default class UChartApi {
          * @returns max data point number
          */
         this._getMaxDataPoints = (column, chartSettings) => {
-            return !isDateColumn(column) && !isEmpty(column.aggregate) ? _get(chartSettings, 'maxDataPoints.option', 1000) : 1000;
+            return !isDateColumn(column) && !isEmpty(column.aggregate)
+                ? _get(chartSettings, "maxDataPoints.option", 1000)
+                : 1000;
         };
         /**
          * Gets sort option structure
@@ -112,15 +127,15 @@ export default class UChartApi {
          * @returns sort option structure
          */
         this._getSortOption = (column) => {
-            let sortBy = 'CATEGORY';
-            let sortDirection = isNumericalColumn(column) ? 'DESC' : 'ASC';
+            let sortBy = "CATEGORY";
+            let sortDirection = isNumericalColumn(column) ? "DESC" : "ASC";
             if (!isEmpty(column.sorting)) {
-                sortBy = _get(column.sorting, 'sortBy');
-                sortDirection = _get(column.sorting, 'order');
+                sortBy = _get(column.sorting, "sortBy");
+                sortDirection = _get(column.sorting, "order");
                 if (sortBy == null)
-                    sortBy = 'VALUE';
+                    sortBy = "VALUE";
                 if (sortDirection == null)
-                    sortDirection = 'DESC';
+                    sortDirection = "DESC";
             }
             return { sortBy, sortDirection };
         };
@@ -132,16 +147,16 @@ export default class UChartApi {
         this._getSummariesBody = (uFilter) => {
             const { column, validator } = uFilter;
             const summary = {
-                aggregate: _get(column, 'aggregate.label', AGGREGATE.COUNT),
+                aggregate: _get(column, "aggregate.label", AGGREGATE.COUNT),
                 questionid: column.id,
                 property: !isDateColumn(uFilter.column) ? uFilter.property : undefined,
-                type: column.type
+                type: column.type,
             };
             let summaries = [summary];
             if (isNumericalColumn(column) || isRangeValidator(validator)) {
                 summaries = [
                     Object.assign(Object.assign({}, summary), { aggregate: AGGREGATE.MIN }),
-                    Object.assign(Object.assign({}, summary), { aggregate: AGGREGATE.MAX })
+                    Object.assign(Object.assign({}, summary), { aggregate: AGGREGATE.MAX }),
                 ];
             }
             return summaries;
@@ -155,13 +170,13 @@ export default class UChartApi {
         this._refineBodies = (bodies, uFilter) => {
             const _bodies = cloneDeep(bodies);
             if (uFilter.property != null) {
-                _bodies.forEach(body => {
+                _bodies.forEach((body) => {
                     if (isDateColumn(uFilter.column)) {
-                        body['groupType'] = 'DATE';
-                        body['groupValue'] = uFilter.property.toUpperCase();
+                        body["groupType"] = "DATE";
+                        body["groupValue"] = uFilter.property.toUpperCase();
                     }
                     else {
-                        body['property'] = uFilter.property;
+                        body["property"] = uFilter.property;
                     }
                 });
             }
@@ -174,11 +189,17 @@ export default class UChartApi {
          * @returns the validator type for the preview request
          */
         this._getValidationType = (column, validator) => {
-            if (isDateColumn(column) || column.type === COLUMN.BUCKET || isNumericalColumn(column)) {
+            if (isDateColumn(column) ||
+                column.type === COLUMN.BUCKET ||
+                isNumericalColumn(column)) {
                 return FILTER_VALIDATOR.EQUALS;
             }
             else {
-                if ([FILTER_VALIDATOR.NOT_CONTAIN, FILTER_VALIDATOR.EQUALS, FILTER_VALIDATOR.NOT_EQUAL].includes(validator)) {
+                if ([
+                    FILTER_VALIDATOR.NOT_CONTAIN,
+                    FILTER_VALIDATOR.EQUALS,
+                    FILTER_VALIDATOR.NOT_EQUAL,
+                ].includes(validator)) {
                     return FILTER_VALIDATOR.CONTAINS;
                 }
                 else if (validator === FILTER_VALIDATOR.NOT_END_WITH) {
@@ -202,14 +223,19 @@ export default class UChartApi {
             const data = { data: [] };
             if (isRangeValidator(uFilter.validator)) {
                 data.data = isEmpty(uFilter.column.aggregate)
-                    ? _get(response, '[0].summary', []).map(summary => ({ value: summary }))
-                    : [{ value: _get(response, '[0].min') }, { value: _get(response, '[0].max') }];
+                    ? _get(response, "[0].summary", []).map((summary) => ({
+                        value: summary,
+                    }))
+                    : [
+                        { value: _get(response, "[0].min") },
+                        { value: _get(response, "[0].max") },
+                    ];
             }
             else if (!this.isResultEmpty(response)) {
-                const records = _get(response, 'data');
+                const records = _get(response, "data");
                 data.data = isEmpty(uFilter.column.aggregate)
-                    ? records.map(record => ({
-                        value: record.key.toString()
+                    ? records.map((record) => ({
+                        value: record.key.toString(),
                     }))
                     : this._getResponseSummaries(records);
             }
@@ -222,21 +248,22 @@ export default class UChartApi {
          * @returns the sumaries
          */
         this._getResponseSummaries = (records, values = []) => {
-            records.forEach(record => {
+            records.forEach((record) => {
                 const value = record.summary[0].toString();
                 if (Array.isArray(record.items) && record.items.length)
                     values = this._getResponseSummaries(record.items, values);
-                else if (!Array.isArray(record.items) && !isEmpty(values.find(v => v.value === value)))
+                else if (!Array.isArray(record.items) &&
+                    !isEmpty(values.find((v) => v.value === value)))
                     values.push({ value });
             });
             return values;
         };
         this.isResultEmpty = (resultObject, validateNesteddata = false) => {
-            const result = _get(resultObject, '[0].data');
+            const result = _get(resultObject, "[0].data");
             let validation = isEmpty(result);
             if (validateNesteddata && !validation) {
                 // Searching empty data when Chart is Multiseries. At least, Chart needs a single item to draw in the serie. (See the second level of the result object)
-                validation = result.every(data => !isEmpty(data) && isEmpty(_get(data, 'items')));
+                validation = result.every((data) => !isEmpty(data) && isEmpty(_get(data, "items")));
             }
             return validation;
         };