@qrvey/utils 1.3.3 → 1.4.0-2

package/dist/filters/adapters/flatUIToFD.js

@@ -15,7 +15,7 @@ export function flatUIToFD(uFilters = [], section = FILTER_SECTION.ANYWHERE, ena
         enabled,
         section,
         version,
-        scopes: buildScopes(uFilters)
+        scopes: buildScopes(uFilters),
     };
 }
 /**
@@ -29,8 +29,11 @@ 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] })] }));
         }
@@ -80,7 +83,9 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     uFilter = cloneDeep(uFilter);
-    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const info = !isEmpty(uFilter.extras.info)
+        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+        : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
     delete uFilter.extras.scopeInfo;
     delete uFilter.extras.dataset;

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -33,25 +33,7 @@ export function flatUIToOldLogic(uFilters, section = FILTER_SECTION.ANYWHERE) {
     };
 }
 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: {
@@ -90,13 +72,13 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             uiValue: getUIValues(filter, { addEnableds: true }),
             validator: filter.validator,
             values: filter.values,
-            _newFilters: Object.assign({}, filter)
+            _newFilters: Object.assign({}, filter),
         };
     });
 };
 export 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,
@@ -104,9 +86,9 @@ export function getLogicBody(uFilters) {
                 {
                     uiExtras: { expressionid: expId },
                     operator: FILTER_OPERATOR.OR,
-                    expressions: getExpressions(props)
-                }
-            ]
+                    expressions: getExpressions(props),
+                },
+            ],
         };
         if (scopeIndex === -1) {
             scopes.push({
@@ -115,12 +97,12 @@ export function getLogicBody(uFilters) {
                 filters: [filterItem],
                 uiExtras: {
                     scopeid: props.scopeid,
-                    collapsed: _get(props, '_newFilters.extras.scopeInfo.collapsed', false),
-                }
+                    collapsed: _get(props, "_newFilters.extras.scopeInfo.collapsed", false),
+                },
             });
         }
         else {
-            const filterIndex = scopes[scopeIndex].filters.findIndex(f => _get(f.expressions[0], 'uiExtras.expressionid') === expId);
+            const filterIndex = scopes[scopeIndex].filters.findIndex((f) => _get(f.expressions[0], "uiExtras.expressionid") === expId);
             if (filterIndex === -1) {
                 scopes[scopeIndex].filters.push(filterItem);
             }
@@ -145,7 +127,7 @@ function getExpressions(props) {
     return expressions;
 }
 export function getExpressionId(props) {
-    return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
+    return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ""}`;
 }
 function getRankingExpressions(props) {
     const values = props.values || [];
@@ -167,75 +149,12 @@ function getRegularExpression(props) {
         formulaType: props.column.formulaType,
         validationType: getBackendValidator(props),
         value: getValues(props),
-        uiExtras: Object.assign(Object.assign({}, props), { uiValue })
+        uiExtras: Object.assign(Object.assign({}, 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 || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.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;
@@ -246,13 +165,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.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
-            if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate))
+            if (props.column.type === COLUMN.RANKING &&
+                isEmpty(props.column.aggregate))
                 return getRankingValues(values, rankingGroupIndex);
             return getResultValues(values, props);
         case FILTER_VALIDATOR.CONTAINS:
@@ -261,42 +179,45 @@ function getValues(props, rankingGroupIndex) {
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case 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.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.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.BEFORE:
         case 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.BEFORE_ON:
         case 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.AFTER:
         case 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.AFTER_ON:
         case 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.IS_NULL:
         case 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[props.validator].label] : [];
         }
         case 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 [];
     }
@@ -309,52 +230,70 @@ function getUIValuess(props, rankingGroupIndex) {
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case 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) => (Object.assign(Object.assign({}, value), { value: value.min, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case 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) => (Object.assign(Object.assign({}, value), { value: value.max, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case 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) => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
-            return [{
+            return [
+                {
                     value: 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: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled,
+                },
+            ];
         case FILTER_VALIDATOR.IN:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
+            return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1
+                    ? value.number
+                    : ""} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS
+                    ? `from ${value.anchor || "current date"}`
+                    : ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
         default:
-            if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
+            if (props.column.type === COLUMN.RANKING &&
+                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) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
-    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${relative.unit}s` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1
+        ? `${relative.unit}s`
+        : relative.unit;
 }
 function getRankingValues(values, rankingGroupIndex) {
-    const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? {
-        position: rankingValue.position - 1,
-        value: rankingValue.value.value
-    } : undefined).filter(Boolean);
+    const flattenValues = isNull(rankingGroupIndex)
+        ? 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 = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
+    const flattenValues = isNull(rankingGroupIndex)
+        ? 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.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
@@ -363,21 +302,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/filters/adapters/flatUIToUI.js

@@ -16,7 +16,7 @@ export function flatUIToUI(uFilters = [], section = FILTER_SECTION.ANYWHERE, ena
         enabled,
         section,
         version,
-        scopes: buildScopes(uFilters)
+        scopes: buildScopes(uFilters),
     };
 }
 /**
@@ -30,9 +30,16 @@ 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 ? 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
+            ? 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] })] }));
         }
@@ -87,7 +94,9 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     uFilter = cloneDeep(uFilter);
-    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const info = !isEmpty(uFilter.extras.info)
+        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+        : undefined;
     const property = adaptDateGroupingProperty(uFilter.property);
     delete uFilter.extras.scopeInfo;
     delete uFilter.extras.dataset;

package/dist/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/filters/adapters/index.js

@@ -1,19 +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 './UIToLogic';
-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/filters/adapters/logicToFD.js

@@ -15,6 +15,5 @@ export function logicToFD(logics = [], section = FILTER_SECTION.ANYWHERE, enable
     if (isEmpty(logics) || !Array.isArray(logics))
         return;
     const builderFilter = logicToFlatUI(logics);
-    const uiFilters = flatUIToFD(builderFilter, section, enabled, version);
-    return uiFilters;
+    return flatUIToFD(builderFilter, section, enabled, version);
 }

package/dist/filters/adapters/logicToFlatUI.js

@@ -19,13 +19,15 @@ export function logicToFlatUI(logics = []) {
     if (isEmpty(logics))
         return [];
     const uFilters = [];
-    logics.forEach(scopeItem => {
+    logics.forEach((scopeItem) => {
         if (scopeItem.filters.length > 0) {
-            scopeItem.filters.forEach(filterItem => {
+            scopeItem.filters.forEach((filterItem) => {
                 filterItem.expressions.forEach((expression1) => {
-                    _hasProperty(expression1, 'expressions') ? expression1.expressions.forEach((expression2) => {
-                        buildFilterByExpression(expression2, scopeItem, uFilters);
-                    }) : buildFilterByExpression(expression1, scopeItem, uFilters);
+                    _hasProperty(expression1, "expressions")
+                        ? expression1.expressions.forEach((expression2) => {
+                            buildFilterByExpression(expression2, scopeItem, uFilters);
+                        })
+                        : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
             });
         }
@@ -34,17 +36,24 @@ export function logicToFlatUI(logics = []) {
 }
 function buildFilterByExpression(expression, scopeItem, uFilters) {
     const uiExtras = expression.uiExtras;
-    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) : -1;
-    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== FILTER_BACKEND_VALIDATOR.IS_NULL)) {
+    const index = uiExtras.column.type === COLUMN.RANKING
+        ? getFilter(uFilters, expression.uiExtras, true)
+        : -1;
+    if (index === -1 &&
+        (!uiExtras.nullValues ||
+            expression.validationType !== FILTER_BACKEND_VALIDATOR.IS_NULL)) {
         const uFilter = getFilterByExpression(expression, scopeItem);
         uFilter.filterid = getFilterid(uFilter);
         uFilters.push(uFilter);
     }
-    if (uiExtras.column.type === COLUMN.RANKING && isEmpty(uiExtras.column.aggregate)) {
+    if (uiExtras.column.type === COLUMN.RANKING &&
+        isEmpty(uiExtras.column.aggregate)) {
         // Restore uiExtras.values array into single IFilterDetail object values array
         if (index > -1)
             uFilters[index].values.push(uiExtras.values[0]);
-        const refinedRankingValues = refineRankingValues((index > -1 ? uFilters[index].values : uiExtras.values), uiExtras.uiValue);
+        const refinedRankingValues = refineRankingValues((index > -1
+            ? uFilters[index].values
+            : uiExtras.values), uiExtras.uiValue);
         if (index > -1)
             uFilters[index].values = refinedRankingValues;
         else
@@ -54,8 +63,12 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
 function getFilterByExpression(expression, scopeItem) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const uiExtras = expression.uiExtras;
-    const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
-    const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
+    const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
+        ? _get(scopeItem, "uiExtras.scopeid")
+        : undefined;
+    const info = !isEmpty(uiExtras.info)
+        ? { icon: uiExtras.info.icon, label: uiExtras.info.label }
+        : undefined;
     const property = adaptDateGroupingProperty(uiExtras.property);
     return {
         collapsed: uiExtras.collapsed,
@@ -65,9 +78,11 @@ function getFilterByExpression(expression, scopeItem) {
             linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
             linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
             qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
-            aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) || ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
-            calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) || ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
-            label: _get(uiExtras.column, 'text') || _get(uiExtras.column, 'label'),
+            aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) ||
+                ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
+            calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) ||
+                ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
+            label: _get(uiExtras.column, "text") || _get(uiExtras.column, "label"),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
             outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
@@ -88,7 +103,8 @@ function getFilterByExpression(expression, scopeItem) {
                 enabled: true,
                 displayed: true,
                 qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
-                label: _get(uiExtras.column, 'dataset.name') || _get(uiExtras.column, 'label'),
+                label: _get(uiExtras.column, "dataset.name") ||
+                    _get(uiExtras.column, "label"),
                 linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
             } }),
         filterid: undefined,
@@ -103,9 +119,17 @@ function getFilterByExpression(expression, scopeItem) {
 }
 function getValues(uiExtras) {
     if (isNullValidator(uiExtras.validator) && isEmpty(uiExtras.values)) {
-        return [{ value: FILTER_VALIDATOR_INFO[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
+        return [
+            {
+                value: FILTER_VALIDATOR_INFO[uiExtras.validator].label,
+                enabled: uiExtras.uiValue[0].enabled != null
+                    ? uiExtras.uiValue[0].enabled
+                    : true,
+            },
+        ];
     }
-    if (uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)) {
+    if (uiExtras.column.type !== COLUMN.RANKING ||
+        !isEmpty(uiExtras.column.aggregate)) {
         return uiExtras.values;
     }
     return [];
@@ -122,7 +146,8 @@ function getFilter(filters, filter, getIndex = false) {
         f.column.id === filter.column.id &&
         f.column.qrveyid === filter.column.qrveyid &&
         f.column.linkid === filter.column.linkid &&
-        _get(f.column, 'aggregate.label') === _get(filter.column, 'aggregate.label') &&
+        _get(f.column, "aggregate.label") ===
+            _get(filter.column, "aggregate.label") &&
         f.extras.scope === filter.scope &&
         f.extras.scopeid === filter.scopeid &&
         f.property === filter.property &&
@@ -136,12 +161,12 @@ function getFilter(filters, filter, getIndex = false) {
  * @returns the array of Ranking values
  */
 function refineRankingValues(values = [], uiValues = []) {
-    return values.map(valueGroup => {
+    return values.map((valueGroup) => {
         return [
-            ...valueGroup.map(value => {
-                const rValue = uiValues.find(uiV => uiV.valueid === value.value.valueid);
+            ...valueGroup.map((value) => {
+                const rValue = uiValues.find((uiV) => uiV.valueid === value.value.valueid);
                 return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
-            })
+            }),
         ];
     });
 }