@qrvey/utils 1.1.0-9 → 1.1.2-1

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

@@ -0,0 +1 @@
+export declare const DATE_YEAR_MONTHS: string[];

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DATE_YEAR_MONTHS = void 0;
+exports.DATE_YEAR_MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];

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

@@ -0,0 +1 @@
+export declare const DATE_YEAR_QUARTERS: string[];

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DATE_YEAR_QUARTERS = void 0;
+exports.DATE_YEAR_QUARTERS = ['Q1', 'Q2', 'Q3', 'Q4'];

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

@@ -1,3 +1,15 @@
+export * from './DATE_DAY_HOURS';
+export * from './DATE_HOUR_MINUTES';
+export * from './DATE_MINUTE_SECONDS';
+export * from './DATE_MONTH_DAYS';
+export * from './DATE_P_PROPERTIES';
+export * from './DATE_P_VALUES';
 export * from './DATE_PROPERTY';
+export * from './DATE_PROPERTY_VALUE';
+export * from './DATE_TIME_P_VALUES';
 export * from './DATE_TIME_PROPERTIES';
 export * from './DATE_TIME_VALUES';
+export * from './DATE_WEEK_DAYS';
+export * from './DATE_YEAR_DAYS';
+export * from './DATE_YEAR_MONTHS';
+export * from './DATE_YEAR_QUARTERS';

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

@@ -10,6 +10,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./DATE_DAY_HOURS"), exports);
+__exportStar(require("./DATE_HOUR_MINUTES"), exports);
+__exportStar(require("./DATE_MINUTE_SECONDS"), exports);
+__exportStar(require("./DATE_MONTH_DAYS"), exports);
+__exportStar(require("./DATE_P_PROPERTIES"), exports);
+__exportStar(require("./DATE_P_VALUES"), exports);
 __exportStar(require("./DATE_PROPERTY"), exports);
+__exportStar(require("./DATE_PROPERTY_VALUE"), exports);
+__exportStar(require("./DATE_TIME_P_VALUES"), exports);
 __exportStar(require("./DATE_TIME_PROPERTIES"), exports);
 __exportStar(require("./DATE_TIME_VALUES"), exports);
+__exportStar(require("./DATE_WEEK_DAYS"), exports);
+__exportStar(require("./DATE_YEAR_DAYS"), exports);
+__exportStar(require("./DATE_YEAR_MONTHS"), exports);
+__exportStar(require("./DATE_YEAR_QUARTERS"), exports);

package/dist/cjs/date/range/getDateRange.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateRange = void 0;
 const index_1 = require("../../general/index");
