@qrvey/utils 1.1.8 → 1.2.1

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

@@ -1,22 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionId = exports.getLogicBody = exports.flatUIToOldLogic = void 0;
-const constants_1 = require("../constants");
-const general_1 = require("../../general");
-const constants_2 = require("../../constants");
-const helpers_1 = require("../helpers");
-const date_1 = require("../../date");
-const isDateColumn_1 = require("../../qrvey/isDateColumn");
+const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const getUIValues_1 = require("../helpers/ui/getUIValues");
+const FILTER_OPERATOR_1 = require("../constants/common/FILTER_OPERATOR");
+const get_1 = require("../../general/object/get");
+const COLUMN_1 = require("../../columns/constants/COLUMN");
+const getBackendValidator_1 = require("../helpers/backend/getBackendValidator");
+const isDateDistinctProperty_1 = require("../helpers/common/isDateDistinctProperty");
+const isDateColumn_1 = require("../../columns/helpers/isDateColumn");
+const isNullValidator_1 = require("../helpers/common/isNullValidator");
+const COLUMN_PROPERTY_1 = require("../../columns/constants/COLUMN_PROPERTY");
+const FILTER_VALIDATOR_1 = require("../constants/common/FILTER_VALIDATOR");
+const FILTER_BACKEND_VALIDATOR_1 = require("../constants/backend/FILTER_BACKEND_VALIDATOR");
+const FILTER_VALIDATOR_INFO_1 = require("../constants/common/FILTER_VALIDATOR_INFO");
+const RELATIVE_CURSOR_INFO_1 = require("../../dates/relative/constants/RELATIVE_CURSOR_INFO");
+const RELATIVE_CURSOR_1 = require("../../dates/relative/constants/RELATIVE_CURSOR");
+const isNull_1 = require("../../general/mix/isNull");
+const flattenDeep_1 = require("../../general/array/flattenDeep");
 /**
  * Generates a Logic structure from flattened UI filters
  * @param uFilters Array of flat filters from UI
  * @returns The logic structure
  */
