@qrvey/utils 1.1.8 → 1.2.1

package/src/dates/relative/interfaces/ui/IRelativeSectionMode.ts

@@ -0,0 +1,3 @@
+import { RELATIVE_MODE } from "../../constants/ui/RELATIVE_MODE";
+
+export type IRelativeSectionMode = RELATIVE_MODE;

package/src/dates/relative/relative.ts

@@ -0,0 +1,26 @@
+import RelativeStatementAdapter from './Adapter';
+import { RelativeStatement } from './interfaces/RelativeStatement';
+
+/**
+ * Resolve a list of relative statements according to operator
+ * @example
+ * Input:
+ * {
+ *  "cursor": "the_next",
+ *  "unit": "year",
+ *  "number": 1,
+ *  "includeCurrent": false,
+ *  "isCalendarDate": false,
+ *  "anchor": "03/05/2021"
+ * }
+ * 
+ * Output:
+ * { gte: "03/06/2021 00:00:00", lte: "03/05/2022 23:59:59" }
+ * 
+ * @param {RelativeStatement[]|string[]} statements - Raw statements/values
+ * @param {Date} clock - Clock/time reference for relative date resolution 
+ * @returns {AbsoluteRange[]|string[]}
+ */
+export function resolveRelative(statements: RelativeStatement[], clock = new Date()) {
+  return statements.map(s => new RelativeStatementAdapter(s, clock).value());
+}

package/src/filters/adapters/FDToFlatUI.ts

@@ -1,9 +1,16 @@
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
-import { getUIValues } from "../helpers";
-import { IFSData, IFSScope, IFUFlattenedFilter } from "../interfaces";
-import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFSData } from "../interfaces/common/IFSData";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+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";
+
 
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
@@ -11,7 +18,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param datasetsInfo Collection of datasets information
  * @returns a flattened UI filters array
  */
