@qrvey/utils 1.1.4 → 1.1.8

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

@@ -4,6 +4,7 @@ exports.FDToFlatUI = void 0;
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
 const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -84,7 +85,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             property: property,
                             uiValues: helpers_1.getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues_1.adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

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

@@ -5,6 +5,7 @@ const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
 const helpers_1 = require("../helpers");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 /**
  * Generates a UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -60,7 +61,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                             outputFormat: general_1._get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
-                        }, property, uiValues: helpers_1.getUIValues(filter) });
+                        }, property, uiValues: helpers_1.getUIValues(filter), values: adaptFilterValues_1.adaptFilterValues(filter) });
                 }) });
         }) })));
     return ufData;

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

@@ -4,6 +4,7 @@ exports.UIToFlatUI = void 0;
 const _1 = require(".");
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
@@ -83,7 +84,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             property,
                             uiValues: helpers_1.getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues_1.adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

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

@@ -4,6 +4,7 @@ exports.UIToOldLogic = void 0;
 const _1 = require(".");
 const general_1 = require("../../general");
 const helpers_1 = require("../helpers");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 const flatUIToOldLogic_1 = require("./flatUIToOldLogic");
 const UIToFlatUI_1 = require("./UIToFlatUI");
 function UIToOldLogic(uFilterData, flattedMethod = true) {
@@ -141,6 +142,6 @@ const getFilterDetail = (filter, scope, dataset) => {
         section: filter.extras.section,
         uiValue: helpers_1.getUIValues(filter, true),
         validator: filter.validator,
-        values: filter.values
+        values: adaptFilterValues_1.adaptFilterValues(filter)
     };
 };

package/dist/cjs/filters/adapters/adaptFilterValues.d.ts

@@ -0,0 +1,8 @@
+import { IFSFilter, IFValue } from "..";
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Gets an adapted filter value array. Validates the enabled property and sets
+ * @param filter The filter
+ * @returns A new value array with the filled properties.
+ */
+export declare function adaptFilterValues(filter: IFSFilter): IFValue[];

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adaptFilterValues = void 0;
+const __1 = require("../..");
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Gets an adapted filter value array. Validates the enabled property and sets
+ * @param filter The filter
+ * @returns A new value array with the filled properties.
+ */
+function adaptFilterValues(filter) {
+    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: __1.isEmpty(value.enabled) ? true : value.enabled }));
+    if (filter.column.type === __1.COLUMN.RANKING && __1.isEmpty(filter.column.aggregate)) {
+        return filter.values.map(rValues => rValues.map(setValue));
+    }
+    return filter.values.map(setValue);
+}
+exports.adaptFilterValues = adaptFilterValues;

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

