@qrvey/utils 1.3.0-9 → 1.3.2

package/dist/filters/adapters/UIToOldLogic.js

@@ -65,6 +65,7 @@ function buildFilters(datasetSection, scope) {
 }
 function buildExpressions(filterSection, scope, dataset) {
     return filterSection.reduce((expressions, filter) => {
+        var _a;
         const expression = {
             enabled: filter.enabled,
             formulaType: filter.column.formulaType,
@@ -74,11 +75,11 @@ function buildExpressions(filterSection, scope, dataset) {
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
             questionid: filter.column.id,
-            validationType: getBackendValidator(filter.validator),
+            validationType: getBackendValidator(filter),
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+        expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
         expressions.push(expression);
         return expressions;
     }, []);
@@ -119,7 +120,7 @@ const getFilterDetail = (filter, scope, dataset) => {
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            label: filter.column.label,
+            text: filter.column.label,
             type: filter.column.type,
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
@@ -144,6 +145,7 @@ const getFilterDetail = (filter, scope, dataset) => {
         panelid: filter.extras.panelid,
         panelName: filter.extras.filterLabel,
         section: filter.extras.section,
+        selectAll: filter.selectAll,
         uiValue: getUIValues(filter, { addEnableds: true }),
         validator: filter.validator,
         values: adaptFilterValues(filter)

package/dist/filters/adapters/adaptDateGroupingProperty.d.ts

@@ -2,7 +2,7 @@ import { IFProperty } from "../interfaces/IFProperty";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property
- * @returns
+ * @param property the property to be adapted
+ * @returns a adapted property
  */
 export declare function adaptDateGroupingProperty(property: IFProperty | any): IFProperty;

package/dist/filters/adapters/adaptDateGroupingProperty.js

@@ -3,8 +3,8 @@ import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property
- * @returns
+ * @param property the property to be adapted
+ * @returns a adapted property
  */
 export function adaptDateGroupingProperty(property) {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/dist/filters/adapters/adaptFilterValues.js

@@ -7,9 +7,9 @@ import { COLUMN } from "../../columns/constants/COLUMN";
  * @returns A new value array with the filled properties.
  */
 export function adaptFilterValues(filter) {
-    const setValue = value => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled }));
+    const setValue = value => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, displayed: isEmpty(value.displayed) ? true : value.displayed, enabled: isEmpty(value.enabled) ? true : value.enabled }));
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-        return filter.values.map(rValues => rValues.map(setValue));
+        return (filter.values || []).map(rValues => rValues.map(setValue));
     }
-    return filter.values.map(setValue);
+    return ((filter.values || []) || []).map(setValue);
 }

package/dist/filters/adapters/flatUIToFD.js

@@ -103,6 +103,7 @@ function buildFilter(uFilter) {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
+        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -86,6 +86,7 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             panelid: filter.extras.panelid,
             panelName: filter.extras.filterLabel,
             section: filter.extras.section,
+            selectAll: filter.selectAll,
             uiValue: getUIValues(filter, { addEnableds: true }),
             validator: filter.validator,
             values: filter.values,
@@ -147,13 +148,14 @@ export function getExpressionId(props) {
     return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
 }
 function getRankingExpressions(props) {
-    const values = props.values;
+    const values = props.values || [];
     return values.map((_value, index) => {
-        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props.validator) });
+        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props) });
         return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
     });
 }
 function getRegularExpression(props) {
+    var _a;
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: getBackendGroupValue(props),
@@ -163,11 +165,11 @@ function getRegularExpression(props) {
         questionid: props.column.id,
         questionType: props.column.type,
         formulaType: props.column.formulaType,
-        validationType: getBackendValidator(props.validator),
+        validationType: getBackendValidator(props),
         value: getValues(props),
         uiExtras: Object.assign(Object.assign({}, props), { uiValue })
     };
-    expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
+    expression['enabled'] = props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
     return expression;
 }
 // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