+const tokens_1 = require("../../tokens");
 /**
  * Get date range object from a string date value
  *
@@ -40,45 +41,52 @@ function getDateRange(value, dateGroupLabel = 'DAY', withTime = true) {
     const range = {};
     const upperCaseDateGroup = dateGroupLabel.toUpperCase();
     const [timeFrom, timeTo] = withTime ? getStringTimeRange(value, upperCaseDateGroup) : ['', ''];
-    const isToken = isTokenBoxLabel(value);
+    const isToken = tokens_1.isTokenLabel(value);
     switch (upperCaseDateGroup) {
-        case 'YEAR':
+        case 'YEAR': {
             const yearRange = !isToken ? getYearRange(value) : { from: `01/01/${value}`, to: `12/31/${value}` };
             range.from = `${yearRange.from}${timeFrom}`;
             range.to = `${yearRange.to}${timeTo}`;
             break;
-        case 'QUARTER':
+        }
+        case 'QUARTER': {
             const quarterRange = !isToken ? getQuarterRange(value) : { from: value, to: value };
             range.from = `${quarterRange.from}${timeFrom}`;
             range.to = `${quarterRange.to}${timeTo}`;
             break;
-        case 'MONTH':
+        }
+        case 'MONTH': {
             const monthRange = monthInclideTokens(value) ? getMonthRangeWithToken(value) : getMonthRange(value);
             range.from = `${monthRange.from}${timeFrom}`;
             range.to = `${monthRange.to}${timeTo}`;
             break;
-        case 'WEEK':
+        }
+        case 'WEEK': {
             const weekRange = !isToken ? getWeekRange(value) : { from: value, to: value };
             range.from = `${weekRange.from}${timeFrom}`;
             range.to = `${weekRange.to}${timeTo}`;
             break;
-        case 'HOUR':
+        }
+        case 'HOUR': {
             const hourRange = !isToken ? getHourRange(value) : { from: value, to: value };
             range.from = hourRange.from;
             range.to = hourRange.to;
             break;
-        case 'MINUTE':
+        }
+        case 'MINUTE': {
             const minuteRange = !isToken ? getMinuteRange(value) : { from: value, to: value };
             range.from = minuteRange.from;
             range.to = minuteRange.to;
             break;
-        default:
+        }
+        default: {
             const dayFrom = new Date(value);
             const dayTo = new Date(value);
             const includTokens = includeTokens(value, '/');
             range.from = `${!includTokens ? getStringDate(dayFrom) : value}${timeFrom}`;
             range.to = `${!includTokens ? getStringDate(dayTo) : value}${timeTo}`;
             break;
+        }
     }
     return range;
 }
@@ -158,7 +166,7 @@ function getWeek(date) {
     if (target.getDay() !== 4) {
         target.setMonth(0, 1 + ((4 - target.getDay()) + 7) % 7);
     }
-    return 1 + Math.ceil((firstThursday - (+target)) / 604800000);
+    return 1 + Math.ceil((firstThursday - +target) / 604800000);
 }
 function getHourRange(date) {
     const target = new Date(date.valueOf());
@@ -173,29 +181,26 @@ function getMinuteRange(date) {
     return { from: `${stringDate}${timeFrom}`, to: `${stringDate}${timeTo}` };
 }
 function getMonthRangeWithToken(value) {
-    let [month, year] = value.split(' ');
-    if (!isTokenBoxLabel(month)) {
+    const [month, year] = value.split(' ');
+    let monthToReturn = month;
+    if (!tokens_1.isTokenLabel(month)) {
         const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        const monthIndex = months.indexOf(month) + 1;
-        month = `${monthIndex <= 9 ? '0' : ''}${monthIndex}`;
+        const monthIndex = months.indexOf(monthToReturn) + 1;
+        monthToReturn = `${monthIndex <= 9 ? '0' : ''}${monthIndex}`;
     }
     return {
-        from: `${month}/01/${year}`,
-        to: `${month}/{{LAST_DAY_MONTH}}/${year}`
+        from: `${monthToReturn}/01/${year}`,
+        to: `${monthToReturn}/{{LAST_DAY_MONTH}}/${year}`
     };
 }
 function monthInclideTokens(value) {
     const [month, year] = value.split(' ');
-    return isTokenBoxLabel(month) || isTokenBoxLabel(year);
-}
-function isTokenBoxLabel(label) {
-    const regex = new RegExp('^(\{\{)([^{}]+)(\}\})$', 'gi');
-    return regex.test(label);
+    return tokens_1.isTokenLabel(month) || tokens_1.isTokenLabel(year);
 }
 function includeTokens(date, separator) {
     const dateSeparet = date.split(separator);
     for (const iterator of dateSeparet) {
-        if (isTokenBoxLabel(iterator))
+        if (tokens_1.isTokenLabel(iterator))
             return true;
     }
 }

package/dist/cjs/date/relative/Adapter.js

@@ -51,7 +51,7 @@ class RelativeStatementAdapter {
         const path = this.cursor === "the_last" /* LAST */ ? 'gte'
             : this.cursor === "the_next" /* NEXT */ ? 'lte'
                 : '';
