@qrvey/utils 1.3.2 → 1.4.0-1

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

@@ -18,7 +18,7 @@ function flatUIToFD(uFilters = [], section = FILTER_SECTION_1.FILTER_SECTION.ANY
         enabled,
         section,
         version,
-        scopes: buildScopes(uFilters)
+        scopes: buildScopes(uFilters),
     };
 }
 exports.flatUIToFD = flatUIToFD;
@@ -33,13 +33,19 @@ function buildScopes(uFilters) {
         const uiFilter = buildFilter(uFilter);
         const uiDataset = buildDataset(uFilter);
         const uiScope = buildScope(uFilter);
-        const scopeIndex = scopes.findIndex(sc => sc.scope === uFilter.extras.scope && sc.scopeid === uFilter.extras.scopeid);
-        const datasetIndex = scopeIndex > -1 ? scopes[scopeIndex].datasets.findIndex(dt => dt.qrveyid === uFilter.extras.dataset.qrveyid) : -1;
+        const scopeIndex = scopes.findIndex((sc) => sc.scope === uFilter.extras.scope &&
+            sc.scopeid === uFilter.extras.scopeid);
+        const datasetIndex = scopeIndex > -1
+            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.qrveyid === uFilter.extras.dataset.qrveyid)
+            : -1;
         if (scopeIndex === -1) {
-            scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
+            scopes.push({
+                ...uiScope,
+                datasets: [{ ...uiDataset, filters: [uiFilter] }],
+            });
         }
         else if (datasetIndex === -1) {
-            scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
+            scopes[scopeIndex].datasets.push({ ...uiDataset, filters: [uiFilter] });
         }
         else {
             scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
@@ -84,7 +90,9 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
-    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info)
+        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+        : undefined;
     const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
     delete uFilter.extras.scopeInfo;
     delete uFilter.extras.dataset;
@@ -102,7 +110,15 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
+        extras: {
+            ...uFilter.extras,
+            panelid: uFilter.extras.panelid,
+            filterLabel: uFilter.extras.filterLabel,
+            info,
+            scope: uFilter.extras.scope,
+            scopeid: uFilter.extras.scopeid,
+            section: uFilter.extras.section,
+        },
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,

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

