@qrvey/utils 1.1.8 → 1.2.1

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

@@ -1,7 +1,17 @@
-import { COLUMN } from "../../../constants";
-import { flattenDeep, isEmpty } from "../../../general";
-import { FILTER_VALIDATOR, FILTER_VALIDATOR_VALUE } from "../../constants";
-import { IFBackendExpressionValue, IFBExpressionRelativeDate, IFBExpressionValue, IFBExpressionValueRanking, IFSFilter, IFSValue, IFSValueRange, IFSValueRanking } from "../../interfaces";
+import { COLUMN } from "../../../columns/constants/COLUMN";
+import { flattenDeep } from "../../../general/array/flattenDeep";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_INFO";
+import { IFBackendExpressionValue } from "../../interfaces/backend/IFBackendExpressionValue";
+import { IFBExpressionRelativeDate } from "../../interfaces/backend/IFBExpressionRelativeDate";
+import { IFBExpressionValue } from "../../interfaces/backend/IFBExpressionValue";
+import { IFBExpressionValueRanking } from "../../interfaces/backend/IFBExpressionValueRanking";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSValue } from "../../interfaces/common/IFSValue";
+import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
+import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
+
 
 /**
  * Gets the expresion values in the logic format
@@ -52,7 +62,7 @@ export function getBackendValues(filter: IFSFilter): IFBackendExpressionValue[]
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
             const addValue = filter.values.length > 0 && (filter.values as IFSValue[]).every(value => value.enabled);
-            return addValue ? [FILTER_VALIDATOR_VALUE[filter.validator].label] : [];
+            return addValue ? [FILTER_VALIDATOR_INFO[filter.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
             return (filter.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);

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

@@ -1,6 +1,7 @@
-import { cloneDeep } from "../../../general";
-import { FILTER_SCOPE } from "../../constants";
-import { IFBLogic, IFSScopeID } from "../../interfaces";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { FILTER_SCOPE } from "../../constants/common/FILTER_SCOPE";
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
 
 /**
  * Gets the filters from logic data by Scopes/Scope IDs.

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

@@ -1,6 +1,8 @@
-import { cloneDeep } from "../../../general";
-import { FILTER_SCOPE } from "../../constants";
-import { IFBLogic, IFScope, IFSScopeID } from "../../interfaces";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { FILTER_SCOPE } from "../../constants/common/FILTER_SCOPE";
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
+import { IFScope } from "../../interfaces/IFScope";
 import { getScopesByHierarchy } from "../getScopesByHierarchy";
 import { getLogicByScopes } from './getLogicByScopes';
 

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

@@ -1,5 +1,5 @@
-import { getAttribute } from '../../../general';
-import { IFilterBuilderGeneralConfig } from '../../interfaces';
+import { getAttribute } from '../../../general/object/getAttribute';
+import { IFilterBuilderGeneralConfig } from '../../interfaces/builder/IFilterBuilderGeneralConfig';
 
 /**
  * Returns a filter builder config object by a any given config

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

@@ -1,4 +1,4 @@
-import { IFSFilter } from "../../interfaces";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 
 /**
  * Validates if both filters are the same

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

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFSData, IFSScope } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFSScope } from "../../interfaces/common/IFSScope";
 
 /**
  * Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.

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

@@ -1,5 +1,15 @@
-import { isEmpty } from "../../../general";
-import { IFSData, IFSDataset, IFSFilter, IFSScope, IFSParamsToGetFilter, IFValue, IFSValueRanking, IFSValue, IFSValueRange, IFSValueRelativeDate, IFUData } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+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 { 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 { IFValue } from "../../interfaces/IFValue";
+import { IFUData } from "../../interfaces/ui/IFUData";
 
 /**
  * Excludes filters from the given Filters.

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

@@ -1,5 +1,8 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFScope, IFSData } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFScope } from "../../interfaces/IFScope";
+
 
 /**
  * Excludes and returns a filter data without filters by the given scopes

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

@@ -1,6 +1,7 @@
-import { isComplexColumn } from "../../../qrvey/isComplexColumn";
-import { IFUColumn } from "../../interfaces";
-import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants";
+import { COMPLEX_COLUMN_PROPERTIES } from "../../../columns/constants/COMPLEX_COLUMN_PROPERTIES";
+import { isComplexColumn } from "../../../columns/helpers/isComplexColumn";
+import { AGGREGATE_ABBREVIATION } from "../../../qrvey/constants/AGGREGATE_ABBREVIATION";
+import { IFUColumn } from "../../interfaces/ui/IFUColumn";
 
 /**
  * Get an string of the properties of the given filter column.
@@ -9,7 +10,7 @@ import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants
  */
 export function getFilterColumnLabel(column: IFUColumn): string {
     const labels: string[] = [];
-    if (isComplexColumn(column as any) && column.property != null) labels.push(COLUMN_COMPLEX_VALUE[column.property].shortLabel);
+    if (isComplexColumn(column as any) && column.property != null) labels.push(COMPLEX_COLUMN_PROPERTIES[column.property].shortLabel);
     if (column.aggregate != null) labels.push(AGGREGATE_ABBREVIATION[column.aggregate]);
     if (column.calculation != null) labels.push(column.calculation);
   

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

@@ -1,4 +1,4 @@
-import { IFUFilter } from "../../interfaces";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { getFilterColumnLabel } from "./getFilterColumnLabel";
 
 /**

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

@@ -1,4 +1,4 @@
-import { IFSFilter } from "../../interfaces";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 
 /**
  * Get the Filter ID by the filter structure

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

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFSData, IFSScope } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFSScope } from "../../interfaces/common/IFSScope";
 
 /**
  * Gets Aggregate Filters in the Filter Data. Gets the filters when the column.aggregate is included.

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

@@ -1,5 +1,18 @@
-import { cloneDeep, isEmpty, _hasProperty } from "../../../general";
-import { IFSData, IFSDataset, IFSFilter, IFSScope, IFSParamsToGetFilter, IFValue, IFSValueRanking, IFSValue, IFSValueRange, IFSValueRelativeDate, IFUData, IFSParamsToGetFilterSettings } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { _hasProperty } from "../../../general/object/hasProperty";
+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 { IFValue } from "../../interfaces/IFValue";
+import { IFUData } from "../../interfaces/ui/IFUData";
 import { getParamsToGetFilterSettings } from "./getParamsToGetFilterSettings";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";

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

@@ -1,5 +1,8 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFScope, IFSData, IFUData } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFScope } from "../../interfaces/IFScope";
+import { IFUData } from "../../interfaces/ui/IFUData";
 
 /**
  * Filters and gets a Filter Data by the given scopes

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

@@ -1,6 +1,10 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { FILTER_SCOPE } from "../../constants";
-import { IFSData, IFSScope, IFSScopeID, IFUData } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { FILTER_SCOPE } from "../../constants/common/FILTER_SCOPE";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFSScope } from "../../interfaces/common/IFSScope";
+import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
+import { IFUData } from "../../interfaces/ui/IFUData";
 
 /**
  * Gets filters from Filter Data by Scopes/Scope IDs.

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

@@ -1,7 +1,10 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFSData, IFSScopeID, IFUData } from "../../interfaces";
 import { getFiltersByScopesIds } from "./getFiltersByScopesIds";
 import { getFiltersByParams } from "./getFiltersByParams";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFUData } from "../../interfaces/ui/IFUData";
+import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
 
 /**
  * Get a new Filter Data by filtering scopes/scope IDs and enabled flags

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

@@ -1,4 +1,4 @@
-import { IFSParamsToGetFilterSettings } from "../../interfaces";
+import { IFSParamsToGetFilterSettings } from "../../interfaces/common/IFSParamsToGetFilterSettings";
 
 /**
  * Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.

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

@@ -1,5 +1,6 @@
-import { isEmpty } from "../../../general";
-import { IFSData, IFUData } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFUData } from "../../interfaces/ui/IFUData";
 
 /**
  * Validates if the filter data has filters by a dataset ID (Qrvey ID).

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

@@ -1,5 +1,5 @@
 export * from './areFiltersEquals';
-export * from './arePropertiesDateP';
+export * from './isDateDistinctProperty';
 export * from './excludeFiltersByAggregateColumn';
 export * from './excludeFiltersByParams';
 export * from './excludeFiltersByScopes';

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

@@ -1,5 +1,6 @@
-import { FILTER_VALIDATOR } from "../../constants";
-import { IFValidator } from "../../interfaces";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFValidator } from "../../interfaces/IFValidator";
+
 
 /**
  * Validates if the given validator is a Between type

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

@@ -0,0 +1,17 @@
+import { isDateColumn } from "../../../columns/helpers/isDateColumn";
+import { DATE_DISTINCT_PROPERTIES } from "../../../dates/constants/DATE_DISTINCT_PROPERTIES";
+import { DATE_DISTINCT_TIME_PROPERTIES } from "../../../dates/constants/DATE_DISTINCT_TIME_PROPERTIES";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFSColumn } from "../../interfaces/common/IFSColumn";
+import { IFProperty } from "../../interfaces/IFProperty";
+import { IFUColumn } from "../../interfaces/ui/IFUColumn";
+
+/**
+ * Determines if the filter column and property is a distinct group dates type
+ * @param column The filter column
+ * @param property The filter property
+ * @returns True if the given property is included from distinct group dates type
+ */
+export function isDateDistinctProperty(column: IFUColumn | IFSColumn, property: IFProperty): boolean {
+  return isDateColumn(column as any) && isEmpty(column.aggregate) && ([...DATE_DISTINCT_PROPERTIES, ...DATE_DISTINCT_TIME_PROPERTIES] as unknown as IFProperty).includes(property);
+}

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

@@ -1,5 +1,5 @@
-import { FILTER_VALIDATOR } from "../../constants";
-import { IFValidator } from "../../interfaces";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Validates if the given validator is a In type

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

@@ -1,5 +1,5 @@
-import { FILTER_VALIDATOR } from "../../constants";
-import { IFValidator } from "../../interfaces";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Checks if the given validator is a Null type.

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

@@ -1,5 +1,5 @@
-import { FILTER_VALIDATOR } from "../../constants";
-import { IFValidator } from "../../interfaces";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Validates if the given validator is a Range type. Range type means the value has min and max values to filter

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

@@ -1,5 +1,5 @@
-import { FILTER_VALIDATOR } from "../../constants";
-import { IFValidator } from "../../interfaces";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Validates if the given validator is a regular type. Regular type means the filter object has a value as string to filter

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

@@ -1,7 +1,16 @@
-import { cloneDeep, isEmpty } from "../../../general";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
 import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
-import { IFSData, IFSDataset, IFSFilter, IFSScope, IFSValue, IFSValueRange, IFSValueRelativeDate, IFUData, IFValue } from "../../interfaces";
+import { IFSData } from "../../interfaces/common/IFSData";
+import { IFSDataset } from "../../interfaces/common/IFSDataset";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
+import { IFSScope } from "../../interfaces/common/IFSScope";
+import { IFSValue } from "../../interfaces/common/IFSValue";
+import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
+import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
+import { IFValue } from "../../interfaces/IFValue";
+import { IFUData } from "../../interfaces/ui/IFUData";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
 import { isInValidator } from "./isInValidator";
 import { isNullValidator } from "./isNullValidator";

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

@@ -1,5 +1,7 @@
-import { isEmpty, _hasProperty } from "../../../general";
-import { IFSDataset, IFSParamsToGetFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { IFSDataset } from "../../interfaces/common/IFSDataset";
+import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
 
 /**
  * Resolves the conditions by given params

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

@@ -1,5 +1,7 @@
-import { isEmpty, _hasProperty } from "../../../general";
-import { IFSFilter, IFSParamsToGetFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
 
 /**
  * Resolves the conditions by given params

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

@@ -1,5 +1,7 @@
-import { isEmpty, _hasProperty } from "../../../general";
-import { IFSParamsToGetFilter, IFSScope } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { IFSParamsToGetFilter } from "../../interfaces/common/IFSParamsToGetFilter";
+import { IFSScope } from "../../interfaces/common/IFSScope";
 
 /**
  * Resolves the conditions by given params

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

@@ -0,0 +1,29 @@
+// import { IFSColumn, IFUColumn } from "../..";
+// import { isDateColumn, isEmpty, isTokenLabel } from "../../..";
+// import { DATE_FORMAT } from "../../../date/constants/DATE_FORMAT";
+// import { IDateFormat } from "../../../date/interfaces/IDateFormat";
+
+// export function validateFilterTextByColumn(column: IFSColumn | IFUColumn, text = '', extras = {}) {
+//     if (isDateColumn(column as any)) validateDateColumn(text, extras?.dateGroup);
+// }
+
+// function validateDateColumn(date = '', dateGroup: IDateFormat = DATE_FORMAT.DAY): boolean {
+//     if (isEmpty(date)) return false;
+//     if (isTokenLabel(date)) return true;
+
+//     let regexStr = '';
+//     if (format === DATE_FORMAT.MONTH) {
+//     return validateDateFormat(date, ' ', format);
+//     } else if (format === DATE_FORMAT.QUARTER) {
+//     return validateDateFormat(date, ' ', format);
+//     } else if (format === DATE_FORMAT.YEAR) {
+//     regexStr = `^\\d{4}$`;
+//     }else if (format === DATE_FORMAT.WEEK) {
+//     return validateDateFormat(date, ' ', format);
+//     } else {
+//     const refineDate = date.split(' ')[0]; // reafine date if have time
+//     return validateDateFormat(refineDate, '/', format);
+//     }
+//     const regex = new RegExp(regexStr, 'g');
+//     return regex.test(date);
+// }

package/src/filters/helpers/getAggFiltersFromFilterData.ts

@@ -1,6 +1,7 @@
-import { isEmpty } from "../../general";
-import { IFBFilterAggregate, IFSData } from "../interfaces";
-import { getFiltersByAggregateColumn } from "./common";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
+import { IFSData } from "../interfaces/common/IFSData";
+import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColumn";
 
 /**
  * 

package/src/filters/helpers/getAvailableScopes.ts

@@ -1,6 +1,7 @@
-import { isEmpty } from "../../general/index";
-import { FILTER_SCOPE } from "../constants";
-import { IFSAvailableScope, IFSScopeID } from "../interfaces";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { IFSAvailableScope } from "../interfaces/common/IFSAvailableScope";
+import { IFSScopeID } from "../interfaces/common/IFSScopeID";
 
 /**
  * Gets Scopes/Scope IDs by given IDs

package/src/filters/helpers/getAvailableScopesIDsByConfig.ts

@@ -1,5 +1,5 @@
-import { getAttribute } from "../../general";
-import { IFSAvailableScope } from "../interfaces";
+import { getAttribute } from "../../general/object/getAttribute";
+import { IFSAvailableScope } from "../interfaces/common/IFSAvailableScope";
 
 /**
  * Gets the Scopes IDS for the Available Scope function by any config

package/src/filters/helpers/getScopesByHierarchy.ts

@@ -1,5 +1,6 @@
-import { FILTER_SCOPE } from "../constants";
-import { IFScope, IFSScopeID } from "../interfaces";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { IFSScopeID } from "../interfaces/common/IFSScopeID";
+import { IFScope } from "../interfaces/IFScope";
 
 /**
  * [TODO: Make a description for this]

package/src/filters/helpers/ui/excludeUIFiltersByAggregate.ts

@@ -1,5 +1,5 @@
-import { cloneDeep } from "../../../general";
-import { IFUFilter } from "../../interfaces";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 
 /**
  * Excludes Aggregate Filters in the Flattened UI Filters array

package/src/filters/helpers/ui/excludeUIFlatFiltersByScopes.ts

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFScope, IFUFlattenedFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFScope } from "../../interfaces/IFScope";
+import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
 
 /**
  * Excludes and returns a UI Flat Filters without filters by the given scopes

package/src/filters/helpers/ui/getFilterPropertyLabel.ts

@@ -1,5 +1,6 @@
-import { IFSFilter, IFUFilter } from "../..";
-import { getPropertyLabel } from "../../..";
+import { getPropertyLabel } from "../../../qrvey/helpers/getPropertyLabel";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 
 /**
      * Gets the label of the filter property

package/src/filters/helpers/ui/getOutputFormatByColumn.ts

@@ -1,5 +1,8 @@
-import { _get, isEmpty } from "../../../general";
-import { IQrveyDataset, IOutputFormat, IQrveyColumn } from "../../../interfaces";
+import { IColumn } from "../../../columns/interfaces/IColumn";
+import { IColumnOutputFormatSettings } from "../../../columns/interfaces/IColumnOutputFormatSettings";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _get } from "../../../general/object/get";
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
 
 /**
  * Gets output format object from Datasets by the given column. Item of the datasets array must have outputformat item in order to be returned
@@ -7,8 +10,8 @@ import { IQrveyDataset, IOutputFormat, IQrveyColumn } from "../../../interfaces"
  * @param datasets array of datasets
  * @returns The output format object
  */
-export function getOutputFormatByColumn(column: any, datasets: IQrveyDataset[] = []): IOutputFormat {
-    let foundColumn: IQrveyColumn;
+export function getOutputFormatByColumn(column: IColumn, datasets: IDataset[] = []): IColumnOutputFormatSettings {
+    let foundColumn: IColumn;
     datasets.some(dataset => {
       foundColumn = dataset.options.find(option => option.id === column.id && !isEmpty(option.outputFormat));
       return foundColumn;

package/src/filters/helpers/ui/getUIFlatFilterByParams.ts

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
+import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
 import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 
  /**

package/src/filters/helpers/ui/getUIFlatFiltersByParams.ts

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
+import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
 import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
 
 /**

package/src/filters/helpers/ui/getUIFlatFiltersByScopes.ts

@@ -1,5 +1,7 @@
-import { cloneDeep, isEmpty } from "../../../general";
-import { IFScope, IFUFlattenedFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { cloneDeep } from "../../../general/object/cloneDeep";
+import { IFScope } from "../../interfaces/IFScope";
+import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
 
 /**
  * Filters and gets a UI Flatten Filters by the given scopes

package/src/filters/helpers/ui/getUIValues.ts

@@ -1,9 +1,24 @@
-import { FILTER_VALIDATOR, FILTER_VALIDATOR_VALUE } from "../../constants";
-import { RELATIVE_CURSOR, RELATIVE_CURSOR_VALUE } from "../../../date";
-import { IFSFilter, IFSValue, IFSValueRange, IFSValueRanking, IFSValueRelativeDate, IFUValue } from "../../interfaces";
-import { COLUMN } from "../../../constants";
-import { flattenDeep, isEmpty } from "../../../general";
+import { RELATIVE_CURSOR } from "../../../dates/relative/constants/RELATIVE_CURSOR";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_INFO";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFSValue } from "../../interfaces/common/IFSValue";
+import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
+import { IFSValueRelativeDate } from "../../interfaces/common/IFSValueRelativeDate";
+import { IFUValue } from "../../interfaces/ui/IFUValue";
+import { COLUMN } from "../../../columns/constants/COLUMN";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFSValueRanking } from "../../interfaces/common/IFSValueRanking";
+import { flattenDeep } from "../../../general/array/flattenDeep";
+import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
 
+/**
+ * 
+ * @param filter 
+ * @param addEnableds 
+ * @param rankingGroupIndex 
+ * @returns 
+ */
 export function getUIValues(filter: IFSFilter, addEnableds = false, rankingGroupIndex?: number): IFUValue[] {
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
@@ -31,13 +46,13 @@ export function getUIValues(filter: IFSFilter, addEnableds = false, rankingGroup
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
-                value: FILTER_VALIDATOR_VALUE[filter.validator].label,
+                value: FILTER_VALIDATOR_INFO[filter.validator].label,
                 enabled: addEnableds ? (filter.values as IFSValue[])[0]?.enabled : undefined,
             }];
         case FILTER_VALIDATOR.IN:
             return (filter.values as IFSValueRelativeDate[]).map(value => ({
                 value: 
-                `${RELATIVE_CURSOR_VALUE[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}`: ''}`,
+                `${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'}`: ''}`,
                 enabled: addEnableds ? filter.enabled : undefined,
             }));
         default:

package/src/filters/interfaces/IFDateProperty.ts

@@ -1,3 +1,3 @@
-import { DATE_PROPERTY } from "../../date/constants";
+import { IDateGroupingProperty } from "../../dates/interfaces/IDateGroupingProperty";
 
-export type IFDateProperty = DATE_PROPERTY;
+export type IFDateProperty = IDateGroupingProperty;

package/src/filters/interfaces/IFDateSection.ts

@@ -1,3 +1,3 @@
-import { FILTER_DATE_SECTION } from "../constants";
+import { FILTER_DATE_SECTION } from "../constants/common/FILTER_DATE_SECTION";
 
 export type IFDateSection = FILTER_DATE_SECTION;

package/src/filters/interfaces/IFDateSectionInfo.ts

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