@qrvey/utils 1.3.3 → 1.4.0-2

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

@@ -15,7 +15,7 @@ function getFiltersByScopesIds(filterData, scopes = []) {
         return;
     filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     filterData.scopes = scopes.reduce((newScopes, scope) => {
-        const filteredScopes = filterData.scopes.filter(fScope => scope.label === fScope.scope &&
+        const filteredScopes = filterData.scopes.filter((fScope) => scope.label === fScope.scope &&
             (scope.id === fScope.scopeid ||
                 (fScope.scope === FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL && fScope.scopeid == null)) &&
             fScope.datasets.length > 0);

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

@@ -11,7 +11,7 @@ function getMergeFiltersSettings(settings) {
     return {
         overwriteFilterProps: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteFilterProps) !== null && _a !== void 0 ? _a : true,
         overwriteValues: (_b = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _b !== void 0 ? _b : false,
-        setGroupedColumnOperator: (_c = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _c !== void 0 ? _c : true
+        setGroupedColumnOperator: (_c = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _c !== void 0 ? _c : true,
     };
 }
 exports.getMergeFiltersSettings = getMergeFiltersSettings;

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

@@ -23,7 +23,7 @@ function getParamsToGetFilterSettings(settings) {
             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,
-        }
+        },
     };
 }
 exports.getParamsToGetFilterSettings = getParamsToGetFilterSettings;

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

@@ -9,11 +9,16 @@ const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterVa
  * @returns The values.
  */
 function getValuesFromDataset(props) {
-    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, dataset: props.dataset, property: props.property, lookupDisplay: props.lookupDisplay });
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({
+        column: props.column,
+        dataset: props.dataset,
+        property: props.property,
+        lookupDisplay: props.lookupDisplay,
+    });
     const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
     const values = { data, total: data.length };
     if (props.value) {
-        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+        values.data = values.data.filter((v) => v.value.toLowerCase().includes(props.value.toLowerCase()));
     }
     return values;
 }

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

@@ -9,11 +9,16 @@ const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterVa
  * @returns The values.
  */
 function getValuesFromModel(props) {
-    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, model: props.model, property: props.property, lookupDisplay: props.lookupDisplay });
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({
+        column: props.column,
+        model: props.model,
+        property: props.property,
+        lookupDisplay: props.lookupDisplay,
+    });
     const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
     const values = { data, total: data.length };
     if (props.value) {
-        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+        values.data = values.data.filter((v) => v.value.toLowerCase().includes(props.value.toLowerCase()));
     }
     return values;
 }

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

@@ -11,6 +11,7 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
 function haveFiltersByDataset(filterData, qrveyid) {
     if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return false;
-    return filterData.scopes.some(scope => scope.datasets.length > 0 && scope.datasets.some(dataset => dataset.qrveyid === qrveyid));
+    return filterData.scopes.some((scope) => scope.datasets.length > 0 &&
+        scope.datasets.some((dataset) => dataset.qrveyid === qrveyid));
 }
 exports.haveFiltersByDataset = haveFiltersByDataset;

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

