@qrvey/utils 1.1.8 → 1.2.1

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -1,15 +1,28 @@
-import { FILTER_VALIDATOR_VALUE } from "../constants";
-import { cloneDeep, flattenDeep, isEmpty, isNull, _get } from "../../general";
-import { COLUMN } from "../../constants";
-import { arePropertiesDateP, getBackendValidator, getUIValues, isNullValidator } from "../helpers";
-import { RELATIVE_CURSOR_VALUE } from "../../date";
-import { isDateColumn } from "../../qrvey/isDateColumn";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { getUIValues } from "../helpers/ui/getUIValues";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
+import { _get } from "../../general/object/get";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { getBackendValidator } from "../helpers/backend/getBackendValidator";
+import { isDateDistinctProperty } from "../helpers/common/isDateDistinctProperty";
+import { isDateColumn } from "../../columns/helpers/isDateColumn";
+import { isNullValidator } from "../helpers/common/isNullValidator";
+import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
+import { FILTER_VALIDATOR } from "../constants/common/FILTER_VALIDATOR";
+import { FILTER_BACKEND_VALIDATOR } from "../constants/backend/FILTER_BACKEND_VALIDATOR";
+import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
+import { RELATIVE_CURSOR_INFO } from "../../dates/relative/constants/RELATIVE_CURSOR_INFO";
+import { RELATIVE_CURSOR } from "../../dates/relative/constants/RELATIVE_CURSOR";
+import { isNull } from "../../general/mix/isNull";
+import { flattenDeep } from "../../general/array/flattenDeep";
 /**
  * Generates a Logic structure from flattened UI filters
  * @param uFilters Array of flat filters from UI
  * @returns The logic structure
  */
