@qrvey/utils 1.2.10-9 → 1.3.0-10

package/dist/dates/relative/constants/RELATIVE_CURSOR_INFO_LIST.d.ts

@@ -1,4 +1,4 @@
-import { IRelativeCursorInfo } from "../interfaces/IRelativeCursorInfo";
+import { IRelativeCursorInfo } from "..";
 /**
  * @description Key/array of compound relative cursor info
  */

package/dist/filters/adapters/FDToFlatUI.js

@@ -80,7 +80,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property: property,
-                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/dist/filters/adapters/UIToFD.js

@@ -20,10 +20,9 @@ export function UIToFD(uFilterData) {
 }
 /**
  * Builds the Fitler Data structure from UI filter data
- * @private
  * @param uFilterData The UI filter Data object
  * @param version the version of the structure
- * @returns a Filter Data structure
+ * @returns
  */
 function UI21ToFD(uFilterData, version) {
     return {

package/dist/filters/adapters/UIToFlatUI.js

@@ -78,7 +78,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property,
-                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/dist/filters/adapters/UIToOldLogic.js

@@ -65,7 +65,6 @@ 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,
@@ -75,11 +74,11 @@ function buildExpressions(filterSection, scope, dataset) {
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
             questionid: filter.column.id,
-            validationType: getBackendValidator(filter),
+            validationType: getBackendValidator(filter.validator),
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
+        expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
         expressions.push(expression);
         return expressions;
     }, []);
@@ -120,7 +119,7 @@ const getFilterDetail = (filter, scope, dataset) => {
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            text: filter.column.label,
+            label: filter.column.label,
             type: filter.column.type,
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
@@ -145,7 +144,6 @@ 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 the property to be adapted
- * @returns a adapted property
+ * @param property
+ * @returns
  */
 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 the property to be adapted
- * @returns a adapted property
+ * @param property
+ * @returns
  */
 export function adaptDateGroupingProperty(property) {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/dist/filters/adapters/adaptFilterValues.js

@@ -9,7 +9,7 @@ import { COLUMN } from "../../columns/constants/COLUMN";
 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 }));
     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,7 +103,6 @@ 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,7 +86,6 @@ 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,
@@ -148,14 +147,13 @@ 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) });
+        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props.validator) });
         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),
@@ -165,11 +163,11 @@ function getRegularExpression(props) {
         questionid: props.column.id,
         questionType: props.column.type,
         formulaType: props.column.formulaType,
-        validationType: getBackendValidator(props),
+        validationType: getBackendValidator(props.validator),
         value: getValues(props),
         uiExtras: Object.assign(Object.assign({}, props), { uiValue })
     };
-    expression['enabled'] = props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
+    expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
     return expression;
 }
 // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
@@ -248,86 +246,72 @@ 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(values, rankingGroupIndex);
-            return getResultValues(values, props);
+                return getRankingValues(props.values, rankingGroupIndex);
+            return getResultValues(props.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 values.map(value => value.enabled ? value.value : undefined);
+            return props.values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lte: value.max, gte: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lt: value.max, gt: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => value.enabled ?
-                { lt: value.max }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lt: value.max }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { lte: value.max }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return values.map(value => value.enabled ?
-                { gt: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ gt: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { gte: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ gte: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && values.every(value => value.enabled);
+            const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return props.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 values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, 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 values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, 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 = 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 = props.values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
         case FILTER_VALIDATOR.IN:
-            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'}` : ''}`, enabled: props.enabled })));
+            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 })));
         default:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-                return getRankingUIValues(values, rankingGroupIndex);
+                return getRankingUIValues(props.values, rankingGroupIndex);
             }
-            return values.map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
+            return (props.values || []).map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
@@ -335,10 +319,10 @@ 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];
@@ -350,7 +334,7 @@ function getRankingUIValues(values, rankingGroupIndex) {
     }));
 }
 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,7 +117,6 @@ 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,8 +1,6 @@
 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,8 +1,6 @@
 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     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') || _get(uiExtras.column, 'label'),
