@qrvey/utils 1.1.0-9 → 1.1.2-1

package/src/filters/adapters/adaptFilterData.ts

@@ -13,7 +13,7 @@ import { UIToFD } from "./UIToFD";
  * @param datasetsInfo Collection of datasets information. If getUIFilterData is true, the datasetsInfo should be mandatory
  * @returns A new filter data structure v2.1
  */
-export function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData = false, datasetsInfo: IQrveyDataset[] = []): IFSData | IFUData {
+export function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData = true, datasetsInfo: IQrveyDataset[] = []): IFSData | IFUData {
     if (isEmpty(filterData)) return;
     filterData = cloneDeep(filterData);
 

package/src/filters/adapters/flatUIToFD.ts

@@ -1,3 +1,4 @@
+import { isEmpty } from "../../general";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { IFSData, IFSDataset, IFSection, IFSFilter, IFSScope, IFUFlattenedFilter } from "../interfaces";
 
@@ -13,7 +14,7 @@ export function flatUIToFD(uFilters: IFUFlattenedFilter[] = [], section: IFSecti
         section, 
         version,
         scopes: buildScopes(uFilters)
-    }
+    };
 }
 
 /**
@@ -81,6 +82,7 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFSDataset {
  * @returns an filter structure
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
+    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -96,8 +98,10 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
         extras: {
+            ...uFilter.extras,
             panelid: uFilter.extras.panelid,
             filterLabel: uFilter.extras.filterLabel,
+            info,
             scope: uFilter.extras.scope,
             scopeid: uFilter.extras.scopeid,
             section: uFilter.extras.section,

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -1,8 +1,8 @@
-import { IFSection, IFSValue, IFSValueRange, IFSValueRanking, IFValue, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterLogic, IFUFlattenedFilter, IFSValueRelativeDate, IFProperty, IFBackendValidator, IFBackendExpressionValue } from "../interfaces";
+import { IFSection, IFSValue, IFSValueRange, IFSValueRanking, IFValue, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterLogic, IFUFlattenedFilter, IFSValueRelativeDate, IFProperty, IFBackendValidator, IFBackendExpressionValue, IFBExpressionRelativeDate } from "../interfaces";
 import { FILTER_BACKEND_VALIDATOR, FILTER_OPERATOR, FILTER_SECTION, FILTER_VALIDATOR, FILTER_VALIDATOR_VALUE } from "../constants";
 import { cloneDeep, flattenDeep, isEmpty, isNull, _get } from "../../general";
 import { COLUMN, COLUMN_PROPERTY } from "../../constants";
-import { getBackendValidator, isNullValidator } from "../helpers";
+import { arePropertiesDateP, getBackendValidator, getUIValues, isNullValidator } from "../helpers";
 import { RELATIVE_CURSOR, RELATIVE_CURSOR_VALUE } from "../../date";
 import { isDateColumn } from "../../qrvey/isDateColumn";
 
@@ -22,7 +22,7 @@ export function flatUIToOldLogic(uFilters: IFUFlattenedFilter[], section: IFSect
         enabled: true,
         section,
         logic: getLogicBody(filterDetails),
-    }
+    };
 }
 
 const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilterDetail[] => {
@@ -67,7 +67,9 @@ const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilt
       },
       dateSection: filter.dateSection,
       enabled: filter.enabled,
+      extras: filter.extras,
       lookupDisplayIndex: filter.lookupDisplayIndex,
+      info: filter.extras.info,
       nullValues: filter.nullValues,
       operator: filter.operator,
       property: filter.property,
@@ -77,11 +79,12 @@ const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilt
       panelid: filter.extras.panelid,
       panelName: filter.extras.filterLabel,
       section: filter.extras.section,
-      // uiValue: getUIValues(filter, true),
+      uiValue: getUIValues(filter, true),
       validator: filter.validator,
-      values: filter.values
-    }
-  })
+      values: filter.values,
+      _newFilters: { ...filter }
+    };
+  });
 };
 
 
@@ -107,7 +110,7 @@ export function getLogicBody(uFilters: OLD_IFilterDetail[]): OLD_IFilterLogic[]
         filters: [filterItem],
         uiExtras: {
           scopeid: props.scopeid,
-          collapsed: props.collapsed,
+          collapsed: _get(props, '_newFilters.extras.scopeInfo.collapsed', false),
         }
       });
     } else {
@@ -135,7 +138,7 @@ function getExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[] {
   return expressions;
 }
 
-export function getExpressionId(props: OLD_IFilterDetail) {
+export function getExpressionId(props: OLD_IFilterDetail): string {
   return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
 }
 
@@ -149,13 +152,13 @@ function getRankingExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[
     return {
       ...expression,
       value: getValues(props, index),
-      uiExtras: { ...expression.uiExtras, uiValue: getUIValues(props, index) }
-    }
+      uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) }
+    };
   });
 }
 
 function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
-  const uiValue = getUIValues(props);
+  const uiValue = getUIValuess(props);
   return {
     enabled: props.enabled,
     groupValue: getGroupValue(props),
@@ -175,17 +178,19 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
 }
 
 function getGroupValue(props: OLD_IFilterDetail): IFProperty {
-  if (isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
+  if (!arePropertiesDateP(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 ((isDateColumn(props.column) && props.property) || isNullValidator(props.validator)) return undefined;
-    if ((props.column.type === COLUMN.EXPRESSION && props.property != null)
-      /*|| (props.column.type === QUESTIONS_TYPES.DATE && props.property === PROPERTY_TYPE.DATE_DAY)*/) {
+    if (isNullValidator(props.validator)) {
       return undefined;
+    } else if (isDateColumn(props.column as any)) {
+      return arePropertiesDateP(props.column as any, props.property) ? props.property?.split('p&')[1] as IFProperty : 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) {
@@ -267,69 +272,48 @@ function getValues(props: OLD_IFilterDetail, rankingGroupIndex?: number): IFBack
     case FILTER_VALIDATOR.NOT_START_WITH:
     case FILTER_VALIDATOR.ENDS_WITH:
     case FILTER_VALIDATOR.NOT_END_WITH:
-      return (props.values as IFSValue[]).map(value => value.value);
+      return (props.values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-      // return rangeValues.map(value => ({
-      //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max,
-      //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-      // }));
-      return (props.values as IFSValueRange[]).map(value => ({
-        lte: value.max,
-        gte: value.min
-      }));
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+        { lte: value.max, gte: value.min }
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-      return (props.values as IFSValueRange[]).map(value => {
-        // const { min, max } = getExclusiveRangeValuesByProperty(value, props);
-        // return {
-        //   [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max,
-        //   [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min
-        // };
-        return {
-          lt: value.max,
-          gt: value.min
-        }
-      });
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+        { lt: value.max, gt: value.min }
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BEFORE:
     case FILTER_VALIDATOR.LESS_THAN:
-      return (props.values as IFSValueRange[]).map(value => {
-        // const { max } = getExclusiveRangeValuesByProperty(value, props);
-        // return { [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max };
-        return { lt: value.max };
-      });
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+        { lt: value.max }
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BEFORE_ON:
     case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-      return (props.values as IFSValueRange[]).map(value => (
-        // {
-        //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max
-        // }
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
         { lte: value.max }
-      ));
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.AFTER:
     case FILTER_VALIDATOR.GREATER_THAN:
-      return (props.values as IFSValueRange[]).map(value => {
-        // const { min } = getExclusiveRangeValuesByProperty(value, props);
-        // return { [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min };
-        return { gt: value.min };
-      });
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+        { gt: value.min }
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.AFTER_ON:
     case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-      return (props.values as IFSValueRange[]).map(value => (
-        // {
-        //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-        // }
+      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
         { gte: value.min }
-      ));
+      ) : undefined).filter(Boolean);
     case FILTER_VALIDATOR.IS_NULL:
-    case FILTER_VALIDATOR.IS_NOT_NULL:
-      return [FILTER_VALIDATOR_VALUE[props.validator].label];
+    case FILTER_VALIDATOR.IS_NOT_NULL: {
+        const addValue = props.values.length > 0 && (props.values as IFSValue[]).every(value => value.enabled);
+        return addValue ? [FILTER_VALIDATOR_VALUE[props.validator].label] : [];
+      }
     case FILTER_VALIDATOR.IN:
-      return _get(props, 'values', [])
+      return (props.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
     default:
       return [];
   }
 }
 