-export function flatUIToOldLogic(uFilters, section = "ANYWHERE" /* ANYWHERE */) {
+export function flatUIToOldLogic(uFilters, section = FILTER_SECTION.ANYWHERE) {
     let oldFilterData;
     if (isEmpty(uFilters))
         return oldFilterData;
@@ -24,24 +37,24 @@ export function flatUIToOldLogic(uFilters, section = "ANYWHERE" /* ANYWHERE */)
 }
 const flatUIToOldFilterDetail = (uFilters = []) => {
     return uFilters.map(filter => {
-        let aggregate, calculation;
-        if (filter.column.aggregate != null) {
-            aggregate = {
-                abbreviation: undefined,
-                id: undefined,
-                label: filter.column.aggregate,
-                text: undefined, // CANNOT ADD AT THIS SCOPE
-            };
-        }
-        if (filter.column.calculation != null) {
-            calculation = {
-                abbreviation: undefined,
-                id: undefined,
-                text: undefined,
-                type: undefined,
-                value: filter.column.calculation,
-            };
-        }
+        // let aggregate, calculation;
+        // if (filter.column.aggregate != null) {
+        //     aggregate = {
+        //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+        //         id: undefined, // CANNOT ADD AT THIS SCOPE
+        //         label: filter.column.aggregate,
+        //         text: undefined, // CANNOT ADD AT THIS SCOPE
+        //     };
+        // }
+        // if (filter.column.calculation != null) {
+        //     calculation = {
+        //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+        //         id: undefined, // CANNOT ADD AT THIS SCOPE
+        //         text: undefined,
+        //         type: undefined,
+        //         value: filter.column.calculation,
+        //     };
+        // }
         return {
             collapsed: filter.collapsed,
             column: {
@@ -53,8 +66,8 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
                 qrveyid: filter.column.qrveyid,
                 text: filter.column.label,
                 type: filter.column.type,
-                aggregate,
-                calculation,
+                aggregate: filter.column.aggregate,
+                calculation: filter.column.calculation,
                 formulaType: filter.column.formulaType,
                 linked: undefined,
                 linkid: filter.column.linkid,
@@ -92,7 +105,7 @@ export function getLogicBody(uFilters) {
             expressions: [
                 {
                     uiExtras: { expressionid: expId },
-                    operator: "OR" /* OR */,
+                    operator: FILTER_OPERATOR.OR,
                     expressions: getExpressions(props)
                 }
             ]
@@ -160,7 +173,7 @@ function getRegularExpression(props) {
     };
 }
 function getGroupValue(props) {
-    if (!arePropertiesDateP(props.column, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
+    if (!isDateDistinctProperty(props.column, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
         return props.property;
     }
 }
@@ -172,11 +185,11 @@ function getProperty(props) {
         else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
             return undefined;
         }
-        else if (props.column.type === COLUMN.LOOKUP && props.property === "display" /* LOOKUP_DISPLAY */ && props.lookupDisplayIndex != null) {
+        else if (props.column.type === COLUMN.LOOKUP && props.property === COLUMN_PROPERTY.LOOKUP_DISPLAY && props.lookupDisplayIndex != null) {
             return props.property.concat('_').concat(props.lookupDisplayIndex.toString());
         }
         else if (props.column.type === COLUMN.IMAGE) {
-            return "answer_id" /* IMAGE_ANSWER_ID */;
+            return COLUMN_PROPERTY.IMAGE_ANSWER_ID;
         }
     }
     return props.property;
@@ -188,42 +201,42 @@ function getValidationType(props) {
     //     : BACKEND_VALIDATORS_TYPE.RANGE;
     // }
     switch (props.validator) {
-        case "EQUALS" /* EQUALS */:
-            return "EQUAL" /* EQUALS */;
-        case "NOT_EQUAL" /* NOT_EQUAL */:
-            return "NOT_EQUAL" /* NOT_EQUAL */;
-        case "CONTAINS" /* CONTAINS */:
-            return "CONTAIN" /* CONTAINS */;
-        case "NOT_CONTAIN" /* NOT_CONTAIN */:
-            return "NOT_CONTAIN" /* NOT_CONTAIN */;
-        case "ENDS_WITH" /* ENDS_WITH */:
-            return "END_WITH" /* ENDS_WITH */;
-        case "NOT_END_WITH" /* NOT_END_WITH */:
-            return "NOT_END_WITH" /* NOT_END_WITH */;
-        case "STARTS_WITH" /* STARTS_WITH */:
-            return "START_WITH" /* STARTS_WITH */;
-        case "NOT_START_WITH" /* NOT_START_WITH */:
-            return "NOT_START_WITH" /* NOT_START_WITH */;
-        case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-        case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
-        case "LESS_THAN" /* LESS_THAN */:
-        case "BEFORE" /* BEFORE */:
-        case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
-        case "BEFORE_ON" /* BEFORE_ON */:
-        case "GREATER_THAN" /* GREATER_THAN */:
-        case "AFTER" /* AFTER */:
-        case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
-        case "AFTER_ON" /* AFTER_ON */:
-            return "RANGE" /* RANGE */;
-        case "IS_NULL" /* IS_NULL */:
-            return "IS_EMPTY" /* IS_NULL */;
-        case "IS_NOT_NULL" /* IS_NOT_NULL */:
-            return "IS_NOT_EMPTY" /* IS_NOT_NULL */;
-        case "IN" /* IN */:
+        case FILTER_VALIDATOR.EQUALS:
+            return FILTER_BACKEND_VALIDATOR.EQUALS;
+        case FILTER_VALIDATOR.NOT_EQUAL:
+            return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+        case FILTER_VALIDATOR.CONTAINS:
+            return FILTER_BACKEND_VALIDATOR.CONTAINS;
+        case FILTER_VALIDATOR.NOT_CONTAIN:
+            return FILTER_BACKEND_VALIDATOR.NOT_CONTAIN;
+        case FILTER_VALIDATOR.ENDS_WITH:
+            return FILTER_BACKEND_VALIDATOR.ENDS_WITH;
+        case FILTER_VALIDATOR.NOT_END_WITH:
+            return FILTER_BACKEND_VALIDATOR.NOT_END_WITH;
+        case FILTER_VALIDATOR.STARTS_WITH:
+            return FILTER_BACKEND_VALIDATOR.STARTS_WITH;
+        case FILTER_VALIDATOR.NOT_START_WITH:
+            return FILTER_BACKEND_VALIDATOR.NOT_START_WITH;
+        case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
+        case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
+        case FILTER_VALIDATOR.LESS_THAN:
+        case FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR.LESS_THAN_EQUAL:
+        case FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR.GREATER_THAN:
+        case FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
+        case FILTER_VALIDATOR.AFTER_ON:
+            return FILTER_BACKEND_VALIDATOR.RANGE;
+        case FILTER_VALIDATOR.IS_NULL:
+            return FILTER_BACKEND_VALIDATOR.IS_NULL;
+        case FILTER_VALIDATOR.IS_NOT_NULL:
+            return FILTER_BACKEND_VALIDATOR.IS_NOT_NULL;
+        case FILTER_VALIDATOR.IN:
             // Validate with backend if this will always be the validator type
-            return "RELATIVE" /* RELATIVE */;
+            return FILTER_BACKEND_VALIDATOR.RELATIVE;
         default:
-            return "EQUAL" /* EQUALS */;
+            return FILTER_BACKEND_VALIDATOR.EQUALS;
     }
 }
 function getNullValueExpression(props) {
@@ -231,7 +244,7 @@ function getNullValueExpression(props) {
     delete props.lookupDisplayIndex;
     delete props.values;
     props.enabled = true;
-    props.validator = "IS_NULL" /* IS_NULL */;
+    props.validator = FILTER_VALIDATOR.IS_NULL;
     props.uiHidden = true;
     return getRegularExpression(props);
 }
@@ -239,40 +252,40 @@ function getValues(props, rankingGroupIndex) {
     // const isDateProperty = !!(isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate));
     // const dateFormat = getDateFormatByProperty(props.property);
     switch (props.validator) {
-        case "EQUALS" /* EQUALS */:
-        case "NOT_EQUAL" /* NOT_EQUAL */:
+        case FILTER_VALIDATOR.EQUALS:
+        case FILTER_VALIDATOR.NOT_EQUAL:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate))
                 return getRankingValues(props.values, rankingGroupIndex);
             return getResultValues(props.values, props);
-        case "CONTAINS" /* CONTAINS */:
-        case "NOT_CONTAIN" /* NOT_CONTAIN */:
-        case "STARTS_WITH" /* STARTS_WITH */:
-        case "NOT_START_WITH" /* NOT_START_WITH */:
-        case "ENDS_WITH" /* ENDS_WITH */:
-        case "NOT_END_WITH" /* NOT_END_WITH */:
+        case FILTER_VALIDATOR.CONTAINS:
+        case FILTER_VALIDATOR.NOT_CONTAIN:
+        case FILTER_VALIDATOR.STARTS_WITH:
+        case FILTER_VALIDATOR.NOT_START_WITH:
+        case FILTER_VALIDATOR.ENDS_WITH:
+        case FILTER_VALIDATOR.NOT_END_WITH:
             return props.values.map(value => value.enabled ? value.value : undefined);
-        case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
+        case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
             return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
-        case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
+        case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
             return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
-        case "BEFORE" /* BEFORE */:
-        case "LESS_THAN" /* LESS_THAN */:
+        case FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR.LESS_THAN:
             return props.values.map(value => value.enabled ? ({ lt: value.max }) : undefined).filter(Boolean);
-        case "BEFORE_ON" /* BEFORE_ON */:
-        case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
+        case FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR.LESS_THAN_EQUAL:
             return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
-        case "AFTER" /* AFTER */:
-        case "GREATER_THAN" /* GREATER_THAN */:
+        case FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR.GREATER_THAN:
             return props.values.map(value => value.enabled ? ({ gt: value.min }) : undefined).filter(Boolean);
-        case "AFTER_ON" /* AFTER_ON */:
-        case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
+        case FILTER_VALIDATOR.AFTER_ON:
+        case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
             return props.values.map(value => value.enabled ? ({ gte: value.min }) : undefined).filter(Boolean);
-        case "IS_NULL" /* IS_NULL */:
-        case "IS_NOT_NULL" /* IS_NOT_NULL */: {
+        case FILTER_VALIDATOR.IS_NULL:
+        case FILTER_VALIDATOR.IS_NOT_NULL: {
             const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
-            return addValue ? [FILTER_VALIDATOR_VALUE[props.validator].label] : [];
+            return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
-        case "IN" /* IN */:
+        case FILTER_VALIDATOR.IN:
             return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
@@ -281,24 +294,24 @@ function getValues(props, rankingGroupIndex) {
 function getUIValuess(props, rankingGroupIndex) {
     var _a, _b;
     switch (props.validator) {
-        case "AFTER" /* AFTER */:
-        case "GREATER_THAN" /* GREATER_THAN */:
-        case "AFTER_ON" /* AFTER_ON */:
-        case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
+        case FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR.GREATER_THAN:
+        case FILTER_VALIDATOR.AFTER_ON:
+        case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
             return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, enabled: value.enabled != null ? value.enabled : true })));
-        case "BEFORE_ON" /* BEFORE_ON */:
-        case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
-        case "BEFORE" /* BEFORE */:
-        case "LESS_THAN" /* LESS_THAN */:
+        case FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR.LESS_THAN_EQUAL:
+        case FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR.LESS_THAN:
             return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
-        case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-        case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
+        case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
+        case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
             return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
-        case "IS_NULL" /* IS_NULL */:
-        case "IS_NOT_NULL" /* IS_NOT_NULL */:
-            return [{ value: FILTER_VALIDATOR_VALUE[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 "IN" /* IN */:
-            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_VALUE[value.cursor].label} ${value.cursor !== "this" /* THIS */ && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== "this" /* THIS */ ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
+        case FILTER_VALIDATOR.IS_NULL:
+        case FILTER_VALIDATOR.IS_NOT_NULL:
+            return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (_b = (_a = props.values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
+        case FILTER_VALIDATOR.IN:
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
         default:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
                 return getRankingUIValues(props.values, rankingGroupIndex);
@@ -307,7 +320,7 @@ function getUIValuess(props, rankingGroupIndex) {
     }
 }
 function getValueUiUnitRelativeDate(relative) {
-    return relative.cursor !== "this" /* THIS */ && relative.number > 1 ? `${relative.unit}s` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${relative.unit}s` : relative.unit;
 }
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];

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

@@ -1,4 +1,6 @@
-import { IFSection, IFUData, IFUFlattenedFilter } from "../interfaces";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFSection } from "../interfaces/IFSection";
+import { IFUData } from "../interfaces/ui/IFUData";
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI

package/dist/filters/adapters/flatUIToUI.js

@@ -1,15 +1,17 @@
-import { adaptDateGroupingProperty } from ".";
-import { isEmpty, getLastIndexFromArray } from "../../general";
-import { FILTER_STRUCTURE_VERSION } from "../constants";
-import { getUIValues } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { getUIValues } from "../helpers/ui/getUIValues";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
+import { isEmpty } from "../../general/mix/isEmpty";
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
  * @param version Tag for the version of the filter data structure
  * @returns a UI Filter Data.
  */
-export function flatUIToUI(uFilters = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = FILTER_STRUCTURE_VERSION) {
+export function flatUIToUI(uFilters = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
         section,

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

@@ -1,4 +1,6 @@
-import { IFSData, IFSection, OLD_IFilterLogic } from "../interfaces";
+import { IFSection } from "../interfaces/IFSection";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+import { IFSData } from "../interfaces/common/IFSData";
 /**
  * Generates a filter data structure from the old logic structure (v2.0).
  * @param filterData The old filter data structure with logic (v2.0)

package/dist/filters/adapters/logicToFD.js

@@ -1,7 +1,8 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
-import { isEmpty } from "../../general";
-import { FILTER_STRUCTURE_VERSION } from "../constants";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { flatUIToFD } from "./flatUIToFD";
 import { logicToFlatUI } from "./logicToFlatUI";
 /**
@@ -10,7 +11,7 @@ import { logicToFlatUI } from "./logicToFlatUI";
  * @param version Tag for the version of the filter data structure
  * @returns a Filter Data.
  */
-export function logicToFD(logics = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = FILTER_STRUCTURE_VERSION) {
+export function logicToFD(logics = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     if (isEmpty(logics) || !Array.isArray(logics))
         return;
     const builderFilter = logicToFlatUI(logics);

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

@@ -1,4 +1,5 @@
-import { IFUFlattenedFilter, OLD_IFilterLogic } from "../interfaces";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)

package/dist/filters/adapters/logicToFlatUI.js

@@ -1,10 +1,16 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
-import { adaptDateGroupingProperty } from ".";
-import { COLUMN } from "../../constants";
-import { isEmpty, _get, _hasProperty } from "../../general";
-import { FILTER_VALIDATOR_VALUE } from "../constants";
-import { getFilterid, getUIValues, isNullValidator, } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { _hasProperty } from "../../general/object/hasProperty";
+import { FILTER_BACKEND_VALIDATOR } from "../constants/backend/FILTER_BACKEND_VALIDATOR";
+import { getFilterid } from "../helpers/common/getFilterid";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { _get } from "../../general/object/get";
+import { getUIValues } from "../helpers/ui/getUIValues";
+import { isNullValidator } from "../helpers/common/isNullValidator";
+import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)
@@ -30,7 +36,7 @@ export function logicToFlatUI(logics = []) {
 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 */)) {
+    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== FILTER_BACKEND_VALIDATOR.IS_NULL)) {
         const uFilter = getFilterByExpression(expression, scopeItem);
         uFilter.filterid = getFilterid(uFilter);
         uFilters.push(uFilter);
@@ -47,9 +53,9 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     const uiExtras = expression.uiExtras;
-    const scopeid = scopeItem.scope !== "GLOBAL" /* GLOBAL */ ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
+    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;
     const property = adaptDateGroupingProperty(uiExtras.property);
     return {
@@ -60,20 +66,20 @@ function getFilterByExpression(expression, scopeItem) {
             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,
+            aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) || ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
+            calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) || ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
+            label: _get(uiExtras.column, 'text') || ((_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.label),
             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,
+            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: 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,
+                collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -82,9 +88,9 @@ function getFilterByExpression(expression, scopeItem) {
                 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,
+                qrveyid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.qrveyid,
+                label: _get((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.dataset, 'name') || ((_u = (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.dataset) === null || _u === void 0 ? void 0 : _u.label),
+                linkid: (_v = uiExtras.column) === null || _v === void 0 ? void 0 : _v.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
@@ -98,7 +104,7 @@ function getFilterByExpression(expression, scopeItem) {
 }
 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 }];
+        return [{ value: FILTER_VALIDATOR_INFO[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;

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

@@ -1,4 +1,6 @@
-import { IFSection, IFUData, OLD_IFilterLogic } from "../interfaces";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSection } from "../interfaces/IFSection";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
 /**
  * Generates a UI filter structure from the old logic structure (v2.0).
  * @param uFilters Array of filters from old logic structure

package/dist/filters/adapters/logicToUI.js

@@ -1,4 +1,5 @@
-import { FILTER_STRUCTURE_VERSION } from "../constants";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { flatUIToUI } from "./flatUIToUI";
 import { logicToFlatUI } from "./logicToFlatUI";
 /**
@@ -7,7 +8,7 @@ import { logicToFlatUI } from "./logicToFlatUI";
  * @param datasetsInfo Collection of datasets information
  * @returns a UI Filter Data.
  */
-export function logicToUI(logics = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = FILTER_STRUCTURE_VERSION) {
+export function logicToUI(logics = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     const flatUiFilters = logicToFlatUI(logics);
     const uiFilters = flatUIToUI(flatUiFilters, section, enabled, version);
     return uiFilters;

package/dist/filters/adapters/transformFilters.js

@@ -1,5 +1,10 @@
-import { capitalize, _get } from '../../general/index';
 import { isTokenLabel } from '../../tokens/isTokenLabel';
+import { FILTER_VALIDATOR } from '../constants/common/FILTER_VALIDATOR';
+import { FILTER_SCOPE } from '../constants/common/FILTER_SCOPE';
+import { FILTER_SECTION } from '../constants/common/FILTER_SECTION';
+import { FILTER_BACKEND_VALIDATOR } from '../constants/backend/FILTER_BACKEND_VALIDATOR';
+import { _get } from '../../general/object/get';
+import { capitalize } from '../../general/string/capitalize';
 /**
  * Transform the old filters structure into the new one
  *
@@ -55,7 +60,7 @@ import { isTokenLabel } from '../../tokens/isTokenLabel';
  *
  * const filterData = transformFilters(oldPreferenceFilters, 'ANALYZE');
  */
-export function transformFilters(oldFiltersObj = {}, section = "ANYWHERE" /* ANYWHERE */) {
+export function transformFilters(oldFiltersObj = {}, section = FILTER_SECTION.ANYWHERE) {
     const filterData = { enabled: true, logic: [], section };
     const tempScopes = {};
     Object.keys(oldFiltersObj).forEach(key => {
@@ -128,13 +133,13 @@ function validateComplexTypes(oldFiltersItem, validations) {
 function getScopeLabel(oldScopeLabel) {
     switch (oldScopeLabel) {
         case 'GLOBAL':
-            return "GLOBAL" /* GLOBAL */;
+            return FILTER_SCOPE.GLOBAL;
         case 'PAGE':
-            return "PAGE" /* PAGE */;
+            return FILTER_SCOPE.PAGE;
         case 'TAB':
-            return "TAB" /* TAB */;
+            return FILTER_SCOPE.TAB;
         case 'PANEL':
-            return "CHART" /* CHART */;
+            return FILTER_SCOPE.CHART;
         default:
             return oldScopeLabel;
     }
@@ -143,22 +148,22 @@ function getValidationType(oldValidation, columnType, formulaType) {
     switch (oldValidation) {
         case 'EQUALS':
         case 'EQUAL':
-            return "EQUALS" /* EQUALS */;
+            return FILTER_VALIDATOR.EQUALS;
         case 'NOT_EQUALS':
         case 'NOT_EQUAL':
-            return "NOT_EQUAL" /* NOT_EQUAL */;
+            return FILTER_VALIDATOR.NOT_EQUAL;
         case 'CONTAINS':
         case 'CONTAIN':
-            return "CONTAINS" /* CONTAINS */;
+            return FILTER_VALIDATOR.CONTAINS;
         case 'NOT_CONTAINS':
         case 'NOT_CONTAIN':
-            return "NOT_CONTAIN" /* NOT_CONTAIN */;
+            return FILTER_VALIDATOR.NOT_CONTAIN;
         case 'LESS_THAN':
         case 'LESS_THAN_OR_EQUAL':
-            return "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */;
+            return FILTER_VALIDATOR.LESS_THAN_EQUAL;
         case 'GREATER_THAN':
         case 'GREATER_THAN_OR_EQUAL':
-            return "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */;
+            return FILTER_VALIDATOR.GREATER_THAN_EQUAL;
         case 'BETWEEN':
         case 'YEAR':
         case 'MONTH_YEAR':
@@ -168,7 +173,7 @@ function getValidationType(oldValidation, columnType, formulaType) {
         case 'MINUTE':
         case 'HOUR':
         case 'DAY':
-            return ![columnType, formulaType].includes('DATE') ? "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */ : "RANGE" /* RANGE */;
+            return ![columnType, formulaType].includes('DATE') ? FILTER_VALIDATOR.BETWEEN_INCLUSIVE : FILTER_BACKEND_VALIDATOR.RANGE;
         default:
             return oldValidation;
     }
@@ -185,28 +190,28 @@ function getValidator(oldValidation) {
         case 'MINUTE':
         case 'HOUR':
         case 'DAY':
-            return "EQUALS" /* EQUALS */;
+            return FILTER_VALIDATOR.EQUALS;
         case 'NOT_EQUALS':
         case 'NOT_EQUAL':
-            return "NOT_EQUAL" /* NOT_EQUAL */;
+            return FILTER_VALIDATOR.NOT_EQUAL;
         case 'CONTAINS':
         case 'CONTAIN':
-            return "CONTAINS" /* CONTAINS */;
+            return FILTER_VALIDATOR.CONTAINS;
         case 'NOT_CONTAINS':
         case 'NOT_CONTAIN':
-            return "NOT_CONTAIN" /* NOT_CONTAIN */;
+            return FILTER_VALIDATOR.NOT_CONTAIN;
         case 'BETWEEN':
-            return "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */;
+            return FILTER_VALIDATOR.BETWEEN_INCLUSIVE;
         case 'LESS_THAN':
         case 'LESS_THAN_OR_EQUAL':
-            return "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */;
+            return FILTER_VALIDATOR.LESS_THAN_EQUAL;
         case 'GREATER_THAN':
         case 'GREATER_THAN_OR_EQUAL':
-            return "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */;
+            return FILTER_VALIDATOR.GREATER_THAN_EQUAL;
         case 'IS_EMPTY':
-            return "IS_NULL" /* IS_NULL */;
+            return FILTER_VALIDATOR.IS_NULL;
         case 'IS_NOT_EMPTY':
-            return "IS_NOT_NULL" /* IS_NOT_NULL */;
+            return FILTER_VALIDATOR.IS_NOT_NULL;
         default:
             return oldValidation;
     }