@@ -246,72 +248,89 @@ function getNullValueExpression(props) {
 function getValues(props, rankingGroupIndex) {
     // const isDateProperty = !!(isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate));
     // const dateFormat = getDateFormatByProperty(props.property);
+    const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate))
-                return getRankingValues(props.values, rankingGroupIndex);
-            return getResultValues(props.values, props);
+                return getRankingValues(values, rankingGroupIndex);
+            return getResultValues(values, props);
         case FILTER_VALIDATOR.CONTAINS:
         case FILTER_VALIDATOR.NOT_CONTAIN:
         case FILTER_VALIDATOR.STARTS_WITH:
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR.NOT_END_WITH:
-            return props.values.map(value => value.enabled ? value.value : undefined);
+            return values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { lte: value.max, gte: value.min }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { lt: value.max, gt: value.min }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return props.values.map(value => value.enabled ? ({ lt: value.max }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { lt: value.max }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { lte: value.max }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return props.values.map(value => value.enabled ? ({ gt: value.min }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { gt: value.min }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return props.values.map(value => value.enabled ? ({ gte: value.min }) : undefined).filter(Boolean);
+            return values.map(value => value.enabled ?
+                { gte: value.min }
+                : undefined).filter(Boolean);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
+            const addValue = values.length > 0 && values.every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
 }
 function getUIValuess(props, rankingGroupIndex) {
     var _a, _b;
+    const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
-            return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (_b = (_a = props.values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
+            return [{
+                    value: FILTER_VALIDATOR_INFO[props.validator].label,
+                    enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled
+                }];
         case FILTER_VALIDATOR.IN:
-            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
+            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
         default:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-                return getRankingUIValues(props.values, rankingGroupIndex);
+                return getRankingUIValues(values, rankingGroupIndex);
             }
-            return (props.values || []).map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
+            return values.map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
@@ -319,22 +338,23 @@ function getValueUiUnitRelativeDate(relative) {
 }
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? {
         position: rankingValue.position - 1,
         value: rankingValue.value.value
-    }) : undefined).filter(Boolean);
+    } : undefined).filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
     return flattenValues.map((rankingValue) => ({
         rankingIndex: rankingGroupIndex,
+        displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
         value: `${rankingValue.value.value} - ${rankingValue.position}`,
         valueid: rankingValue.value.valueid,
         enabled: rankingValue.enabled
     }));
 }
 function getResultValues(values, props) {
-    return values.map((value) => {
+    return (values || []).map((value) => {
         if (value.enabled) {
             if (props.column.type === COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;

package/dist/filters/adapters/flatUIToUI.js

@@ -117,6 +117,7 @@ function buildFilter(uFilter) {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
+        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/dist/filters/adapters/index.d.ts

@@ -1,6 +1,8 @@
 export * from './transformFilters';
+export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
+export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';

package/dist/filters/adapters/index.js

@@ -1,6 +1,8 @@
 export * from './transformFilters';
+export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
+export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';

package/dist/filters/adapters/logicToFlatUI.js

@@ -52,7 +52,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
     const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
@@ -67,18 +67,18 @@ function getFilterByExpression(expression, scopeItem) {
             qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
             aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) || ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
             calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) || ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
-            label: _get(uiExtras.column, 'text') || ((_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.label),
+            label: _get(uiExtras.column, 'text') || _get(uiExtras.column, 'label'),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
-            outputFormat: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.outputFormat,
-            type: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.type,
+            outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
+            type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
         },
         dateSection: uiExtras.dateSection,
         displayed: true,
         enabled: uiExtras.enabled,
         extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
             scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
+                collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -87,15 +87,16 @@ function getFilterByExpression(expression, scopeItem) {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                qrveyid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.qrveyid,
-                label: _get(uiExtras.column, 'dataset.name') || ((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.label),
-                linkid: (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.linkid,
+                qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
+                label: _get(uiExtras.column, 'dataset.name') || _get(uiExtras.column, 'label'),
+                linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
+        selectAll: uiExtras.selectAll,
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };
@@ -139,7 +140,7 @@ function refineRankingValues(values = [], uiValues = []) {
         return [
             ...valueGroup.map(value => {
                 const rValue = uiValues.find(uiV => uiV.valueid === value.value.valueid);
-                return Object.assign(Object.assign({}, value), { enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
+                return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
             })
         ];
     });

package/dist/filters/adapters/modelAnswerToFilterValue.d.ts

@@ -0,0 +1,8 @@
+import { IModelAnswer } from "../../qrvey/interfaces/IModelAnswer";
+import { IFSValue } from "../interfaces/common/IFSValue";
+/**
+ * Adapter for model answer to convert to recognizable values for Filter Builder
+ * @param answers Array of the qrvey model answers
+ * @returns Array of values
+ */
+export declare function modelAnswerToFilterValue(answers?: IModelAnswer[]): IFSValue[];

package/dist/filters/adapters/modelAnswerToFilterValue.js

@@ -0,0 +1,12 @@
+/**
+ * Adapter for model answer to convert to recognizable values for Filter Builder
+ * @param answers Array of the qrvey model answers
+ * @returns Array of values
+ */
+export function modelAnswerToFilterValue(answers = []) {
+    return answers.map(answer => ({
+        value: answer.answer,
+        valueid: answer.answerid,
+        imageUrl: answer.answerUrl
+    }));
+}

package/dist/filters/constants/builder/FILTER_BUILDER_SCOPE_LABEL.js

@@ -1,4 +1,4 @@
-import { FILTER_SCOPE } from "..";
+import { FILTER_SCOPE } from "../common/FILTER_SCOPE";
 export const FILTER_BUILDER_SCOPE_LABEL = {
     [FILTER_SCOPE.GLOBAL]: 'All pages',
     [FILTER_SCOPE.PAGE]: 'Current page',

package/dist/filters/constants/builder/STATIC_OPTION_COLUMNS.d.ts

@@ -1,2 +1,2 @@
-import { COLUMN } from "../../../columns/constants/COLUMN";
-export declare const STATIC_OPTION_COLUMNS: COLUMN[];
+import { IColumnType } from "../../../columns/interfaces/IColumnType";
+export declare const STATIC_OPTION_COLUMNS: IColumnType[];

package/dist/filters/constants/builder/index.d.ts

@@ -3,6 +3,7 @@ export * from './COLUMNS_FOR_EQUALS_LAYOUT';
 export * from './COLUMNS_FOR_EQUALS_NULL_LAYOUT';
 export * from './COLUMNS_FOR_NULL_LAYOUT';
 export * from './COLUMNS_FOR_TEXT_LAYOUT';
+export * from './FILTER_BUILDER_SCOPE_LABEL';
 export * from './FILTER_FLOW';
 export * from './FILTER_VALIDATORS_FOR_SLIDEBAR';
 export * from './FILTER_VALIDATORS_FOR_WINDOW';

package/dist/filters/constants/builder/index.js

@@ -3,6 +3,7 @@ export * from './COLUMNS_FOR_EQUALS_LAYOUT';
 export * from './COLUMNS_FOR_EQUALS_NULL_LAYOUT';
 export * from './COLUMNS_FOR_NULL_LAYOUT';
 export * from './COLUMNS_FOR_TEXT_LAYOUT';
+export * from './FILTER_BUILDER_SCOPE_LABEL';
 export * from './FILTER_FLOW';
 export * from './FILTER_VALIDATORS_FOR_SLIDEBAR';
 export * from './FILTER_VALIDATORS_FOR_WINDOW';

package/dist/filters/helpers/OLD_getAggFilters.d.ts

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

package/dist/filters/helpers/OLD_getAggFilters.js

@@ -0,0 +1,84 @@
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { _get } from "../../general/object/get";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
+/**
+ * @deprecated soon
+ * @param logics
+ * @param summaries
+ * @returns the filter aggregate structure
+ */
+export function getAggFilters(logics = [], summaries = []) {
+    const aggregateFilters = getAggregateFilters(logics);
+    const aggFilters = aggregateFilters.map(aggFilter => {
+        const expressions = getExpressionsInLogic([aggFilter]);
+        return expressions && expressions.length && {
+            operator: FILTER_OPERATOR.OR,
+            expressions: expressions.map((expression) => {
+                const summaryIndex = summaries.findIndex(summary => expression.questionid === summary.questionid &&
+                    expression.qrveyid === summary.qrveyid &&
+                    expression.linkid === summary.linkid &&
+                    _get(expression.uiExtras.column, 'aggregate') === summary.aggregate);
+                if (summaryIndex > -1 || expression.questionType === COLUMN.AGGREGATED_FORMULA) {
+                    return {
+                        enabled: expression.enabled,
+                        summaryIndex,
+                        validationType: expression.validationType,
+                        value: expression.value,
+                    };
+                }
+                return;
+            }).filter(Boolean)
+        };
+    }).filter(aggFilter => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
+    return aggFilters && concatAggFilters(aggFilters);
+}
+/**
+ * Filters and gets the filters used for aggregate values.
+ * @param logics The filter logic structure
+ * @param formatToFilters Flag to change de way of returning the filter structure.
+ * @returns the aggregate filters in the IFilterFilters way or as logic structure.
+ */
+function getAggregateFilters(logics = []) {
+    logics = cloneDeep(logics);
+    const aggregateLogics = logics.reduce((newLogics, logic) => {
+        if (!logic)
+            return newLogics;
+        // if ([FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(logic.scope)) {
+        logic.filters.forEach((filter, index) => {
+            const expressions = _get(filter, 'expressions[0].expressions');
+            if (!isEmpty(expressions)) {
+                const aggregateFilters = filter.expressions[0].expressions.filter(expression => !isEmpty(expression.uiExtras.column.aggregate));
+                logic.filters[index].expressions[0].expressions = aggregateFilters;
+                if (!filter.expressions[0].expressions.length)
+                    logic.filters[index] = undefined;
+            }
+        });
+        logic.filters = logic.filters.filter(filter => filter);
+        if (logic.filters.length)
+            newLogics.push(logic);
+        //}
+        return newLogics;
+    }, []);
+    return aggregateLogics;
+}
+function concatAggFilters(aggFilters, operator = FILTER_OPERATOR.AND) {
+    const expressions = aggFilters.filter(Boolean);
+    if (!expressions.length)
+        return undefined;
+    else if (expressions.length === 1)
+        return expressions[0];
+    return {
+        operator,
+        expressions: aggFilters.filter(Boolean)
+    };
+}
+function getExpressionsInLogic(logics = []) {
+    return logics.reduce((expressions, logic) => {
+        logic.filters.forEach(filter => {
+            expressions = expressions.concat(filter.expressions[0].expressions);
+        });
+        return expressions;
+    }, []);
+}

package/dist/filters/helpers/applyHierarchyForAggFilters.d.ts

@@ -4,8 +4,8 @@ import { IFUChartSettings } from "../interfaces/ui/IFUChartSettings";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes
- * @param currentScope
- * @returns
+ * @param scopes the pair id/label scopes
+ * @param currentScope the scope to be validated
+ * @returns the chart settings
  */
 export declare function applyHierarchyForAggFilters(chartSettings: IFUChartSettings, scopes?: IFSScopeID[], currentScope?: IFScope): IFUChartSettings;

package/dist/filters/helpers/applyHierarchyForAggFilters.js

@@ -5,9 +5,9 @@ import { getScopesByHierarchy } from "./getScopesByHierarchy";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes
- * @param currentScope
- * @returns
+ * @param scopes the pair id/label scopes
+ * @param currentScope the scope to be validated
+ * @returns the chart settings
  */
 export function applyHierarchyForAggFilters(chartSettings, scopes = [], currentScope = FILTER_SCOPE.GLOBAL) {
     if (isEmpty(chartSettings))

package/dist/filters/helpers/backend/buildExpression.js

@@ -9,14 +9,15 @@ import { getBackendValues } from "./getBackendValues";
  * @returns a filter expression
  */
 export function buildExpression(filter) {
+    var _a;
     const expression = {
         groupValue: getBackendGroupValue(filter),
         questionid: filter.column.id,
         questionType: filter.column.type,
         property: getBackendProperty(filter),
-        validationType: getBackendValidator(filter.validator),
+        validationType: getBackendValidator(filter),
         value: getBackendValues(filter),
     };
-    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+    expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
     return expression;
 }

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.d.ts

@@ -1,8 +1,10 @@
 import { IFBFilterAggregate } from "../../interfaces/backend/IFBFilterAggregate";
 /**
+ * @todo Make a proper description for this function
  *
- * @param aggFilters
- * @param summaryIndex
- * @returns
+ * Gets the aggFilters structure by an index
+ * @param aggFilters The aggFilter Structure
+ * @param summaryIndex an index
+ * @returns a new aggFilters structure
  */
 export declare function getAggFiltersBySummaryIndex(aggFilters: IFBFilterAggregate, summaryIndex: number): IFBFilterAggregate;

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js

@@ -1,9 +1,11 @@
 import { filterNestedTree } from "../../../general/array/filterNestedTree";
 /**
+ * @todo Make a proper description for this function
  *
- * @param aggFilters
- * @param summaryIndex
- * @returns
+ * Gets the aggFilters structure by an index
+ * @param aggFilters The aggFilter Structure
+ * @param summaryIndex an index
+ * @returns a new aggFilters structure
  */
 export function getAggFiltersBySummaryIndex(aggFilters, summaryIndex) {
     if (!aggFilters)

package/dist/filters/helpers/backend/getBackendValidator.d.ts

@@ -1,8 +1,8 @@
 import { IFBackendValidator } from "../../interfaces/backend/IFBackendValidator";
-import { IFValidator } from "../../interfaces/IFValidator";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 /**
  * Gets the Validator that is used in requests
  * @param validator Filter Validator used in UI
  * @returns Filter Validator used in Backend
  */
-export declare function getBackendValidator(validator: IFValidator): IFBackendValidator;
+export declare function getBackendValidator(filter: IFSFilter): IFBackendValidator;

package/dist/filters/helpers/backend/getBackendValidator.js

@@ -5,12 +5,12 @@ import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
  * @param validator Filter Validator used in UI
  * @returns Filter Validator used in Backend
  */
-export function getBackendValidator(validator) {
-    switch (validator) {
+export function getBackendValidator(filter) {
+    switch (filter.validator) {
         case FILTER_VALIDATOR.EQUALS:
-            return FILTER_BACKEND_VALIDATOR.EQUALS;
+            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.NOT_EQUAL : FILTER_BACKEND_VALIDATOR.EQUALS;
         case FILTER_VALIDATOR.NOT_EQUAL:
-            return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.EQUALS : FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
         case FILTER_VALIDATOR.CONTAINS:
             return FILTER_BACKEND_VALIDATOR.CONTAINS;
         case FILTER_VALIDATOR.NOT_CONTAIN: