@qrvey/utils 1.1.0-9 → 1.1.2-1

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

@@ -22,28 +22,42 @@ function getBackendValues(filter) {
         case "NOT_START_WITH" /* NOT_START_WITH */:
         case "ENDS_WITH" /* ENDS_WITH */:
         case "NOT_END_WITH" /* NOT_END_WITH */:
-            return filter.values.map(value => value.value);
+            return filter.values.map(value => value.enabled ? value.value : undefined);
         case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-            return filter.values.map(value => ({ lte: value.max, gte: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { lte: value.max, gte: value.min }
+                : undefined).filter(Boolean);
         case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
-            return filter.values.map(value => ({ lt: value.max, gt: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { lt: value.max, gt: value.min }
+                : undefined).filter(Boolean);
         case "BEFORE" /* BEFORE */:
         case "LESS_THAN" /* LESS_THAN */:
-            return filter.values.map(value => ({ lt: value.max }));
+            return filter.values.map(value => value.enabled ?
+                { lt: value.max }
+                : undefined).filter(Boolean);
         case "BEFORE_ON" /* BEFORE_ON */:
         case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
-            return filter.values.map(value => ({ lte: value.max }));
+            return filter.values.map(value => value.enabled ?
+                { lte: value.max }
+                : undefined).filter(Boolean);
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
-            return filter.values.map(value => ({ gt: value.min }));
+            return filter.values.map(value => value.enabled ?
+                { gt: value.min }
+                : undefined).filter(Boolean);
         case "AFTER_ON" /* AFTER_ON */:
         case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
-            return filter.values.map(value => ({ gte: value.min }));
+            return filter.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_2.FILTER_VALIDATOR_VALUE[filter.validator].label];
+        case "IS_NOT_NULL" /* IS_NOT_NULL */: {
+            const addValue = filter.values.length > 0 && filter.values.every(value => value.enabled);
+            return addValue ? [constants_2.FILTER_VALIDATOR_VALUE[filter.validator].label] : [];
+        }
         case "IN" /* IN */:
-            return filter.values;
+            return filter.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -57,13 +71,15 @@ exports.getBackendValues = getBackendValues;
  */
 function getResultValues(values, filter) {
     return values.map((value) => {
-        if (filter.column.type === constants_1.COLUMN.IMAGE) {
-            return value.valueid;
-        }
-        else {
-            return value.value;
+        if (value.enabled) {
+            if (filter.column.type === constants_1.COLUMN.IMAGE) {
+                return value.valueid;
+            }
+            else {
+                return value.value;
+            }
         }
-    }).filter(value => value);
+    }).filter(Boolean);
 }
 /**
  * Gets the Ranking values.
@@ -73,8 +89,8 @@ function getResultValues(values, filter) {
  */
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = rankingGroupIndex == null ? 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);
 }

package/dist/cjs/filters/helpers/common/arePropertiesDateP.d.ts

@@ -0,0 +1,8 @@
+import { IFProperty, IFSColumn, IFUColumn } from "../../interfaces";
+/**
+ * Determines if the filter column and property is a distinct group dates type
+ * @param column The filter column
+ * @param property The filter property
+ * @returns True if the given property is included from distinct group dates type
+ */
+export declare function arePropertiesDateP(column: IFUColumn | IFSColumn, property: IFProperty): boolean;

package/dist/cjs/filters/helpers/common/arePropertiesDateP.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.arePropertiesDateP = void 0;
+const date_1 = require("../../../date");
+const general_1 = require("../../../general");
+const isDateColumn_1 = require("../../../qrvey/isDateColumn");
+/**
+ * Determines if the filter column and property is a distinct group dates type
+ * @param column The filter column
+ * @param property The filter property
+ * @returns True if the given property is included from distinct group dates type
+ */
+function arePropertiesDateP(column, property) {
+    return isDateColumn_1.isDateColumn(column) && general_1.isEmpty(column.aggregate) && date_1.DATE_P_PROPERTIES.includes(property);
+}
+exports.arePropertiesDateP = arePropertiesDateP;

package/dist/cjs/filters/helpers/common/getFilterColumnLabel.js

@@ -16,6 +16,6 @@ function getFilterColumnLabel(column) {
         labels.push(column.aggregate);
     if (column.calculation != null)
         labels.push(column.calculation);
-    return (labels.length > 0) ? `(${labels.join(' - ')})` : '';
+    return labels.length > 0 ? `(${labels.join(' - ')})` : '';
 }
 exports.getFilterColumnLabel = getFilterColumnLabel;

package/dist/cjs/filters/helpers/common/getFilterid.js

@@ -38,6 +38,6 @@ function getFilterid(filter, index) {
         filterid.push((_h = filter.column) === null || _h === void 0 ? void 0 : _h.calculation);
     if (index != null)
         filterid.push(index.toString());
-    return (filterid.length > 0) ? filterid.join('|') : '';
+    return filterid.length > 0 ? filterid.join('|') : '';
 }
 exports.getFilterid = getFilterid;

package/dist/cjs/filters/helpers/common/getFiltersByParams.js

@@ -38,22 +38,22 @@ function getFiltersByParams(filterData, params, settings) {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
                                                 rankingValues.map(rValue => {
-                                                    if (params.enableds == null || params.enableds === rValue.enabled)
+                                                    if (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'values') || params.enableds.values === rValue.enabled)
                                                         return rValue;
                                                 }).filter(Boolean);
                                             }
                                             else {
                                                 value = value;
-                                                if (params.enableds == null || params.enableds === value.enabled)
+                                                if (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'values') || params.enableds.values === value.enabled)
                                                     return value;
                                             }
                                         }).filter(Boolean) });
                                 }