+            label: _get(uiExtras.column, 'text') || ((_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.label),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
-            outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
-            type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
+            outputFormat: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.outputFormat,
+            type: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.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: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
+                collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -87,16 +87,15 @@ function getFilterByExpression(expression, scopeItem) {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                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,
+                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,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
-        selectAll: uiExtras.selectAll,
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };

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

@@ -1,4 +1,4 @@
-import { FILTER_SCOPE } from "../common/FILTER_SCOPE";
+import { FILTER_SCOPE } from "..";
 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 { IColumnType } from "../../../columns/interfaces/IColumnType";
-export declare const STATIC_OPTION_COLUMNS: IColumnType[];
+import { COLUMN } from "../../../columns/constants/COLUMN";
+export declare const STATIC_OPTION_COLUMNS: COLUMN[];

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

@@ -3,7 +3,6 @@ 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,7 +3,6 @@ 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/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 the pair id/label scopes
- * @param currentScope the scope to be validated
- * @returns the chart settings
+ * @param scopes
+ * @param currentScope
+ * @returns
  */
 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 the pair id/label scopes
- * @param currentScope the scope to be validated
- * @returns the chart settings
+ * @param scopes
+ * @param currentScope
+ * @returns
  */
 export function applyHierarchyForAggFilters(chartSettings, scopes = [], currentScope = FILTER_SCOPE.GLOBAL) {
     if (isEmpty(chartSettings))

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

@@ -9,15 +9,14 @@ 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),
+        validationType: getBackendValidator(filter.validator),
         value: getBackendValues(filter),
     };
-    expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
+    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
     return expression;
 }

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

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

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

@@ -1,11 +1,9 @@
 import { filterNestedTree } from "../../../general/array/filterNestedTree";
 /**
- * @todo Make a proper description for this function
  *
- * Gets the aggFilters structure by an index
- * @param aggFilters The aggFilter Structure
- * @param summaryIndex an index
- * @returns a new aggFilters structure
+ * @param aggFilters
+ * @param summaryIndex
+ * @returns
  */
 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 { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFValidator } from "../../interfaces/IFValidator";
 /**
  * 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(filter: IFSFilter): IFBackendValidator;
+export declare function getBackendValidator(validator: IFValidator): 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(filter) {
-    switch (filter.validator) {
+export function getBackendValidator(validator) {
+    switch (validator) {
         case FILTER_VALIDATOR.EQUALS:
-            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.NOT_EQUAL : FILTER_BACKEND_VALIDATOR.EQUALS;
+            return FILTER_BACKEND_VALIDATOR.EQUALS;
         case FILTER_VALIDATOR.NOT_EQUAL:
-            return filter.selectAll ? FILTER_BACKEND_VALIDATOR.EQUALS : FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+            return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
         case FILTER_VALIDATOR.CONTAINS:
             return FILTER_BACKEND_VALIDATOR.CONTAINS;
         case FILTER_VALIDATOR.NOT_CONTAIN:

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

@@ -9,68 +9,66 @@ import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_I
  * @returns A collection of backend expression value
  */
 export function getBackendValues(filter) {
-    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate))
-                return getRankingValues(values);
-            return getResultValues(values, filter);
+                return getRankingValues(filter.values);
+            return getResultValues(filter.values, filter);
         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 values.map(value => value.enabled ? value.value : undefined);
+            return filter.values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lte: value.max, gte: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lt: value.max, gt: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lt: value.max }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { lte: value.max }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { gt: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => value.enabled ?
+            return filter.values.map(value => value.enabled ?
                 { gte: value.min }
                 : undefined).filter(Boolean);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && values.every(value => value.enabled);
+            const addValue = filter.values.length > 0 && filter.values.every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[filter.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return filter.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
 }
 /**
  * Gets the expression values. Depending on the column type
- * @private
  * @param values a collection of filter values
  * @param filter The filter structure
- * @returns Expression values
+ * @returns
  */
 function getResultValues(values, filter) {
-    return (values || []).map((value) => {
+    return values.map((value) => {
         if (value.enabled) {
             if (filter.column.type === COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
@@ -83,7 +81,6 @@ function getResultValues(values, filter) {
 }
 /**
  * Gets the Ranking values.
- * @private
  * @param values a collection of filter values in the ranking structure
  * @param rankingGroupIndex determine the value by this index to build and return it
  * @returns Expression values for ranking

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

@@ -6,5 +6,5 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
-export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';
+export * from './getLogicByScopes';

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

@@ -6,6 +6,5 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
-export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';
-// export * from './hasDatasetRelatedFilters';
+export * from './getLogicByScopes';

package/dist/filters/helpers/builder/getFilterBuilderGeneralConfig.d.ts

@@ -1,7 +1,7 @@
-import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
+import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
 /**
  * Returns a filter builder config object by a any given config
  * @param config any config object
  * @returns The filter builder config object
  */
-export declare function getFilterBuilderGeneralConfig(config?: any): IFilterConfig;
+export declare function getFilterBuilderGeneralConfig(config?: any): IFilterBuilderGeneralConfig;