@@ -1,29 +1,29 @@
-export * from './areFiltersEquals';
-export * from './excludeFiltersByAggregateColumn';
-export * from './excludeFiltersByParams';
-export * from './excludeFiltersByScopes';
-export * from './getFilterColumnLabel';
-export * from './getFilterid';
-export * from './getFilterLabel';
-export * from './getFiltersByAggregateColumn';
-export * from './getFiltersByDatasetsColumns';
-export * from './getFiltersByParams';
-export * from './getFiltersByScopes';
-export * from './getFiltersByScopesIds';
-export * from './getFiltersByVisibility';
-export * from './getMergeFiltersSettings';
-export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
-export * from './haveFiltersByDataset';
-export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
-export * from './isInValidator';
-export * from './isNullValidator';
-export * from './isRangeValidator';
-export * from './isRegularValidator';
-export * from './mergeFilters';
-export * from './mergeValues';
-export * from './resolveDatasetConditions';
-export * from './resolveFilterConditions';
-export * from './resolveScopeConditions';
+export * from "./areFiltersEquals";
+export * from "./excludeFiltersByAggregateColumn";
+export * from "./excludeFiltersByParams";
+export * from "./excludeFiltersByScopes";
+export * from "./getFilterColumnLabel";
+export * from "./getFilterid";
+export * from "./getFilterLabel";
+export * from "./getFiltersByAggregateColumn";
+export * from "./getFiltersByDatasetsColumns";
+export * from "./getFiltersByParams";
+export * from "./getFiltersByScopes";
+export * from "./getFiltersByScopesIds";
+export * from "./getFiltersByVisibility";
+export * from "./getMergeFiltersSettings";
+export * from "./getParamsToGetFilterSettings";
+export * from "./getValuesFromModel";
+export * from "./getValuesFromDataset";
+export * from "./haveFiltersByDataset";
+export * from "./isBetweenValidator";
+export * from "./isDateDistinctProperty";
+export * from "./isInValidator";
+export * from "./isNullValidator";
+export * from "./isRangeValidator";
+export * from "./isRegularValidator";
+export * from "./mergeFilters";
+export * from "./mergeValues";
+export * from "./resolveDatasetConditions";
+export * from "./resolveFilterConditions";
+export * from "./resolveScopeConditions";

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

@@ -43,4 +43,3 @@ __exportStar(require("./mergeValues"), exports);
 __exportStar(require("./resolveDatasetConditions"), exports);
 __exportStar(require("./resolveFilterConditions"), exports);
 __exportStar(require("./resolveScopeConditions"), exports);
-// export * from './validateFilterTextByColumn';

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

@@ -8,6 +8,9 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  * @returns true: it is a between validator; false: it is not a between validator
  */
 function isBetweenValidator(validator) {
-    return [FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE].includes(validator);
+    return [
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE,
+    ].includes(validator);
 }
 exports.isBetweenValidator = isBetweenValidator;

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

@@ -12,6 +12,11 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  * @returns True if the given property is included from distinct group dates type
  */
 function isDateDistinctProperty(column, property) {
-    return (0, isDateColumn_1.isDateColumn)(column) && (0, isEmpty_1.isEmpty)(column.aggregate) && [...DATE_DISTINCT_PROPERTIES_1.DATE_DISTINCT_PROPERTIES, ...DATE_DISTINCT_TIME_PROPERTIES_1.DATE_DISTINCT_TIME_PROPERTIES].includes(property);
+    return ((0, isDateColumn_1.isDateColumn)(column) &&
+        (0, isEmpty_1.isEmpty)(column.aggregate) &&
+        [
+            ...DATE_DISTINCT_PROPERTIES_1.DATE_DISTINCT_PROPERTIES,
+            ...DATE_DISTINCT_TIME_PROPERTIES_1.DATE_DISTINCT_TIME_PROPERTIES,
+        ].includes(property));
 }
 exports.isDateDistinctProperty = isDateDistinctProperty;

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

@@ -9,11 +9,16 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  */
 function isRangeValidator(validator) {
     return [
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN, FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN, FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER, FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE,
     ].includes(validator);
 }
 exports.isRangeValidator = isRangeValidator;

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

@@ -9,10 +9,14 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  */
 function isRegularValidator(validator) {
     return [
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH,
     ].includes(validator);
 }
 exports.isRegularValidator = isRegularValidator;

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

@@ -32,7 +32,7 @@ function mergeFilters(filterData1, filterData2, settings) {
         enabled: filterData1.enabled,
         scopes: mergeScopes(filterData1.scopes, filterData2.scopes, settings),
         section: filterData1.section,
-        version: filterData1.version
+        version: filterData1.version,
     };
 }
 exports.mergeFilters = mergeFilters;