-                            }).filter(filter => !general_1.isEmpty(filter) && filter.values.length > 0) });
+                            }).filter(filter => !general_1.isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0)) });
                     }
-                }).filter(dataset => !general_1.isEmpty(dataset) && dataset.filters.length > 0) });
+                }).filter(dataset => !general_1.isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0)) });
         }
-    }).filter(scope => !general_1.isEmpty(scope) && scope.datasets.length > 0);
+    }).filter(scope => !general_1.isEmpty(scope) && (!settings.filterEmptyArrays.scope || scope.datasets.length > 0));
     return filterData.scopes.length > 0 ? filterData : undefined;
 }
 exports.getFiltersByParams = getFiltersByParams;

package/dist/cjs/filters/helpers/common/getFiltersByVisibility.js

@@ -15,7 +15,7 @@ function getFiltersByVisibility(filterData, scopes) {
         return;
     filterData = general_1.cloneDeep(filterData);
     filterData = getFiltersByScopesIds_1.getFiltersByScopesIds(filterData, scopes);
-    filterData = getFiltersByParams_1.getFiltersByParams(filterData, { enableds: true });
+    filterData = getFiltersByParams_1.getFiltersByParams(filterData, { enableds: { datasets: true, scopes: true, values: true } }, { filterEmptyArrays: { filter: false } });
     return filterData;
 }
 exports.getFiltersByVisibility = getFiltersByVisibility;

package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.d.ts

@@ -0,0 +1,7 @@
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
+/**
+ * Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
+ * @param settings an object to the MergeFilters settings
+ * @returns a new MergeFilters settings object.
+ */
+export declare function getMergeFiltersSettings(settings?: IFSMergeFiltersSettings): IFSMergeFiltersSettings;