-function getUIValues(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
+function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
   switch (props.validator) {
     case FILTER_VALIDATOR.AFTER:
     case FILTER_VALIDATOR.GREATER_THAN:
@@ -358,14 +342,14 @@ function getUIValues(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
       }));
     case FILTER_VALIDATOR.IS_NULL:
     case FILTER_VALIDATOR.IS_NOT_NULL:
-      return [{ value: FILTER_VALIDATOR_VALUE[props.validator].label, enabled: props.enabled }];
+      return [{ value: FILTER_VALIDATOR_VALUE[props.validator].label, enabled: (props.values as IFSValue[])[0]?.enabled ?? props.enabled }];
     case FILTER_VALIDATOR.IN:
       return (props.values as IFSValueRelativeDate[]).map(value => ({
         ...value,
         value: 
         `${RELATIVE_CURSOR_VALUE[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'}`: ''}`,
         enabled: props.enabled
-      }))
+      }));
     default:
       if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
         return getRankingUIValues(props.values as IFSValueRanking[][], rankingGroupIndex);
@@ -380,10 +364,10 @@ function getValueUiUnitRelativeDate(relative: IFSValueRelativeDate) {
 
 function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
       position: rankingValue.position - 1,
       value: rankingValue.value.value
-    }));
+    }) : undefined).filter(Boolean);
   }
   
   function getRankingUIValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
@@ -397,13 +381,15 @@ function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: numbe
   }
 
   function getResultValues(values: IFSValue[], props: OLD_IFilterDetail) {
-  return values.map((value: IFSValue) => {
-    if (props.column.type === COLUMN.IMAGE) {
-      return value.valueid;
-    } else {
-      return value.value;
-    }
-  }).filter(value => value);
+    return values.map((value: IFSValue) => {
+      if (value.enabled) {
+          if (props.column.type === COLUMN.IMAGE) {
+              return value.valueid;
+          } else {
+              return value.value;
+          }
+      }
+    }).filter(Boolean);
   // return values.map((value: IFBResultValue) => {
   //   if (!isEmpty(props.column.aggregate)) {
   //     return value.value || '';

package/src/filters/adapters/flatUIToUI.ts

@@ -15,7 +15,7 @@ export function flatUIToUI(uFilters: IFUFlattenedFilter[] = [], section: IFSecti
         section, 
         version,
         scopes: buildScopes(uFilters)
-    }
+    };
 }
 
 /**
@@ -88,6 +88,7 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFUDataset {
  * @returns an filter structure
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
+    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -110,8 +111,10 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
         extras: {
+            ...uFilter.extras,
             panelid: uFilter.extras.panelid,
             filterLabel: uFilter.extras.filterLabel,
+            info,
             scope: uFilter.extras.scope,
             scopeid: uFilter.extras.scopeid,
             section: uFilter.extras.section,

package/src/filters/adapters/logicToFlatUI.ts

@@ -2,10 +2,10 @@
 // TO Logic structure = Cleaner logic structure
 
 import { COLUMN } from "../../constants";
-import { isEmpty, _get } from "../../general";
-import { FILTER_BACKEND_VALIDATOR, FILTER_SCOPE } from "../constants";
-import { getFilterid, getUIValues } from "../helpers";
-import { IFSValueRanking, IFUFlattenedFilter, OLD_IFilterDetail, OLD_IFilterLogic } from "../interfaces";
+import { isEmpty, _get, _hasProperty } from "../../general";
+import { FILTER_BACKEND_VALIDATOR, FILTER_SCOPE, FILTER_VALIDATOR_VALUE } from "../constants";
+import { getFilterid, getUIValues, isNullValidator, } from "../helpers";
+import { IFSValueRanking, IFUFlattenedFilter, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterLogic } from "../interfaces";
 
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
@@ -15,86 +15,110 @@ import { IFSValueRanking, IFUFlattenedFilter, OLD_IFilterDetail, OLD_IFilterLogi
 export function logicToFlatUI(logics: OLD_IFilterLogic[] = []): IFUFlattenedFilter[] {
     if (isEmpty(logics)) return [];
 
-    let uFilters: IFUFlattenedFilter[] = [];
+    const uFilters: IFUFlattenedFilter[] = [];
     logics.forEach(scopeItem => {
         if (scopeItem.filters.length > 0) {
             scopeItem.filters.forEach(filterItem => {
-                filterItem.expressions[0].expressions.forEach(expression => {
-                    const uiExtras = expression.uiExtras;
-                    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) as number : -1;
-                    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== FILTER_BACKEND_VALIDATOR.IS_NULL)) {
-                        const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
-                        const uFilter: IFUFlattenedFilter = {
-                            collapsed: uiExtras.collapsed,
-                            column: {
-                                id: uiExtras.column?.id,
-                                formulaType: uiExtras.column?.formulaType,
-                                linkid: uiExtras.column?.linkid,
-                                linked: uiExtras.column?.linked,
-                                qrveyid: uiExtras.column?.qrveyid,
-                                aggregate: uiExtras.column?.aggregate?.label,
-                                calculation: uiExtras.column?.calculation?.value,
-                                label: uiExtras.column?.text,
-                                property: uiExtras.column.property,
-                                sorting: uiExtras.column.sorting,
-                                outputFormat: uiExtras.column?.outputFormat,
-                                type: uiExtras.column?.type,
-                            },
-                            dateSection: uiExtras.dateSection,
-                            displayed: true,
-                            enabled: expression.enabled,
-                            extras: {
-                                panelid: uiExtras.panelid,
-                                filterLabel: uiExtras.panelName,
-                                scopeid,
-                                scope: scopeItem.scope,
-                                section: uiExtras.section,
-                                scopeInfo: {
-                                    collapsed: false,
-                                    enabled: scopeItem.enabled,
-                                    displayed: true,
-                                    scope: scopeItem.scope,
-                                    scopeid,
-                                },
-                                dataset: {
-                                    collapsed: false,
-                                    enabled: true,
-                                    displayed: true,
-                                    qrveyid: uiExtras.column?.qrveyid,
-                                    label: uiExtras.column?.dataset?.name,
-                                    linkid: uiExtras.column?.linkid,
-                                },
-                            },
-                            filterid: undefined,
-                            lookupDisplayIndex: uiExtras.lookupDisplayIndex,
-                            nullValues: uiExtras.nullValues,
-                            operator: uiExtras.operator,
-                            property: uiExtras.property,
-                            uiValues: getUIValues(uiExtras as any),
-                            validator: uiExtras.validator,
-                            values: uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)
-                                ? (uiExtras.values || [] as any[]).map((v, i) => ({
-                                ...v,
-                                enabled: uiExtras.uiValue[i].enabled != null ? uiExtras.uiValue[i].enabled : true
-                                })) : [],
-                        }
-                        uFilter.filterid = getFilterid(uFilter);
-                        uFilters.push(uFilter);
-                    }
-                    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 ) as IFSValueRanking[][], uiExtras.uiValue);
-                        if (index > -1) uFilters[index].values = refinedRankingValues;
-                        else uFilters[uFilters.length - 1].values = refinedRankingValues;
-                    }
+                filterItem.expressions.forEach((expression1: OLD_IFilterExpression) => {
+                    _hasProperty(expression1, 'expressions') ? expression1.expressions.forEach((expression2: OLD_IFilterExpression) => {
+                        buildFilterByExpression(expression2, scopeItem, uFilters);
+                    }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
+                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
+                //     buildFilterByExpression(expression, scopeItem, uFilters);
+                // });
             });
         }
     });
     return uFilters;
 }
 
+function buildFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD_IFilterLogic, uFilters: IFUFlattenedFilter[]) {
+    const uiExtras = expression.uiExtras;
+    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) as number : -1;
+    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== FILTER_BACKEND_VALIDATOR.IS_NULL)) {
+        const uFilter: IFUFlattenedFilter = getFilterByExpression(expression, scopeItem);
+        uFilter.filterid = getFilterid(uFilter);
+        uFilters.push(uFilter);
+    }
+    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 ) as IFSValueRanking[][], uiExtras.uiValue);
+        if (index > -1) uFilters[index].values = refinedRankingValues;
+        else uFilters[uFilters.length - 1].values = refinedRankingValues;
+    }
+}
+
+function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD_IFilterLogic) {
+    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;
+    return {
+        collapsed: uiExtras.collapsed,
+        column: {
+            id: uiExtras.column?.id,
+            formulaType: uiExtras.column?.formulaType,
+            linkid: uiExtras.column?.linkid,
+            linked: uiExtras.column?.linked,
+            qrveyid: uiExtras.column?.qrveyid,
+            aggregate: uiExtras.column?.aggregate?.label,
+            calculation: uiExtras.column?.calculation?.value,
+            label: uiExtras.column?.text,
+            property: uiExtras.column.property,
+            sorting: uiExtras.column.sorting,
+            outputFormat: uiExtras.column?.outputFormat,
+            type: uiExtras.column?.type,
+        },
+        dateSection: uiExtras.dateSection,
+        displayed: true,
+        enabled: expression.enabled,
+        extras: {
+            ...uiExtras.extras,
+            panelid: uiExtras.panelid,
+            filterLabel: uiExtras.panelName,
+            info,
+            scopeid,
+            scope: scopeItem.scope,
+            section: uiExtras.section,
+            scopeInfo: {
+                collapsed: scopeItem.uiExtras?.collapsed,
+                enabled: scopeItem.enabled,
+                displayed: true,
+                scope: scopeItem.scope,
+                scopeid,
+            },
+            dataset: {
+                collapsed: false,
+                enabled: true,
+                displayed: true,
+                qrveyid: uiExtras.column?.qrveyid,
+                label: uiExtras.column?.dataset?.name,
+                linkid: uiExtras.column?.linkid,
+            },
+        },
+        filterid: undefined,
+        lookupDisplayIndex: uiExtras.lookupDisplayIndex,
+        nullValues: uiExtras.nullValues,
+        operator: uiExtras.operator,
+        property: uiExtras.property,
+        uiValues: getUIValues(uiExtras as any),
+        validator: uiExtras.validator,
+        values: getValues(uiExtras),
+    };
+}
+
+function getValues(uiExtras: OLD_IFilterDetail) {
+    if (isNullValidator(uiExtras.validator) && isEmpty(uiExtras.values)) {
+        return [{ value: FILTER_VALIDATOR_VALUE[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
+    }
+    if (uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)) {
+        return uiExtras.values;
+    }
+    return [];    
+    
+}
+
 /**
  * Get the filter or the index of the given array, validating an old filter structure.
  * @param filters The array of UI filters
@@ -103,7 +127,7 @@ export function logicToFlatUI(logics: OLD_IFilterLogic[] = []): IFUFlattenedFilt
  * @returns the index or the UI filter object
  */
 function getFilter(filters: IFUFlattenedFilter[], filter: OLD_IFilterDetail, getIndex = false): number | IFUFlattenedFilter {
-    const validator = (f: IFUFlattenedFilter) => (f.validator === filter.validator &&
+    const validator = (f: IFUFlattenedFilter) => f.validator === filter.validator &&
         f.column.id === filter.column.id &&
         f.column.qrveyid === filter.column.qrveyid &&
         f.column.linkid === filter.column.linkid &&
@@ -111,7 +135,7 @@ function getFilter(filters: IFUFlattenedFilter[], filter: OLD_IFilterDetail, get
         f.extras.scope === filter.scope &&
         f.extras.scopeid === filter.scopeid &&
         f.property === filter.property &&
-        f.extras.panelid === filter.panelid);
+        f.extras.panelid === filter.panelid;
     return getIndex ? filters.findIndex(validator) : filters.find(validator);
 }
 
@@ -121,7 +145,7 @@ function getFilter(filters: IFUFlattenedFilter[], filter: OLD_IFilterDetail, get
  * @param uiValues Object with additional info about the values of the filter.
  * @returns the array of Ranking values 
  */
-function refineRankingValues(values: IFSValueRanking[][] = [], uiValues): IFSValueRanking[][] {
+function refineRankingValues(values: IFSValueRanking[][] = [], uiValues = []): IFSValueRanking[][] {
     return values.map(valueGroup => {
         return [
             ...valueGroup.map(value => {