@qrvey/utils 1.1.2-0 → 1.1.4

package/dist/cjs/constants/COLUMN_PROPERTY.d.ts

@@ -7,12 +7,12 @@ export declare const enum COLUMN_PROPERTY {
     DATE_HOUR = "hour",
     DATE_MINUTE = "minute",
     DATE_SECOND = "second",
-    DATE_YEAR_QUARTER = "p&quarter",
-    DATE_YEAR_MONTH = "p&month",
-    DATE_MONTH_DAY = "p&day",
-    DATE_DAY_HOUR = "p&hour",
-    DATE_HOUR_MINUTE = "p&minute",
-    DATE_MINUTE_SECOND = "p&second",
+    DATE_YEAR_QUARTER = "quarter_only",
+    DATE_YEAR_MONTH = "month_only",
+    DATE_MONTH_DAY = "day_only",
+    DATE_DAY_HOUR = "hour_only",
+    DATE_HOUR_MINUTE = "minute_only",
+    DATE_MINUTE_SECOND = "second_only",
     NAME_FIRST = "first_name",
     NAME_LAST = "last_name",
     ADDRESS_STREET = "street_address",

package/dist/cjs/constants/COLUMN_PROPERTY_VALUE.d.ts

@@ -1,7 +1,6 @@
-import { COLUMN_PROPERTY } from "./COLUMN_PROPERTY";
 export declare const COLUMN_PROPERTY_VALUE: {
     DATE: {
-        value: COLUMN_PROPERTY;
+        value: import("./COLUMN_PROPERTY").COLUMN_PROPERTY;
         label: string;
         display: boolean;
     }[];

package/dist/cjs/constants/COLUMN_PROPERTY_VALUE.js

@@ -2,17 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COLUMN_PROPERTY_VALUE = void 0;
 const date_1 = require("../date");
+const DATE_VALUES_1 = require("../date/constants/DATE_VALUES");
 const COLUMN_1 = require("./COLUMN");
 const COLUMN_COMPLEX_VALUE_1 = require("./COLUMN_COMPLEX_VALUE");
 const setTabStructure = compound => ({ value: compound.property, label: compound.shortLabel });
 const C = {
-    [COLUMN_1.COLUMN.DATE]: [
-        { value: "day" /* DATE_DAY */, label: 'Complete Date', display: true },
-        { value: "year" /* DATE_YEAR */, label: 'Year', display: true },
-        { value: "quarter" /* DATE_QUARTER */, label: 'Quarter', display: true },
-        { value: "month" /* DATE_MONTH */, label: 'Month', display: true },
-        { value: "week" /* DATE_WEEK */, label: 'Weeks', display: true }
-    ],
+    [COLUMN_1.COLUMN.DATE]: DATE_VALUES_1.DATE_VALUES,
     [COLUMN_1.COLUMN.LOOKUP]: [
         { value: 'display', label: 'Display', display: true },
         { value: 'value', label: 'Value', display: true }
@@ -26,5 +21,5 @@ const C = {
     [COLUMN_1.COLUMN.EXPRESSION]: COLUMN_COMPLEX_VALUE_1.COLUMN_COMPLEX_VALUE.EXPRESSION.map(setTabStructure),
     [COLUMN_1.COLUMN.IMAGEUPLOAD]: COLUMN_COMPLEX_VALUE_1.COLUMN_COMPLEX_VALUE.IMAGEUPLOAD.map(setTabStructure),
 };
-C[COLUMN_1.COLUMN.DATE + '-complete'] = C[COLUMN_1.COLUMN.DATE].concat(date_1.DATE_P_VALUES).concat(date_1.DATE_TIME_P_VALUES);
+C[COLUMN_1.COLUMN.DATE + '-complete'] = C[COLUMN_1.COLUMN.DATE].concat(date_1.DATE_TIME_VALUES).concat(date_1.DATE_P_VALUES).concat(date_1.DATE_TIME_P_VALUES);
 exports.COLUMN_PROPERTY_VALUE = C;

package/dist/cjs/date/constants/DATE_PROPERTY_VALUE.d.ts

@@ -1,8 +1,8 @@
 export declare const DATE_PROPERTY_VALUE: {
-    "p&quarter": string[];
-    "p&month": string[];
-    "p&day": string[];
-    "p&hour": string[];
-    "p&minute": string[];
-    "p&second": string[];
+    quarter_only: string[];
+    month_only: string[];
+    day_only: string[];
+    hour_only: string[];
+    minute_only: string[];
+    second_only: string[];
 };

package/dist/cjs/date/constants/DATE_PROPERTY_VALUE.js

@@ -8,10 +8,10 @@ const DATE_MONTH_DAYS_1 = require("./DATE_MONTH_DAYS");
 const DATE_YEAR_MONTHS_1 = require("./DATE_YEAR_MONTHS");
 const DATE_YEAR_QUARTERS_1 = require("./DATE_YEAR_QUARTERS");
 exports.DATE_PROPERTY_VALUE = {
-    ["p&quarter" /* DATE_YEAR_QUARTER */]: DATE_YEAR_QUARTERS_1.DATE_YEAR_QUARTERS,
-    ["p&month" /* DATE_YEAR_MONTH */]: DATE_YEAR_MONTHS_1.DATE_YEAR_MONTHS,
-    ["p&day" /* DATE_MONTH_DAY */]: DATE_MONTH_DAYS_1.DATE_MONTH_DAYS,
-    ["p&hour" /* DATE_DAY_HOUR */]: DATE_DAY_HOURS_1.DATE_DAY_HOURS,
-    ["p&minute" /* DATE_HOUR_MINUTE */]: DATE_HOUR_MINUTES_1.DATE_HOUR_MINUTES,
-    ["p&second" /* DATE_MINUTE_SECOND */]: DATE_MINUTE_SECONDS_1.DATE_MINUTE_SECONDS,
+    ["quarter_only" /* DATE_YEAR_QUARTER */]: DATE_YEAR_QUARTERS_1.DATE_YEAR_QUARTERS,
+    ["month_only" /* DATE_YEAR_MONTH */]: DATE_YEAR_MONTHS_1.DATE_YEAR_MONTHS,
+    ["day_only" /* DATE_MONTH_DAY */]: DATE_MONTH_DAYS_1.DATE_MONTH_DAYS,
+    ["hour_only" /* DATE_DAY_HOUR */]: DATE_DAY_HOURS_1.DATE_DAY_HOURS,
+    ["minute_only" /* DATE_HOUR_MINUTE */]: DATE_HOUR_MINUTES_1.DATE_HOUR_MINUTES,
+    ["second_only" /* DATE_MINUTE_SECOND */]: DATE_MINUTE_SECONDS_1.DATE_MINUTE_SECONDS,
 };

package/dist/cjs/date/constants/DATE_P_PROPERTIES.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATE_P_PROPERTIES = void 0;
 exports.DATE_P_PROPERTIES = [
-    "p&quarter" /* DATE_YEAR_QUARTER */,
-    "p&month" /* DATE_YEAR_MONTH */,
-    "p&day" /* DATE_MONTH_DAY */,
-    "p&hour" /* DATE_DAY_HOUR */,
-    "p&minute" /* DATE_HOUR_MINUTE */,
-    "p&second" /* DATE_MINUTE_SECOND */,
+    "quarter_only" /* DATE_YEAR_QUARTER */,
+    "month_only" /* DATE_YEAR_MONTH */,
+    "day_only" /* DATE_MONTH_DAY */,
+    "hour_only" /* DATE_DAY_HOUR */,
+    "minute_only" /* DATE_HOUR_MINUTE */,
+    "second_only" /* DATE_MINUTE_SECOND */,
 ];

package/dist/cjs/date/constants/DATE_P_VALUES.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATE_P_VALUES = void 0;
 exports.DATE_P_VALUES = [
-    { value: "p&quarter" /* DATE_YEAR_QUARTER */, label: 'Quarter of Year', display: true },
-    { value: "p&month" /* DATE_YEAR_MONTH */, label: 'Month of Year', display: true },
-    { value: "p&day" /* DATE_MONTH_DAY */, label: 'Day of Month', display: true },
+    { value: "quarter_only" /* DATE_YEAR_QUARTER */, label: 'Quarter', display: true },
+    { value: "month_only" /* DATE_YEAR_MONTH */, label: 'Month', display: true },
+    { value: "day_only" /* DATE_MONTH_DAY */, label: 'Day (Month)', display: true },
 ];

package/dist/cjs/date/constants/DATE_TIME_P_VALUES.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATE_TIME_P_VALUES = void 0;
 exports.DATE_TIME_P_VALUES = [
-    { value: "p&hour" /* DATE_DAY_HOUR */, label: 'Hour of Day', display: true },
-    { value: "p&minute" /* DATE_HOUR_MINUTE */, label: 'Minute of Hour', display: true },
-    { value: "p&second" /* DATE_MINUTE_SECOND */, label: 'Second of Minute', display: true },
+    { value: "hour_only" /* DATE_DAY_HOUR */, label: 'Hour', display: true },
+    { value: "minute_only" /* DATE_HOUR_MINUTE */, label: 'Minute', display: true },
+    { value: "second_only" /* DATE_MINUTE_SECOND */, label: 'Second', display: true },
 ];

package/dist/cjs/date/constants/DATE_TIME_VALUES.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATE_TIME_VALUES = void 0;
 exports.DATE_TIME_VALUES = [
-    { label: 'Hours', value: "hour" /* DATE_HOUR */, display: true },
-    { label: 'Minutes', value: "minute" /* DATE_MINUTE */, display: true },
-    { label: 'Seconds', value: "second" /* DATE_SECOND */, display: true },
+    { label: 'Date, Hour', value: "hour" /* DATE_HOUR */, display: true },
+    { label: 'Date, Minute', value: "minute" /* DATE_MINUTE */, display: true },
+    { label: 'Date, Second', value: "second" /* DATE_SECOND */, display: true },
 ];

package/dist/cjs/date/constants/DATE_VALUES.d.ts

@@ -0,0 +1,6 @@
+import { COLUMN_PROPERTY } from "../../constants";
+export declare const DATE_VALUES: {
+    value: COLUMN_PROPERTY;
+    label: string;
+    display: boolean;
+}[];

package/dist/cjs/date/constants/DATE_VALUES.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DATE_VALUES = void 0;
+exports.DATE_VALUES = [
+    { value: "day" /* DATE_DAY */, label: 'Full Date', display: true },
+    { value: "year" /* DATE_YEAR */, label: 'Year', display: true },
+    { value: "quarter" /* DATE_QUARTER */, label: 'Quarter, Year', display: true },
+    { value: "month" /* DATE_MONTH */, label: 'Month, Year', display: true },
+    { value: "week" /* DATE_WEEK */, label: 'Week, Year', display: true }
+];

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FDToFlatUI = void 0;
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -43,6 +44,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         if (!general_1.isEmpty(datasetInfo))
                             columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !general_1.isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
+                        const property = adaptDateGroupingProperty_1.adaptDateGroupingProperty(filter.property);
                         const uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -79,7 +81,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property: property,
                             uiValues: helpers_1.getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FDToUI = void 0;
+const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
 const helpers_1 = require("../helpers");
@@ -47,6 +48,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                     let columnInfo;
                     if (!general_1.isEmpty(datasetInfo))
                         columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
+                    const property = _1.adaptDateGroupingProperty(filter.property);
                     return Object.assign(Object.assign({}, filter), { column: {
                             aggregate: filter.column.aggregate,
                             calculation: filter.column.calculation,
@@ -58,7 +60,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                             outputFormat: general_1._get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
-                        }, uiValues: helpers_1.getUIValues(filter) });
+                        }, property, uiValues: helpers_1.getUIValues(filter) });
                 }) });
         }) })));
     return ufData;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIToFlatUI = void 0;