@@ -37,25 +37,7 @@ function flatUIToOldLogic(uFilters, section = FILTER_SECTION_1.FILTER_SECTION.AN
 }
 exports.flatUIToOldLogic = flatUIToOldLogic;
 const flatUIToOldFilterDetail = (uFilters = []) => {
-    return uFilters.map(filter => {
-        // let aggregate, calculation;
-        // if (filter.column.aggregate != null) {
-        //     aggregate = {
-        //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-        //         id: undefined, // CANNOT ADD AT THIS SCOPE
-        //         label: filter.column.aggregate,
-        //         text: undefined, // CANNOT ADD AT THIS SCOPE
-        //     };
-        // }
-        // if (filter.column.calculation != null) {
-        //     calculation = {
-        //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-        //         id: undefined, // CANNOT ADD AT THIS SCOPE
-        //         text: undefined,
-        //         type: undefined,
-        //         value: filter.column.calculation,
-        //     };
-        // }
+    return uFilters.map((filter) => {
         return {
             collapsed: filter.collapsed,
             column: {
@@ -94,13 +76,13 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             uiValue: (0, getUIValues_1.getUIValues)(filter, { addEnableds: true }),
             validator: filter.validator,
             values: filter.values,
-            _newFilters: Object.assign({}, filter)
+            _newFilters: { ...filter },
         };
     });
 };
 function getLogicBody(uFilters) {
     return uFilters.reduce((scopes, props) => {
-        const scopeIndex = scopes.findIndex(sc => sc.scope === props.scope && sc.uiExtras.scopeid === props.scopeid);
+        const scopeIndex = scopes.findIndex((sc) => sc.scope === props.scope && sc.uiExtras.scopeid === props.scopeid);
         const expId = getExpressionId(props);
         const filterItem = {
             operator: props.operator,
@@ -108,9 +90,9 @@ function getLogicBody(uFilters) {
                 {
                     uiExtras: { expressionid: expId },
                     operator: FILTER_OPERATOR_1.FILTER_OPERATOR.OR,
-                    expressions: getExpressions(props)
-                }
-            ]
+                    expressions: getExpressions(props),
+                },
+            ],
         };
         if (scopeIndex === -1) {
             scopes.push({
@@ -119,12 +101,12 @@ function getLogicBody(uFilters) {
                 filters: [filterItem],
                 uiExtras: {
                     scopeid: props.scopeid,
-                    collapsed: (0, get_1._get)(props, '_newFilters.extras.scopeInfo.collapsed', false),
-                }
+                    collapsed: (0, get_1._get)(props, "_newFilters.extras.scopeInfo.collapsed", false),
+                },
             });
         }
         else {
-            const filterIndex = scopes[scopeIndex].filters.findIndex(f => (0, get_1._get)(f.expressions[0], 'uiExtras.expressionid') === expId);
+            const filterIndex = scopes[scopeIndex].filters.findIndex((f) => (0, get_1._get)(f.expressions[0], "uiExtras.expressionid") === expId);
             if (filterIndex === -1) {
                 scopes[scopeIndex].filters.push(filterItem);
             }
@@ -145,23 +127,32 @@ function getExpressions(props) {
         expressions.push(getRegularExpression(props));
     }
     if (props.nullValues) {
-        expressions.push(getNullValueExpression(Object.assign({}, props)));
+        expressions.push(getNullValueExpression({ ...props }));
     }
     return expressions;
 }
 function getExpressionId(props) {
-    return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
+    return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ""}`;
 }
 exports.getExpressionId = getExpressionId;
 function getRankingExpressions(props) {
     const values = props.values || [];
     return values.map((_value, index) => {
-        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: (0, getBackendValidator_1.getBackendValidator)(props) });
-        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
+        const expression = {
+            ...getRegularExpression({
+                ...props,
+                values: [props.values[index]],
+            }),
+            validationType: (0, getBackendValidator_1.getBackendValidator)(props),
+        };
+        return {
+            ...expression,
+            value: getValues(props, index),
+            uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) },
+        };
     });
 }
 function getRegularExpression(props) {
-    var _a;
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(props),
@@ -173,75 +164,15 @@ function getRegularExpression(props) {
         formulaType: props.column.formulaType,
         validationType: (0, getBackendValidator_1.getBackendValidator)(props),
         value: getValues(props),
-        uiExtras: Object.assign(Object.assign({}, props), { uiValue })
+        uiExtras: {
+            ...props,
+            uiValue,
+        },
     };
-    expression['enabled'] = props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
+    expression["enabled"] =
+        props.selectAll || expression.value?.length > 0 ? props.enabled : false;
     return expression;
 }
-// function getGroupValue(props: OLD_IFilterDetail): IFProperty {
-//   if (!isDateDistinctProperty(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
-//     return props.property;
-//   }
-// }
-// function getProperty(props: OLD_IFilterDetail) {
-//   if (isEmpty(props.column.aggregate)) {
-//     if (isNullValidator(props.validator) || isDateColumn(props.column as any)) {
-//       return undefined;
-//     } else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
-//         return undefined;
-//     } else if (props.column.type === COLUMN.LOOKUP && props.property === COLUMN_PROPERTY.LOOKUP_DISPLAY && props.lookupDisplayIndex != null) {
-//       return props.property.concat('_').concat(props.lookupDisplayIndex.toString()) as any;
-//     } else if (props.column.type === COLUMN.IMAGE) {
-//       return COLUMN_PROPERTY.IMAGE_ANSWER_ID;
-//     }
-//   }
-//   return props.property;
-// }
-// function getValidationType(props: OLD_IFilterDetail): IFBackendValidator {
-//   // if (isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate) && !isNullValidator(props.validator) && PROPERTY_TYPE.DATE_SECOND !== props.property) {
-//   //   return props.validator === VALIDATORS_TYPE.NOT_EQUAL
-//   //     ? BACKEND_VALIDATORS_TYPE.NOT_RANGE
-//   //     : BACKEND_VALIDATORS_TYPE.RANGE;
-//   // }
-//   switch (props.validator) {
-//     case FILTER_VALIDATOR.EQUALS:
-//       return FILTER_BACKEND_VALIDATOR.EQUALS;
-//     case FILTER_VALIDATOR.NOT_EQUAL:
-//       return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
-//     case FILTER_VALIDATOR.CONTAINS:
-//       return FILTER_BACKEND_VALIDATOR.CONTAINS;
-//     case FILTER_VALIDATOR.NOT_CONTAIN:
-//       return FILTER_BACKEND_VALIDATOR.NOT_CONTAIN;
-//     case FILTER_VALIDATOR.ENDS_WITH:
-//       return FILTER_BACKEND_VALIDATOR.ENDS_WITH;
-//     case FILTER_VALIDATOR.NOT_END_WITH:
-//       return FILTER_BACKEND_VALIDATOR.NOT_END_WITH;
-//     case FILTER_VALIDATOR.STARTS_WITH:
-//       return FILTER_BACKEND_VALIDATOR.STARTS_WITH;
-//     case FILTER_VALIDATOR.NOT_START_WITH:
-//       return FILTER_BACKEND_VALIDATOR.NOT_START_WITH;
-//     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-//     case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-//     case FILTER_VALIDATOR.LESS_THAN:
-//     case FILTER_VALIDATOR.BEFORE:
-//     case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-//     case FILTER_VALIDATOR.BEFORE_ON:
-//     case FILTER_VALIDATOR.GREATER_THAN:
-//     case FILTER_VALIDATOR.AFTER:
-//     case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-//     case FILTER_VALIDATOR.AFTER_ON:
-//       return FILTER_BACKEND_VALIDATOR.RANGE;
-//     case FILTER_VALIDATOR.IS_NULL:
-//       return FILTER_BACKEND_VALIDATOR.IS_NULL;
-//     case FILTER_VALIDATOR.IS_NOT_NULL:
-//       return FILTER_BACKEND_VALIDATOR.IS_NOT_NULL;
-//     case FILTER_VALIDATOR.IN:
-//       // Validate with backend if this will always be the validator type
-//       return FILTER_BACKEND_VALIDATOR.RELATIVE;
-//     default:
-//       return FILTER_BACKEND_VALIDATOR.EQUALS;
-//   }
-// }
 function getNullValueExpression(props) {
     delete props.property;
     delete props.lookupDisplayIndex;
@@ -252,13 +183,12 @@ function getNullValueExpression(props) {
     return getRegularExpression(props);
 }
 function getValues(props, rankingGroupIndex) {
-    // const isDateProperty = !!(isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate));
-    // const dateFormat = getDateFormatByProperty(props.property);
     const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL:
-            if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(props.column.aggregate))
+            if (props.column.type === COLUMN_1.COLUMN.RANKING &&
+                (0, isEmpty_1.isEmpty)(props.column.aggregate))
                 return getRankingValues(values, rankingGroupIndex);
             return getResultValues(values, props);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS:
@@ -267,100 +197,143 @@ function getValues(props, rankingGroupIndex) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH:
-            return values.map(value => value.enabled ? value.value : undefined);
+            return values.map((value) => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lte: value.max, gte: value.min }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => value.enabled ? { lte: value.max, gte: value.min } : undefined)
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lt: value.max, gt: value.min }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => value.enabled ? { lt: value.max, gt: value.min } : undefined)
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => value.enabled ?
-                { lt: value.max }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => (value.enabled ? { lt: value.max } : undefined))
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { lte: value.max }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => (value.enabled ? { lte: value.max } : undefined))
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
-            return values.map(value => value.enabled ?
-                { gt: value.min }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => (value.enabled ? { gt: value.min } : undefined))
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { gte: value.min }
-                : undefined).filter(Boolean);
+            return values
+                .map((value) => (value.enabled ? { gte: value.min } : undefined))
+                .filter(Boolean);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && values.every(value => value.enabled);
+            const addValue = values.length > 0 &&
+                values.every((value) => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return values
+                .map((value) => (value.enabled ? value : undefined))
+                .filter(Boolean);
         default:
             return [];
     }
 }
 function getUIValuess(props, rankingGroupIndex) {
-    var _a, _b;
     const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: value.min,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: value.max,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: `${value.min} - ${value.max}`,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
-            return [{
+            return [
+                {
                     value: FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[props.validator].label,
-                    enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled
-                }];
+                    enabled: values[0]?.enabled ?? props.enabled,
+                },
+            ];
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
+            return values.map((value) => ({
+                ...value,
+                value: `${RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1
+                    ? value.number
+                    : ""} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS
+                    ? `from ${value.anchor || "current date"}`
+                    : ""}`,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: props.enabled,
+            }));
         default:
-            if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
+            if (props.column.type === COLUMN_1.COLUMN.RANKING &&
+                (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
                 return getRankingUIValues(values, rankingGroupIndex);
             }
-            return values.map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
+            return values.map((val) => ({
+                ...val,
+                enabled: val.enabled != null ? val.enabled : true,
+            }));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
-    return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1 ? `${relative.unit}s` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1
+        ? `${relative.unit}s`
+        : relative.unit;
 }
 function getRankingValues(values, rankingGroupIndex) {
-    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex) ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? {
-        position: rankingValue.position - 1,
-        value: rankingValue.value.value
-    } : undefined).filter(Boolean);
+    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex)
+        ? (0, flattenDeep_1.flattenDeep)(values)
+        : values[rankingGroupIndex];
+    return flattenValues
+        .map((rankingValue) => rankingValue.enabled
+        ? {
+            position: rankingValue.position - 1,
+            value: rankingValue.value.value,
+        }
+        : undefined)
+        .filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
-    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex) ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];
+    const flattenValues = (0, isNull_1.isNull)(rankingGroupIndex)
+        ? (0, flattenDeep_1.flattenDeep)(values)
+        : values[rankingGroupIndex];
     return flattenValues.map((rankingValue) => ({
         rankingIndex: rankingGroupIndex,
         displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
         value: `${rankingValue.value.value} - ${rankingValue.position}`,
         valueid: rankingValue.value.valueid,
-        enabled: rankingValue.enabled
+        enabled: rankingValue.enabled,
     }));
 }
 function getResultValues(values, props) {
-    return (values || []).map((value) => {
+    return (values || [])
+        .map((value) => {
         if (value.enabled) {
             if (props.column.type === COLUMN_1.COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
@@ -369,21 +342,6 @@ function getResultValues(values, props) {
                 return value.value;
             }
         }
-    }).filter(Boolean);
-    // return values.map((value: IFBResultValue) => {
-    //   if (!isEmpty(props.column.aggregate)) {
-    //     return value.value || '';
-    //   } else {
-    //     if (isDateColumn(props.column) && props.property && ![PROPERTY_TYPE.DATE_SECOND].includes(props.property)) {
-    //       const range = getDateRange(value.value, props.property);
-    //       return {
-    //         gte: range.from,
-    //         lte: range.to
-    //       };
-    //     } else if (props.column.type === QUESTIONS_TYPES.IMAGE) {
-    //       return value.valueid;
-    //     }
-    //     return value.value || '';
-    //   }
-    // }) as any;
+    })
+        .filter(Boolean);
 }

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

@@ -19,7 +19,7 @@ function flatUIToUI(uFilters = [], section = FILTER_SECTION_1.FILTER_SECTION.ANY
         enabled,
         section,
         version,
-        scopes: buildScopes(uFilters)
+        scopes: buildScopes(uFilters),
     };
 }
 exports.flatUIToUI = flatUIToUI;
@@ -34,14 +34,24 @@ function buildScopes(uFilters) {
         const uiFilter = buildFilter(uFilter);
         const uiDataset = buildDataset(uFilter);
         const uiScope = buildScope(uFilter);
-        const scopeIndex = scopes.findIndex(sc => sc.scope === uFilter.extras.scope && sc.scopeid === uFilter.extras.scopeid);
-        const datasetIndex = scopeIndex > -1 ? scopes[scopeIndex].datasets.findIndex(dt => dt.qrveyid === uFilter.extras.dataset.qrveyid) : -1;
-        const lastUiFilterIndex = datasetIndex > -1 ? (0, getLastIndexFromArray_1.getLastIndexFromArray)(scopes[scopeIndex].datasets[datasetIndex].filters, uf => uf.column.id === uiFilter.column.id && uf.column.linkid === uFilter.column.linkid && uf.column.qrveyid === uFilter.column.qrveyid) : -1;
+        const scopeIndex = scopes.findIndex((sc) => sc.scope === uFilter.extras.scope &&
+            sc.scopeid === uFilter.extras.scopeid);
+        const datasetIndex = scopeIndex > -1
+            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.qrveyid === uFilter.extras.dataset.qrveyid)
+            : -1;
+        const lastUiFilterIndex = datasetIndex > -1
+            ? (0, getLastIndexFromArray_1.getLastIndexFromArray)(scopes[scopeIndex].datasets[datasetIndex].filters, (uf) => uf.column.id === uiFilter.column.id &&
+                uf.column.linkid === uFilter.column.linkid &&
+                uf.column.qrveyid === uFilter.column.qrveyid)
+            : -1;
         if (scopeIndex === -1) {
-            scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
+            scopes.push({
+                ...uiScope,
+                datasets: [{ ...uiDataset, filters: [uiFilter] }],
+            });
         }
         else if (datasetIndex === -1) {
-            scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
+            scopes[scopeIndex].datasets.push({ ...uiDataset, filters: [uiFilter] });
         }
         else if (lastUiFilterIndex === -1) {
             scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
@@ -91,7 +101,9 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
-    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info)
+        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+        : undefined;
     const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
     delete uFilter.extras.scopeInfo;
     delete uFilter.extras.dataset;
@@ -116,7 +128,15 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
+        extras: {
+            ...uFilter.extras,
+            panelid: uFilter.extras.panelid,
+            filterLabel: uFilter.extras.filterLabel,
+            info,
+            scope: uFilter.extras.scope,
+            scopeid: uFilter.extras.scopeid,
+            section: uFilter.extras.section,
+        },
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,

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

@@ -1,18 +1,18 @@
-export * from './transformFilters';
-export * from './modelAnswerToFilterValue';
-export * from './adaptDateGroupingProperty';
-export * from './adaptFilterData';
-export * from './adaptFilterValues';
-export * from './FDToFlatUI';
-export * from './FDToLogic';
-export * from './FDToUI';
-export * from './flatUIToFD';
-export * from './flatUIToLogic';
-export * from './flatUIToUI';
-export * from './flatUIToOldLogic';
-export * from './logicToFD';
-export * from './logicToFlatUI';
-export * from './logicToUI';
-export * from './UIToFD';
-export * from './UIToFlatUI';
-export * from './UIToOldLogic';
+export * from "./transformFilters";
+export * from "./modelAnswerToFilterValue";
+export * from "./adaptDateGroupingProperty";
+export * from "./adaptFilterData";
+export * from "./adaptFilterValues";
+export * from "./FDToFlatUI";
+export * from "./FDToLogic";
+export * from "./FDToUI";
+export * from "./flatUIToFD";
+export * from "./flatUIToLogic";
+export * from "./flatUIToUI";
+export * from "./flatUIToOldLogic";
+export * from "./logicToFD";
+export * from "./logicToFlatUI";
+export * from "./logicToUI";
+export * from "./UIToFD";
+export * from "./UIToFlatUI";
+export * from "./UIToOldLogic";

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

@@ -31,5 +31,4 @@ __exportStar(require("./logicToFlatUI"), exports);
 __exportStar(require("./logicToUI"), exports);
 __exportStar(require("./UIToFD"), exports);
 __exportStar(require("./UIToFlatUI"), exports);
-// export * from './UIToLogic';
 __exportStar(require("./UIToOldLogic"), exports);

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

@@ -18,7 +18,6 @@ function logicToFD(logics = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHE
     if ((0, isEmpty_1.isEmpty)(logics) || !Array.isArray(logics))
         return;
     const builderFilter = (0, logicToFlatUI_1.logicToFlatUI)(logics);
-    const uiFilters = (0, flatUIToFD_1.flatUIToFD)(builderFilter, section, enabled, version);
-    return uiFilters;
+    return (0, flatUIToFD_1.flatUIToFD)(builderFilter, section, enabled, version);
 }
 exports.logicToFD = logicToFD;