-        return index_1.get(value, path, new Date());
+        return index_1._get(value, path, new Date());
     }
     /**
      * Convert verbal statement to range value

package/dist/cjs/date/relative/constants/DATE_FORMATS.d.ts

@@ -1,2 +1,2 @@
-export declare const DATETIME_FORMAT = "MM-DD-YYYY HH:mm:ss";
+export declare const DATETIME_FORMAT = "MM/DD/YYYY HH:mm:ss";
 export declare const INPUT_FORMATS: string[];

package/dist/cjs/date/relative/constants/DATE_FORMATS.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.INPUT_FORMATS = exports.DATETIME_FORMAT = void 0;
-exports.DATETIME_FORMAT = 'MM-DD-YYYY HH:mm:ss';
+exports.DATETIME_FORMAT = 'MM/DD/YYYY HH:mm:ss';
 exports.INPUT_FORMATS = [
+    exports.DATETIME_FORMAT,
     'MM/DD/YYYY',
     'MM-DD-YYYY',
     'YYYY-MM-DD',
-    'MM/DD/YYYY HH:mm:ss',
+    'MM-DD-YYYY HH:mm:ss',
     'YYYY-MM-DD HH:mm:ss',
-    exports.DATETIME_FORMAT
 ];

package/dist/cjs/date/relative/helpers/formatStatement.js

@@ -10,12 +10,12 @@ const index_1 = require("../../../general/object/index");
 function formatStatement(statement) {
     const loweredStatement = index_1.mapValues(statement, s => typeof s === 'string' ? s.toLowerCase() : s);
     return {
-        cursor: index_1.get(loweredStatement, 'cursor', "this" /* THIS */),
-        unit: index_1.get(loweredStatement, 'unit', "day" /* DAY */),
-        number: index_1.get(loweredStatement, 'number', 0),
-        anchor: index_1.get(loweredStatement, 'anchor', "@now" /* NOW_TOKEN */),
-        isCalendarDate: index_1.get(loweredStatement, 'isCalendarDate', true),
-        includeCurrent: index_1.get(loweredStatement, 'includeCurrent', true)
+        cursor: index_1._get(loweredStatement, 'cursor', "this" /* THIS */),
+        unit: index_1._get(loweredStatement, 'unit', "day" /* DAY */),
+        number: index_1._get(loweredStatement, 'number', 0),
+        anchor: index_1._get(loweredStatement, 'anchor', "@now" /* NOW_TOKEN */),
+        isCalendarDate: index_1._get(loweredStatement, 'isCalendarDate', true),
+        includeCurrent: index_1._get(loweredStatement, 'includeCurrent', true)
     };
 }
 exports.formatStatement = formatStatement;

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

@@ -30,7 +30,7 @@ exports.FDToFlatUI = FDToFlatUI;
  * @returns a flattened UI filters array
  */
 function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