@@ -4,6 +4,7 @@ exports.flatUIToFD = void 0;
 const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 /**
  * Generates a filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -102,6 +103,6 @@ function buildFilter(uFilter) {
         operator: uFilter.operator,
         property,
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues_1.adaptFilterValues(uFilter),
     };
 }

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

@@ -5,6 +5,7 @@ const _1 = require(".");
 const general_1 = require("../../general");
 const constants_1 = require("../constants");
 const helpers_1 = require("../helpers");
+const adaptFilterValues_1 = require("./adaptFilterValues");
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -117,6 +118,6 @@ function buildFilter(uFilter) {
         property,
         uiValues: helpers_1.getUIValues(uFilter),
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues_1.adaptFilterValues(uFilter),
     };
 }

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

@@ -25,9 +25,6 @@ function logicToFlatUI(logics = []) {
                         buildFilterByExpression(expression2, scopeItem, uFilters);
                     }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
-                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
-                //     buildFilterByExpression(expression, scopeItem, uFilters);
-                // });
             });
         }
     });

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

@@ -13,7 +13,7 @@ function getFilterColumnLabel(column) {
     if (isComplexColumn_1.isComplexColumn(column) && column.property != null)
         labels.push(constants_1.COLUMN_COMPLEX_VALUE[column.property].shortLabel);
     if (column.aggregate != null)
-        labels.push(column.aggregate);
+        labels.push(constants_1.AGGREGATE_ABBREVIATION[column.aggregate]);
     if (column.calculation != null)
         labels.push(column.calculation);
     return labels.length > 0 ? `(${labels.join(' - ')})` : '';

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

@@ -37,7 +37,7 @@ function getFiltersByParams(filterData, params, settings) {
                                     return Object.assign(Object.assign({}, filter), { values: filter.values.map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
-                                                rankingValues.map(rValue => {
+                                                return rankingValues.map(rValue => {
                                                     if (!general_1._hasProperty(params, 'enableds') || !general_1._hasProperty(params.enableds, 'values') || params.enableds.values === rValue.enabled)
                                                         return rValue;
                                                 }).filter(Boolean);

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

@@ -116,28 +116,28 @@ function mergeValues(filter1, filter2, overwrite = false) {
     let newValues = [];
     if (!overwrite) {
         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]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.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);
                 }
                 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) {
-                    values.push(filter2.values[value2Index]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
                 }
                 return values;
             }, filter1.values);
         }
         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) {
-                    values.push(filter2.values[value2Index]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
                 }
                 return values;
             }, filter1.values);

package/dist/cjs/filters/interfaces/common/IFSValueRelativeDate.d.ts

@@ -1,4 +1,4 @@
 import { RelativeStatement } from "../../../date";
 export declare type IFSValueRelativeDate = {
-    enabled: boolean;
+    enabled?: boolean;
 } & RelativeStatement;

package/dist/cjs/qrvey/getPropertyLabel.js

@@ -6,7 +6,7 @@ const __1 = require("..");
 function getPropertyLabel(column, property) {
     var _a;
     let propertyLabel;
-    const propertyValues = __1.COLUMN_PROPERTY_VALUE[_1.isDateColumn(column) ? column.type + '-complete' : column.type];
+    const propertyValues = __1.COLUMN_PROPERTY_VALUE[_1.isDateColumn(column) ? 'DATE-complete' : column.type];
     if (!__1.isEmpty(propertyValues))
         propertyLabel = (_a = propertyValues.find(pValue => pValue.value === property)) === null || _a === void 0 ? void 0 : _a.label;
     return propertyLabel;

package/dist/filters/adapters/FDToFlatUI.js

@@ -1,6 +1,7 @@
 import { cloneDeep, isEmpty, _get } from "../../general";
 import { getUIValues } from "../helpers";
 import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { adaptFilterValues } from "./adaptFilterValues";
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -80,7 +81,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             property: property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

package/dist/filters/adapters/FDToUI.js

@@ -2,6 +2,7 @@ import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty, _get } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
+import { adaptFilterValues } from "./adaptFilterValues";
 /**
  * Generates a UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -56,7 +57,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                             outputFormat: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
-                        }, property, uiValues: getUIValues(filter) });
+                        }, property, uiValues: getUIValues(filter), values: adaptFilterValues(filter) });
                 }) });
         }) })));
     return ufData;

package/dist/filters/adapters/UIToFlatUI.js

@@ -1,6 +1,7 @@
 import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { getUIValues } from "../helpers";
+import { adaptFilterValues } from "./adaptFilterValues";
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
@@ -79,7 +80,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

package/dist/filters/adapters/UIToOldLogic.js

@@ -1,6 +1,7 @@
 import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
+import { adaptFilterValues } from "./adaptFilterValues";
 import { flatUIToOldLogic } from "./flatUIToOldLogic";
 import { UIToFlatUI } from "./UIToFlatUI";
 export function UIToOldLogic(uFilterData, flattedMethod = true) {
@@ -137,6 +138,6 @@ const getFilterDetail = (filter, scope, dataset) => {
         section: filter.extras.section,
         uiValue: getUIValues(filter, true),
         validator: filter.validator,
-        values: filter.values
+        values: adaptFilterValues(filter)
     };
 };

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

@@ -0,0 +1,8 @@
+import { IFSFilter, IFValue } from "..";
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Gets an adapted filter value array. Validates the enabled property and sets
+ * @param filter The filter
+ * @returns A new value array with the filled properties.
+ */
+export declare function adaptFilterValues(filter: IFSFilter): IFValue[];

package/dist/filters/adapters/adaptFilterValues.js

@@ -0,0 +1,14 @@
+import { COLUMN, isEmpty } from "../..";
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Gets an adapted filter value array. Validates the enabled property and sets
+ * @param filter The filter
+ * @returns A new value array with the filled properties.
+ */
+export function adaptFilterValues(filter) {
+    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: isEmpty(value.enabled) ? true : value.enabled }));
+    if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
+        return filter.values.map(rValues => rValues.map(setValue));
+    }
+    return filter.values.map(setValue);
+}

package/dist/filters/adapters/flatUIToFD.js

@@ -1,6 +1,7 @@
 import { adaptDateGroupingProperty } from ".";
 import { isEmpty } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
