@qrvey/utils 1.3.0-9 → 1.3.0

package/src/columns/interfaces/IColumn.ts

@@ -3,17 +3,25 @@ import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
 import { IAggregateType } from "../../charts/interfaces/IAggregateType";
+import { IBColumnAnswerExpressionWord } from "./IBColumnAnswerExpressionWord";
+import { IBColumnAnswerLookupValueValue } from "./IBColumnAnswerLookupValueValue";
 
 /**
  * Structure for columns used in the  App frontend side
  */
-export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId"> {
+export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId" | "sliderVal" | "value" | "words" | "negative" | "positive" | "activeCat"> {
     bucketid?: string;
     aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
+    expressionCategory?: boolean;
+    expressionNegative?: IBColumnAnswerExpressionWord[];
+    expressionPositive?: IBColumnAnswerExpressionWord[];
+    expressionWords?: IBColumnAnswerExpressionWord[];
     formulaid?: string;
     label?: string;
     linkid?: string;
+    lookupValue?: IBColumnAnswerLookupValueValue;
     property?: IColumnPropertyType;
+    slidebarValue?: number;
     sorting?: IColumnSortingSettings;
 }

package/src/columns/interfaces/IColumnImageUploadOption.ts

@@ -0,0 +1,3 @@
+import { COLUMN_IMAGE_UPLOAD_OPTION } from "../constants/COLUMN_IMAGE_UPLOAD_OPTION";
+
+export type IColumnImageUploadOption = COLUMN_IMAGE_UPLOAD_OPTION;

package/src/columns/interfaces/index.ts

@@ -1,6 +1,18 @@
+export * from './IBColumAnswer';
 export * from './IBColumn';
+export * from './IBColumnAnswerExpression';
+export * from './IBColumnAnswerExpressionCategory';
+export * from './IBColumnAnswerExpressionWord';
+export * from './IBColumnAnswerGeneral';
+export * from './IBColumnAnswerImages';
+export * from './IBColumnAnswerLookupAnswer';
+export * from './IBColumnAnswerLookupAnswerAnswer';
+export * from './IBColumnAnswerLookupValueValue';
+export * from './IBColumnAnswerSlidebar';
+
 export * from './IColumn';
 
+export * from './IColumnImageUploadOption';
 export * from './IColumnInfo';
 export * from './IColumnOutputFormatSettings';
 

package/src/dates/constants/index.ts

@@ -34,6 +34,7 @@ export * from './DATE_MONTH_DAYS';
 
 export * from './DATE_REGULAR_EXPRESSION';
 
+export * from './DATE_WEEK_DAYS_DDDD';
 export * from './DATE_WEEK_DAYS';
 export * from './DATE_YEAR_DAYS';
 export * from './DATE_YEAR_MONTHS';

package/src/dates/index.ts

@@ -1,6 +1,6 @@
+export * from './adapters/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
 export * from './range/index';
 export * from './relative/index';
-export * from './adapters/index';

package/src/dates/relative/constants/RELATIVE_CURSOR_INFO_LIST.ts

@@ -1,6 +1,6 @@
 import { RELATIVE_CURSOR_INFO } from "./RELATIVE_CURSOR_INFO";
-import { IRelativeCursorInfo } from "..";
 import { RELATIVE_CURSOR } from "./RELATIVE_CURSOR";
+import { IRelativeCursorInfo } from "../interfaces/IRelativeCursorInfo";
 /**
  * @description Key/array of compound relative cursor info
  */

package/src/filters/adapters/FDToFlatUI.ts

@@ -98,6 +98,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IDataset[] = []): I
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property: property,
+                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/src/filters/adapters/FDToLogic.ts