+const _1 = require(".");
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
 /**
@@ -42,6 +43,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                         if (!general_1.isEmpty(datasetInfo))
                             columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !general_1.isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
+                        const property = _1.adaptDateGroupingProperty(filter.property);
                         const uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -78,7 +80,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property,
                             uiValues: helpers_1.getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIToOldLogic = void 0;
+const _1 = require(".");
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
 const flatUIToOldLogic_1 = require("./flatUIToOldLogic");
@@ -103,6 +104,7 @@ const getFilterDetail = (filter, scope, dataset) => {
             label: filter.extras.info.label,
         };
     }
+    const property = _1.adaptDateGroupingProperty(filter.property);
     return {
         collapsed: filter.collapsed,
         column: {
@@ -130,7 +132,7 @@ const getFilterDetail = (filter, scope, dataset) => {
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,
-        property: filter.property,
+        property,
         scope: scope.scope,
         scopeid: filter.extras.scopeid,
         scopeEnabled: scope.enabled,

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

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

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adaptDateGroupingProperty = void 0;
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Get the new property base on the old date grouping properties
+ * @param property
+ * @returns
+ */
+function adaptDateGroupingProperty(property) {
+    return property === 'p&quarter' ? "quarter_only" /* DATE_YEAR_QUARTER */ :
+        property === 'p&month' ? "month_only" /* DATE_YEAR_MONTH */ :
+            property === 'p&day' ? "day_only" /* DATE_MONTH_DAY */ :
+                property === 'p&hour' ? "hour_only" /* DATE_DAY_HOUR */ :
+                    property === 'p&minute' ? "minute_only" /* DATE_HOUR_MINUTE */ :
+                        property === 'p&second' ? "second_only" /* DATE_MINUTE_SECOND */ :
+                            property;
+}
+exports.adaptDateGroupingProperty = adaptDateGroupingProperty;

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