- export function FDToFlatUI(filterData: IFSData, datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
+ export function FDToFlatUI(filterData: IFSData, datasetsInfo: IDataset[] = []): IFUFlattenedFilter[] {
     let uFilters: IFUFlattenedFilter[] = [];
     if (isEmpty(filterData) || isEmpty(filterData.scopes) || filterData.scopes.length === 0) return uFilters;
     filterData = cloneDeep(filterData);
@@ -31,7 +38,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param datasetsInfo Collection of datasets information
  * @returns a flattened UI filters array
  */
-function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
+function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IDataset[] = []): IFUFlattenedFilter[] {
     const uFilters: IFUFlattenedFilter[] = [];
     if (scopes.length === 0) return uFilters;
     scopes.forEach(scope => {
@@ -39,9 +46,9 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
             scope.datasets.forEach(dataset => {
                 if (dataset.filters.length > 0) {
                     dataset.filters.forEach(filter => {
-                        const datasetInfo: IQrveyDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
-                        let columnInfo: IQrveyColumn;
-                        if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
+                        const datasetInfo: IDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
+                        let columnInfo: IColumn;
+                        if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.dataset?.qrveyid === filter.column.qrveyid && cInfo.dataset?.linkid === filter.column.linkid);
                         const info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = adaptDateGroupingProperty(filter.property);
 
@@ -53,8 +60,8 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                                 qrveyid: filter.column.qrveyid,
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
-                                label: columnInfo?.text,
-                                linkid: columnInfo?.linkid,
+                                label: columnInfo?.label,
+                                linkid: datasetInfo?.linkid,
                                 linked: columnInfo?.linked,
                                 outputFormat: _get(datasetInfo, 'outputFormat'),
                                 type: columnInfo?.type || filter.column.type,
@@ -83,7 +90,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
-                                    label: datasetInfo?.name,
+                                    label: datasetInfo?.label,
                                     linkid: dataset.linkid,
                                 },
                             },

package/src/filters/adapters/FDToLogic.ts

@@ -1,9 +1,13 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
 
-import { isEmpty } from "../../general";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { buildFilters } from "../helpers/backend/buildFilters";
-import { IFBFilter, IFBLogic, IFSData, IFSDataset, IFSScope } from "../interfaces";
+import { IFSScope } from "../interfaces/common/IFSScope";
+import { IFBLogic } from "../interfaces/backend/IFBLogic";
+import { IFSData } from "../interfaces/common/IFSData";
+import { IFBFilter } from "../interfaces/backend/IFBFilter";
+import { IFSDataset } from "../interfaces/common/IFSDataset";
 
 /**
  * Generates a Filter Logic structure from Filter Data structure.

package/src/filters/adapters/FDToUI.ts

@@ -1,10 +1,18 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { IQrveyColumn, IQrveyDataset } from "../../interfaces";
-import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
-import { getUIValues } from "../helpers";
-import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSData } from "../interfaces/common/IFSData";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { IFSScope } from "../interfaces/common/IFSScope";
+import { IFSection } from "../interfaces/IFSection";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+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.
@@ -12,7 +20,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param datasetsInfo Collection of datasets information
  * @returns a UI Filters structure
  */
- export function FDToUI(filterData: IFSData, datasetsInfo: IQrveyDataset[] = []): IFUData {
+export function FDToUI(filterData: IFSData, datasetsInfo: IDataset[] = []): IFUData {
     let ufData: IFUData;
     if (isEmpty(filterData) || isEmpty(filterData.scopes)) return ufData;
 
@@ -34,7 +42,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param datasetsInfo Collection of datasets information
  * @returns a UI filter Structure
  */
- function FD21ToUI(scopes: IFSScope[] = [], section: IFSection = FILTER_SECTION.ANYWHERE, enabled = true, datasetsInfo: IQrveyDataset[] = [], version = FILTER_STRUCTURE_VERSION): IFUData {
+ function FD21ToUI(scopes: IFSScope[] = [], section: IFSection = FILTER_SECTION.ANYWHERE, enabled = true, datasetsInfo: IDataset[] = [], version = FILTER_STRUCTURE_VERSION): IFUData {
     if (scopes.length === 0) return;
 
     const ufData: IFUData = {
@@ -46,12 +54,12 @@ import { adaptFilterValues } from "./adaptFilterValues";
     ufData.scopes = scopes.map<IFUScope>(scope => ({
         ...scope,
         datasets: scope.datasets.map(dataset => {
-            const datasetInfo: IQrveyDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
+            const datasetInfo: IDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
             return {
                 ...dataset,
-                label: datasetInfo?.name,
+                label: datasetInfo?.label,
                 filters: dataset.filters.map(filter => {
-                    let columnInfo: IQrveyColumn;
+                    let columnInfo: IColumn;
                     if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                     const property = adaptDateGroupingProperty(filter.property);
 
@@ -62,9 +70,9 @@ import { adaptFilterValues } from "./adaptFilterValues";
                             calculation: filter.column.calculation,
                             formulaType: columnInfo?.formulaType,
                             id: filter.column.id,
-                            label: columnInfo?.text,
+                            label: columnInfo?.label,
                             linked: columnInfo?.linked,
-                            linkid: columnInfo?.linkid || datasetInfo?.linkid,
+                            linkid: columnInfo?.dataset?.linkid || datasetInfo?.linkid,
                             outputFormat: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: columnInfo?.type || filter.column.type,

package/src/filters/adapters/UIToFD.ts

@@ -1,5 +1,10 @@
-import { cloneDeep, isEmpty } from "../../general";
-import { IFSData, IFSScope, IFUData, IFUScope } from "../interfaces";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IFSData } from "../interfaces/common/IFSData";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSScope } from "../interfaces/common/IFSScope";
+import { IFUScope } from "../interfaces/ui/IFUScope";
+
 
 /**
  * Generates a Filter Data Structure structure from UI Filter Data structure.

package/src/filters/adapters/UIToFlatUI.ts

@@ -1,9 +1,13 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty } from "../../general";
-import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
-import { getUIValues } from "../helpers";
-import { IFUData, IFUFlattenedFilter, IFUScope } from "../interfaces";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { adaptFilterValues } from "./adaptFilterValues";
+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.
@@ -11,7 +15,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param datasetsInfo Collection of datasets information. Optional for updating the datasets info
  * @returns a flattened UI filters array
  */
- export function UIToFlatUI(filterData: IFUData, datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
+ export function UIToFlatUI(filterData: IFUData, datasetsInfo: IDataset[] = []): IFUFlattenedFilter[] {
     let uFilters: IFUFlattenedFilter[] = [];
     if (isEmpty(filterData) || isEmpty(filterData.scopes) || filterData.scopes.length === 0) return uFilters;
     filterData = cloneDeep(filterData);
@@ -30,7 +34,7 @@ import { adaptFilterValues } from "./adaptFilterValues";
  * @param scopes The filter scope section
  * @returns a flattened UI filters array
  */
-function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
+function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IDataset[] = []): IFUFlattenedFilter[] {
     const uFilters: IFUFlattenedFilter[] = [];
     if (scopes.length === 0) return uFilters;
     scopes.forEach(scope => {
@@ -38,8 +42,8 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
             scope.datasets.forEach(dataset => {
                 if (dataset.filters.length > 0) {
                     dataset.filters.forEach(filter => {
-                        const datasetInfo: IQrveyDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
-                        let columnInfo: IQrveyColumn;
+                        const datasetInfo: IDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
+                        let columnInfo: IColumn;
                         if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = adaptDateGroupingProperty(filter.property);
@@ -52,7 +56,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                                 qrveyid: filter.column.qrveyid,
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
-                                label: columnInfo?.text || filter.column.label,
+                                label: columnInfo?.label || filter.column.label,
                                 linkid: filter.column.linkid,
                                 linked: filter.column.linked,
                                 outputFormat: filter.column.outputFormat,
@@ -82,7 +86,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
-                                    label: datasetInfo?.name || dataset.label,
+                                    label: dataset.label,
                                     linkid: dataset.linkid,
                                 },
                             },

package/src/filters/adapters/UIToOldLogic.ts

@@ -1,11 +1,25 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty } from "../../general";
-import { FILTER_OPERATOR } from "../constants";
-import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
-import { IFSection, IFUData, IFUDataset, IFUFilter, IFUScope, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterFilters, OLD_IFilterLogic } from "../interfaces";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
 import { adaptFilterValues } from "./adaptFilterValues";
 import { flatUIToOldLogic } from "./flatUIToOldLogic";
 import { UIToFlatUI } from "./UIToFlatUI";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { IFUScope } from "../interfaces/ui/IFUScope";
+import { IFSection } from "../interfaces/IFSection";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+import { IFUDataset } from "../interfaces/ui/IFUDataset";
+import { OLD_IFilterFilters } from "../interfaces/OLD_IFilterFilters";
+import { IFUFilter } from "../interfaces/ui/IFUFilter";
+import { OLD_IFilterExpression } from "../interfaces/OLD_IFilterExpression";
+import { getBackendGroupValue } from "../helpers/backend/getBackendGroupValue";
+import { getBackendProperty } from "../helpers/backend/getBackendProperty";
+import { getBackendValidator } from "../helpers/backend/getBackendValidator";
+import { getBackendValues } from "../helpers/backend/getBackendValues";
+import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
+import { getUIValues } from "../helpers/ui/getUIValues";
 
 export function UIToOldLogic(uFilterData: IFUData, flattedMethod = true): OLD_IFilterData {
     let oldFilterData: OLD_IFilterData;
@@ -85,24 +99,25 @@ function buildExpressions(filterSection: IFUFilter[], scope: IFUScope, dataset:
 }
 
 const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset): OLD_IFilterDetail => {
-    let aggregate, calculation, info;
-    if (filter.column.aggregate != null) {
-        aggregate = {
-            abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-            id: undefined, // CANNOT ADD AT THIS SCOPE
-            label: filter.column.aggregate,
-            text: undefined, // CANNOT ADD AT THIS SCOPE
-        };
-    }
-    if (filter.column.calculation != null) {
-        calculation = {
-            abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-            id: undefined, // CANNOT ADD AT THIS SCOPE
-            text: undefined,
-            type: undefined,
-            value: filter.column.calculation,
-        };
-    }
+    // let aggregate, calculation, info;
+    let info;
+    // if (filter.column.aggregate != null) {
+    //     aggregate = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         label: filter.column.aggregate,
+    //         text: undefined, // CANNOT ADD AT THIS SCOPE
+    //     };
+    // }
+    // if (filter.column.calculation != null) {
+    //     calculation = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         text: undefined,
+    //         type: undefined,
+    //         value: filter.column.calculation,
+    //     };
+    // }
     if (!isEmpty(filter.extras.info)) {
         info = {
             icon: filter.extras.info.icon,
@@ -115,15 +130,15 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         collapsed: filter.collapsed,
         column: {
             dataset: {
-                name: dataset.label,
+                label: dataset.label,
                 qrveyid: dataset.qrveyid,
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            text: filter.column.label,
+            label: filter.column.label,
             type: filter.column.type,
-            aggregate,
-            calculation,
+            aggregate: filter.column.aggregate,
+            calculation: filter.column.calculation,
             formulaType: filter.column.formulaType,
             linked: undefined,
             linkid: filter.column.linkid,

package/src/filters/adapters/adaptDateGroupingProperty.ts

@@ -1,5 +1,6 @@
-import { IFProperty } from "..";
-import { COLUMN_PROPERTY } from "../..";
+import { IFProperty } from "../interfaces/IFProperty";
+import { DATE_DISTINCT_PROPERTY } from "../../dates/constants/DATE_DISTINCT_PROPERTY";
+import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT_TIME_PROPERTY";
 
 /**
  * [TODO: For 2022, eliminate this adapter]
@@ -8,11 +9,11 @@ import { COLUMN_PROPERTY } from "../..";
  * @returns 
  */
 export function adaptDateGroupingProperty(property: IFProperty | any): IFProperty {
-    return property === 'p&quarter' ? COLUMN_PROPERTY.DATE_YEAR_QUARTER :
-        property === 'p&month' ? COLUMN_PROPERTY.DATE_YEAR_MONTH :
-            property === 'p&day' ? COLUMN_PROPERTY.DATE_MONTH_DAY :
-                property === 'p&hour' ? COLUMN_PROPERTY.DATE_DAY_HOUR :
-                    property === 'p&minute' ? COLUMN_PROPERTY.DATE_HOUR_MINUTE :
-                        property === 'p&second' ? COLUMN_PROPERTY.DATE_MINUTE_SECOND :
+    return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :
+        property === 'p&month' ? DATE_DISTINCT_PROPERTY.YEAR_MONTH :
+            property === 'p&day' ? DATE_DISTINCT_PROPERTY.MONTH_DAY :
+                property === 'p&hour' ? DATE_DISTINCT_TIME_PROPERTY.DAY_HOUR :
+                    property === 'p&minute' ? DATE_DISTINCT_TIME_PROPERTY.HOUR_MINUTE :
+                        property === 'p&second' ? DATE_DISTINCT_TIME_PROPERTY.MINUTE_SECOND :
                             property;
 }

package/src/filters/adapters/adaptFilterData.ts

@@ -1,10 +1,15 @@
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { IQrveyDataset } from "../../interfaces";
-import { IFSData, IFUData, OLD_IFilterData } from "../interfaces";
-import { FDToUI } from "./FDToUI";
-import { logicToFD } from "./logicToFD";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSData } from "../interfaces/common/IFSData";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { _get } from "../../general/object/get";
 import { logicToUI } from "./logicToUI";
+import { FDToUI } from "./FDToUI";
 import { UIToFD } from "./UIToFD";
+import { logicToFD } from "./logicToFD";
+
 
 /**
  * Checks and adapts the v2.0 Filter Data Structure to the v2.1
@@ -13,7 +18,7 @@ import { UIToFD } from "./UIToFD";
  * @param datasetsInfo Collection of datasets information. If getUIFilterData is true, the datasetsInfo should be mandatory
  * @returns A new filter data structure v2.1
  */
-export function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData = true, datasetsInfo: IQrveyDataset[] = []): IFSData | IFUData {
+export function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData = true, datasetsInfo: IDataset[] = []): IFSData | IFUData {
     if (isEmpty(filterData)) return;
     filterData = cloneDeep(filterData);
 

package/src/filters/adapters/adaptFilterValues.ts

@@ -1,5 +1,12 @@
-import { IFSFilter, IFSValue, IFSValueRange, IFSValueRanking, IFSValueRelativeDate, IFValue } from "..";
-import {COLUMN, isEmpty } from "../..";
+import { IFValue } from "../interfaces/IFValue";
+import { IFSFilter } from "../interfaces/common/IFSFilter";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { IFSValueRanking } from "../interfaces/common/IFSValueRanking";
+import { IFSValue } from "../interfaces/common/IFSValue";
+import { IFSValueRange } from "../interfaces/common/IFSValueRange";
+import { IFSValueRelativeDate } from "../interfaces/common/IFSValueRelativeDate";
+
 
 /**
  * [TODO: For 2022, eliminate this adapter]

package/src/filters/adapters/flatUIToFD.ts

@@ -1,8 +1,14 @@
-import { adaptDateGroupingProperty } from ".";
-import { isEmpty } from "../../general";
-import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
-import { IFSData, IFSDataset, IFSection, IFSFilter, IFSScope, IFUFlattenedFilter } from "../interfaces";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFSection } from "../interfaces/IFSection";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { IFSData } from "../interfaces/common/IFSData";
+import { IFSScope } from "../interfaces/common/IFSScope";
+import { IFSFilter } from "../interfaces/common/IFSFilter";
+import { IFSDataset } from "../interfaces/common/IFSDataset";
 
 /**
  * Generates a filter data structure from the flatttened UI filters.

package/src/filters/adapters/flatUIToLogic.ts

@@ -1,6 +1,7 @@
-import { IFBLogic, IFUFlattenedFilter } from "../interfaces";
 import { flatUIToFD } from "./flatUIToFD";
 import { FDToLogic } from "./FDToLogic";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFBLogic } from "../interfaces/backend/IFBLogic";
 
 /**
  * Generates a Logic structure from flattened UI filters

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -1,10 +1,37 @@
-import { IFSection, IFSValue, IFSValueRange, IFSValueRanking, IFValue, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterLogic, IFUFlattenedFilter, IFSValueRelativeDate, IFProperty, IFBackendValidator, IFBackendExpressionValue, IFBExpressionRelativeDate } from "../interfaces";
-import { FILTER_BACKEND_VALIDATOR, FILTER_OPERATOR, FILTER_SECTION, FILTER_VALIDATOR, FILTER_VALIDATOR_VALUE } from "../constants";
-import { cloneDeep, flattenDeep, isEmpty, isNull, _get } from "../../general";
-import { COLUMN, COLUMN_PROPERTY } from "../../constants";
-import { arePropertiesDateP, getBackendValidator, getUIValues, isNullValidator } from "../helpers";
-import { RELATIVE_CURSOR, RELATIVE_CURSOR_VALUE } from "../../date";
-import { isDateColumn } from "../../qrvey/isDateColumn";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
+import { IFSection } from "../interfaces/IFSection";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
+import { getUIValues } from "../helpers/ui/getUIValues";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
+import { _get } from "../../general/object/get";
+import { OLD_IFilterExpression } from "../interfaces/OLD_IFilterExpression";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { IFSValueRanking } from "../interfaces/common/IFSValueRanking";
+import { IFValue } from "../interfaces/IFValue";
+import { getBackendValidator } from "../helpers/backend/getBackendValidator";
+import { IFProperty } from "../interfaces/IFProperty";
+import { isDateDistinctProperty } from "../helpers/common/isDateDistinctProperty";
+import { isDateColumn } from "../../columns/helpers/isDateColumn";
+import { isNullValidator } from "../helpers/common/isNullValidator";
+import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
+import { IFBackendValidator } from "../interfaces/backend/IFBackendValidator";
+import { FILTER_VALIDATOR } from "../constants/common/FILTER_VALIDATOR";
+import { FILTER_BACKEND_VALIDATOR } from "../constants/backend/FILTER_BACKEND_VALIDATOR";
+import { IFBackendExpressionValue } from "../interfaces/backend/IFBackendExpressionValue";
+import { IFSValue } from "../interfaces/common/IFSValue";
+import { IFSValueRange } from "../interfaces/common/IFSValueRange";
+import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
+import { IFBExpressionRelativeDate } from "../interfaces/backend/IFBExpressionRelativeDate";
+import { IFSValueRelativeDate } from "../interfaces/common/IFSValueRelativeDate";
+import { RELATIVE_CURSOR_INFO } from "../../dates/relative/constants/RELATIVE_CURSOR_INFO";
+import { RELATIVE_CURSOR } from "../../dates/relative/constants/RELATIVE_CURSOR";
+import { isNull } from "../../general/mix/isNull";
+import { flattenDeep } from "../../general/array/flattenDeep";
 
 /**
  * Generates a Logic structure from flattened UI filters
@@ -27,24 +54,24 @@ export function flatUIToOldLogic(uFilters: IFUFlattenedFilter[], section: IFSect
 
 const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilterDetail[] => {
   return uFilters.map(filter => {
-    let aggregate, calculation;
-    if (filter.column.aggregate != null) {
-        aggregate = {
-            abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-            id: undefined, // CANNOT ADD AT THIS SCOPE
-            label: filter.column.aggregate,
-            text: undefined, // CANNOT ADD AT THIS SCOPE
-        };
-    }
-    if (filter.column.calculation != null) {
-        calculation = {
-            abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-            id: undefined, // CANNOT ADD AT THIS SCOPE
-            text: undefined,
-            type: undefined,
-            value: filter.column.calculation,
-        };
-    }
+    // let aggregate, calculation;
+    // if (filter.column.aggregate != null) {
+    //     aggregate = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         label: filter.column.aggregate,
+    //         text: undefined, // CANNOT ADD AT THIS SCOPE
+    //     };
+    // }
+    // if (filter.column.calculation != null) {
+    //     calculation = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         text: undefined,
+    //         type: undefined,
+    //         value: filter.column.calculation,
+    //     };
+    // }
     return {
       collapsed: filter.collapsed,
       column: {
@@ -56,8 +83,8 @@ const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilt
           qrveyid: filter.column.qrveyid,
           text: filter.column.label,
           type: filter.column.type,
-          aggregate,
-          calculation,
+          aggregate: filter.column.aggregate,
+          calculation: filter.column.calculation,
           formulaType: filter.column.formulaType,
           linked: undefined,
           linkid: filter.column.linkid,
@@ -178,7 +205,7 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
 }
 
 function getGroupValue(props: OLD_IFilterDetail): IFProperty {
-  if (!arePropertiesDateP(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
+  if (!isDateDistinctProperty(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
     return props.property;
   }
 }
@@ -302,7 +329,7 @@ function getValues(props: OLD_IFilterDetail, rankingGroupIndex?: number): IFBack
     case FILTER_VALIDATOR.IS_NULL:
     case FILTER_VALIDATOR.IS_NOT_NULL: {
         const addValue = props.values.length > 0 && (props.values as IFSValue[]).every(value => value.enabled);
-        return addValue ? [FILTER_VALIDATOR_VALUE[props.validator].label] : [];
+        return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
       }
     case FILTER_VALIDATOR.IN:
       return (props.values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
@@ -340,12 +367,12 @@ function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
       }));
     case FILTER_VALIDATOR.IS_NULL:
     case FILTER_VALIDATOR.IS_NOT_NULL:
-      return [{ value: FILTER_VALIDATOR_VALUE[props.validator].label, enabled: (props.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 (props.values as IFSValueRelativeDate[]).map(value => ({
         ...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: props.enabled
       }));
     default:

package/src/filters/adapters/flatUIToUI.ts

@@ -1,9 +1,16 @@
-import { adaptDateGroupingProperty } from ".";
-import { isEmpty, getLastIndexFromArray } from "../../general";
-import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
-import { getUIValues } from "../helpers";
-import { IFSection, IFUData, IFUDataset, IFUFilter, IFUFlattenedFilter, IFUScope } from "../interfaces";
+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";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFUScope } from "../interfaces/ui/IFUScope";
+import { IFUFilter } from "../interfaces/ui/IFUFilter";
+import { IFUDataset } from "../interfaces/ui/IFUDataset";
+import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
+import { isEmpty } from "../../general/mix/isEmpty";
 
 /**
  * Generates a UI filter data structure from the flatttened UI filters.