@qrvey/utils 1.2.10-9 → 1.3.0-10

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:

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

@@ -19,55 +19,53 @@ import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
  * @returns A collection of backend expression value
  */
 export function getBackendValues(filter: IFSFilter): IFBackendExpressionValue[] {
-    const values = filter.values || [];
-
     switch (filter.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
-            if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) return getRankingValues(values as IFSValueRanking[][]);
-            return getResultValues(values as IFSValue[], filter);
+            if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) return getRankingValues(filter.values as IFSValueRanking[][]);
+            return getResultValues(filter.values as IFSValue[], filter);
         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 (filter.values as IFSValue[]).map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lte: value.max, gte: value.min }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.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 (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.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 (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).map(value => value.enabled ? 
                 { lte: value.max }
              : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.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 (values as IFSValueRange[]).map(value => value.enabled ? 
+            return (filter.values as IFSValueRange[]).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 as IFSValue[]).every(value => value.enabled);
+            const addValue = filter.values.length > 0 && (filter.values as IFSValue[]).every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[filter.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return (values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
+            return (filter.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
@@ -75,13 +73,12 @@ export function getBackendValues(filter: IFSFilter): IFBackendExpressionValue[]
 
 /**
  * Gets the expression values. Depending on the column type
- * @private
  * @param values a collection of filter values
  * @param filter The filter structure
- * @returns Expression values
+ * @returns 
  */
 function getResultValues(values: IFSValue[], filter: IFSFilter): IFBExpressionValue[] {
-  return (values || []).map((value: IFSValue) => {
+  return values.map((value: IFSValue) => {
     if (value.enabled) {
         if (filter.column.type === COLUMN.IMAGE) {
             return value.valueid || value.imageUrl || value.value;
@@ -94,7 +91,6 @@ function getResultValues(values: IFSValue[], filter: IFSFilter): IFBExpressionVa
 
 /**
  * Gets the Ranking values. 
- * @private
  * @param values a collection of filter values in the ranking structure
  * @param rankingGroupIndex determine the value by this index to build and return it
  * @returns Expression values for ranking

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

@@ -6,6 +6,5 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
-export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';
-// export * from './hasDatasetRelatedFilters';
+export * from './getLogicByScopes';

package/src/filters/helpers/builder/getFilterBuilderGeneralConfig.ts

@@ -1,12 +1,12 @@
 import { getAttribute } from '../../../general/object/getAttribute';
-import { IFilterConfig } from '../../interfaces/common/IFilterConfig';
+import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
 
 /**
  * Returns a filter builder config object by a any given config
  * @param config any config object
  * @returns The filter builder config object
  */
-export function getFilterBuilderGeneralConfig(config: any = {}): IFilterConfig {
+export function getFilterBuilderGeneralConfig(config: any = {}): IFilterBuilderGeneralConfig {
     return {
         apiKey: getAttribute(config, 'api_key') || config.apiKey,
         appid: getAttribute(config, 'app_id') || config.appid,

package/src/filters/helpers/common/excludeFiltersByParams.ts

@@ -42,7 +42,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                     if (resolveFilterConditions(filter, params)) {
                       return {
                         ...filter,
-                        values: (filter.values || []).map((value: IFValue) => {
+                        values: filter.values.map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
                             rankingValues.map(rValue => {
@@ -54,7 +54,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                           }
                         }).filter(Boolean) };
                     }
-                  }).filter(filter => !isEmpty(filter) && (filter.selectAll && filter.values?.length > 0))
+                  }).filter(filter => !isEmpty(filter) && filter.values.length > 0)
                 };  
               }  
             }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
@@ -88,5 +88,5 @@ function resolveFilterConditions(filter: IFSFilter, params: IFSParamsToGetFilter
         params.column?.qrveyid !== filter.column.qrveyid &&
         params.column?.linkid !== filter.column.linkid) &&
         params.column?.aggregate !== filter.column.aggregate) &&
-    filter.values?.length > 0;
+    filter.values.length > 0;
 }

package/src/filters/helpers/common/getFiltersByDatasetsColumns.ts

@@ -0,0 +1,35 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFUData } from "../../interfaces/ui/IFUData";
+
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
+    if (isEmpty(data) || isEmpty(data.scopes)) return;
+
+    return {
+        ...data,
+        scopes: data.scopes.map(scope => ({
+            ...scope,
+            datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+                if (!isEmpty(dataset)) {
+                    return {
+                        ...filterDataset,
+                        filters: filterDataset.filters.map(filter => {
+                            const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
+                            if (!isEmpty(column)) {
+                                return { ...filter };
+                            }
+                        }).filter(Boolean)
+                    };
+                }
+            }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
+        })).filter(scope => !isEmpty(scope) && scope.datasets.length > 0)
+    };
+}

package/src/filters/helpers/common/getFiltersByParams.ts

@@ -5,12 +5,12 @@ import { IFSData } from "../../interfaces/common/IFSData";
 import { IFSDataset } from "../../interfaces/common/IFSDataset";
 import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 import { IFSScope } from "../../interfaces/common/IFSScope";
 import { IFSValue } from "../../interfaces/common/IFSValue";
 import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
 import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
 import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
 import { IFValue } from "../../interfaces/IFValue";
 import { IFUData } from "../../interfaces/ui/IFUData";
 import { getParamsToGetFilterSettings } from "./getParamsToGetFilterSettings";
@@ -33,7 +33,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * @param params given parameters to validate the dataset 
  * @returns a new Filter object structure
  */
-export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFFiltersParamsToGetFilter): IFSData | IFUData {
+export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSParamsToGetFilter, settings?: IFSParamsToGetFilterSettings): IFSData | IFUData {
     if (isEmpty(filterData) || isEmpty(filterData.scopes)) return;
     if (isEmpty(params)) return filterData;
     filterData = cloneDeep(filterData);
@@ -52,7 +52,7 @@ export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSPar
                     if (resolveFilterConditions(filter, params, settings.letPassUndefinedProperties.filter, settings.letPassUndefinedParams.filter)) {
                       return {
                         ...filter,
-                        values: (filter.values || []).map((value: IFValue) => {
+                        values: filter.values.map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
                             return rankingValues.map(rValue => {
@@ -64,7 +64,7 @@ export function getFiltersByParams(filterData: IFSData | IFUData, params: IFSPar
                           }
                         }).filter(Boolean) };
                     }
-                  }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || filter.values?.length > 0))
+                  }).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0))
                 };  
               }  
             }).filter(dataset => !isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0))