+import { adaptFilterValues } from "./adaptFilterValues";
 /**
  * Generates a filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -98,6 +99,6 @@ function buildFilter(uFilter) {
         operator: uFilter.operator,
         property,
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues(uFilter),
     };
 }

package/dist/filters/adapters/flatUIToUI.js

@@ -2,6 +2,7 @@ import { adaptDateGroupingProperty } from ".";
 import { isEmpty, getLastIndexFromArray } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
+import { adaptFilterValues } from "./adaptFilterValues";
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
  * @param uFilters Array of flattened filters from UI
@@ -113,6 +114,6 @@ function buildFilter(uFilter) {
         property,
         uiValues: getUIValues(uFilter),
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues(uFilter),
     };
 }

package/dist/filters/adapters/logicToFlatUI.js

@@ -22,9 +22,6 @@ export function logicToFlatUI(logics = []) {
                         buildFilterByExpression(expression2, scopeItem, uFilters);
                     }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
-                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
-                //     buildFilterByExpression(expression, scopeItem, uFilters);
-                // });
             });
         }
     });

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

@@ -1,5 +1,5 @@
 import { isComplexColumn } from "../../../qrvey/isComplexColumn";
-import { COLUMN_COMPLEX_VALUE } from "../../../constants";
+import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants";
 /**
  * Get an string of the properties of the given filter column.
  * @param column The filter column
@@ -10,7 +10,7 @@ export function getFilterColumnLabel(column) {
     if (isComplexColumn(column) && column.property != null)
         labels.push(COLUMN_COMPLEX_VALUE[column.property].shortLabel);
     if (column.aggregate != null)
-        labels.push(column.aggregate);
+        labels.push(AGGREGATE_ABBREVIATION[column.aggregate]);
     if (column.calculation != null)
         labels.push(column.calculation);
     return labels.length > 0 ? `(${labels.join(' - ')})` : '';

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

@@ -34,7 +34,7 @@ export function getFiltersByParams(filterData, params, settings) {
                                     return Object.assign(Object.assign({}, filter), { values: filter.values.map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
-                                                rankingValues.map(rValue => {
+                                                return rankingValues.map(rValue => {
                                                     if (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'values') || params.enableds.values === rValue.enabled)
                                                         return rValue;
                                                 }).filter(Boolean);

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

@@ -112,28 +112,28 @@ function mergeValues(filter1, filter2, overwrite = false) {
     let newValues = [];
     if (!overwrite) {
         if (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]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.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);
                 }
                 return values;
             }, filter1.values);
         }
         else if (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) {
-                    values.push(filter2.values[value2Index]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
                 }
                 return values;
             }, filter1.values);
         }
         else if (isRegularValidator(filter1.validator) || 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) {
-                    values.push(filter2.values[value2Index]);
+            newValues = filter2.values.reduce((values, value2) => {
+                const value1Index = filter1.values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
                 }
                 return values;
             }, filter1.values);

package/dist/filters/interfaces/common/IFSValueRelativeDate.d.ts

@@ -1,4 +1,4 @@
 import { RelativeStatement } from "../../../date";
 export declare type IFSValueRelativeDate = {
-    enabled: boolean;
+    enabled?: boolean;
 } & RelativeStatement;

package/dist/qrvey/getPropertyLabel.js

@@ -3,7 +3,7 @@ import { COLUMN_PROPERTY_VALUE, isEmpty } from "..";
 export function getPropertyLabel(column, property) {
     var _a;
     let propertyLabel;
-    const propertyValues = COLUMN_PROPERTY_VALUE[isDateColumn(column) ? column.type + '-complete' : column.type];
+    const propertyValues = COLUMN_PROPERTY_VALUE[isDateColumn(column) ? 'DATE-complete' : column.type];
     if (!isEmpty(propertyValues))
         propertyLabel = (_a = propertyValues.find(pValue => pValue.value === property)) === null || _a === void 0 ? void 0 : _a.label;
     return propertyLabel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.1.4",
+  "version": "1.1.8",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/src/filters/adapters/FDToFlatUI.ts

@@ -3,6 +3,7 @@ import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
 import { getUIValues } from "../helpers";
 import { IFSData, IFSScope, IFUFlattenedFilter } from "../interfaces";
 import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { adaptFilterValues } from "./adaptFilterValues";
 
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
@@ -93,7 +94,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             property: property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

package/src/filters/adapters/FDToUI.ts

@@ -4,6 +4,7 @@ import { IQrveyColumn, IQrveyDataset } from "../../interfaces";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
 import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
+import { adaptFilterValues } from "./adaptFilterValues";
 
 /**
  * Generates a UI filter structure from Filter Data structure.
@@ -70,6 +71,7 @@ import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
                         },
                         property,
                         uiValues: getUIValues(filter),
+                        values: adaptFilterValues(filter),
                     };
                 })
             };

package/src/filters/adapters/UIToFlatUI.ts

@@ -3,6 +3,7 @@ import { cloneDeep, isEmpty } from "../../general";
 import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
 import { getUIValues } from "../helpers";
 import { IFUData, IFUFlattenedFilter, IFUScope } from "../interfaces";
+import { adaptFilterValues } from "./adaptFilterValues";
 
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
@@ -92,7 +93,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
-                            values: filter.values,
+                            values: adaptFilterValues(filter),
                         };
                         uFilters.push(uFilter);
                     });

package/src/filters/adapters/UIToOldLogic.ts

@@ -3,6 +3,7 @@ import { cloneDeep, isEmpty } from "../../general";
 import { FILTER_OPERATOR } from "../constants";
 import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
 import { IFSection, IFUData, IFUDataset, IFUFilter, IFUScope, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterFilters, OLD_IFilterLogic } from "../interfaces";
+import { adaptFilterValues } from "./adaptFilterValues";
 import { flatUIToOldLogic } from "./flatUIToOldLogic";
 import { UIToFlatUI } from "./UIToFlatUI";
 
@@ -146,6 +147,6 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         section: filter.extras.section,
         uiValue: getUIValues(filter, true),
         validator: filter.validator,
-        values: filter.values
+        values: adaptFilterValues(filter)
     };
 };

package/src/filters/adapters/adaptFilterValues.ts

@@ -0,0 +1,17 @@
+import { IFSFilter, IFSValue, IFSValueRange, IFSValueRanking, IFSValueRelativeDate, IFValue } from "..";
+import {COLUMN, isEmpty } from "../..";
+
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Gets an adapted filter value array. Validates the enabled property and sets
+ * @param filter The filter
+ * @returns A new value array with the filled properties.
+ */
+export function adaptFilterValues(filter: IFSFilter): IFValue[] {
+    const setValue = value => ({ ...value, enabled: isEmpty(value.enabled) ? true : value.enabled });
+
+    if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
+        return (filter.values as IFSValueRanking[][]).map(rValues => rValues.map(setValue));
+    }
+    return (filter.values as IFSValue[] | IFSValueRange[] | IFSValueRelativeDate[]).map(setValue);
+}

