@qrvey/utils 1.1.0-9 → 1.1.2-1

package/dist/cjs/filters/adapters/flatUIToUI.js

@@ -86,6 +86,7 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    const info = !general_1.isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -107,13 +108,7 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: {
-            panelid: uFilter.extras.panelid,
-            filterLabel: uFilter.extras.filterLabel,
-            scope: uFilter.extras.scope,
-            scopeid: uFilter.extras.scopeid,
-            section: uFilter.extras.section,
-        },
+        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,

package/dist/cjs/filters/adapters/logicToFlatUI.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logicToFlatUI = void 0;
 const constants_1 = require("../../constants");
 const general_1 = require("../../general");
+const constants_2 = require("../constants");
 const helpers_1 = require("../helpers");
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
@@ -14,87 +15,101 @@ const helpers_1 = require("../helpers");
 function logicToFlatUI(logics = []) {
     if (general_1.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 === constants_1.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 */ ? general_1._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: helpers_1.getUIValues(uiExtras),
-                            validator: uiExtras.validator,
-                            values: uiExtras.column.type !== constants_1.COLUMN.RANKING || !general_1.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 = helpers_1.getFilterid(uFilter);
-                        uFilters.push(uFilter);
-                    }
-                    if (uiExtras.column.type === constants_1.COLUMN.RANKING && general_1.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) => {
+                    general_1._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;
 }
 exports.logicToFlatUI = logicToFlatUI;
+function buildFilterByExpression(expression, scopeItem, uFilters) {
+    const uiExtras = expression.uiExtras;
+    const index = uiExtras.column.type === constants_1.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 = helpers_1.getFilterid(uFilter);
+        uFilters.push(uFilter);
+    }
+    if (uiExtras.column.type === constants_1.COLUMN.RANKING && general_1.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 */ ? general_1._get(scopeItem, 'uiExtras.scopeid') : undefined;
+    const info = !general_1.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: helpers_1.getUIValues(uiExtras),
+        validator: uiExtras.validator,
+        values: getValues(uiExtras),
+    };
+}
+function getValues(uiExtras) {
+    if (helpers_1.isNullValidator(uiExtras.validator) && general_1.isEmpty(uiExtras.values)) {
+        return [{ value: constants_2.FILTER_VALIDATOR_VALUE[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
+    }
+    if (uiExtras.column.type !== constants_1.COLUMN.RANKING || !general_1.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
@@ -103,7 +118,7 @@ exports.logicToFlatUI = logicToFlatUI;
  * @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 &&
@@ -111,7 +126,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);
 }
 /**
@@ -120,7 +135,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/cjs/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/cjs/filters/adapters/transformFilters.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFilters = void 0;
 const index_1 = require("../../general/index");
-const get_1 = require("../../general/object/get");
+const isTokenLabel_1 = require("../../tokens/isTokenLabel");
 /**
  * Transform the old filters structure into the new one
  *
@@ -218,14 +218,14 @@ function getValidator(oldValidation) {
 function getProperty(filterObjItem, validationKey) {
     if (filterObjItem.type === 'IMAGE')
         return 'answer_id';
-    const value = get_1.get(filterObjItem, `values[0]['${validationKey}'][0]`, {});
+    const value = index_1._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);
@@ -256,45 +256,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 => index_1.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_1.isTokenLabel(value)) {
                 value = getFilterRangeValue(item.value.range || item.value, 'gte', 'lte');
             }
             else if (columnType === 'YES_NO') {
@@ -308,7 +310,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) {
@@ -366,12 +368,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/cjs/filters/constants/backend/FILTER_BACKEND_VALIDATOR.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/dist/cjs/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/cjs/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FILTER_GROUPED_COLUMN_OPERATOR = void 0;
+exports.FILTER_GROUPED_COLUMN_OPERATOR = "OR" /* OR */;

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

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

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

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/dist/cjs/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/cjs/filters/constants/common/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FILTER_DATE_SECTION"), exports);
 __exportStar(require("./FILTER_DATE_SECTIONS"), exports);
+__exportStar(require("./FILTER_GROUPED_COLUMN_OPERATOR"), exports);
 __exportStar(require("./FILTER_OPERATOR"), exports);
 __exportStar(require("./FILTER_SCOPE_LABEL"), exports);
 __exportStar(require("./FILTER_SCOPE"), exports);

package/dist/cjs/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/cjs/filters/helpers/backend/buildExpression.js

@@ -5,9 +5,14 @@ const getBackendGroupValue_1 = require("./getBackendGroupValue");
 const getBackendProperty_1 = require("./getBackendProperty");
 const getBackendValidator_1 = require("./getBackendValidator");
 const getBackendValues_1 = require("./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
+ */
 function buildExpression(filter) {
-    return {
-        enabled: filter.enabled,
+    const expression = {
         groupValue: getBackendGroupValue_1.getBackendGroupValue(filter),
         questionid: filter.column.id,
         questionType: filter.column.type,
@@ -15,5 +20,7 @@ function buildExpression(filter) {
         validationType: getBackendValidator_1.getBackendValidator(filter.validator),
         value: getBackendValues_1.getBackendValues(filter),
     };
+    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+    return expression;
 }
 exports.buildExpression = buildExpression;

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

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendGroupValue = void 0;
 const general_1 = require("../../../general");
 const isDateColumn_1 = require("../../../qrvey/isDateColumn");
+const common_1 = require("../common");
 /**
  * Gets a group value for the backend logic structure
  * @param filter The filter
  * @returns a property
  */
 function getBackendGroupValue(filter) {
-    if (general_1.isEmpty(filter.column.aggregate) && isDateColumn_1.isDateColumn(filter.column) && filter.property != null) {
+    if (!common_1.arePropertiesDateP(filter.column, filter.property) && general_1.isEmpty(filter.column.aggregate) && isDateColumn_1.isDateColumn(filter.column) && filter.property != null) {
         return filter.property;
     }
 }

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

@@ -11,10 +11,15 @@ const common_1 = require("../common");
  * @returns a property
  */
 function getBackendProperty(filter) {
+    var _a;
     if (general_1.isEmpty(filter.column.aggregate)) {
-        if ((isDateColumn_1.isDateColumn(filter.column) && filter.property != null) || common_1.isNullValidator(filter.validator))
+        if (common_1.isNullValidator(filter.validator)) {
             return undefined;
-        if ((filter.column.type === constants_1.COLUMN.EXPRESSION && filter.property != null)) {
+        }
+        else if (isDateColumn_1.isDateColumn(filter.column)) {
+            return common_1.arePropertiesDateP(filter.column, filter.property) ? (_a = filter.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
+        }
+        else if (filter.column.type === constants_1.COLUMN.EXPRESSION && filter.property != null) {
             return undefined;
         }
         else if (filter.column.type === constants_1.COLUMN.LOOKUP && filter.property === "display" /* LOOKUP_DISPLAY */ && filter.lookupDisplayIndex != null) {