@@ -33,8 +33,9 @@ export function FDToLogic(filterData: IFSData): IFBLogic[] {
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
+    if (isEmpty(filterData)) return [];
+
+    return filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
         const logic: IFBLogic = buildLogic(scope);
         let filters: IFBFilter[] = [];
         if (scope.datasets.length > 0) {
@@ -45,9 +46,8 @@ function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
         }
         logics.push({ ...logic, filters });
         return logics;
-        }, [] as IFBLogic[]);
-    return logics;
-  }
+    }, [] as IFBLogic[]);
+}
 
 function buildLogic(scopeSection: IFSScope): IFBLogic {
     return {

package/src/filters/adapters/UIToFD.ts

@@ -27,9 +27,10 @@ import { IFUScope } from "../interfaces/ui/IFUScope";
 
 /**
  * Builds the Fitler Data structure from UI filter data
+ * @private
  * @param uFilterData The UI filter Data object
  * @param version the version of the structure
- * @returns 
+ * @returns a Filter Data structure
  */
 function UI21ToFD(uFilterData: IFUData, version): IFSData {
     return {

package/src/filters/adapters/UIToFlatUI.ts

@@ -94,6 +94,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IDataset[] = []): I
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property,
+                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/src/filters/adapters/UIToOldLogic.ts

@@ -89,11 +89,11 @@ function buildExpressions(filterSection: IFUFilter[], scope: IFUScope, dataset:
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
             questionid: filter.column.id,
-            validationType: getBackendValidator(filter.validator),
+            validationType: getBackendValidator(filter),
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+        expression['enabled'] = filter.selectAll || expression.value?.length > 0 ? filter.enabled : false;
 
         expressions.push(expression);
         return expressions;
@@ -137,7 +137,7 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            label: filter.column.label,
+            text: filter.column.label,
             type: filter.column.type,
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
@@ -162,6 +162,7 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         panelid: filter.extras.panelid,
         panelName: filter.extras.filterLabel,
         section: filter.extras.section,
+        selectAll: filter.selectAll,
         uiValue: getUIValues(filter, { addEnableds: true } ),
         validator: filter.validator,
         values: adaptFilterValues(filter)

package/src/filters/adapters/adaptDateGroupingProperty.ts

@@ -5,8 +5,8 @@ import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property 
- * @returns 
+ * @param property the property to be adapted
+ * @returns a adapted property
  */
 export function adaptDateGroupingProperty(property: IFProperty | any): IFProperty {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/src/filters/adapters/adaptFilterValues.ts

@@ -15,10 +15,10 @@ import { IFSValueRelativeDate } from "../interfaces/common/IFSValueRelativeDate"
  * @returns A new value array with the filled properties.
  */
 export function adaptFilterValues(filter: IFSFilter): IFValue[] {
-    const setValue = value => ({ ...value, value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled });
+    const setValue = value => ({ ...value, value: isEmpty(value.value) ? undefined : value.value, displayed: isEmpty(value.displayed) ? true : value.displayed, enabled: isEmpty(value.enabled) ? true : value.enabled });
 
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-        return (filter.values as IFSValueRanking[][]).map(rValues => rValues.map(setValue));
+        return ((filter.values || []) as IFSValueRanking[][]).map(rValues => rValues.map(setValue));
     }
-    return (filter.values as IFSValue[] | IFSValueRange[] | IFSValueRelativeDate[]).map(setValue);
+    return ((filter.values || []) as IFSValue[] | IFSValueRange[] | IFSValueRelativeDate[] || []).map(setValue);
 }

package/src/filters/adapters/flatUIToFD.ts

@@ -125,6 +125,7 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
+        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -48,7 +48,7 @@ export function flatUIToOldLogic(uFilters: IFUFlattenedFilter[], section: IFSect
 }
 
 const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilterDetail[] => {
-  return uFilters.map(filter => {
+  return uFilters.map<OLD_IFilterDetail>(filter => {
     // let aggregate, calculation;
     // if (filter.column.aggregate != null) {
     //     aggregate = {
@@ -101,6 +101,7 @@ const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilt
       panelid: filter.extras.panelid,
       panelName: filter.extras.filterLabel,
       section: filter.extras.section,
+      selectAll: filter.selectAll,
       uiValue: getUIValues(filter, { addEnableds: true }),
       validator: filter.validator,
       values: filter.values,
@@ -165,11 +166,11 @@ export function getExpressionId(props: OLD_IFilterDetail): string {
 }
 
 function getRankingExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[] {
-  const values = props.values as IFSValueRanking[][];
+  const values = props.values as IFSValueRanking[][] || [];
   return values.map((_value, index) => {
     const expression: OLD_IFilterExpression = {
       ...getRegularExpression({ ...props, values: [props.values[index]] as IFValue[] }), // Each uiExtras.value array in each expression of Ranking. For editing, removing and disabling values.
-      validationType: getBackendValidator(props.validator)
+      validationType: getBackendValidator(props as any)
     };
     return {
       ...expression,
@@ -189,14 +190,14 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
     questionid: props.column.id,
     questionType: props.column.type,
     formulaType: props.column.formulaType,
-    validationType: getBackendValidator(props.validator),
+    validationType: getBackendValidator(props as any),
     value: getValues(props),
     uiExtras: {
       ...props,
       uiValue
     }
   };
-  expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
+  expression['enabled'] = props.selectAll || expression.value?.length > 0 ? props.enabled : false;
 
   return expression;
 }
@@ -282,101 +283,110 @@ function getNullValueExpression(props: OLD_IFilterDetail): OLD_IFilterExpression
 function getValues(props: OLD_IFilterDetail, rankingGroupIndex?: number): IFBackendExpressionValue[] {
   // 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)) return getRankingValues(props.values as IFSValueRanking[][], rankingGroupIndex);
-      return getResultValues(props.values as IFSValue[], props);
+      if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) return getRankingValues(values as IFSValueRanking[][], rankingGroupIndex);
+      return getResultValues(values as IFSValue[], props);
     case FILTER_VALIDATOR.CONTAINS:
     case FILTER_VALIDATOR.NOT_CONTAIN:
     case FILTER_VALIDATOR.STARTS_WITH:
     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.enabled ? value.value : undefined);
+      return (values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { lte: value.max, gte: value.min }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { lt: value.max, gt: value.min }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BEFORE:
     case FILTER_VALIDATOR.LESS_THAN:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { lt: value.max }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.BEFORE_ON:
     case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { lte: value.max }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.AFTER:
     case FILTER_VALIDATOR.GREATER_THAN:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { gt: value.min }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.AFTER_ON:
     case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-      return (props.values as IFSValueRange[]).map(value => value.enabled ? (
+      return (values as IFSValueRange[]).map(value => value.enabled ?
         { gte: value.min }
-      ) : undefined).filter(Boolean);
+      : undefined).filter(Boolean);
     case FILTER_VALIDATOR.IS_NULL:
     case FILTER_VALIDATOR.IS_NOT_NULL: {
-        const addValue = props.values.length > 0 && (props.values as IFSValue[]).every(value => value.enabled);
+        const addValue = values.length > 0 && (values as IFSValue[]).every(value => value.enabled);
         return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
       }
     case FILTER_VALIDATOR.IN:
-      return (props.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
+      return (values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
     default:
       return [];
   }
 }
 
 function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
+  const values = props.values || [];
+
   switch (props.validator) {
     case FILTER_VALIDATOR.AFTER:
     case FILTER_VALIDATOR.GREATER_THAN:
     case FILTER_VALIDATOR.AFTER_ON:
     case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-      return (props.values as IFSValueRange[]).map(value => ({
+      return (values as IFSValueRange[]).map(value => ({
         ...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 (props.values as IFSValueRange[]).map(value => ({
+      return (values as IFSValueRange[]).map(value => ({
         ...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 (props.values as IFSValueRange[]).map(value => ({
+      return (values as IFSValueRange[]).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.IS_NULL:
     case FILTER_VALIDATOR.IS_NOT_NULL:
-      return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (props.values as IFSValue[])[0]?.enabled ?? props.enabled }];
+      return [{
+        value: FILTER_VALIDATOR_INFO[props.validator].label,
+        enabled: (values as IFSValue[])[0]?.enabled ?? props.enabled }];
     case FILTER_VALIDATOR.IN:
-      return (props.values as IFSValueRelativeDate[]).map(value => ({
+      return (values as IFSValueRelativeDate[]).map(value => ({
         ...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)) {
-        return getRankingUIValues(props.values as IFSValueRanking[][], rankingGroupIndex);
+        return getRankingUIValues(values as IFSValueRanking[][], rankingGroupIndex);
       }
-      return (props.values as IFSValue[] || []).map(val => ({ ...val, enabled: val.enabled != null ? val.enabled : true }));
+      return (values as IFSValue[]).map(val => ({ ...val, enabled: val.enabled != null ? val.enabled : true }));
   }
 }
 
@@ -386,16 +396,17 @@ function getValueUiUnitRelativeDate(relative: IFSValueRelativeDate) {
 
 function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? {
       position: rankingValue.position - 1,
       value: rankingValue.value.value
-    }) : undefined).filter(Boolean);
+    } : undefined).filter(Boolean);
   }
   
   function getRankingUIValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
     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
@@ -403,7 +414,7 @@ function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: numbe
   }
 
   function getResultValues(values: IFSValue[], props: OLD_IFilterDetail) {
-    return values.map((value: IFSValue) => {
+    return (values || []).map((value: IFSValue) => {
       if (value.enabled) {
           if (props.column.type === COLUMN.IMAGE) {
               return value.valueid || value.imageUrl || value.value;

package/src/filters/adapters/flatUIToUI.ts

@@ -138,6 +138,7 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
+        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/src/filters/adapters/index.ts

@@ -1,7 +1,10 @@
 export * from './transformFilters';
 
+export * from './modelAnswerToFilterValue';
+
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
+export * from './adaptFilterValues';
 
 export * from './FDToFlatUI';
 export * from './FDToLogic';
@@ -20,3 +23,4 @@ export * from './UIToFD';
 export * from './UIToFlatUI';
 // export * from './UIToLogic';
 export * from './UIToOldLogic';
+

package/src/filters/adapters/logicToFlatUI.ts

@@ -74,7 +74,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
             qrveyid: uiExtras.column?.qrveyid,
             aggregate: (uiExtras.column?.aggregate as any)?.label || uiExtras.column?.aggregate,
             calculation: (uiExtras.column?.calculation as any)?.value || uiExtras.column?.calculation,
-            label: _get(uiExtras.column, 'text') || uiExtras.column?.label,
+            label: _get(uiExtras.column, 'text') || _get(uiExtras.column, 'label'),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
             outputFormat: uiExtras.column?.outputFormat,
@@ -103,7 +103,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
                 enabled: true,
                 displayed: true,
                 qrveyid: uiExtras.column?.qrveyid,
-                label: _get(uiExtras.column, 'dataset.name') || uiExtras.column?.label,
+                label: _get(uiExtras.column, 'dataset.name') || _get(uiExtras.column, 'label'),
                 linkid: uiExtras.column?.linkid,
             },
         },
@@ -112,6 +112,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
+        selectAll: uiExtras.selectAll,
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };
@@ -161,7 +162,8 @@ function refineRankingValues(values: IFSValueRanking[][] = [], uiValues = []): I
                 const rValue = uiValues.find(uiV => uiV.valueid === value.value.valueid);
                 return {
                     ...value,
-                    enabled: rValue && rValue.enabled != null ? rValue.enabled : true
+                    displayed: rValue && rValue.displayed != null ? rValue.displayed : true,
+                    enabled: rValue && rValue.enabled != null ? rValue.enabled : true,
                 };
             })
         ];

package/src/filters/adapters/modelAnswerToFilterValue.ts

@@ -0,0 +1,15 @@
+import { IModelAnswer } from "../../qrvey/interfaces/IModelAnswer";
+import { IFSValue } from "../interfaces/common/IFSValue";
+
+/**
+ * Adapter for model answer to convert to recognizable values for Filter Builder
+ * @param answers Array of the qrvey model answers
+ * @returns Array of values
+ */
+ export function modelAnswerToFilterValue(answers: IModelAnswer[] = []): IFSValue[] {
+    return answers.map(answer => ({
+      value: answer.answer,
+      valueid: answer.answerid,
+      imageUrl: answer.answerUrl
+    }));
+}

package/src/filters/constants/builder/FILTER_BUILDER_SCOPE_LABEL.ts

@@ -1,4 +1,4 @@
-import { FILTER_SCOPE } from "..";
+import { FILTER_SCOPE } from "../common/FILTER_SCOPE";
 
 export const FILTER_BUILDER_SCOPE_LABEL = {
     [FILTER_SCOPE.GLOBAL]: 'All pages',

package/src/filters/constants/builder/STATIC_OPTION_COLUMNS.ts

@@ -1,7 +1,8 @@
 import { COLUMN } from "../../../columns/constants/COLUMN";
+import { IColumnType } from "../../../columns/interfaces/IColumnType";
 
 // COLUMN TYPES FOR GETTING OPTION VALUES (i.e FROM MODEL OBJECT)
-export const STATIC_OPTION_COLUMNS = [
+export const STATIC_OPTION_COLUMNS: IColumnType[] = [
     COLUMN.DROPDOWN,
     COLUMN.EXPRESSION,
     COLUMN.IMAGE,

package/src/filters/constants/builder/index.ts

@@ -3,6 +3,7 @@ export * from './COLUMNS_FOR_EQUALS_LAYOUT';
 export * from './COLUMNS_FOR_EQUALS_NULL_LAYOUT';
 export * from './COLUMNS_FOR_NULL_LAYOUT';
 export * from './COLUMNS_FOR_TEXT_LAYOUT';
+export * from './FILTER_BUILDER_SCOPE_LABEL';
 export * from './FILTER_FLOW';
 export * from './FILTER_VALIDATORS_FOR_SLIDEBAR';
 export * from './FILTER_VALIDATORS_FOR_WINDOW';

package/src/filters/helpers/OLD_getAggFilters.ts

@@ -0,0 +1,90 @@
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { _get } from "../../general/object/get";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
+import { IFBExpressionAggregate } from "../interfaces/backend/IFBExpressionAggregate";
+import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
+import { IFOperator } from "../interfaces/IFOperator";
+import { OLD_IFilterExpression } from "../interfaces/OLD_IFilterExpression";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+
+/**
+ * @deprecated soon
+ * @param logics 
+ * @param summaries 
+ * @returns the filter aggregate structure
+ */
+export function getAggFilters(logics: OLD_IFilterLogic[] = [], summaries: any[] = []): IFBFilterAggregate {
+    const aggregateFilters: OLD_IFilterLogic[] = getAggregateFilters(logics) as OLD_IFilterLogic[];
+    const aggFilters: IFBFilterAggregate[] = aggregateFilters.map(aggFilter => {
+      const expressions = getExpressionsInLogic([aggFilter]);
+      return expressions && expressions.length && {
+        operator: FILTER_OPERATOR.OR,
+        expressions: expressions.map((expression): IFBExpressionAggregate => {
+          const summaryIndex = summaries.findIndex(summary =>
+            expression.questionid === summary.questionid &&
+            expression.qrveyid === summary.qrveyid &&
+            expression.linkid === summary.linkid &&
+            _get(expression.uiExtras.column, 'aggregate') === summary.aggregate
+          );
+          if (summaryIndex > -1 || expression.questionType === COLUMN.AGGREGATED_FORMULA) {
+            return {
+              enabled: expression.enabled,
+              summaryIndex,
+              validationType: expression.validationType,
+              value: expression.value,
+            };
+          }
+          return;
+        }).filter(Boolean)
+      };
+    }).filter(aggFilter => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
+    return aggFilters && concatAggFilters(aggFilters);
+}
+
+/**
+ * Filters and gets the filters used for aggregate values.
+ * @param logics The filter logic structure
+ * @param formatToFilters Flag to change de way of returning the filter structure.
+ * @returns the aggregate filters in the IFilterFilters way or as logic structure.
+ */
+function getAggregateFilters(logics: OLD_IFilterLogic[] = []): OLD_IFilterLogic[] {
+    logics = cloneDeep(logics);
+    const aggregateLogics = logics.reduce((newLogics: OLD_IFilterLogic[], logic: OLD_IFilterLogic) => {
+      if (!logic) return newLogics;
+      // if ([FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(logic.scope)) {
+        logic.filters.forEach((filter, index) => {
+          const expressions = _get(filter, 'expressions[0].expressions');
+          if (!isEmpty(expressions)) {
+            const aggregateFilters = (filter.expressions[0].expressions as OLD_IFilterExpression[]).filter(expression => !isEmpty(expression.uiExtras.column.aggregate));
+            logic.filters[index].expressions[0].expressions = aggregateFilters;
+            if (!filter.expressions[0].expressions.length) logic.filters[index] = undefined;
+          }
+        });
+        logic.filters = logic.filters.filter(filter => filter);
+        if (logic.filters.length) newLogics.push(logic);
+      //}
+      return newLogics;
+    }, [] as OLD_IFilterLogic[]);
+    return aggregateLogics;
+}
+
+function concatAggFilters(aggFilters: IFBFilterAggregate[], operator: IFOperator = FILTER_OPERATOR.AND): IFBFilterAggregate {
+    const expressions = aggFilters.filter(Boolean);
+    if (!expressions.length) return undefined;
+    else if (expressions.length === 1) return expressions[0];
+    return {
+        operator,
+        expressions: aggFilters.filter(Boolean)
+    };
+}
+
+function getExpressionsInLogic(logics: OLD_IFilterLogic[] = []): OLD_IFilterExpression[] {
+    return logics.reduce((expressions: OLD_IFilterExpression[], logic: OLD_IFilterLogic) => {
+      logic.filters.forEach(filter => {
+        expressions = expressions.concat(filter.expressions[0].expressions);
+      });
+      return expressions;
+    }, [] as OLD_IFilterExpression[]);
+}

package/src/filters/helpers/applyHierarchyForAggFilters.ts

@@ -9,9 +9,9 @@ import { getScopesByHierarchy } from "./getScopesByHierarchy";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes 
- * @param currentScope 
- * @returns 
+ * @param scopes the pair id/label scopes
+ * @param currentScope the scope to be validated
+ * @returns the chart settings
  */
 export function applyHierarchyForAggFilters(chartSettings: IFUChartSettings, scopes: IFSScopeID[] = [], currentScope: IFScope = FILTER_SCOPE.GLOBAL): IFUChartSettings {
   if (isEmpty(chartSettings)) return;

package/src/filters/helpers/backend/buildExpression.ts

@@ -17,10 +17,10 @@ export function buildExpression(filter: IFSFilter): IFBExpression {
         questionid: filter.column.id,
         questionType: filter.column.type,
         property: getBackendProperty(filter),
-        validationType: getBackendValidator(filter.validator),
+        validationType: getBackendValidator(filter),
         value: getBackendValues(filter),
     };
-    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+    expression['enabled'] =  filter.selectAll || expression.value?.length > 0 ? filter.enabled : false;
 
     return expression;
 }