package/src/filters/adapters/flatUIToFD.ts

@@ -2,6 +2,7 @@ import { adaptDateGroupingProperty } from ".";
 import { isEmpty } from "../../general";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { IFSData, IFSDataset, IFSection, IFSFilter, IFSScope, IFUFlattenedFilter } from "../interfaces";
+import { adaptFilterValues } from "./adaptFilterValues";
 
 /**
  * Generates a filter data structure from the flatttened UI filters.
@@ -114,6 +115,6 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
         operator: uFilter.operator,
         property,
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues(uFilter),
     };
 }

package/src/filters/adapters/flatUIToUI.ts

@@ -3,6 +3,7 @@ import { isEmpty, getLastIndexFromArray } from "../../general";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
 import { IFSection, IFUData, IFUDataset, IFUFilter, IFUFlattenedFilter, IFUScope } from "../interfaces";
+import { adaptFilterValues } from "./adaptFilterValues";
 
 /**
  * Generates a UI filter data structure from the flatttened UI filters.
@@ -128,6 +129,6 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
         property,
         uiValues: getUIValues(uFilter),
         validator: uFilter.validator,
-        values: uFilter.values,
+        values: adaptFilterValues(uFilter),
     };
 }

package/src/filters/adapters/logicToFlatUI.ts

@@ -25,9 +25,6 @@ export function logicToFlatUI(logics: OLD_IFilterLogic[] = []): IFUFlattenedFilt
                         buildFilterByExpression(expression2, scopeItem, uFilters);
                     }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
-                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
-                //     buildFilterByExpression(expression, scopeItem, uFilters);
-                // });
             });
         }
     });

package/src/filters/helpers/common/getFilterColumnLabel.ts

@@ -1,6 +1,6 @@
 import { isComplexColumn } from "../../../qrvey/isComplexColumn";
 import { IFUColumn } from "../../interfaces";
-import { COLUMN_COMPLEX_VALUE } from "../../../constants";
+import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants";
 
 /**
  * Get an string of the properties of the given filter column.
@@ -10,7 +10,7 @@ import { COLUMN_COMPLEX_VALUE } from "../../../constants";
 export function getFilterColumnLabel(column: IFUColumn): string {
     const labels: string[] = [];
     if (isComplexColumn(column as any) && column.property != null) labels.push(COLUMN_COMPLEX_VALUE[column.property].shortLabel);
-    if (column.aggregate != null) labels.push(column.aggregate);
+    if (column.aggregate != null) labels.push(AGGREGATE_ABBREVIATION[column.aggregate]);
     if (column.calculation != null) labels.push(column.calculation);
   
     return labels.length > 0 ? `(${labels.join(' - ')})` : '';

package/src/filters/helpers/common/getFiltersByParams.ts

@@ -42,7 +42,7 @@ export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSPar
                         values: filter.values.map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
-                            rankingValues.map(rValue => {
+                            return rankingValues.map(rValue => {
                               if (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'values') || params.enableds.values === rValue.enabled) return rValue;
                             }).filter(Boolean);
                           } else {