@@ -45,7 +45,10 @@ exports.mergeFilters = mergeFilters;
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
-        const scope2Index = scopes2.findIndex(scope2 => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
+        const scope2Index = scopes2.findIndex((scope2) => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, {
+            scope: scope1.scope,
+            scopeid: scope1.scopeid,
+        }));
         if (scope2Index > -1) {
             scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
@@ -66,7 +69,10 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
-        const dataset2Index = datasets2.findIndex(dataset2 => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
+        const dataset2Index = datasets2.findIndex((dataset2) => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, {
+            qrveyid: dataset1.qrveyid,
+            linkid: dataset1.linkid,
+        }));
         if (dataset2Index > -1) {
             dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
@@ -87,14 +93,22 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
-        const filter2Index = filters2.findIndex(filter2 => (0, resolveFilterConditions_1.resolveFilterConditions)(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
+        const filter2Index = filters2.findIndex((filter2) => (0, 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: (0, mergeValues_1.mergeValues)(filter1, filters2[filter2Index], settings) });
             filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             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 });
+            filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator
+                    ? FILTER_GROUPED_COLUMN_OPERATOR_1.FILTER_GROUPED_COLUMN_OPERATOR
+                    : filter1.operator });
         }
         filter1.filterid = (0, getFilterid_1.getFilterid)(filter1);
         filters.push(filter1);

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

@@ -29,7 +29,12 @@ function mergeValues(filter1, filter2, settings) {
         if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
                 var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                const value1Index = filter1Values.findIndex((value1) => 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 (value1Index === -1) {
                     values.push(value2);
                 }
@@ -51,7 +56,7 @@ function mergeValues(filter1, filter2, settings) {
         else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
                 var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                const value1Index = filter1Values.findIndex((value1) => value2.max === value1.max && value2.min === value1.min);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
@@ -66,10 +71,12 @@ function mergeValues(filter1, filter2, settings) {
                 return values;
             }, filter1Values);
         }
-        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
+        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) ||
+            (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
                 var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                const value1Index = filter1Values.findIndex((value1) => value2.imageUrl === value1.imageUrl &&
+                    value2.value === value1.value);
                 if (value1Index === -1) {
                     values.push(value2);
                 }

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

@@ -12,9 +12,19 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  * @returns true: the condition is satisfied
  */
 function resolveDatasetConditions(dataset, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    return (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'datasets') || (letPassUndefinedProperties && dataset.enabled == null) || (letPassUndefinedParams && params.enableds.datasets == null) || params.enableds.datasets === dataset.enabled) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'qrveyid') || (letPassUndefinedProperties && dataset.qrveyid == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.qrveyid)) || params.qrveyid === dataset.qrveyid) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'linkid') || (letPassUndefinedProperties && dataset.linkid == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.linkid)) || params.linkid === dataset.linkid) &&
-        dataset.filters.length > 0;
+    return ((!(0, hasProperty_1._hasProperty)(params, "enableds") ||
+        !(0, hasProperty_1._hasProperty)(params.enableds, "datasets") ||
+        (letPassUndefinedProperties && dataset.enabled == null) ||
+        (letPassUndefinedParams && params.enableds.datasets == null) ||
+        params.enableds.datasets === dataset.enabled) &&
+        (!(0, hasProperty_1._hasProperty)(params, "qrveyid") ||
+            (letPassUndefinedProperties && dataset.qrveyid == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.qrveyid)) ||
+            params.qrveyid === dataset.qrveyid) &&
+        (!(0, hasProperty_1._hasProperty)(params, "linkid") ||
+            (letPassUndefinedProperties && dataset.linkid == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.linkid)) ||
+            params.linkid === dataset.linkid) &&
+        dataset.filters.length > 0);
 }
 exports.resolveDatasetConditions = resolveDatasetConditions;

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