@@ -13,7 +13,7 @@ const UIToFD_1 = require("./UIToFD");
  * @param datasetsInfo Collection of datasets information. If getUIFilterData is true, the datasetsInfo should be mandatory
  * @returns A new filter data structure v2.1
  */
-function adaptFilterData(filterData, getUIFilterData = false, datasetsInfo = []) {
+function adaptFilterData(filterData, getUIFilterData = true, datasetsInfo = []) {
     if (general_1.isEmpty(filterData))
         return;
     filterData = general_1.cloneDeep(filterData);

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flatUIToFD = void 0;
+const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
 /**
@@ -80,6 +81,7 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     const info = !general_1.isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = _1.adaptDateGroupingProperty(uFilter.property);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -98,7 +100,7 @@ function buildFilter(uFilter) {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         validator: uFilter.validator,
         values: uFilter.values,
     };

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

@@ -171,14 +171,10 @@ function getGroupValue(props) {
     }
 }
 function getProperty(props) {
-    var _a;
     if (general_1.isEmpty(props.column.aggregate)) {
-        if (helpers_1.isNullValidator(props.validator)) {
+        if (helpers_1.isNullValidator(props.validator) || isDateColumn_1.isDateColumn(props.column)) {
             return undefined;
         }
-        else if (isDateColumn_1.isDateColumn(props.column)) {
-            return helpers_1.arePropertiesDateP(props.column, props.property) ? (_a = props.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
-        }
         else if (props.column.type === constants_2.COLUMN.EXPRESSION && props.property != null) {
             return undefined;
         }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flatUIToUI = void 0;
+const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
 const helpers_1 = require("../helpers");
@@ -87,6 +88,7 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     const info = !general_1.isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = _1.adaptDateGroupingProperty(uFilter.property);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -112,7 +114,7 @@ function buildFilter(uFilter) {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         uiValues: helpers_1.getUIValues(uFilter),
         validator: uFilter.validator,
         values: uFilter.values,

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

@@ -1,4 +1,5 @@
 export * from './transformFilters';
+export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
 export * from './FDToFlatUI';
 export * from './FDToLogic';

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

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./transformFilters"), exports);
+__exportStar(require("./adaptDateGroupingProperty"), exports);
 __exportStar(require("./adaptFilterData"), exports);
 __exportStar(require("./FDToFlatUI"), exports);
 __exportStar(require("./FDToLogic"), exports);

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

@@ -3,6 +3,7 @@
 // TO Logic structure = Cleaner logic structure
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logicToFlatUI = void 0;
+const _1 = require(".");
 const constants_1 = require("../../constants");
 const general_1 = require("../../general");
 const constants_2 = require("../constants");
@@ -19,76 +20,89 @@ function logicToFlatUI(logics = []) {
     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, _s;
-                    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 info = !general_1.isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : 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: 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),
-                        };
-                        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;
+    const property = _1.adaptDateGroupingProperty(uiExtras.property);
+    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,
+        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 }];

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

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendGroupValue = void 0;
+const __1 = require("../..");
 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 (!common_1.arePropertiesDateP(filter.column, filter.property) && general_1.isEmpty(filter.column.aggregate) && isDateColumn_1.isDateColumn(filter.column) && filter.property != null) {
-        return filter.property;
+    if (general_1.isEmpty(filter.column.aggregate) && isDateColumn_1.isDateColumn(filter.column) && filter.property != null) {
+        const property = __1.adaptDateGroupingProperty(filter.property);
+        return property;
     }
 }
 exports.getBackendGroupValue = getBackendGroupValue;

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

@@ -11,14 +11,10 @@ const common_1 = require("../common");
  * @returns a property
  */
 function getBackendProperty(filter) {
-    var _a;
     if (general_1.isEmpty(filter.column.aggregate)) {
-        if (common_1.isNullValidator(filter.validator)) {
+        if (common_1.isNullValidator(filter.validator) || isDateColumn_1.isDateColumn(filter.column)) {
             return undefined;
         }
-        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;
         }

package/dist/cjs/filters/helpers/ui/getFilterPropertyLabel.d.ts

@@ -0,0 +1,7 @@
+import { IFSFilter, IFUFilter } from "../..";
+/**
+     * Gets the label of the filter property
+     * @param filter The UI Filter
+     * @returns a string of the filter property label
+     */
+export declare function getFilterPropertyLabel(filter: IFUFilter | IFSFilter): string;

package/dist/cjs/filters/helpers/ui/getFilterPropertyLabel.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilterPropertyLabel = void 0;
+const __1 = require("../../..");
+/**
+     * Gets the label of the filter property
+     * @param filter The UI Filter
+     * @returns a string of the filter property label
+     */
+function getFilterPropertyLabel(filter) {
+    return __1.getPropertyLabel(filter.column, filter.property);
+}
+exports.getFilterPropertyLabel = getFilterPropertyLabel;

package/dist/cjs/filters/helpers/ui/index.d.ts

@@ -1,5 +1,6 @@
 export * from './excludeUIFiltersByAggregate';
 export * from './excludeUIFlatFiltersByScopes';
+export * from './getFilterPropertyLabel';
 export * from './getOutputFormatByColumn';
 export * from './getUIFlatFilterByParams';
 export * from './getUIFlatFiltersByParams';