@qrvey/utils 1.2.10-7 → 1.3.0-0

package/src/columns/interfaces/IBColumn.ts

@@ -1,29 +1,22 @@
 import { IFormulaType } from "../../formulas/interfaces/IFormulaType";
-import { IBColumAnswer } from "./IBColumAnswer";
-import { IBColumnAnswerExpression } from "./IBColumnAnswerExpression";
-import { IBColumnAnswerExpressionCategory } from "./IBColumnAnswerExpressionCategory";
-import { IBColumnAnswerLookupValue } from "./IBColumnAnswerLookupValue";
-import { IBColumnAnswerSlidebar } from "./IBColumnAnswerSlidebar";
-import { IColumnImageUploadOption } from "./IColumnImageUploadOption";
 import { IColumnOutputFormatSettings } from "./IColumnOutputFormatSettings";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnType } from "./IColumnType";
 
 /**
- * Structure for columns received in the question/list, model endpoints
+ * Structure for columns used in the  App frontend side
  */
-export interface IBColumn extends Partial<IBColumAnswer>, Partial<IBColumnAnswerExpression>, Partial<IBColumnAnswerExpressionCategory>, Partial<IBColumnAnswerSlidebar>, Partial<IBColumnAnswerLookupValue> {
+export interface IBColumn {
     bucketId?: string; //Same as id
     formulaId?: string; //Same as id
     formulaType?: IFormulaType;
     geogroup?: boolean;
     id: string;
-    imageUploadOption?: IColumnImageUploadOption; 
+    text: string;
     linked?: boolean;
     linkid?: string;
     outputFormat?: IColumnOutputFormatSettings;
     property?: IColumnPropertyType;
     qrveyid: string;
-    text: string;
     type: IColumnType;
 }

package/src/columns/interfaces/IColumn.ts

@@ -3,25 +3,17 @@ 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" | "sliderVal" | "value" | "words" | "negative" | "positive" | "activeCat"> {
+export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId"> {
     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/index.ts

@@ -1,18 +1,6 @@
-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/DATE_REGULAR_EXPRESSION.ts

@@ -25,7 +25,7 @@ export const DATE_REGULAR_EXPRESSION = {
     SECOND: `^${YEAR_MONTH_NUMBER}/${MONTH_DAY}/${YEAR} ${DAY_TIME}$`,
     MONTH_DAY: `^${MONTH_DAY}$`,
     YEAR_MONTH: `^${YEAR_MONTH}$`,
-    YEAR_MONTH_NUMBER: `${YEAR_MONTH_NUMBER}`,
+    YEAR_MONTH_NUMBER: `^${YEAR_MONTH_NUMBER}$`,
     YEAR_QUARTER: `^${YEAR_QUARTER}$`,
     YEAR_WEEK: `^${YEAR_WEEK}$`,
     DAY_HOUR: `^${DAY_HOUR}$`,

package/src/dates/constants/index.ts

@@ -34,7 +34,6 @@ 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/helpers/getSeparatorByDateFormat.ts

@@ -7,7 +7,7 @@ import { IDateFormat } from "../interfaces/IDateFormat";
  * @returns a separator string
  */
 export function getSeparatorByDateFormat(format: IDateFormat = DATE_FORMAT.DAY): string {
-    return format === DATE_FORMAT.YEAR || format === DATE_FORMAT.DAY_TIME || format === DATE_FORMAT.MONTH_DAY || format === DATE_FORMAT.YEAR_MONTH || format === DATE_FORMAT.YEAR_QUARTER || format === DATE_FORMAT.YEAR_WEEK || format === DATE_FORMAT.DAY_HOUR|| format === DATE_FORMAT.HOUR_MINUTE || format === DATE_FORMAT.MINUTE_SECOND ? '' :
+    return format === DATE_FORMAT.YEAR || format === DATE_FORMAT.DAY_TIME || format === DATE_FORMAT.MONTH_DAY || format === DATE_FORMAT.YEAR_MONTH || format === DATE_FORMAT.YEAR_QUARTER || format === DATE_FORMAT.YEAR_WEEK || format === DATE_FORMAT.DAY_HOUR|| format === DATE_FORMAT.HOUR_MINUTE || format === DATE_FORMAT.MINUTE_SECOND ? ' ' :
         format === DATE_FORMAT.MONTH || format === DATE_FORMAT.QUARTER || format === DATE_FORMAT.WEEK || format === DATE_FORMAT.HOUR || format === DATE_FORMAT.MINUTE || format === DATE_FORMAT.SECOND ? ' ' :
             '/';
 }

package/src/dates/helpers/index.ts

@@ -1,4 +1,3 @@
-export * from './getDateByDateFormat';
 export * from './getDateFormatByProperty';
 export * from './getDateFormatRegularExpressionInArray';
 export * from './getSeparatorByDateFormat';

package/src/dates/helpers/validateDate.ts

@@ -14,7 +14,7 @@ import { validateDateByDateFormat } from "./validateDateByDateFormat";
  * @param format String of the format to validate
  * @returns True if it is valid or not. Undefined if date is undefined
  */
- export function validateDate(date: string, format: IDateFormat = DATE_FORMAT.DAY): boolean {
+export function validateDate(date: string, format: IDateFormat = DATE_FORMAT.DAY): boolean {
     if (isEmpty(date)) return false;
     if (isTokenLabel(date)) return true;
 

package/src/dates/helpers/validateDateByDateFormat.ts

@@ -15,7 +15,7 @@ export function validateDateByDateFormat(date: string, dateFormat: IDateFormat =
     const separator = getSeparatorByDateFormat(dateFormat);
     const separatedDate = date.split(separator);
     const regularExpression = getDateFormatRegularExpressionInArray(dateFormat);
-  
+
     if (regularExpression.length !== separatedDate.length) return false;
   
     for (let i = 0; i < separatedDate.length; i++) {

package/src/dates/index.ts

@@ -1,4 +1,3 @@
-export * from './adapters/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/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,7 +98,6 @@ 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/UIToFD.ts

@@ -27,10 +27,9 @@ 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 a Filter Data structure
+ * @returns 
  */
 function UI21ToFD(uFilterData: IFUData, version): IFSData {
     return {

package/src/filters/adapters/UIToFlatUI.ts

@@ -94,7 +94,6 @@ 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),
+            validationType: getBackendValidator(filter.validator),
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression['enabled'] = filter.selectAll || expression.value?.length > 0 ? filter.enabled : false;
+        expression['enabled'] = 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,
-            text: filter.column.label,
+            label: filter.column.label,
             type: filter.column.type,
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
@@ -162,7 +162,6 @@ 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 the property to be adapted
- * @returns a adapted property
+ * @param property 
+ * @returns 
  */
 export function adaptDateGroupingProperty(property: IFProperty | any): IFProperty {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/src/filters/adapters/adaptFilterValues.ts

@@ -18,7 +18,7 @@ export function adaptFilterValues(filter: IFSFilter): IFValue[] {
     const setValue = value => ({ ...value, value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled });
 
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-        return ((filter.values || []) as IFSValueRanking[][]).map(rValues => rValues.map(setValue));
+        return (filter.values as 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,7 +125,6 @@ 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<OLD_IFilterDetail>(filter => {
+  return uFilters.map(filter => {
     // let aggregate, calculation;
     // if (filter.column.aggregate != null) {
     //     aggregate = {
@@ -101,7 +101,6 @@ 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,
@@ -166,11 +165,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 as any)
+      validationType: getBackendValidator(props.validator)
     };
     return {
       ...expression,
@@ -190,14 +189,14 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
     questionid: props.column.id,
     questionType: props.column.type,
     formulaType: props.column.formulaType,
-    validationType: getBackendValidator(props as any),
+    validationType: getBackendValidator(props.validator),
     value: getValues(props),
     uiExtras: {
       ...props,
       uiValue
     }
   };
-  expression['enabled'] = props.selectAll || expression.value?.length > 0 ? props.enabled : false;
+  expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
 
   return expression;
 }
@@ -283,69 +282,66 @@ 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(values as IFSValueRanking[][], rankingGroupIndex);
-      return getResultValues(values as IFSValue[], props);
+      if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) return getRankingValues(props.values as IFSValueRanking[][], rankingGroupIndex);
+      return getResultValues(props.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 (values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
+      return (props.values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 (values as IFSValueRange[]).map(value => value.enabled ?
+      return (props.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 = values.length > 0 && (values as IFSValue[]).every(value => value.enabled);
+        const addValue = props.values.length > 0 && (props.values as IFSValue[]).every(value => value.enabled);
         return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
       }
     case FILTER_VALIDATOR.IN:
-      return (values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
+      return (props.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 (values as IFSValueRange[]).map(value => ({
+      return (props.values as IFSValueRange[]).map(value => ({
         ...value,
         value: value.min,
         enabled: value.enabled != null ? value.enabled : true
@@ -354,23 +350,23 @@ function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
     case FILTER_VALIDATOR.LESS_THAN_EQUAL:
     case FILTER_VALIDATOR.BEFORE:
     case FILTER_VALIDATOR.LESS_THAN:
-      return (values as IFSValueRange[]).map(value => ({
+      return (props.values as IFSValueRange[]).map(value => ({
         ...value,
         value: value.max,
         enabled: value.enabled != null ? value.enabled : true
       }));
     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
     case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-      return (values as IFSValueRange[]).map(value => ({
+      return (props.values as IFSValueRange[]).map(value => ({
         ...value,
         value: `${value.min} - ${value.max}`,
         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: (values as IFSValue[])[0]?.enabled ?? props.enabled }];
+      return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (props.values as IFSValue[])[0]?.enabled ?? props.enabled }];
     case FILTER_VALIDATOR.IN:
-      return (values as IFSValueRelativeDate[]).map(value => ({
+      return (props.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'}`: ''}`,
@@ -378,9 +374,9 @@ function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
       }));
     default:
       if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-        return getRankingUIValues(values as IFSValueRanking[][], rankingGroupIndex);
+        return getRankingUIValues(props.values as IFSValueRanking[][], rankingGroupIndex);
       }
-      return (values as IFSValue[]).map(val => ({ ...val, enabled: val.enabled != null ? val.enabled : true }));
+      return (props.values as IFSValue[] || []).map(val => ({ ...val, enabled: val.enabled != null ? val.enabled : true }));
   }
 }
 
@@ -390,10 +386,10 @@ 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) {
@@ -407,7 +403,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,7 +138,6 @@ 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,10 +1,7 @@
 export * from './transformFilters';
 
-export * from './modelAnswerToFilterValue';
-
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
-export * from './adaptFilterValues';
 
 export * from './FDToFlatUI';
 export * from './FDToLogic';
@@ -23,4 +20,3 @@ 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') || _get(uiExtras.column, 'label'),
+            label: _get(uiExtras.column, 'text') || 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') || _get(uiExtras.column, 'label'),
+                label: _get(uiExtras.column, 'dataset.name') || uiExtras.column?.label,
                 linkid: uiExtras.column?.linkid,
             },
         },
@@ -112,7 +112,6 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
-        selectAll: uiExtras.selectAll,
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };

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

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

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

@@ -1,8 +1,7 @@
 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: IColumnType[] = [
+export const STATIC_OPTION_COLUMNS = [
     COLUMN.DROPDOWN,
     COLUMN.EXPRESSION,
     COLUMN.IMAGE,

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

@@ -3,7 +3,6 @@ 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/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 the pair id/label scopes
- * @param currentScope the scope to be validated
- * @returns the chart settings
+ * @param scopes 
+ * @param currentScope 
+ * @returns 
  */
 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),
+        validationType: getBackendValidator(filter.validator),
         value: getBackendValues(filter),
     };
-    expression['enabled'] =  filter.selectAll || expression.value?.length > 0 ? filter.enabled : false;
+    expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
 
     return expression;
 }

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

@@ -2,12 +2,10 @@ import { filterNestedTree } from "../../../general/array/filterNestedTree";
 import { IFBFilterAggregate } from "../../interfaces/backend/IFBFilterAggregate";
 
 /**
- * @todo Make a proper description for this function
  * 
- * Gets the aggFilters structure by an index
- * @param aggFilters The aggFilter Structure
- * @param summaryIndex an index
- * @returns a new aggFilters structure
+ * @param aggFilters 
+ * @param summaryIndex 
+ * @returns 
  */
 export function getAggFiltersBySummaryIndex(aggFilters: IFBFilterAggregate, summaryIndex: number): IFBFilterAggregate {
     if (!aggFilters) return undefined;

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

@@ -1,19 +1,19 @@
 import { FILTER_BACKEND_VALIDATOR } from "../../constants/backend/FILTER_BACKEND_VALIDATOR";
 import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
 import { IFBackendValidator } from "../../interfaces/backend/IFBackendValidator";
-import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Gets the Validator that is used in requests
  * @param validator Filter Validator used in UI
  * @returns Filter Validator used in Backend
  */
-export function getBackendValidator(filter: IFSFilter): IFBackendValidator {
-    switch (filter.validator) {
+export function getBackendValidator(validator: IFValidator): IFBackendValidator {
+    switch (validator) {
       case FILTER_VALIDATOR.EQUALS:
-        return filter.selectAll ? FILTER_BACKEND_VALIDATOR.NOT_EQUAL : FILTER_BACKEND_VALIDATOR.EQUALS;
+        return FILTER_BACKEND_VALIDATOR.EQUALS;
       case FILTER_VALIDATOR.NOT_EQUAL:
-        return filter.selectAll ? FILTER_BACKEND_VALIDATOR.EQUALS : FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
+        return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
       case FILTER_VALIDATOR.CONTAINS:
         return FILTER_BACKEND_VALIDATOR.CONTAINS;
       case FILTER_VALIDATOR.NOT_CONTAIN: