@qrvey/utils 1.2.7 → 1.2.9-10

package/src/dates/constants/DATE_YEAR_QUARTERS_RANGE.ts

@@ -0,0 +1,18 @@
+export const DATE_YEAR_QUARTERS_RANGE = {
+    Q1: {
+      initial: 0,
+      final: 2
+    },
+    Q2: {
+      initial: 3,
+      final: 5
+    },
+    Q3: {
+      initial: 6,
+      final: 8
+    },
+    Q4: {
+      initial: 9,
+      final: 11
+    }
+};

package/src/dates/constants/index.ts

@@ -37,4 +37,6 @@ export * from './DATE_REGULAR_EXPRESSION';
 export * from './DATE_WEEK_DAYS';
 export * from './DATE_YEAR_DAYS';
 export * from './DATE_YEAR_MONTHS';
+export * from './DATE_YEAR_MONTHS_MMMM';
 export * from './DATE_YEAR_QUARTERS';
+export * from './DATE_YEAR_QUARTERS_RANGE';

package/src/dates/helpers/getDateByDateFormat.ts

@@ -0,0 +1,34 @@
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { IDateFormat } from "../interfaces/IDateFormat";
+import { yearToDate } from "../adapters/yearToDate";
+import { monthYearToDate } from "../adapters/monthYearToDate";
+import { quarterYearToDate } from "../adapters/quarterYearToDate";
+import { weekYearToDate } from "../adapters/weekYearToDate";
+import { mdyDateToDate } from "../adapters/mdyDateToDate";
+
+/**
+ * Gets a Date Object instance by a Date format
+ * @param date String with a formatted date
+ * @param format The date format
+ * @param time flag to convert the formatted date to miliseconds
+ * @returns a Date object, milisecond time or the same value if date format does not match.
+ */
+export function getDateByDateFormat(date: string, format: IDateFormat, time = false) {
+    switch (format) {
+        case DATE_FORMAT.YEAR:
+            return yearToDate(date, time);
+        case DATE_FORMAT.MONTH:
+            return monthYearToDate(date, time);
+        case DATE_FORMAT.QUARTER:
+            return quarterYearToDate(date, time);
+        case DATE_FORMAT.WEEK:
+            return weekYearToDate(date, time);
+        case DATE_FORMAT.DAY:
+        case DATE_FORMAT.HOUR:
+        case DATE_FORMAT.MINUTE:
+        case DATE_FORMAT.SECOND:
+            return mdyDateToDate(date, time);
+        default:
+            return date;
+    }
+}

package/src/dates/helpers/getDateFormatByProperty.ts

@@ -0,0 +1,26 @@
+import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
+import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { IDateFormat } from "../interfaces/IDateFormat";
+
+/**
+ * Gets the date format by the given property
+ * @param property The Column Property
+ * @returns The date format
+ */
+export function getDateFormatByProperty(property: IColumnPropertyType): IDateFormat {
+    return property === COLUMN_PROPERTY.YEAR ? DATE_FORMAT.YEAR :
+        property === COLUMN_PROPERTY.MONTH ? DATE_FORMAT.MONTH :
+      property === COLUMN_PROPERTY.QUARTER ? DATE_FORMAT.QUARTER :
+      property === COLUMN_PROPERTY.WEEK ? DATE_FORMAT.WEEK :
+      property === COLUMN_PROPERTY.DAY ? DATE_FORMAT.DAY :
+      property === COLUMN_PROPERTY.HOUR ? DATE_FORMAT.HOUR :
+      property === COLUMN_PROPERTY.MINUTE ? DATE_FORMAT.MINUTE :
+      property === COLUMN_PROPERTY.SECOND ? DATE_FORMAT.SECOND :
+      property === COLUMN_PROPERTY.MONTH_DAY ? DATE_FORMAT.MONTH_DAY :
+      property === COLUMN_PROPERTY.YEAR_MONTH ? DATE_FORMAT.YEAR_MONTH :
+      property === COLUMN_PROPERTY.YEAR_QUARTER ? DATE_FORMAT.YEAR_QUARTER :
+      property === COLUMN_PROPERTY.DAY_HOUR ? DATE_FORMAT.DAY_HOUR :
+      property === COLUMN_PROPERTY.HOUR_MINUTE ? DATE_FORMAT.HOUR_MINUTE :
+      property === COLUMN_PROPERTY.MINUTE_SECOND ? DATE_FORMAT.MINUTE_SECOND : undefined;
+}