@@ -13,14 +13,37 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  */
 function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    return (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'filters') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds.filters == null) || params.enableds.filters === filter.enabled) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'dateSection') || (letPassUndefinedProperties && filter.dateSection == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.dateSection)) || params.dateSection === filter.dateSection) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.panelid)) || params.panelid === filter.extras.panelid) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.property)) || params.property === filter.property) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'validator') || (letPassUndefinedProperties && filter.validator == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.validator)) || params.validator === filter.validator) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.column)) || ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) || ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
-            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid) || ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
-            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid) || ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
-            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate) || ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate)));
+    return ((!(0, hasProperty_1._hasProperty)(params, "enableds") ||
+        !(0, hasProperty_1._hasProperty)(params.enableds, "filters") ||
+        (letPassUndefinedProperties && filter.enabled == null) ||
+        (letPassUndefinedParams && params.enableds.filters == null) ||
+        params.enableds.filters === filter.enabled) &&
+        (!(0, hasProperty_1._hasProperty)(params, "dateSection") ||
+            (letPassUndefinedProperties && filter.dateSection == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.dateSection)) ||
+            params.dateSection === filter.dateSection) &&
+        (!(0, hasProperty_1._hasProperty)(params, "panelid") ||
+            (letPassUndefinedProperties && filter.extras.panelid == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.panelid)) ||
+            params.panelid === filter.extras.panelid) &&
+        (!(0, hasProperty_1._hasProperty)(params, "property") ||
+            (letPassUndefinedProperties && filter.property == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.property)) ||
+            params.property === filter.property) &&
+        (!(0, hasProperty_1._hasProperty)(params, "validator") ||
+            (letPassUndefinedProperties && filter.validator == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.validator)) ||
+            params.validator === filter.validator) &&
+        (!(0, hasProperty_1._hasProperty)(params, "column") ||
+            (letPassUndefinedProperties && filter.column == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.column)) ||
+            (((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_a = params.column) === null || _a === void 0 ? void 0 : _a.id)) ||
+                ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
+                ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid)) ||
+                    ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
+                ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid)) ||
+                    ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
+                ((letPassUndefinedParams && (0, isEmpty_1.isEmpty)((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate)) ||
+                    ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate))));
 }
 exports.resolveFilterConditions = resolveFilterConditions;

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

@@ -12,9 +12,19 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  * @returns true: the condition is satisfied
  */
 function resolveScopeConditions(scope, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    return (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'scopes') || (letPassUndefinedProperties && scope.enabled == null) || (letPassUndefinedParams && params.enableds.scopes == null) || params.enableds.scopes === scope.enabled) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'scope') || (letPassUndefinedProperties && scope.scope == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.scope)) || scope.scope === params.scope) &&
-        (!(0, hasProperty_1._hasProperty)(params, 'scopeid') || (letPassUndefinedProperties && scope.scopeid == null) || (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.scopeid)) || scope.scopeid === params.scopeid) &&
-        scope.datasets.filter.length > 0;
+    return ((!(0, hasProperty_1._hasProperty)(params, "enableds") ||
+        !(0, hasProperty_1._hasProperty)(params.enableds, "scopes") ||
+        (letPassUndefinedProperties && scope.enabled == null) ||
+        (letPassUndefinedParams && params.enableds.scopes == null) ||
+        params.enableds.scopes === scope.enabled) &&
+        (!(0, hasProperty_1._hasProperty)(params, "scope") ||
+            (letPassUndefinedProperties && scope.scope == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.scope)) ||
+            scope.scope === params.scope) &&
+        (!(0, hasProperty_1._hasProperty)(params, "scopeid") ||
+            (letPassUndefinedProperties && scope.scopeid == null) ||
+            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.scopeid)) ||
+            scope.scopeid === params.scopeid) &&
+        scope.datasets.filter.length > 0);
 }
 exports.resolveScopeConditions = resolveScopeConditions;

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

@@ -14,46 +14,6 @@ function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, (0, getFiltersByAggregateColumn_1.getFiltersByAggregateColumn)(filterData));
     if ((0, isEmpty_1.isEmpty)(filterData))
         return;
