@qrvey/utils 1.1.0-9 → 1.1.2-1

package/dist/filters/adapters/logicToFlatUI.js

@@ -1,8 +1,9 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
 import { COLUMN } from "../../constants";
-import { isEmpty, _get } from "../../general";
-import { getFilterid, getUIValues } from "../helpers";
+import { isEmpty, _get, _hasProperty } from "../../general";
+import { FILTER_VALIDATOR_VALUE } from "../constants";
+import { getFilterid, getUIValues, isNullValidator, } from "../helpers";
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)
@@ -11,86 +12,100 @@ import { getFilterid, getUIValues } from "../helpers";
 export function logicToFlatUI(logics = []) {
     if (isEmpty(logics))
         return [];
-    let uFilters = [];
+    const uFilters = [];
     logics.forEach(scopeItem => {
         if (scopeItem.filters.length > 0) {
             scopeItem.filters.forEach(filterItem => {
-                filterItem.expressions[0].expressions.forEach(expression => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-                    const uiExtras = expression.uiExtras;
-                    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) : -1;
-                    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== "IS_EMPTY" /* IS_NULL */)) {
-                        const scopeid = scopeItem.scope !== "GLOBAL" /* GLOBAL */ ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
-                        const uFilter = {
-                            collapsed: uiExtras.collapsed,
-                            column: {
-                                id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
-                                formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
-                                linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
-                                linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
-                                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,
-                                calculation: (_j = (_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.calculation) === null || _j === void 0 ? void 0 : _j.value,
-                                label: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.text,
-                                property: uiExtras.column.property,
-                                sorting: uiExtras.column.sorting,
-                                outputFormat: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.outputFormat,
-                                type: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.type,
-                            },
-                            dateSection: uiExtras.dateSection,
-                            displayed: true,
-                            enabled: expression.enabled,
-                            extras: {
-                                panelid: uiExtras.panelid,
-                                filterLabel: uiExtras.panelName,
-                                scopeid,
-                                scope: scopeItem.scope,
-                                section: uiExtras.section,
-                                scopeInfo: {
-                                    collapsed: false,
-                                    enabled: scopeItem.enabled,
-                                    displayed: true,
-                                    scope: scopeItem.scope,
-                                    scopeid,
-                                },
-                                dataset: {
-                                    collapsed: false,
-                                    enabled: true,
-                                    displayed: true,
-                                    qrveyid: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.qrveyid,
-                                    label: (_q = (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.dataset) === null || _q === void 0 ? void 0 : _q.name,
-                                    linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
-                                },
-                            },
-                            filterid: undefined,
-                            lookupDisplayIndex: uiExtras.lookupDisplayIndex,
-                            nullValues: uiExtras.nullValues,
-                            operator: uiExtras.operator,
-                            property: uiExtras.property,
-                            uiValues: getUIValues(uiExtras),
-                            validator: uiExtras.validator,
-                            values: uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)
-                                ? (uiExtras.values || []).map((v, i) => (Object.assign(Object.assign({}, v), { enabled: uiExtras.uiValue[i].enabled != null ? uiExtras.uiValue[i].enabled : true }))) : [],
-                        };
-                        uFilter.filterid = getFilterid(uFilter);
-                        uFilters.push(uFilter);
-                    }
-                    if (uiExtras.column.type === COLUMN.RANKING && isEmpty(uiExtras.column.aggregate)) {
-                        // Restore uiExtras.values array into single IFilterDetail object values array
-                        if (index > -1)
-                            uFilters[index].values.push(uiExtras.values[0]);
-                        const refinedRankingValues = refineRankingValues((index > -1 ? uFilters[index].values : uiExtras.values), uiExtras.uiValue);
-                        if (index > -1)
-                            uFilters[index].values = refinedRankingValues;
-                        else
-                            uFilters[uFilters.length - 1].values = refinedRankingValues;
-                    }
+                filterItem.expressions.forEach((expression1) => {
+                    _hasProperty(expression1, 'expressions') ? expression1.expressions.forEach((expression2) => {
+                        buildFilterByExpression(expression2, scopeItem, uFilters);
+                    }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
+                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
+                //     buildFilterByExpression(expression, scopeItem, uFilters);
+                // });
             });
         }
     });
     return uFilters;
 }
+function buildFilterByExpression(expression, scopeItem, uFilters) {
+    const uiExtras = expression.uiExtras;
+    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) : -1;
+    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== "IS_EMPTY" /* IS_NULL */)) {
+        const uFilter = getFilterByExpression(expression, scopeItem);
+        uFilter.filterid = getFilterid(uFilter);
+        uFilters.push(uFilter);
+    }
+    if (uiExtras.column.type === COLUMN.RANKING && isEmpty(uiExtras.column.aggregate)) {
+        // Restore uiExtras.values array into single IFilterDetail object values array
+        if (index > -1)
+            uFilters[index].values.push(uiExtras.values[0]);
+        const refinedRankingValues = refineRankingValues((index > -1 ? uFilters[index].values : uiExtras.values), uiExtras.uiValue);
+        if (index > -1)
+            uFilters[index].values = refinedRankingValues;
+        else
+            uFilters[uFilters.length - 1].values = refinedRankingValues;
+    }
+}
+function getFilterByExpression(expression, scopeItem) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    const uiExtras = expression.uiExtras;
+    const scopeid = scopeItem.scope !== "GLOBAL" /* GLOBAL */ ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
+    const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
+    return {
+        collapsed: uiExtras.collapsed,
+        column: {
+            id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
+            formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
+            linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
+            linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
+            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,
+            calculation: (_j = (_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.calculation) === null || _j === void 0 ? void 0 : _j.value,
+            label: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.text,
+            property: uiExtras.column.property,
+            sorting: uiExtras.column.sorting,
+            outputFormat: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.outputFormat,
+            type: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.type,
+        },
+        dateSection: uiExtras.dateSection,
+        displayed: true,
+        enabled: expression.enabled,
+        extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
+            scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
+                collapsed: (_o = scopeItem.uiExtras) === null || _o === void 0 ? void 0 : _o.collapsed,
+                enabled: scopeItem.enabled,
+                displayed: true,
+                scope: scopeItem.scope,
+                scopeid,
+            }, dataset: {
+                collapsed: false,
+                enabled: true,
+                displayed: true,
+                qrveyid: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.qrveyid,
+                label: (_r = (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.dataset) === null || _r === void 0 ? void 0 : _r.name,
+                linkid: (_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.linkid,
+            } }),
+        filterid: undefined,
+        lookupDisplayIndex: uiExtras.lookupDisplayIndex,
+        nullValues: uiExtras.nullValues,
+        operator: uiExtras.operator,
+        property: uiExtras.property,
+        uiValues: getUIValues(uiExtras),
+        validator: uiExtras.validator,
+        values: getValues(uiExtras),
+    };
+}
+function getValues(uiExtras) {
+    if (isNullValidator(uiExtras.validator) && isEmpty(uiExtras.values)) {
+        return [{ value: FILTER_VALIDATOR_VALUE[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
+    }
+    if (uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)) {
+        return uiExtras.values;
+    }
+    return [];
+}
 /**
  * Get the filter or the index of the given array, validating an old filter structure.
  * @param filters The array of UI filters
@@ -99,7 +114,7 @@ export function logicToFlatUI(logics = []) {
  * @returns the index or the UI filter object
  */
 function getFilter(filters, filter, getIndex = false) {
-    const validator = (f) => (f.validator === filter.validator &&
+    const validator = (f) => f.validator === filter.validator &&
         f.column.id === filter.column.id &&
         f.column.qrveyid === filter.column.qrveyid &&
         f.column.linkid === filter.column.linkid &&
@@ -107,7 +122,7 @@ function getFilter(filters, filter, getIndex = false) {
         f.extras.scope === filter.scope &&
         f.extras.scopeid === filter.scopeid &&
         f.property === filter.property &&
-        f.extras.panelid === filter.panelid);
+        f.extras.panelid === filter.panelid;
     return getIndex ? filters.findIndex(validator) : filters.find(validator);
 }
 /**
@@ -116,7 +131,7 @@ function getFilter(filters, filter, getIndex = false) {
  * @param uiValues Object with additional info about the values of the filter.
  * @returns the array of Ranking values
  */
-function refineRankingValues(values = [], uiValues) {
+function refineRankingValues(values = [], uiValues = []) {
     return values.map(valueGroup => {
         return [
             ...valueGroup.map(value => {

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

@@ -53,7 +53,7 @@
  *
  * const filterData = transformFilters(oldPreferenceFilters, 'ANALYZE');
  */
-export declare function transformFilters(oldFiltersObj?: object, section?: string): {
+export declare function transformFilters(oldFiltersObj?: {}, section?: string): {
     enabled: boolean;
     logic: any[];
     section: string;

package/dist/filters/adapters/transformFilters.js

@@ -1,5 +1,5 @@
-import { capitalize } from '../../general/index';
-import { get } from '../../general/object/get';
+import { capitalize, _get } from '../../general/index';
+import { isTokenLabel } from '../../tokens/isTokenLabel';
 /**
  * Transform the old filters structure into the new one
  *
@@ -214,14 +214,14 @@ function getValidator(oldValidation) {
 function getProperty(filterObjItem, validationKey) {
     if (filterObjItem.type === 'IMAGE')
         return 'answer_id';
-    const value = get(filterObjItem, `values[0]['${validationKey}'][0]`, {});
+    const value = _get(filterObjItem, `values[0]['${validationKey}'][0]`, {});
     const property = filterObjItem.property || value.property || value.targetFilter;
     return property && property.toUpperCase();
 }
 function getDateProperty(validationKey, columnType, formulaType) {
     if (![columnType, formulaType].includes('DATE'))
         return;
-    return (['MONTH_YEAR', 'YEAR', 'QUARTER', 'WEEK', 'HOUR', 'MINUTE', 'SECOND'].includes(validationKey)) ? validationKey.split('_')[0].toLowerCase() : 'day';
+    return ['MONTH_YEAR', 'YEAR', 'QUARTER', 'WEEK', 'HOUR', 'MINUTE', 'SECOND'].includes(validationKey) ? validationKey.split('_')[0].toLowerCase() : 'day';
 }
 function getFilterRangeValue(range, minProp = 'min', maxProp = 'max', extras = {}) {
     return Object.assign({ [minProp]: range.from || range.gte, [maxProp]: range.to || range.lte }, extras);
@@ -252,45 +252,47 @@ function getValues(values, columnType, oldValidation = 'EQUAL', destination = 'v
         case 'BETWEEN':
         case 'YEAR':
         case 'MONTH_YEAR':
-            return (destination === 'value')
+            return destination === 'value'
                 ? values.map(val => getFilterRangeValue(val.value.range || val.value, 'gte', 'lte'))
-                : (destination === 'uiValue')
+                : destination === 'uiValue'
                     ? values.map(val => getFilterRangeValue(val.value.range || val.value, 'min', 'max', { enabled: val.enabled, value: getUiRangeValue(val.value), validationLabel: oldValidation }))
                     : ['YEAR', 'MONTH_YEAR', 'QUARTER'].includes(oldValidation)
                         ? values.map(item => ({ value: getUiRangeValue(item.value) }))
                         : values.map(val => getFilterRangeValue(val.value.range || val.value));
         case 'LESS_THAN':
-        case 'GREATER_THAN':
+        case 'GREATER_THAN': {
             const prop = oldValidation === 'LESS_THAN' ? 'lte' : 'gte';
-            return (destination === 'value')
+            return destination === 'value'
                 ? values.map(val => getFilterRangeValue({ [prop]: val.value }, 'gte', 'lte'))
-                : (destination === 'uiValue')
+                : destination === 'uiValue'
                     ? values.map(val => getFilterRangeValue({ [prop]: val.value }, 'min', 'max', { enabled: val.enabled, value: val.value }))
                     : values.map(val => getFilterRangeValue({ [prop]: val.value }));
+        }
         case 'IS_EMPTY':
-        case 'IS_NOT_EMPTY':
+        case 'IS_NOT_EMPTY': {
             const valueClean = getValidator(oldValidation).toLowerCase().split('_').map(v => capitalize(v)).join(' ');
-            return (destination === 'value')
+            return destination === 'value'
                 ? [valueClean]
-                : (destination === 'uiValue')
+                : destination === 'uiValue'
                     ? values.map(val => ({ value: valueClean, enabled: val.enabled }))
                     : [];
+        }
         default:
             return getFilterEqualValues(values, columnType, destination, formulaType);
     }
 }
 function getFilterEqualValues(values, columnType, destination = 'value', formulaType) {
     if (columnType === 'RANKING') {
-        return (destination === 'value')
+        return destination === 'value'
             ? values.map(item => ({ position: +item.position, value: item.value }))
-            : (destination === 'uiValue')
+            : destination === 'uiValue'
                 ? values.map(item => ({ value: getUiRangeValue({ from: item.value, to: +item.position + 1 }), enabled: true }))
                 : getRankingFBvalues(values);
     }
-    const formattedValues = (destination === 'value')
+    const formattedValues = destination === 'value'
         ? values.map(item => {
             let value = item.value;
-            if ([columnType, formulaType].includes('DATE') && !isTokenBoxLabel(value)) {
+            if ([columnType, formulaType].includes('DATE') && !isTokenLabel(value)) {
                 value = getFilterRangeValue(item.value.range || item.value, 'gte', 'lte');
             }
             else if (columnType === 'YES_NO') {
@@ -304,7 +306,7 @@ function getFilterEqualValues(values, columnType, destination = 'value', formula
             }
             return value;
         })
-        : values.map(item => ({ value: columnType === 'YES_NO' ? item.value.toLowerCase() : ([columnType, formulaType].includes('DATE') ? item.value.label || item.value : String(item.value)), valueid: columnType === 'EXPRESSION' ? undefined : item.id || item.answerid, enabled: item.enabled || true }));
+        : values.map(item => ({ value: columnType === 'YES_NO' ? item.value.toLowerCase() : [columnType, formulaType].includes('DATE') ? item.value.label || item.value : String(item.value), valueid: columnType === 'EXPRESSION' ? undefined : item.id || item.answerid, enabled: item.enabled || true }));
     return formattedValues;
 }
 function getFormulaType(oldFiltersItem) {
@@ -362,12 +364,3 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
     });
     return expressions;
 }
-/**
- * Get a text and evaluate if it matchs with a token box label.
- * @param label string to evaluate
- * @return True is label matchs; otherwise false
- */
-function isTokenBoxLabel(label) {
-    const regex = new RegExp('^(\{\{)([^{}]+)(\}\})$', 'gi');
-    return regex.test(label);
-}

package/dist/filters/constants/backend/FILTER_BACKEND_VALIDATOR.js

@@ -1,2 +1 @@
-;
 export {};

package/dist/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.d.ts

@@ -0,0 +1,2 @@
+import { FILTER_OPERATOR } from "./FILTER_OPERATOR";
+export declare const FILTER_GROUPED_COLUMN_OPERATOR = FILTER_OPERATOR.OR;

package/dist/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.js

@@ -0,0 +1 @@
+export const FILTER_GROUPED_COLUMN_OPERATOR = "OR" /* OR */;

package/dist/filters/constants/common/FILTER_OPERATOR.js

@@ -1,2 +1 @@
-;
 export {};

package/dist/filters/constants/common/FILTER_VALIDATOR.js

@@ -1,2 +1 @@
-;
 export {};

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

@@ -1,5 +1,6 @@
 export * from './FILTER_DATE_SECTION';
 export * from './FILTER_DATE_SECTIONS';
+export * from './FILTER_GROUPED_COLUMN_OPERATOR';
 export * from './FILTER_OPERATOR';
 export * from './FILTER_SCOPE_LABEL';
 export * from './FILTER_SCOPE';

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

@@ -1,5 +1,6 @@
 export * from './FILTER_DATE_SECTION';
 export * from './FILTER_DATE_SECTIONS';
+export * from './FILTER_GROUPED_COLUMN_OPERATOR';
 export * from './FILTER_OPERATOR';
 export * from './FILTER_SCOPE_LABEL';
 export * from './FILTER_SCOPE';

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

@@ -1,2 +1,8 @@
 import { IFBExpression, IFSFilter } from "../../interfaces";
+/**
+ * Builds filter expression by the filter data.
+ * - If the resulting value array is empty the enabled property will be false.
+ * @param filter The filter to transform
+ * @returns a filter expression
+ */
 export declare function buildExpression(filter: IFSFilter): IFBExpression;

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

@@ -2,9 +2,14 @@ import { getBackendGroupValue } from "./getBackendGroupValue";
 import { getBackendProperty } from "./getBackendProperty";
 import { getBackendValidator } from "./getBackendValidator";
 import { getBackendValues } from "./getBackendValues";
+/**
+ * Builds filter expression by the filter data.
+ * - If the resulting value array is empty the enabled property will be false.
+ * @param filter The filter to transform
+ * @returns a filter expression
+ */
 export function buildExpression(filter) {
-    return {
-        enabled: filter.enabled,
+    const expression = {
         groupValue: getBackendGroupValue(filter),
         questionid: filter.column.id,
         questionType: filter.column.type,
@@ -12,4 +17,6 @@ export function buildExpression(filter) {
         validationType: getBackendValidator(filter.validator),
         value: getBackendValues(filter),
     };
+    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+    return expression;
 }

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

@@ -1,12 +1,13 @@
 import { isEmpty } from "../../../general";
 import { isDateColumn } from "../../../qrvey/isDateColumn";
+import { arePropertiesDateP } from "../common";
 /**
  * Gets a group value for the backend logic structure
  * @param filter The filter
  * @returns a property
  */
 export function getBackendGroupValue(filter) {
-    if (isEmpty(filter.column.aggregate) && isDateColumn(filter.column) && filter.property != null) {
+    if (!arePropertiesDateP(filter.column, filter.property) && isEmpty(filter.column.aggregate) && isDateColumn(filter.column) && filter.property != null) {
         return filter.property;
     }
 }

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

@@ -1,17 +1,22 @@
 import { COLUMN } from "../../../constants";
 import { isEmpty } from "../../../general";
 import { isDateColumn } from "../../../qrvey/isDateColumn";
-import { isNullValidator } from "../common";
+import { arePropertiesDateP, isNullValidator } from "../common";
 /**
  * Gets a property for the logic structure
  * @param filter The filter
  * @returns a property
  */
 export function getBackendProperty(filter) {
+    var _a;
     if (isEmpty(filter.column.aggregate)) {
-        if ((isDateColumn(filter.column) && filter.property != null) || isNullValidator(filter.validator))
+        if (isNullValidator(filter.validator)) {
             return undefined;
-        if ((filter.column.type === COLUMN.EXPRESSION && filter.property != null)) {
+        }
+        else if (isDateColumn(filter.column)) {
+            return arePropertiesDateP(filter.column, filter.property) ? (_a = filter.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
+        }
+        else if (filter.column.type === COLUMN.EXPRESSION && filter.property != null) {
             return undefined;
         }
         else if (filter.column.type === COLUMN.LOOKUP && filter.property === "display" /* LOOKUP_DISPLAY */ && filter.lookupDisplayIndex != null) {

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

@@ -19,28 +19,42 @@ export function getBackendValues(filter) {
         case "NOT_START_WITH" /* NOT_START_WITH */:
         case "ENDS_WITH" /* ENDS_WITH */:
         case "NOT_END_WITH" /* NOT_END_WITH */:
-            return filter.values.map(value => value.value);
+            return filter.values.map(value => value.enabled ? value.value : undefined);
         case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-            return filter.values.map(value => ({ lte: value.max, gte: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { lte: value.max, gte: value.min }
+                : undefined).filter(Boolean);
         case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
-            return filter.values.map(value => ({ lt: value.max, gt: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { lt: value.max, gt: value.min }
+                : undefined).filter(Boolean);
         case "BEFORE" /* BEFORE */:
         case "LESS_THAN" /* LESS_THAN */:
-            return filter.values.map(value => ({ lt: value.max }));
+            return filter.values.map(value => value.enabled ?
+                { lt: value.max }
+                : undefined).filter(Boolean);
         case "BEFORE_ON" /* BEFORE_ON */:
         case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
-            return filter.values.map(value => ({ lte: value.max }));
+            return filter.values.map(value => value.enabled ?
+                { lte: value.max }
+                : undefined).filter(Boolean);
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
-            return filter.values.map(value => ({ gt: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { gt: value.min }
+                : undefined).filter(Boolean);
         case "AFTER_ON" /* AFTER_ON */:
         case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
-            return filter.values.map(value => ({ gte: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { gte: value.min }
+                : undefined).filter(Boolean);
         case "IS_NULL" /* IS_NULL */:
-        case "IS_NOT_NULL" /* IS_NOT_NULL */:
-            return [FILTER_VALIDATOR_VALUE[filter.validator].label];
+        case "IS_NOT_NULL" /* IS_NOT_NULL */: {
+            const addValue = filter.values.length > 0 && filter.values.every(value => value.enabled);
+            return addValue ? [FILTER_VALIDATOR_VALUE[filter.validator].label] : [];
+        }
         case "IN" /* IN */:
-            return filter.values;
+            return filter.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -53,13 +67,15 @@ export function getBackendValues(filter) {
  */
 function getResultValues(values, filter) {
     return values.map((value) => {
-        if (filter.column.type === COLUMN.IMAGE) {
-            return value.valueid;
-        }
-        else {
-            return value.value;
+        if (value.enabled) {
+            if (filter.column.type === COLUMN.IMAGE) {
+                return value.valueid;
+            }
+            else {
+                return value.value;
+            }
         }
-    }).filter(value => value);
+    }).filter(Boolean);
 }
 /**
  * Gets the Ranking values.
@@ -69,8 +85,8 @@ function getResultValues(values, filter) {
  */
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = rankingGroupIndex == null ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? {
         position: rankingValue.position - 1,
         value: rankingValue.value.value
-    }));
+    } : undefined).filter(Boolean);
 }