package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMergeFiltersSettings = void 0;
+/**
+ * Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
+ * @param settings an object to the MergeFilters settings
+ * @returns a new MergeFilters settings object.
+ */
+function getMergeFiltersSettings(settings) {
+    var _a, _b;
+    return {
+        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+        setGroupedColumnOperator: (_b = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _b !== void 0 ? _b : true
+    };
+}
+exports.getMergeFiltersSettings = getMergeFiltersSettings;

package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.d.ts

@@ -1,2 +1,7 @@
 import { IFSParamsToGetFilterSettings } from "../../interfaces";
+/**
+ * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
+ * @param settings an object to the ParamsToGetFilter settings
+ * @returns a new ParamsToGetFilter settings object.
+ */
 export declare function getParamsToGetFilterSettings(settings?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings;

package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParamsToGetFilterSettings = void 0;
+/**
+ * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
+ * @param settings an object to the ParamsToGetFilter settings
+ * @returns a new ParamsToGetFilter settings object.
+ */
 function getParamsToGetFilterSettings(settings) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     return {
         letPassUndefinedParams: {
             dataset: (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedParams) === null || _a === void 0 ? void 0 : _a.dataset) !== null && _b !== void 0 ? _b : true,
@@ -13,6 +18,11 @@ function getParamsToGetFilterSettings(settings) {
             dataset: (_h = (_g = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _g === void 0 ? void 0 : _g.dataset) !== null && _h !== void 0 ? _h : false,
             filter: (_k = (_j = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _j === void 0 ? void 0 : _j.filter) !== null && _k !== void 0 ? _k : false,
             scope: (_m = (_l = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _l === void 0 ? void 0 : _l.scope) !== null && _m !== void 0 ? _m : false,
+        },
+        filterEmptyArrays: {
+            dataset: (_p = (_o = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _o === void 0 ? void 0 : _o.dataset) !== null && _p !== void 0 ? _p : true,
+            filter: (_r = (_q = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _q === void 0 ? void 0 : _q.filter) !== null && _r !== void 0 ? _r : true,
+            scope: (_t = (_s = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _s === void 0 ? void 0 : _s.scope) !== null && _t !== void 0 ? _t : true,
         }
     };
 }

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

@@ -1,4 +1,5 @@
 export * from './areFiltersEquals';
+export * from './arePropertiesDateP';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
@@ -10,6 +11,7 @@ export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';
 export * from './getFiltersByVisibility';
+export * from './getMergeFiltersSettings';
 export * from './getParamsToGetFilterSettings';
 export * from './haveFiltersByDataset';
 export * from './isBetweenValidator';

package/dist/cjs/filters/helpers/common/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./areFiltersEquals"), exports);
+__exportStar(require("./arePropertiesDateP"), exports);
 __exportStar(require("./excludeFiltersByAggregateColumn"), exports);
 __exportStar(require("./excludeFiltersByParams"), exports);
 __exportStar(require("./excludeFiltersByScopes"), exports);
@@ -22,6 +23,7 @@ __exportStar(require("./getFiltersByParams"), exports);
 __exportStar(require("./getFiltersByScopes"), exports);
 __exportStar(require("./getFiltersByScopesIds"), exports);
 __exportStar(require("./getFiltersByVisibility"), exports);
+__exportStar(require("./getMergeFiltersSettings"), exports);
 __exportStar(require("./getParamsToGetFilterSettings"), exports);
 __exportStar(require("./haveFiltersByDataset"), exports);
 __exportStar(require("./isBetweenValidator"), exports);

package/dist/cjs/filters/helpers/common/mergeFilters.d.ts

@@ -1,4 +1,5 @@
 import { IFSData, IFUData } from "../../interfaces";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 /**
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
@@ -6,4 +7,4 @@ import { IFSData, IFUData } from "../../interfaces";
  * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
-export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, overwriteValues?: boolean): IFSData | IFUData;
+export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData;

package/dist/cjs/filters/helpers/common/mergeFilters.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeFilters = void 0;
 const general_1 = require("../../../general");
+const FILTER_GROUPED_COLUMN_OPERATOR_1 = require("../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR");
+const getMergeFiltersSettings_1 = require("./getMergeFiltersSettings");
+const isInValidator_1 = require("./isInValidator");
+const isNullValidator_1 = require("./isNullValidator");
 const isRangeValidator_1 = require("./isRangeValidator");
 const isRegularValidator_1 = require("./isRegularValidator");
 const resolveDatasetConditions_1 = require("./resolveDatasetConditions");
@@ -14,7 +18,7 @@ const resolveScopeConditions_1 = require("./resolveScopeConditions");
  * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter data structure
  */
-function mergeFilters(filterData1, filterData2, overwriteValues = false) {
+function mergeFilters(filterData1, filterData2, settings) {
     if (general_1.isEmpty(filterData1) || general_1.isEmpty(filterData1.scopes)) {
         if (general_1.isEmpty(filterData2) || general_1.isEmpty(filterData2.scopes))
             return;
@@ -24,9 +28,10 @@ function mergeFilters(filterData1, filterData2, overwriteValues = false) {
         return filterData1;
     filterData1 = general_1.cloneDeep(filterData1);
     filterData2 = general_1.cloneDeep(filterData2);
+    settings = getMergeFiltersSettings_1.getMergeFiltersSettings(settings);
     return {
         enabled: filterData1.enabled,
-        scopes: mergeScopes(filterData1.scopes, filterData2.scopes, overwriteValues),
+        scopes: mergeScopes(filterData1.scopes, filterData2.scopes, settings),
         section: filterData1.section,
         version: filterData1.version
     };
@@ -39,11 +44,11 @@ exports.mergeFilters = mergeFilters;
  * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new scope structure array
  */
-function mergeScopes(scopes1 = [], scopes2 = [], overwriteValues = false) {
+function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
         const scope2Index = scopes2.findIndex(scope2 => resolveScopeConditions_1.resolveScopeConditions(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, overwriteValues) });
+            scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(scope1);
@@ -60,11 +65,11 @@ function mergeScopes(scopes1 = [], scopes2 = [], overwriteValues = false) {
  * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new dataset structure array
  */
-function mergeDatasets(datasets1 = [], datasets2 = [], overwriteValues = false) {
+function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex(dataset2 => resolveDatasetConditions_1.resolveDatasetConditions(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, overwriteValues) });
+            dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(dataset1);
@@ -81,13 +86,16 @@ function mergeDatasets(datasets1 = [], datasets2 = [], overwriteValues = false)
  * @param overwriteValues Flag to overwrite or not the filter values
  * @returns a new filter structure array
  */
-function mergeFilterss(filters1 = [], filters2 = [], overwriteValues = false) {
+function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions_1.resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], overwriteValues) });
+            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
             filters2.splice(filter2Index, 1);
         }
+        else {
+            filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR_1.FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
+        }
         filters.push(filter1);
         return filters;
     }, []);
@@ -107,7 +115,16 @@ function mergeValues(filter1, filter2, overwrite = false) {
         return [];
     let newValues = [];
     if (!overwrite) {
-        if (isRangeValidator_1.isRangeValidator(filter1.validator)) {
+        if (isInValidator_1.isInValidator(filter1.validator)) {
+            newValues = filter1.values.reduce((values, value1) => {
+                const value2Index = filter2.values.findIndex(value2 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                if (value2Index === -1) {
+                    values.push(filter2.values[value2Index]);
+                }
+                return values;
+            }, filter1.values);
+        }
+        else if (isRangeValidator_1.isRangeValidator(filter1.validator)) {
             newValues = filter1.values.reduce((values, value1) => {
                 const value2Index = filter2.values.findIndex(value2 => value2.max === value1.max && value2.min === value1.min);
                 if (value2Index === -1) {
@@ -116,7 +133,7 @@ function mergeValues(filter1, filter2, overwrite = false) {
                 return values;
             }, filter1.values);
         }
-        else if (isRegularValidator_1.isRegularValidator(filter1.validator)) {
+        else if (isRegularValidator_1.isRegularValidator(filter1.validator) || isNullValidator_1.isNullValidator(filter1.validator)) {
             newValues = filter1.values.reduce((values, value1) => {
                 const value2Index = filter2.values.findIndex(value2 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
                 if (value2Index === -1) {

package/dist/cjs/filters/helpers/common/resolveDatasetConditions.js

@@ -11,7 +11,7 @@ const general_1 = require("../../../general");
  * @returns true: the condition is satisfied
  */
 function resolveDatasetConditions(dataset, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    return (!general_1._hasProperty(params, 'enableds') || (letPassUndefinedProperties && dataset.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === dataset.enabled) &&
+    return (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'datasets') || (letPassUndefinedProperties && dataset.enabled == null) || (letPassUndefinedParams && params.enableds.datasets == null) || params.enableds.datasets === dataset.enabled) &&
         (!general_1._hasProperty(params, 'qrveyid') || (letPassUndefinedProperties && dataset.qrveyid == null) || (letPassUndefinedParams && general_1.isEmpty(params.qrveyid)) || params.qrveyid === dataset.qrveyid) &&
         (!general_1._hasProperty(params, 'linkid') || (letPassUndefinedProperties && dataset.linkid == null) || (letPassUndefinedParams && general_1.isEmpty(params.linkid)) || params.linkid === dataset.linkid) &&
         dataset.filters.length > 0;

package/dist/cjs/filters/helpers/common/resolveFilterConditions.js

@@ -12,7 +12,7 @@ const general_1 = require("../../../general");
  */
 function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
     var _a, _b, _c, _d;
-    return (!general_1._hasProperty(params, 'enableds') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === filter.enabled) &&
+    return (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'filters') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds.filters == null) || params.enableds.filters === filter.enabled) &&
         (!general_1._hasProperty(params, 'dateSection') || (letPassUndefinedProperties && filter.dateSection == null) || (letPassUndefinedParams && general_1.isEmpty(params.dateSection)) || params.dateSection === filter.dateSection) &&
         (!general_1._hasProperty(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && general_1.isEmpty(params.panelid)) || params.panelid === filter.extras.panelid) &&
         (!general_1._hasProperty(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && general_1.isEmpty(params.property)) || params.property === filter.property) &&
@@ -20,7 +20,6 @@ function resolveFilterConditions(filter, params, letPassUndefinedProperties = fa
         (!general_1._hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && general_1.isEmpty(params.column)) || (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) === filter.column.id &&
             ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) === filter.column.qrveyid &&
             ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) === filter.column.linkid &&
-            ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) === filter.column.aggregate)) &&
-        filter.values.length > 0;
+            ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) === filter.column.aggregate));
 }
 exports.resolveFilterConditions = resolveFilterConditions;

package/dist/cjs/filters/helpers/common/resolveScopeConditions.js

@@ -11,7 +11,7 @@ const general_1 = require("../../../general");
  * @returns true: the condition is satisfied
  */
 function resolveScopeConditions(scope, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    return (!general_1._hasProperty(params, 'enableds') || (letPassUndefinedProperties && scope.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === scope.enabled) &&
+    return (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'scopes') || (letPassUndefinedProperties && scope.enabled == null) || (letPassUndefinedParams && params.enableds.scopes == null) || params.enableds.scopes === scope.enabled) &&
         (!general_1._hasProperty(params, 'scope') || (letPassUndefinedProperties && scope.scope == null) || (letPassUndefinedParams && general_1.isEmpty(params.scope)) || scope.scope === params.scope) &&
         (!general_1._hasProperty(params, 'scopeid') || (letPassUndefinedProperties && scope.scopeid == null) || (letPassUndefinedParams && general_1.isEmpty(params.scopeid)) || scope.scopeid === params.scopeid) &&
         scope.datasets.filter.length > 0;

package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.d.ts

@@ -5,4 +5,4 @@ import { IFBFilterAggregate, IFSData } from "../interfaces";
  * @param summaries
  * @returns
  */
-export declare function getAggFiltersFromFilterData(filterData: IFSData, summaries: any[]): IFBFilterAggregate;
+export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;

package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAggFiltersFromFilterData = void 0;
 const general_1 = require("../../general");
-const backend_1 = require("./backend");
 const common_1 = require("./common");
-const adapters_1 = require("../adapters");
 /**
  *
  * @param logics
@@ -12,26 +10,27 @@ const adapters_1 = require("../adapters");
  * @returns
  */
 // [TODO: FILTERS - FIX AGGREGATE FILTERS]
-function getAggFiltersFromFilterData(filterData, summaries) {
+function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, common_1.getFiltersByAggregateColumn(filterData));
     if (general_1.isEmpty(filterData))
         return;
-    const uFilters = adapters_1.FDToFlatUI(filterData);
-    const aggFilters = uFilters.map(uFilter => {
-        const summaryIndex = summaries.findIndex(summary => uFilter.column.id === summary.questionid &&
-            uFilter.column.qrveyid === summary.qrveyid &&
-            uFilter.column.linkid === summary.linkid &&
-            uFilter.column.aggregate === summary.aggregate);
-        if (summaryIndex > -1) {
-            return {
-                enabled: uFilter.enabled,
-                summaryIndex,
-                validationType: backend_1.getBackendValidator(uFilter.validator),
-                value: backend_1.getBackendValues(uFilter),
-            };
-        }
-    }).filter(Boolean);
-    debugger;
+    // const uFilters = FDToFlatUI(filterData);
+    // const aggFilters: IFBExpressionAggregate[] = uFilters.map(uFilter => {
+    //   const summaryIndex = summaries.findIndex(summary =>
+    //       uFilter.column.id === summary.questionid &&
+    //       uFilter.column.qrveyid === summary.qrveyid &&
+    //       uFilter.column.linkid === summary.linkid &&
+    //       uFilter.column.aggregate === summary.aggregate
+    //   );
+    //   if (summaryIndex > -1) {
+    //       return {
+    //         enabled: uFilter.enabled,
+    //         summaryIndex,
+    //         validationType: getBackendValidator(uFilter.validator),
+    //         value: getBackendValues(uFilter),
+    //       };
+    //     }
+    // }).filter(Boolean);
     //   // [TODO: FILTERS - Adapt filter.validator and filter.values in the backend format]
     //   const aggFilters: IFBFilterAggregate[] = filterData.scopes.map((scope) => {
     //     scope.datasets.forEach(dataset => {