-    // 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 => {
-    //       buildFilters(dataset.filters);
-    //       const filters = dataset.filters.map((filter): IFBExpressionAggregate => {
-    //         filter
-    //         const summaryIndex = summaries.findIndex(summary =>
-    //           filter.column.id === summary.questionid &&
-    //           dataset.qrveyid === summary.qrveyid &&
-    //           dataset.linkid === summary.linkid &&
-    //           filter.column.aggregate === summary.aggregate
-    //         );
-    //         if (summaryIndex > -1) {
-    //           return {
-    //             enabled: filter.enabled,
-    //             summaryIndex,
-    //             validationType: filter.validator as any,
-    //             value: filter.values as any,
-    //           };
-    //         }
-    //       }).filter(Boolean);
-    //     })
-    //   }).filter(aggFilter => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
-    return; // aggFilters && concatAggFilters(aggFilters);
+    return;
 }
 exports.getAggFiltersFromFilterData = getAggFiltersFromFilterData;

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

@@ -23,9 +23,18 @@ function getAvailableScopes(config) {
         if (config.tabid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid)
-            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+            scopes = [
+                ...scopes,
+                { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid },
+            ];
         if (config.panelid || config.tabid || config.pageid)
-            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
+            scopes = [
+                ...scopes,
+                {
+                    label: FILTER_SCOPE_1.FILTER_SCOPE.CHART,
+                    id: config.panelid || config.tabid || config.pageid,
+                },
+            ];
     }
     else if (config.defaultid) {
         scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];

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

@@ -10,11 +10,11 @@ const getAttribute_1 = require("../../general/object/getAttribute");
 function getAvailableScopesIDsByConfig(config = {}) {
     return {
         scope: config.scope,
-        scopeid: (0, getAttribute_1.getAttribute)(config, 'scope_id') || config.scopeid,
-        qrveyid: (0, getAttribute_1.getAttribute)(config, 'qrvey_id') || config.qrveyid,
-        tabid: (0, getAttribute_1.getAttribute)(config, 'tab_id') || config.tabid,
-        pageid: (0, getAttribute_1.getAttribute)(config, 'page_id') || config.pageid,
-        defaultid: (0, getAttribute_1.getAttribute)(config, 'default_id') || config.defaultid,
+        scopeid: (0, getAttribute_1.getAttribute)(config, "scope_id") || config.scopeid,
+        qrveyid: (0, getAttribute_1.getAttribute)(config, "qrvey_id") || config.qrveyid,
+        tabid: (0, getAttribute_1.getAttribute)(config, "tab_id") || config.tabid,
+        pageid: (0, getAttribute_1.getAttribute)(config, "page_id") || config.pageid,
+        defaultid: (0, getAttribute_1.getAttribute)(config, "default_id") || config.defaultid,
     };
 }
 exports.getAvailableScopesIDsByConfig = getAvailableScopesIDsByConfig;

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