package/src/dates/helpers/getDateFormatRegularExpressionInArray.ts

@@ -0,0 +1,45 @@
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { DATE_REGULAR_EXPRESSION } from "../constants/DATE_REGULAR_EXPRESSION";
+import { IDateFormat } from "../interfaces/IDateFormat";
+
+/**
+ * Gets an array of regular expressions by the given date format
+ * @param dateFormat the date format
+ * @returns an array of regular expressions
+ */
+export function getDateFormatRegularExpressionInArray(dateFormat: IDateFormat = DATE_FORMAT.DAY): string[] {
+    switch (dateFormat) {
+        case DATE_FORMAT.YEAR: 
+            return [DATE_REGULAR_EXPRESSION.YEAR];
+        case DATE_FORMAT.MONTH:
+            return [DATE_REGULAR_EXPRESSION.YEAR_MONTH, DATE_REGULAR_EXPRESSION.YEAR];
+        case DATE_FORMAT.QUARTER:
+            return [DATE_REGULAR_EXPRESSION.YEAR_QUARTER, DATE_REGULAR_EXPRESSION.YEAR];
+        case DATE_FORMAT.WEEK:
+            return [DATE_REGULAR_EXPRESSION.YEAR_WEEK, DATE_REGULAR_EXPRESSION.YEAR];
+        case DATE_FORMAT.DAY:
+            return [DATE_REGULAR_EXPRESSION.YEAR_MONTH_NUMBER, DATE_REGULAR_EXPRESSION.MONTH_DAY, DATE_REGULAR_EXPRESSION.YEAR];
+        case DATE_FORMAT.DAY_TIME:
+            return [DATE_REGULAR_EXPRESSION.DAY_TIME];
+        case DATE_FORMAT.HOUR:
+        case DATE_FORMAT.MINUTE:
+        case DATE_FORMAT.SECOND:
+            return [DATE_REGULAR_EXPRESSION.DAY, DATE_REGULAR_EXPRESSION.DAY_TIME];
+        case DATE_FORMAT.MONTH_DAY:
+            return [DATE_REGULAR_EXPRESSION.MONTH_DAY];
+        case DATE_FORMAT.YEAR_MONTH:
+            return [DATE_REGULAR_EXPRESSION.YEAR_MONTH];
+        case DATE_FORMAT.YEAR_QUARTER:
+            return [DATE_REGULAR_EXPRESSION.YEAR_QUARTER];
+        case DATE_FORMAT.YEAR_WEEK:
+            return [DATE_REGULAR_EXPRESSION.YEAR_WEEK];
+        case DATE_FORMAT.DAY_HOUR:
+            return [DATE_REGULAR_EXPRESSION.DAY_HOUR];
+        case DATE_FORMAT.HOUR_MINUTE:
+            return [DATE_REGULAR_EXPRESSION.HOUR_MINUTE];
+        case DATE_FORMAT.MINUTE_SECOND:
+            return [DATE_REGULAR_EXPRESSION.MINUTE_SECOND];
+      default:
+        return [DATE_REGULAR_EXPRESSION.YEAR_MONTH_NUMBER, DATE_REGULAR_EXPRESSION.MONTH_DAY, DATE_REGULAR_EXPRESSION.YEAR];
+    }
+}

package/src/dates/helpers/getSeparatorByDateFormat.ts

@@ -0,0 +1,13 @@
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { IDateFormat } from "../interfaces/IDateFormat";
+
+/**
+ * Gets the separator of the date format
+ * @param format the date format
+ * @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 ? '' :
+        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/getWeek.ts

@@ -0,0 +1,21 @@
+/**
+ * Gets the week number of the year
+ * Additionally, the month and the year
+ * @param date the date object
+ * @returns an object with the week, month and year.
+ */
+export function getWeek (date: Date) {
+    const target = new Date(date.valueOf());
+    const dayNr = (date.getDay() + 6) % 7;
+    target.setDate(target.getDate() - dayNr + 3);
+    const firstThursday = target.valueOf();
+    target.setMonth(0, 1);
+    if (target.getDay() !== 4) {
+      target.setMonth(0, 1 + ((4 - target.getDay()) + 7) % 7);
+    }
+    return {
+      week: 1 + Math.ceil((firstThursday - +target) / 604800000),
+      month: target.getMonth() + 1,
+      year: target.getFullYear()
+    };
+}