-function flatUIToOldLogic(uFilters, section = "ANYWHERE" /* ANYWHERE */) {
+function flatUIToOldLogic(uFilters, section = FILTER_SECTION_1.FILTER_SECTION.ANYWHERE) {
     let oldFilterData;
-    if (general_1.isEmpty(uFilters))
+    if ((0, isEmpty_1.isEmpty)(uFilters))
         return oldFilterData;
-    uFilters = general_1.cloneDeep(uFilters);
+    uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
     const filterDetails = flatUIToOldFilterDetail(uFilters);
     return {
         collapsed: false,
@@ -28,24 +41,24 @@ function flatUIToOldLogic(uFilters, section = "ANYWHERE" /* ANYWHERE */) {
 exports.flatUIToOldLogic = flatUIToOldLogic;
 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: {
@@ -57,8 +70,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,
@@ -80,7 +93,7 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             panelid: filter.extras.panelid,
             panelName: filter.extras.filterLabel,
             section: filter.extras.section,
-            uiValue: helpers_1.getUIValues(filter, true),
+            uiValue: (0, getUIValues_1.getUIValues)(filter, true),
             validator: filter.validator,
             values: filter.values,
             _newFilters: Object.assign({}, filter)
@@ -96,7 +109,7 @@ function getLogicBody(uFilters) {
             expressions: [
                 {
                     uiExtras: { expressionid: expId },
-                    operator: "OR" /* OR */,
+                    operator: FILTER_OPERATOR_1.FILTER_OPERATOR.OR,
                     expressions: getExpressions(props)
                 }
             ]
@@ -108,12 +121,12 @@ function getLogicBody(uFilters) {
                 filters: [filterItem],
                 uiExtras: {
                     scopeid: props.scopeid,
-                    collapsed: general_1._get(props, '_newFilters.extras.scopeInfo.collapsed', false),
+                    collapsed: (0, get_1._get)(props, '_newFilters.extras.scopeInfo.collapsed', false),
                 }
             });
         }
         else {
-            const filterIndex = scopes[scopeIndex].filters.findIndex(f => general_1._get(f.expressions[0], 'uiExtras.expressionid') === expId);
+            const filterIndex = scopes[scopeIndex].filters.findIndex(f => (0, get_1._get)(f.expressions[0], 'uiExtras.expressionid') === expId);
             if (filterIndex === -1) {
                 scopes[scopeIndex].filters.push(filterItem);
             }
@@ -127,7 +140,7 @@ function getLogicBody(uFilters) {
 exports.getLogicBody = getLogicBody;
 function getExpressions(props) {
     let expressions = [];
-    if (props.column.type === constants_2.COLUMN.RANKING && general_1.isEmpty(props.column.aggregate)) {
+    if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
         expressions = expressions.concat(getRankingExpressions(props));
     }
     else {
@@ -145,7 +158,7 @@ exports.getExpressionId = getExpressionId;
 function getRankingExpressions(props) {
     const values = props.values;
     return values.map((_value, index) => {
-        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: helpers_1.getBackendValidator(props.validator) });
+        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: (0, getBackendValidator_1.getBackendValidator)(props.validator) });
         return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
     });
 }
@@ -166,23 +179,23 @@ function getRegularExpression(props) {
     };
 }
 function getGroupValue(props) {
-    if (!helpers_1.arePropertiesDateP(props.column, props.property) && general_1.isEmpty(props.column.aggregate) && isDateColumn_1.isDateColumn(props.column) && props.property) {
+    if (!(0, isDateDistinctProperty_1.isDateDistinctProperty)(props.column, props.property) && (0, isEmpty_1.isEmpty)(props.column.aggregate) && (0, isDateColumn_1.isDateColumn)(props.column) && props.property) {
         return props.property;
     }
 }
 function getProperty(props) {
-    if (general_1.isEmpty(props.column.aggregate)) {
-        if (helpers_1.isNullValidator(props.validator) || isDateColumn_1.isDateColumn(props.column)) {
+    if ((0, isEmpty_1.isEmpty)(props.column.aggregate)) {
+        if ((0, isNullValidator_1.isNullValidator)(props.validator) || (0, isDateColumn_1.isDateColumn)(props.column)) {
             return undefined;
         }
-        else if (props.column.type === constants_2.COLUMN.EXPRESSION && props.property != null) {
+        else if (props.column.type === COLUMN_1.COLUMN.EXPRESSION && props.property != null) {
             return undefined;
         }
-        else if (props.column.type === constants_2.COLUMN.LOOKUP && props.property === "display" /* LOOKUP_DISPLAY */ && props.lookupDisplayIndex != null) {
+        else if (props.column.type === COLUMN_1.COLUMN.LOOKUP && props.property === COLUMN_PROPERTY_1.COLUMN_PROPERTY.LOOKUP_DISPLAY && props.lookupDisplayIndex != null) {
             return props.property.concat('_').concat(props.lookupDisplayIndex.toString());
         }
-        else if (props.column.type === constants_2.COLUMN.IMAGE) {
-            return "answer_id" /* IMAGE_ANSWER_ID */;
+        else if (props.column.type === COLUMN_1.COLUMN.IMAGE) {
+            return COLUMN_PROPERTY_1.COLUMN_PROPERTY.IMAGE_ANSWER_ID;
         }
     }
     return props.property;
@@ -194,42 +207,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_1.FILTER_VALIDATOR.EQUALS:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.EQUALS;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.CONTAINS;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.NOT_CONTAIN;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.ENDS_WITH;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.NOT_END_WITH;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.STARTS_WITH;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.NOT_START_WITH;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.RANGE;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.IS_NULL;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.IS_NOT_NULL;
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
             // Validate with backend if this will always be the validator type
-            return "RELATIVE" /* RELATIVE */;
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.RELATIVE;
         default:
-            return "EQUAL" /* EQUALS */;
+            return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.EQUALS;
     }
 }
 function getNullValueExpression(props) {
@@ -237,7 +250,7 @@ function getNullValueExpression(props) {
     delete props.lookupDisplayIndex;
     delete props.values;
     props.enabled = true;
-    props.validator = "IS_NULL" /* IS_NULL */;
+    props.validator = FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL;
     props.uiHidden = true;
     return getRegularExpression(props);
 }
@@ -245,40 +258,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 */:
-            if (props.column.type === constants_2.COLUMN.RANKING && general_1.isEmpty(props.column.aggregate))
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL:
+            if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.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_1.FILTER_VALIDATOR.CONTAINS:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH:
             return props.values.map(value => value.enabled ? value.value : undefined);
-        case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
+        case FILTER_VALIDATOR_1.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_1.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_1.FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.AFTER_ON:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.IS_NULL:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL: {
             const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
-            return addValue ? [constants_1.FILTER_VALIDATOR_VALUE[props.validator].label] : [];
+            return addValue ? [FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
-        case "IN" /* IN */:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
             return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
@@ -287,43 +300,43 @@ 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_1.FILTER_VALIDATOR.AFTER:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.BEFORE_ON:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
+        case FILTER_VALIDATOR_1.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_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
+        case FILTER_VALIDATOR_1.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: constants_1.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: `${date_1.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_1.FILTER_VALIDATOR.IS_NULL:
+        case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
+            return [{ value: FILTER_VALIDATOR_INFO_1.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_1.FILTER_VALIDATOR.IN:
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
         default:
-            if (props.column.type === constants_2.COLUMN.RANKING && general_1.isEmpty(props.column.aggregate)) {
+            if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
                 return getRankingUIValues(props.values, rankingGroupIndex);
             }
             return (props.values || []).map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
-    return relative.cursor !== "this" /* THIS */ && relative.number > 1 ? `${relative.unit}s` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1 ? `${relative.unit}s` : relative.unit;
 }
 function getRankingValues(values, rankingGroupIndex) {
-    const flattenValues = general_1.isNull(rankingGroupIndex) ? general_1.flattenDeep(values) : values[rankingGroupIndex];
+    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex) ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
     return flattenValues.map(rankingValue => rankingValue.enabled ? ({
         position: rankingValue.position - 1,
         value: rankingValue.value.value
     }) : undefined).filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
-    const flattenValues = general_1.isNull(rankingGroupIndex) ? general_1.flattenDeep(values) : values[rankingGroupIndex];
+    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex) ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
     return flattenValues.map((rankingValue) => ({
         rankingIndex: rankingGroupIndex,
         value: `${rankingValue.value.value} - ${rankingValue.position}`,
@@ -334,7 +347,7 @@ function getRankingUIValues(values, rankingGroupIndex) {
 function getResultValues(values, props) {
     return values.map((value) => {
         if (value.enabled) {
-            if (props.column.type === constants_2.COLUMN.IMAGE) {
+            if (props.column.type === COLUMN_1.COLUMN.IMAGE) {
                 return value.valueid;
             }
             else {

package/dist/cjs/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/cjs/filters/adapters/flatUIToUI.js

@@ -1,18 +1,20 @@
 "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");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
+const getUIValues_1 = require("../helpers/ui/getUIValues");
 const adaptFilterValues_1 = require("./adaptFilterValues");
+const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
+const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
+const getLastIndexFromArray_1 = require("../../general/array/getLastIndexFromArray");
+const isEmpty_1 = require("../../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.
  */
-function flatUIToUI(uFilters = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = constants_1.FILTER_STRUCTURE_VERSION) {
+function flatUIToUI(uFilters = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION_1.FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
         section,
@@ -34,7 +36,7 @@ function buildScopes(uFilters) {
         const uiScope = buildScope(uFilter);
         const scopeIndex = scopes.findIndex(sc => sc.scope === uFilter.extras.scope && sc.scopeid === uFilter.extras.scopeid);
         const datasetIndex = scopeIndex > -1 ? scopes[scopeIndex].datasets.findIndex(dt => dt.qrveyid === uFilter.extras.dataset.qrveyid) : -1;
-        const lastUiFilterIndex = datasetIndex > -1 ? general_1.getLastIndexFromArray(scopes[scopeIndex].datasets[datasetIndex].filters, uf => uf.column.id === uiFilter.column.id && uf.column.linkid === uFilter.column.linkid && uf.column.qrveyid === uFilter.column.qrveyid) : -1;
+        const lastUiFilterIndex = datasetIndex > -1 ? (0, getLastIndexFromArray_1.getLastIndexFromArray)(scopes[scopeIndex].datasets[datasetIndex].filters, uf => uf.column.id === uiFilter.column.id && uf.column.linkid === uFilter.column.linkid && uf.column.qrveyid === uFilter.column.qrveyid) : -1;
         if (scopeIndex === -1) {
             scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
         }
@@ -88,8 +90,8 @@ 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;
-    const property = _1.adaptDateGroupingProperty(uFilter.property);
+    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -116,8 +118,8 @@ function buildFilter(uFilter) {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
-        uiValues: helpers_1.getUIValues(uFilter),
+        uiValues: (0, getUIValues_1.getUIValues)(uFilter),
         validator: uFilter.validator,
-        values: adaptFilterValues_1.adaptFilterValues(uFilter),
+        values: (0, adaptFilterValues_1.adaptFilterValues)(uFilter),
     };
 }

package/dist/cjs/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/cjs/filters/adapters/logicToFD.js

@@ -3,8 +3,9 @@
 // TO Logic structure = Cleaner logic structure
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logicToFD = void 0;
-const general_1 = require("../../general");
-const constants_1 = require("../constants");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
+const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
 const flatUIToFD_1 = require("./flatUIToFD");
 const logicToFlatUI_1 = require("./logicToFlatUI");
 /**
@@ -13,11 +14,11 @@ const logicToFlatUI_1 = require("./logicToFlatUI");
  * @param version Tag for the version of the filter data structure
  * @returns a Filter Data.
  */
-function logicToFD(logics = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = constants_1.FILTER_STRUCTURE_VERSION) {
-    if (general_1.isEmpty(logics) || !Array.isArray(logics))
+function logicToFD(logics = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION_1.FILTER_STRUCTURE_VERSION) {
+    if ((0, isEmpty_1.isEmpty)(logics) || !Array.isArray(logics))
         return;
-    const builderFilter = logicToFlatUI_1.logicToFlatUI(logics);
-    const uiFilters = flatUIToFD_1.flatUIToFD(builderFilter, section, enabled, version);
+    const builderFilter = (0, logicToFlatUI_1.logicToFlatUI)(logics);
+    const uiFilters = (0, flatUIToFD_1.flatUIToFD)(builderFilter, section, enabled, version);
     return uiFilters;
 }
 exports.logicToFD = logicToFD;

package/dist/cjs/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)