-    let uFilters = [];
+    const uFilters = [];
     if (scopes.length === 0)
         return uFilters;
     scopes.forEach(scope => {
@@ -42,6 +42,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         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 info = !general_1.isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -59,29 +60,21 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             dateSection: filter.dateSection,
                             displayed: filter.displayed,
                             enabled: filter.enabled,
-                            extras: {
-                                panelid: filter.extras.panelid,
-                                filterLabel: filter.extras.filterLabel,
-                                scope: filter.extras.scope,
-                                scopeid: filter.extras.scopeid,
-                                section: filter.extras.section,
-                                scopeInfo: {
+                            extras: Object.assign(Object.assign({}, filter.extras), { panelid: filter.extras.panelid, filterLabel: filter.extras.filterLabel, info, scope: filter.extras.scope, scopeid: filter.extras.scopeid, section: filter.extras.section, scopeInfo: {
                                     collapsed: scope.collapsed,
                                     enabled: scope.enabled,
                                     displayed: scope.displayed,
                                     label: scope.label,
                                     scope: scope.scope,
                                     scopeid: scope.scopeid,
-                                },
-                                dataset: {
+                                }, dataset: {
                                     qrveyid: dataset.qrveyid,
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name,
                                     linkid: dataset.linkid,
-                                },
-                            },
+                                } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,

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

@@ -33,10 +33,9 @@ exports.FDToUI = FDToUI;
  * @returns a UI filter Structure
  */
 function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, datasetsInfo = [], version = constants_1.FILTER_STRUCTURE_VERSION) {
-    let ufData;
     if (scopes.length === 0)
-        return ufData;
-    ufData = {
+        return;
+    const ufData = {
         enabled,
         section,
         version,

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

@@ -29,7 +29,7 @@ exports.UIToFlatUI = UIToFlatUI;
  * @returns a flattened UI filters array
  */
 function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
-    let uFilters = [];
+    const uFilters = [];
     if (scopes.length === 0)
         return uFilters;
     scopes.forEach(scope => {
@@ -41,6 +41,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                         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 info = !general_1.isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -58,29 +59,21 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             dateSection: filter.dateSection,
                             displayed: filter.displayed,
                             enabled: filter.enabled,
-                            extras: {
-                                panelid: filter.extras.panelid,
-                                filterLabel: filter.extras.filterLabel,
-                                scope: filter.extras.scope,
-                                scopeid: filter.extras.scopeid,
-                                section: filter.extras.section,
-                                scopeInfo: {
+                            extras: Object.assign(Object.assign({}, filter.extras), { panelid: filter.extras.panelid, filterLabel: filter.extras.filterLabel, info, scope: filter.extras.scope, scopeid: filter.extras.scopeid, section: filter.extras.section, scopeInfo: {
                                     collapsed: scope.collapsed,
                                     enabled: scope.enabled,
                                     displayed: scope.displayed,
                                     label: scope.label,
                                     scope: scope.scope,
                                     scopeid: scope.scopeid,
-                                },
-                                dataset: {
+                                }, dataset: {
                                     qrveyid: dataset.qrveyid,
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name) || dataset.label,
                                     linkid: dataset.linkid,
-                                },
-                            },
+                                } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,

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

@@ -79,7 +79,7 @@ function buildExpressions(filterSection, scope, dataset) {
     }, []);
 }
 const getFilterDetail = (filter, scope, dataset) => {
-    let aggregate, calculation;
+    let aggregate, calculation, info;
     if (filter.column.aggregate != null) {
         aggregate = {
             abbreviation: undefined,
@@ -97,6 +97,12 @@ const getFilterDetail = (filter, scope, dataset) => {
             value: filter.column.calculation,
         };
     }
+    if (!general_1.isEmpty(filter.extras.info)) {
+        info = {
+            icon: filter.extras.info.icon,
+            label: filter.extras.info.label,
+        };
+    }
     return {
         collapsed: filter.collapsed,
         column: {
@@ -119,6 +125,8 @@ const getFilterDetail = (filter, scope, dataset) => {
         },
         dateSection: filter.dateSection,
         enabled: filter.enabled,
+        extras: filter.extras,
+        info,
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,

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 general_1 = require("../../general");
 const constants_1 = require("../constants");
 /**
  * Generates a filter data structure from the flatttened UI filters.
@@ -78,6 +79,7 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    const info = !general_1.isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -92,13 +94,7 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: {
-            panelid: uFilter.extras.panelid,
-            filterLabel: uFilter.extras.filterLabel,
-            scope: uFilter.extras.scope,
-            scopeid: uFilter.extras.scopeid,
-            section: uFilter.extras.section,
-        },
+        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,

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

@@ -68,7 +68,9 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             },
             dateSection: filter.dateSection,
             enabled: filter.enabled,
+            extras: filter.extras,
             lookupDisplayIndex: filter.lookupDisplayIndex,
+            info: filter.extras.info,
             nullValues: filter.nullValues,
             operator: filter.operator,
             property: filter.property,
@@ -78,9 +80,10 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             panelid: filter.extras.panelid,
             panelName: filter.extras.filterLabel,
             section: filter.extras.section,
-            // uiValue: getUIValues(filter, true),
+            uiValue: helpers_1.getUIValues(filter, true),
             validator: filter.validator,
-            values: filter.values
+            values: filter.values,
+            _newFilters: Object.assign({}, filter)
         };
     });
 };
@@ -105,7 +108,7 @@ function getLogicBody(uFilters) {
                 filters: [filterItem],
                 uiExtras: {
                     scopeid: props.scopeid,
-                    collapsed: props.collapsed,
+                    collapsed: general_1._get(props, '_newFilters.extras.scopeInfo.collapsed', false),
                 }
             });
         }
@@ -143,11 +146,11 @@ 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) });
-        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValues(props, index) }) });
+        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
     });
 }
 function getRegularExpression(props) {
-    const uiValue = getUIValues(props);
+    const uiValue = getUIValuess(props);
     return {
         enabled: props.enabled,
         groupValue: getGroupValue(props),
@@ -163,16 +166,20 @@ function getRegularExpression(props) {
     };
 }
 function getGroupValue(props) {
-    if (general_1.isEmpty(props.column.aggregate) && isDateColumn_1.isDateColumn(props.column) && props.property) {
+    if (!helpers_1.arePropertiesDateP(props.column, props.property) && general_1.isEmpty(props.column.aggregate) && isDateColumn_1.isDateColumn(props.column) && props.property) {
         return props.property;
     }
 }
 function getProperty(props) {
+    var _a;
     if (general_1.isEmpty(props.column.aggregate)) {
-        if ((isDateColumn_1.isDateColumn(props.column) && props.property) || helpers_1.isNullValidator(props.validator))
+        if (helpers_1.isNullValidator(props.validator)) {
             return undefined;
-        if ((props.column.type === constants_2.COLUMN.EXPRESSION && props.property != null)
-        /*|| (props.column.type === QUESTIONS_TYPES.DATE && props.property === PROPERTY_TYPE.DATE_DAY)*/ ) {
+        }
+        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;
         }
         else if (props.column.type === constants_2.COLUMN.LOOKUP && props.property === "display" /* LOOKUP_DISPLAY */ && props.lookupDisplayIndex != null) {
@@ -253,66 +260,36 @@ function getValues(props, rankingGroupIndex) {
         case "NOT_START_WITH" /* NOT_START_WITH */:
         case "ENDS_WITH" /* ENDS_WITH */:
         case "NOT_END_WITH" /* NOT_END_WITH */:
-            return props.values.map(value => value.value);
+            return props.values.map(value => value.enabled ? value.value : undefined);
         case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-            // return rangeValues.map(value => ({
-            //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max,
-            //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-            // }));
-            return props.values.map(value => ({
-                lte: value.max,
-                gte: value.min
-            }));
+            return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
         case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
-            return props.values.map(value => {
-                // const { min, max } = getExclusiveRangeValuesByProperty(value, props);
-                // return {
-                //   [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max,
-                //   [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min
-                // };
-                return {
-                    lt: value.max,
-                    gt: value.min
-                };
-            });
+            return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
         case "BEFORE" /* BEFORE */:
         case "LESS_THAN" /* LESS_THAN */:
-            return props.values.map(value => {
-                // const { max } = getExclusiveRangeValuesByProperty(value, props);
-                // return { [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max };
-                return { lt: value.max };
-            });
+            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 */:
-            return props.values.map(value => (
-            // {
-            //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max
-            // }
-            { lte: value.max }));
+            return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
-            return props.values.map(value => {
-                // const { min } = getExclusiveRangeValuesByProperty(value, props);
-                // return { [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min };
-                return { gt: value.min };
-            });
+            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 */:
-            return props.values.map(value => (
-            // {
-            //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-            // }
-            { gte: value.min }));
+            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 */:
-            return [constants_1.FILTER_VALIDATOR_VALUE[props.validator].label];
+        case "IS_NOT_NULL" /* 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] : [];
+        }
         case "IN" /* IN */:
-            return general_1._get(props, 'values', []);
+            return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
 }
-function getUIValues(props, rankingGroupIndex) {
+function getUIValuess(props, rankingGroupIndex) {
+    var _a, _b;
     switch (props.validator) {
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
@@ -329,7 +306,7 @@ function getUIValues(props, rankingGroupIndex) {
             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: props.enabled }];
+            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 })));
         default:
@@ -344,10 +321,10 @@ function getValueUiUnitRelativeDate(relative) {
 }
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = general_1.isNull(rankingGroupIndex) ? general_1.flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
         position: rankingValue.position - 1,
         value: rankingValue.value.value
-    }));
+    }) : undefined).filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
     const flattenValues = general_1.isNull(rankingGroupIndex) ? general_1.flattenDeep(values) : values[rankingGroupIndex];
@@ -360,13 +337,15 @@ function getRankingUIValues(values, rankingGroupIndex) {
 }
 function getResultValues(values, props) {
     return values.map((value) => {
-        if (props.column.type === constants_2.COLUMN.IMAGE) {
-            return value.valueid;
-        }
-        else {
-            return value.value;
+        if (value.enabled) {
+            if (props.column.type === constants_2.COLUMN.IMAGE) {
+                return value.valueid;
+            }
+            else {
+                return value.value;
+            }
         }
-    }).filter(value => value);
+    }).filter(Boolean);
     // return values.map((value: IFBResultValue) => {
     //   if (!isEmpty(props.column.aggregate)) {
     //     return value.value || '';