package/src/filters/helpers/common/getMergeFiltersSettings.ts

@@ -1,13 +1,12 @@
-import { IFFiltersMergeFilters } from "../../interfaces/functions/IFFiltersMergeFilters";
+import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
 
 /**
  * Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the MergeFilters settings
  * @returns a new MergeFilters settings object.
  */
-export function getMergeFiltersSettings(settings?: IFFiltersMergeFilters): IFFiltersMergeFilters {
+export function getMergeFiltersSettings(settings?: IFSMergeFiltersSettings): IFSMergeFiltersSettings {
     return {
-        overwriteFilterProps: settings?.overwriteFilterProps ?? true,
         overwriteValues: settings?.overwriteValues ?? false,
         setGroupedColumnOperator: settings?.setGroupedColumnOperator ?? true
     };

package/src/filters/helpers/common/getParamsToGetFilterSettings.ts

@@ -1,11 +1,11 @@
-import { IFFiltersParamsToGetFilter } from "../../interfaces/functions/IFFiltersParamsToGetFilter";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 
 /**
  * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
  * @param settings an object to the ParamsToGetFilter settings
  * @returns a new ParamsToGetFilter settings object.
  */
-export function getParamsToGetFilterSettings(settings?: IFFiltersParamsToGetFilter): IFFiltersParamsToGetFilter {
+export function getParamsToGetFilterSettings(settings?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings {
     return {
         letPassUndefinedParams: {
             dataset: settings?.letPassUndefinedParams?.dataset ?? true,

package/src/filters/helpers/common/index.ts

@@ -1,31 +1,26 @@
 export * from './areFiltersEquals';
-
+export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';
-
 export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';
 export * from './getFiltersByVisibility';
 export * from './getMergeFiltersSettings';
 export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
 export * from './haveFiltersByDataset';
 export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
 export * from './isInValidator';
 export * from './isNullValidator';
 export * from './isRangeValidator';
 export * from './isRegularValidator';
 export * from './mergeFilters';
-export * from './mergeValues';
 export * from './resolveDatasetConditions';
 export * from './resolveFilterConditions';
 export * from './resolveScopeConditions';
-// export * from './validateFilterTextByColumn';