package/src/dates/helpers/index.ts

@@ -0,0 +1,6 @@
+export * from './getDateFormatByProperty';
+export * from './getDateFormatRegularExpressionInArray';
+export * from './getSeparatorByDateFormat';
+export * from './getWeek';
+export * from './validateDate';
+export * from './validateDateByDateFormat';

package/src/dates/helpers/validateDate.ts

@@ -0,0 +1,22 @@
+
+import { isEmpty } from "../../general/mix/isEmpty";
+import { isTokenLabel } from "../../tokens/isTokenLabel";
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { IDateFormat } from "../interfaces/IDateFormat";
+import { validateDateByDateFormat } from "./validateDateByDateFormat";
+
+/**
+ * Validate a string date depending on giving format
+ * - If the string is a token label, the function lets it pass.
+ * - Otherwise depends of the format
+ * - Some escenarios the string is a mix of token labels and dates
+ * @param date String of date
+ * @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 {
+    if (isEmpty(date)) return false;
+    if (isTokenLabel(date)) return true;
+
+    return validateDateByDateFormat(date, format);
+}

package/src/dates/helpers/validateDateByDateFormat.ts

@@ -0,0 +1,25 @@
+import { isTokenLabel } from "../../tokens/isTokenLabel";
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { IDateFormat } from "../interfaces/IDateFormat";
+import { getDateFormatRegularExpressionInArray } from "./getDateFormatRegularExpressionInArray";
+import { getSeparatorByDateFormat } from "./getSeparatorByDateFormat";
+
+/**
+ * Validates the given string as Date by its date format.
+ * @param date a string to validate as date form
+ * @param dateForma the format of the date to validate the string
+ * @returns true: the string is a valida date
+ */
+export function validateDateByDateFormat(date: string, dateFormat: IDateFormat = DATE_FORMAT.DAY): boolean {
+    const resultValidation: boolean[] = [];
+    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++) {
+        resultValidation.push(isTokenLabel(separatedDate[i]) || new RegExp(regularExpression[i], 'g').test(separatedDate[i]));
+    }
+    return resultValidation.every(validValue => validValue);
+}

package/src/dates/index.ts

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

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

@@ -1,7 +1,10 @@
+import { IRelativeCursorInfo } from "../interfaces/IRelativeCursorInfo";
+import { RelativeCursor } from "../interfaces/RelativeCursor";
 import { RELATIVE_CURSOR } from "./RELATIVE_CURSOR";
+import { RELATIVE_CURSOR_LABEL } from "./RELATIVE_CURSOR_LABEL";
 