@@ -9,8 +9,8 @@ const FILTER_SCOPE_1 = require("../constants/common/FILTER_SCOPE");
  * @returns A new array of Scopes/Scope IDs
  */
 function getScopesByHierarchy(scopes = [], currentScope = FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL) {
-    const scopeIndex = scopes.findIndex(s => s.label === currentScope);
-    const chartScopeIndex = scopes.findIndex(s => s.label === FILTER_SCOPE_1.FILTER_SCOPE.CHART);
+    const scopeIndex = scopes.findIndex((s) => s.label === currentScope);
+    const chartScopeIndex = scopes.findIndex((s) => s.label === FILTER_SCOPE_1.FILTER_SCOPE.CHART);
     return scopeIndex !== -1
         ? scopes.slice(0, scopeIndex)
         : chartScopeIndex !== -1

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

@@ -1,9 +1,9 @@
-export * from './backend/index';
-export * from './builder/index';
-export * from './common/index';
-export * from './ui/index';
-export * from './applyHierarchyForAggFilters';
-export * from './getAvailableScopes';
-export * from './getAvailableScopesIDsByConfig';
-export * from './getScopesByHierarchy';
-export * from './OLD_getAggFilters';
+export * from "./backend/index";
+export * from "./builder/index";
+export * from "./common/index";
+export * from "./ui/index";
+export * from "./applyHierarchyForAggFilters";
+export * from "./getAvailableScopes";
+export * from "./getAvailableScopesIDsByConfig";
+export * from "./getScopesByHierarchy";
+export * from "./OLD_getAggFilters";

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

@@ -19,7 +19,6 @@ __exportStar(require("./builder/index"), exports);
 __exportStar(require("./common/index"), exports);
 __exportStar(require("./ui/index"), exports);
 __exportStar(require("./applyHierarchyForAggFilters"), exports);
-// export * from './getAggFiltersFromFilterData';
 __exportStar(require("./getAvailableScopes"), exports);
 __exportStar(require("./getAvailableScopesIDsByConfig"), exports);
 __exportStar(require("./getScopesByHierarchy"), exports);

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

@@ -9,6 +9,6 @@ const cloneDeep_1 = require("../../../general/object/cloneDeep");
  */
 function excludeUIFiltersByAggregate(uFilters = []) {
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return uFilters.filter(uFilter => uFilter.column.aggregate == null);
+    return uFilters.filter((uFilter) => uFilter.column.aggregate == null);
 }
 exports.excludeUIFiltersByAggregate = excludeUIFiltersByAggregate;

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

@@ -13,6 +13,6 @@ function excludeUIFlatFiltersByScopes(uFilters = [], scopes = []) {
     if ((0, isEmpty_1.isEmpty)(uFilters))
         return [];
     uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    return uFilters.filter(uFilter => !scopes.includes(uFilter.extras.scope));
+    return uFilters.filter((uFilter) => !scopes.includes(uFilter.extras.scope));
 }
 exports.excludeUIFlatFiltersByScopes = excludeUIFlatFiltersByScopes;

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

@@ -2,8 +2,8 @@ import { II18nServiceTranslate } from "../../../globalization/interfaces/II18nSe
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 /**
-     * Gets the label of the filter property
-     * @param filter The UI Filter
-     * @returns a string of the filter property label
-     */
+ * Gets the label of the filter property
+ * @param filter The UI Filter
+ * @returns a string of the filter property label
+ */
 export declare function getFilterPropertyLabel(filter: IFUFilter | IFSFilter, translate?: II18nServiceTranslate): string;

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilterPropertyLabel = void 0;
 const getPropertyLabel_1 = require("../../../qrvey/helpers/getPropertyLabel");
 /**
-     * Gets the label of the filter property
-     * @param filter The UI Filter
-     * @returns a string of the filter property label
-     */
+ * Gets the label of the filter property
+ * @param filter The UI Filter
+ * @returns a string of the filter property label
+ */
 function getFilterPropertyLabel(filter, translate) {
     return (0, getPropertyLabel_1.getPropertyLabel)(filter.column, filter.property, translate);
 }

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

@@ -11,10 +11,10 @@ const get_1 = require("../../../general/object/get");
  */
 function getOutputFormatByColumn(column, datasets = []) {
     let foundColumn;
-    datasets.some(dataset => {
-        foundColumn = dataset.options.find(option => option.id === column.id && !(0, isEmpty_1.isEmpty)(option.outputFormat));
+    datasets.some((dataset) => {
+        foundColumn = dataset.options.find((option) => option.id === column.id && !(0, isEmpty_1.isEmpty)(option.outputFormat));
         return foundColumn;
     });
-    return (0, get_1._get)(foundColumn, 'outputFormat');
+    return (0, get_1._get)(foundColumn, "outputFormat");
 }
 exports.getOutputFormatByColumn = getOutputFormatByColumn;