-export const RELATIVE_CURSOR_INFO = {
-    [RELATIVE_CURSOR.THIS]: { label: 'This', value: 'this' },
-    [RELATIVE_CURSOR.NEXT]: { label: 'The next', value: 'the next' },
-    [RELATIVE_CURSOR.LAST]: { label: 'The last', value: 'the last' },
+export const RELATIVE_CURSOR_INFO: { [key in RelativeCursor]: IRelativeCursorInfo } = {
+    [RELATIVE_CURSOR.THIS]: { abbrLabel: 'This', shortLabel: 'This', label: RELATIVE_CURSOR_LABEL.THIS, value: RELATIVE_CURSOR.THIS, displayed: true, i18nLabelPath: 'filter.relative_container.cursors.this_label' },
+    [RELATIVE_CURSOR.NEXT]: { abbrLabel: 'Next', shortLabel: 'Next', label: RELATIVE_CURSOR_LABEL.NEXT, value: RELATIVE_CURSOR.NEXT, displayed: true, i18nLabelPath: 'filter.relative_container.cursors.the_next_label' },
+    [RELATIVE_CURSOR.LAST]: { abbrLabel: 'Last', shortLabel: 'Last', label: RELATIVE_CURSOR_LABEL.LAST, value: RELATIVE_CURSOR.LAST, displayed: true, i18nLabelPath: 'filter.relative_container.cursors.the_last_label' },
 };

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

@@ -0,0 +1,11 @@
+import { RELATIVE_CURSOR_INFO } from "./RELATIVE_CURSOR_INFO";
+import { IRelativeCursorInfo } from "..";
+import { RELATIVE_CURSOR } from "./RELATIVE_CURSOR";
+/**
+ * @description Key/array of compound relative cursor info
+ */
+export const RELATIVE_CURSOR_INFO_LIST: IRelativeCursorInfo[] = [
+    RELATIVE_CURSOR_INFO[RELATIVE_CURSOR.THIS],
+    RELATIVE_CURSOR_INFO[RELATIVE_CURSOR.LAST],
+    RELATIVE_CURSOR_INFO[RELATIVE_CURSOR.NEXT],
+];

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

@@ -0,0 +1,5 @@
+export enum RELATIVE_CURSOR_LABEL {
+    THIS = 'This',
+    NEXT = 'The next',
+    LAST = 'The last',
+}

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

@@ -0,0 +1,11 @@
+import { DATE_GROUPING_PROPERTY } from "../../constants/DATE_GROUPING_PROPERTY";
+import { IRelativeUnit } from "../interfaces/IRelativeUnit";
+import { IRelativeUnitInfo } from "../interfaces/IRelativeUnitInfo";
+
+export const RELATIVE_UNIT_INFO: { [key in IRelativeUnit]: IRelativeUnitInfo } = {
+    DAY: { abbrLabel: 'Day', shortLabel: 'Day', label: 'Day', value: DATE_GROUPING_PROPERTY.DAY, displayed: true, i18nLabelPath: 'common.units.day' },
+    MONTH: { abbrLabel: 'Month', shortLabel: 'Month', label: 'Month', value: DATE_GROUPING_PROPERTY.MONTH, displayed: true, i18nLabelPath: 'common.units.month' },
+    QUARTER: { abbrLabel: 'Quarter', shortLabel: 'Quarter', label: 'Quarter', value: DATE_GROUPING_PROPERTY.QUARTER, displayed: true, i18nLabelPath: 'common.units.quarter' },
+    WEEK: { abbrLabel: 'Week', shortLabel: 'Week', label: 'Week', value: DATE_GROUPING_PROPERTY.WEEK, displayed: true, i18nLabelPath: 'common.units.week' },
+    YEAR: { abbrLabel: 'Year', shortLabel: 'Year', label: 'Year', value: DATE_GROUPING_PROPERTY.YEAR, displayed: true, i18nLabelPath: 'common.units.year' },
+};

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

@@ -0,0 +1,13 @@
+import { IRelativeUnitInfo } from "../interfaces/IRelativeUnitInfo";
+import { RELATIVE_UNIT_INFO } from "./RELATIVE_UNIT_INFO";
+
+/**
+ * @description Key/array of compound relative cursor info
+ */
+export const RELATIVE_UNIT_INFO_LIST: IRelativeUnitInfo[] = [
+    RELATIVE_UNIT_INFO['YEAR'],
+    RELATIVE_UNIT_INFO['QUARTER'],
+    RELATIVE_UNIT_INFO['MONTH'],
+    RELATIVE_UNIT_INFO['WEEK'],
+    RELATIVE_UNIT_INFO['DAY'],
+];

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

@@ -1,6 +1,10 @@
 export * from './COMMON';
 export * from './DATE_FORMATS';
 export * from './RELATIVE_CURSOR';
+export * from './RELATIVE_CURSOR_INFO_LIST';
 export * from './RELATIVE_CURSOR_INFO';
+export * from './RELATIVE_CURSOR_LABEL';
+export * from './RELATIVE_UNIT_INFO_LIST';
+export * from './RELATIVE_UNIT_INFO';
 
 export * from './ui/index';

package/src/dates/relative/interfaces/IRelativeCursorInfo.ts

@@ -0,0 +1,6 @@
+import { IGeneralInfo } from "../../../interfaces/general/IGeneralInfo";
+import { RelativeCursor } from "./RelativeCursor";
+
+export interface IRelativeCursorInfo extends IGeneralInfo {
+	value: RelativeCursor;
+}

package/src/dates/relative/interfaces/IRelativeUnit.ts

@@ -0,0 +1,3 @@
+import { DATE_GROUPING_PROPERTY } from "../../constants/DATE_GROUPING_PROPERTY";
+
+export type IRelativeUnit = keyof typeof DATE_GROUPING_PROPERTY;

package/src/dates/relative/interfaces/IRelativeUnitInfo.ts

@@ -0,0 +1,7 @@
+import { IGeneralInfo } from "../../../interfaces/general/IGeneralInfo";
+import { IDateGroupingProperty } from "../../interfaces/IDateGroupingProperty";
+
+
+export interface IRelativeUnitInfo extends IGeneralInfo {
+	value: IDateGroupingProperty;
+}

package/src/dates/relative/interfaces/index.ts

@@ -1,6 +1,9 @@
 export * from './AbsoluteStatement';
 export * from './Anchor';
 export * from './RelativeCursor';
+export * from './IRelativeCursorInfo';
+export * from './IRelativeUnit';
+export * from './IRelativeUnitInfo';
 export * from './RelativeInput';
 export * from './RelativeStatement';
 export * from './RelativeToAbsoluteStruct';

package/src/filters/adapters/FDToFlatUI.ts

@@ -9,7 +9,6 @@ import { IFSScope } from "../interfaces/common/IFSScope";
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { _get } from "../../general/object/get";
-import { getUIValues } from "../helpers/ui/getUIValues";
 
 
 /**
@@ -99,7 +98,6 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IDataset[] = []): I
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property: property,
-                            uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/src/filters/adapters/FDToUI.ts

@@ -12,7 +12,6 @@ import { IFUScope } from "../interfaces/ui/IFUScope";
 import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { _get } from "../../general/object/get";
-import { getUIValues } from "../helpers/ui/getUIValues";
 
 /**
  * Generates a UI filter structure from Filter Data structure.
@@ -78,7 +77,6 @@ export function FDToUI(filterData: IFSData, datasetsInfo: IDataset[] = []): IFUD
                             type: columnInfo?.type || filter.column.type,
                         },
                         property,
-                        uiValues: getUIValues(filter),
                         values: adaptFilterValues(filter),
                     };
                 })

package/src/filters/adapters/UIToFD.ts

@@ -46,7 +46,6 @@ function UI21ToFD(uFilterData: IFUData, version): IFSData {
                     delete filter.column.sorting;
                     delete filter.column.uniqueid;
                     delete filter.column.linked;
-                    delete filter.uiValues;
                 });
             });
             scopes.push(scope);

package/src/filters/adapters/UIToFlatUI.ts

@@ -7,7 +7,6 @@ import { isEmpty } from "../../general/mix/isEmpty";
 import { cloneDeep } from "../../general/object/cloneDeep";
 import { IFUScope } from "../interfaces/ui/IFUScope";
 import { IColumn } from "../../columns/interfaces/IColumn";
-import { getUIValues } from "../helpers/ui/getUIValues";
 
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
@@ -95,7 +94,6 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IDataset[] = []): I
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property,
-                            uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/src/filters/adapters/UIToOldLogic.ts

@@ -162,7 +162,7 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         panelid: filter.extras.panelid,
         panelName: filter.extras.filterLabel,
         section: filter.extras.section,
-        uiValue: getUIValues(filter, true),
+        uiValue: getUIValues(filter, { addEnableds: true } ),
         validator: filter.validator,
         values: adaptFilterValues(filter)
     };

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -101,7 +101,7 @@ const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilt
       panelid: filter.extras.panelid,
       panelName: filter.extras.filterLabel,
       section: filter.extras.section,
-      uiValue: getUIValues(filter, true),
+      uiValue: getUIValues(filter, { addEnableds: true }),
       validator: filter.validator,
       values: filter.values,
       _newFilters: { ...filter }

package/src/filters/adapters/flatUIToUI.ts

@@ -1,5 +1,4 @@
 import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
-import { getUIValues } from "../helpers/ui/getUIValues";
 import { adaptFilterValues } from "./adaptFilterValues";
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 import { IFSection } from "../interfaces/IFSection";
@@ -134,7 +133,6 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
-        uiValues: getUIValues(uFilter),
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/src/filters/adapters/logicToFlatUI.ts

@@ -13,7 +13,6 @@ import { getFilterid } from "../helpers/common/getFilterid";
 import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
 import { _get } from "../../general/object/get";
 import { IFSValueRanking } from "../interfaces/common/IFSValueRanking";
-import { getUIValues } from "../helpers/ui/getUIValues";
 import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
 import { isNullValidator } from "../helpers/common/isNullValidator";
 import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
@@ -59,7 +58,7 @@ function buildFilterByExpression(expression: OLD_IFilterExpression, scopeItem: O
     }
 }
 
-function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD_IFilterLogic) {
+function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD_IFilterLogic): IFUFlattenedFilter {
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
     const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
@@ -113,7 +112,6 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
         nullValues: uiExtras.nullValues,
         operator: uiExtras.operator,
         property,
-        uiValues: getUIValues(uiExtras as any),
         validator: uiExtras.validator,
         values: getValues(uiExtras),
     };