@qrvey/utils 1.1.2-0 → 1.1.4

package/dist/general/mix/randomId.js

@@ -1,14 +1,31 @@
+import { isEmpty, isNull } from ".";
 /**
- * create random unique string
+ * Creates a random string
+ * - If the first given argument is different than a length number, the variable is replaced by a default number
+ * - If the optional second given argument is passed the random string is permutated.
  * @param {Number} length size of the generated string. Default 8
- * @return {String}
+ * @param {Array} exclude collection of strings that is going to be excluded of the random string.
+ * @return {String} Random string
  */
-export function randomId(_length = 8) {
+export function randomId(length = 8, exclude = []) {
+    if (typeof length !== 'number')
+        length = 8;
+    if (isNull(exclude) || !Array.isArray(exclude))
+        exclude = [];
+    exclude = exclude.filter(e => typeof e === 'string');
     const charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_';
+    const blackList = [];
     let id = '';
-    for (let i = 0; i < 8; i++) {
-        const randPos = Math.floor(Math.random() * charSet.length);
-        id += charSet[randPos];
-    }
+    do {
+        if (!isEmpty(id) && !blackList.includes(id))
+            blackList.push(id);
+        id = '';
+        for (let i = 0; i < length; i++) {
+            const randPos = Math.floor(Math.random() * charSet.length);
+            id += charSet[randPos];
+        }
+    } while (exclude.length > 0 && exclude.includes(id) && blackList.length < exclude.length);
+    if (exclude.length > 0 && blackList.length >= exclude.length)
+        id = '';
     return id;
 }

package/dist/general/mix/size.d.ts

@@ -1,8 +1,8 @@
 /**
- * get the length of an Array or String and also the number of first level attributes
- * in an Object.
- * For `null` or `undefined` argument the returned value will be 0.
- * @param {Any} obj
- * @returns {Number}
+ * Gets the length of the given array.
+ * - Useful for Object, Array and string type.
+ * - For `null` or `undefined` or else argument the returned value will be 0.
+ * @param {Any} obj Any object-type variable
+ * @returns {Number} the size of the given variable
  */
 export declare function size(obj: any): number;

package/dist/general/mix/size.js

@@ -1,10 +1,13 @@
+import { isEmpty } from ".";
 /**
- * get the length of an Array or String and also the number of first level attributes
- * in an Object.
- * For `null` or `undefined` argument the returned value will be 0.
- * @param {Any} obj
- * @returns {Number}
+ * Gets the length of the given array.
+ * - Useful for Object, Array and string type.
+ * - For `null` or `undefined` or else argument the returned value will be 0.
+ * @param {Any} obj Any object-type variable
+ * @returns {Number} the size of the given variable
  */
 export function size(obj) {
-    return Object.keys(obj || '').length;
+    if (isEmpty(obj))
+        return 0;
+    return Object.keys(obj).length;
 }

package/dist/general/object/get.d.ts

@@ -26,7 +26,7 @@
  * _get({ item1: { item11: 'Hello Again' }, item2: {} }, ['item1', 'item11'])
  * @returns the resolved value.
  */
-export declare function _get(baseObject: any, path: string | string[], defaultValue?: any): any;
+export declare function _get<T = any>(baseObject: T, path: string | string[], defaultValue?: any): any;
 /**
  *
  * /**

package/dist/general/object/getAttribute.d.ts

@@ -1,6 +1,13 @@
 /**
- * search for properties in different case styles such as: lower, upper, camel and pascal
- * But for this, is required ask for a property in snake_case style
+ * Searchs for properties in different case styles such as: lower, upper, camel and pascal
+ * - To optimize the searching, it is required a key in a snake_case style
+ * - List of cases that do not match
+ * -- From lower to snake case
+ * -- From upper to snake case
+ * -- From lower to camel case
+ * -- From upper to camel case
+ * -- From lower to pascal case
+ * -- From upper to pascal case
  * @param {object} obj object to look for
  * @param {string} key String attribute in snake_case style
  *

package/dist/general/object/getAttribute.js

@@ -1,17 +1,48 @@
 /**
- * search for properties in different case styles such as: lower, upper, camel and pascal
- * But for this, is required ask for a property in snake_case style
+ * Searchs for properties in different case styles such as: lower, upper, camel and pascal
+ * - To optimize the searching, it is required a key in a snake_case style
+ * - List of cases that do not match
+ * -- From lower to snake case
+ * -- From upper to snake case
+ * -- From lower to camel case
+ * -- From upper to camel case
+ * -- From lower to pascal case
+ * -- From upper to pascal case
  * @param {object} obj object to look for
  * @param {string} key String attribute in snake_case style
  *
  * @example
  * getAttribute(obj, 'snake_case') //it search for: obj.snake_case || obj.snakeCase || obj.SnakeCase || obj.snakecase || obj.SNAKECASE
  */
+import { isObject } from ".";
+import { isEmpty } from "..";
 export function getAttribute(obj, key) {
-    // getAttr: key should be lower_underscore_case
-    const camel = key.replace(/_(.)/g, (_, a) => a.toUpperCase());
-    const pascal = camel.replace(/(.)/, (_, a) => a.toUpperCase());
-    const lower = key.replace(/_/g, '');
-    const upper = lower.toUpperCase();
-    return obj[key] || obj[camel] || obj[pascal] || obj[lower] || obj[upper];
+    var _a, _b, _c, _d, _e;
+    if (!isValid(obj, key))
+        return;
+    const snake = getSnakeCase(key);
+    const camel = getCamelCase(snake);
+    const pascal = getPascalCase(camel);
+    const lower = getLowerCase(pascal);
+    const upper = getUpperCase(lower);
+    return (_e = (_d = (_c = (_b = (_a = obj[key]) !== null && _a !== void 0 ? _a : obj[snake]) !== null && _b !== void 0 ? _b : obj[camel]) !== null && _c !== void 0 ? _c : obj[pascal]) !== null && _d !== void 0 ? _d : obj[lower]) !== null && _e !== void 0 ? _e : obj[upper];
+}
+function getSnakeCase(key) {
+    return key.replace(/[A-Z]/g, (a, i) => i == 0 ? a.toLowerCase() : '_' + a.toLowerCase());
+}
+function getCamelCase(key) {
+    return key.replace(/(.)/, (_, a) => a.toLowerCase()).replace(/_(.)/g, (_, a) => a.toUpperCase());
+}
+function getPascalCase(key) {
+    return key.replace(/(.)/, (_, a) => a.toUpperCase());
+}
+function getLowerCase(key) {
+    return key.replace(/_/g, '').toLowerCase();
+}
+function getUpperCase(key) {
+    return key.toUpperCase();
+}
+function isValid(obj, key) {
+    return (!isEmpty(obj) && isObject(obj))
+        && (!isEmpty(key) && typeof key === 'string');
 }

package/dist/general/object/hasProperty.d.ts

@@ -14,4 +14,4 @@
  * const obj2 = { prop1: 'hello world' }
  * _hasProperty(ob1, prop2) // false
  */
-export declare function _hasProperty(obj?: {}, property?: string): boolean;
+export declare function _hasProperty(obj?: {}, property?: string | number): boolean;

package/dist/general/object/hasProperty.js

@@ -1,3 +1,5 @@
+import { isObject } from ".";
+import { isEmpty } from "..";
 /**
  * Use the hasOwnProperty in order to verify if the given property exists in the object.
  *
@@ -15,5 +17,11 @@
  * _hasProperty(ob1, prop2) // false
  */
 export function _hasProperty(obj = {}, property = '') {
+    if (!isValid(obj, property))
+        return false;
     return Object.prototype.hasOwnProperty.call(obj, property);
 }
+function isValid(obj, property) {
+    return !isEmpty(obj) && (isObject(obj) || Array.isArray(obj))
+        && !isEmpty(property) && (typeof property === 'string' || typeof property === 'number');
+}

package/dist/general/object/index.d.ts

@@ -3,6 +3,7 @@ export * from './get';
 export * from './getAttribute';
 export * from './hasProperty';
 export * from './isObject';
+export * from './objectCopy';
 export * from './omit';
 export * from './pick';
 export * from './mapValues';

package/dist/general/object/index.js

@@ -3,6 +3,7 @@ export * from './get';
 export * from './getAttribute';
 export * from './hasProperty';
 export * from './isObject';
+export * from './objectCopy';
 export * from './omit';
 export * from './pick';
 export * from './mapValues';

package/dist/general/object/isObject.js

@@ -1,8 +1,9 @@
+import { getTag } from "..";
 /**
  * Checks if the given argument is an object type
  * @param obj the variable to check
  * @returns True: It is an object; False: It is not.
  */
 export function isObject(obj) {
-    return Object.prototype.toString.call(obj) === '[object Object]';
+    return obj === Object(obj) || getTag(obj) === '[object Object]';
 }

package/dist/general/object/objectCopy.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Created a new reference of the given argument
+ * @param entity The variable to be copied
+ * @param cache
+ * @returns A new reference of the given argument
+ */
+export declare function objectCopy(entity: any, cache?: WeakMap<object, any>): any;

package/dist/general/object/objectCopy.js

@@ -0,0 +1,28 @@
+/**
+ * Created a new reference of the given argument
+ * @param entity The variable to be copied
+ * @param cache
+ * @returns A new reference of the given argument
+ */
+export function objectCopy(entity, cache = new WeakMap()) {
+    if (!isClonable(entity))
+        return entity;
+    if (cache.has(entity))
+        return cache.get(entity);
+    const c = new entity.constructor;
+    if (c.name === 'Date')
+        return new Date(entity);
+    if (entity instanceof Map) {
+        entity.forEach((value, key) => c.set(objectCopy(key), objectCopy(value)));
+    }
+    if (entity instanceof Set) {
+        entity.forEach((value) => c.add(objectCopy(value)));
+    }
+    cache.set(entity, c);
+    return Object.assign(c, ...Object.keys(entity).map((prop) => ({ [prop]: objectCopy(entity[prop], cache) })));
+}
+function isClonable(entity) {
+    const referenceTypes = ['Array', 'Object', 'Map', 'Set', 'Date'];
+    const entityName = entity && entity.constructor.name;
+    return referenceTypes.includes(entityName);
+}

package/dist/general/string/capitalize.d.ts

@@ -1,6 +1,6 @@
 /**
- * Upper case teh first letter of a given text
+ * Upper case the first letter of a given text
  * @param {String} text
- * @returns {String}
+ * @returns {String} a capitalized text
  */
-export declare function capitalize(text: string): string;
+export declare function capitalize(text?: string): string;

package/dist/general/string/capitalize.js

@@ -1,8 +1,11 @@
+import { isEmpty } from "..";
 /**
- * Upper case teh first letter of a given text
+ * Upper case the first letter of a given text
  * @param {String} text
- * @returns {String}
+ * @returns {String} a capitalized text
  */
-export function capitalize(text) {
+export function capitalize(text = '') {
+    if (isEmpty(text) || typeof text !== 'string')
+        return text;
     return text.toLowerCase().replace(/^\w/, c => c.toUpperCase());
 }

package/dist/qrvey/getPropertyLabel.d.ts

@@ -0,0 +1,2 @@
+import { COLUMN_PROPERTY, IQrveyColumn } from "..";
+export declare function getPropertyLabel(column: IQrveyColumn, property: COLUMN_PROPERTY): string;

package/dist/qrvey/getPropertyLabel.js

@@ -0,0 +1,10 @@
+import { isDateColumn } from ".";
+import { COLUMN_PROPERTY_VALUE, isEmpty } from "..";
+export function getPropertyLabel(column, property) {
+    var _a;
+    let propertyLabel;
+    const propertyValues = COLUMN_PROPERTY_VALUE[isDateColumn(column) ? column.type + '-complete' : column.type];
+    if (!isEmpty(propertyValues))
+        propertyLabel = (_a = propertyValues.find(pValue => pValue.value === property)) === null || _a === void 0 ? void 0 : _a.label;
+    return propertyLabel;
+}

package/dist/qrvey/index.d.ts

@@ -1,3 +1,4 @@
 export * from './getColumnsLabel';
+export * from './getPropertyLabel';
 export * from './isDateColumn';
 export * from './isComplexColumn';

package/dist/qrvey/index.js

@@ -1,3 +1,4 @@
 export * from './getColumnsLabel';
+export * from './getPropertyLabel';
 export * from './isDateColumn';
 export * from './isComplexColumn';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.1.2-0",
+  "version": "1.1.4",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/src/constants/COLUMN_PROPERTY.ts

@@ -11,15 +11,15 @@ export const enum COLUMN_PROPERTY {
     DATE_SECOND = 'second',
 
     // PROPERTY DATE TYPES
-    DATE_YEAR_QUARTER = 'p&quarter',
-    DATE_YEAR_MONTH = 'p&month',
+    DATE_YEAR_QUARTER = 'quarter_only',
+    DATE_YEAR_MONTH = 'month_only',
     // DATE_YEAR_DAY = 'p-y-day',
-    DATE_MONTH_DAY = 'p&day',
+    DATE_MONTH_DAY = 'day_only',
     //DATE_WEEK_DAY = 'p-w-day'
-    DATE_DAY_HOUR = 'p&hour',
-    DATE_HOUR_MINUTE = 'p&minute',
-    DATE_MINUTE_SECOND = 'p&second',
-
+    DATE_DAY_HOUR = 'hour_only',
+    DATE_HOUR_MINUTE = 'minute_only',
+    DATE_MINUTE_SECOND = 'second_only',
+    
     // COMPLEX PROPERTY TYPES
     NAME_FIRST = 'first_name',
     NAME_LAST = 'last_name',

package/src/constants/COLUMN_PROPERTY_VALUE.ts

@@ -1,17 +1,11 @@
-import { DATE_P_VALUES, DATE_TIME_P_VALUES } from "../date";
+import { DATE_P_VALUES, DATE_TIME_VALUES, DATE_TIME_P_VALUES } from "../date";
+import { DATE_VALUES } from "../date/constants/DATE_VALUES";
 import { COLUMN } from "./COLUMN";
 import { COLUMN_COMPLEX_VALUE } from "./COLUMN_COMPLEX_VALUE";
-import { COLUMN_PROPERTY } from "./COLUMN_PROPERTY";
 
 const setTabStructure = compound => ({ value: compound.property, label: compound.shortLabel });
 const C = {
-  [COLUMN.DATE]: [
-    { value: COLUMN_PROPERTY.DATE_DAY, label: 'Complete Date', display: true },
-    { value: COLUMN_PROPERTY.DATE_YEAR, label: 'Year', display: true },
-    { value: COLUMN_PROPERTY.DATE_QUARTER, label: 'Quarter', display: true },
-    { value: COLUMN_PROPERTY.DATE_MONTH, label: 'Month', display: true },
-    { value: COLUMN_PROPERTY.DATE_WEEK, label: 'Weeks', display: true }
-  ],
+  [COLUMN.DATE]: DATE_VALUES,
   [COLUMN.LOOKUP]: [
     { value: 'display', label: 'Display', display: true },
     { value: 'value', label: 'Value', display: true }
@@ -26,6 +20,6 @@ const C = {
   [COLUMN.IMAGEUPLOAD]: COLUMN_COMPLEX_VALUE.IMAGEUPLOAD.map(setTabStructure),
 };
 
-C[COLUMN.DATE + '-complete'] = C[COLUMN.DATE].concat(DATE_P_VALUES).concat(DATE_TIME_P_VALUES);
+C[COLUMN.DATE + '-complete'] = C[COLUMN.DATE].concat(DATE_TIME_VALUES).concat(DATE_P_VALUES).concat(DATE_TIME_P_VALUES);
 
 export const COLUMN_PROPERTY_VALUE = C;

package/src/date/constants/DATE_P_VALUES.ts

@@ -1,7 +1,7 @@
 import { COLUMN_PROPERTY } from "../../constants";
 
 export const DATE_P_VALUES = [
-    { value: COLUMN_PROPERTY.DATE_YEAR_QUARTER, label: 'Quarter of Year', display: true },
-    { value: COLUMN_PROPERTY.DATE_YEAR_MONTH, label: 'Month of Year', display: true },
-    { value: COLUMN_PROPERTY.DATE_MONTH_DAY, label: 'Day of Month', display: true },
+    { value: COLUMN_PROPERTY.DATE_YEAR_QUARTER, label: 'Quarter', display: true },
+    { value: COLUMN_PROPERTY.DATE_YEAR_MONTH, label: 'Month', display: true },
+    { value: COLUMN_PROPERTY.DATE_MONTH_DAY, label: 'Day (Month)', display: true },
 ];

package/src/date/constants/DATE_TIME_P_VALUES.ts

@@ -1,7 +1,7 @@
 import { COLUMN_PROPERTY } from "../../constants";
 
 export const DATE_TIME_P_VALUES = [
-    { value: COLUMN_PROPERTY.DATE_DAY_HOUR, label: 'Hour of Day', display: true },
-    { value: COLUMN_PROPERTY.DATE_HOUR_MINUTE, label: 'Minute of Hour', display: true },
-    { value: COLUMN_PROPERTY.DATE_MINUTE_SECOND, label: 'Second of Minute', display: true },
+    { value: COLUMN_PROPERTY.DATE_DAY_HOUR, label: 'Hour', display: true },
+    { value: COLUMN_PROPERTY.DATE_HOUR_MINUTE, label: 'Minute', display: true },
+    { value: COLUMN_PROPERTY.DATE_MINUTE_SECOND, label: 'Second', display: true },
 ];

package/src/date/constants/DATE_TIME_VALUES.ts

@@ -1,7 +1,7 @@
 import { COLUMN_PROPERTY } from "../../constants";
 
 export const DATE_TIME_VALUES = [
-    { label: 'Hours', value: COLUMN_PROPERTY.DATE_HOUR, display: true },
-    { label: 'Minutes', value: COLUMN_PROPERTY.DATE_MINUTE, display: true },
-    { label: 'Seconds', value: COLUMN_PROPERTY.DATE_SECOND, display: true },
+    { label: 'Date, Hour', value: COLUMN_PROPERTY.DATE_HOUR, display: true },
+    { label: 'Date, Minute', value: COLUMN_PROPERTY.DATE_MINUTE, display: true },
+    { label: 'Date, Second', value: COLUMN_PROPERTY.DATE_SECOND, display: true },
 ];

package/src/date/constants/DATE_VALUES.ts

@@ -0,0 +1,9 @@
+import { COLUMN_PROPERTY } from "../../constants";
+
+export const DATE_VALUES = [
+    { value: COLUMN_PROPERTY.DATE_DAY, label: 'Full Date', display: true },
+    { value: COLUMN_PROPERTY.DATE_YEAR, label: 'Year', display: true },
+    { value: COLUMN_PROPERTY.DATE_QUARTER, label: 'Quarter, Year', display: true },
+    { value: COLUMN_PROPERTY.DATE_MONTH, label: 'Month, Year', display: true },
+    { value: COLUMN_PROPERTY.DATE_WEEK, label: 'Week, Year', display: true }
+];

package/src/filters/adapters/FDToFlatUI.ts

@@ -2,6 +2,7 @@ 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";
 
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
@@ -41,6 +42,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                         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 info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
+                        const property = adaptDateGroupingProperty(filter.property);
 
                         const uFilter: IFUFlattenedFilter = {
                             collapsed: filter.collapsed,
@@ -88,7 +90,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property: property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

package/src/filters/adapters/FDToUI.ts

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty, _get } from "../../general";
 import { IQrveyColumn, IQrveyDataset } from "../../interfaces";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
@@ -51,6 +52,8 @@ import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
                 filters: dataset.filters.map(filter => {
                     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 property = adaptDateGroupingProperty(filter.property);
+
                     return {
                         ...filter,
                         column: {
@@ -65,6 +68,7 @@ import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
                             qrveyid: filter.column.qrveyid,
                             type: columnInfo?.type || filter.column.type,
                         },
+                        property,
                         uiValues: getUIValues(filter),
                     };
                 })

package/src/filters/adapters/UIToFlatUI.ts

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
 import { getUIValues } from "../helpers";
@@ -40,6 +41,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                         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 info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
+                        const property = adaptDateGroupingProperty(filter.property);
 
                         const uFilter: IFUFlattenedFilter = {
                             collapsed: filter.collapsed,
@@ -87,7 +89,7 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

package/src/filters/adapters/UIToOldLogic.ts

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { FILTER_OPERATOR } from "../constants";
 import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
@@ -107,6 +108,8 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
             label: filter.extras.info.label,
         };
     }
+    const property = adaptDateGroupingProperty(filter.property);
+
     return {
         collapsed: filter.collapsed,
         column: {
@@ -134,7 +137,7 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,
-        property: filter.property,
+        property,
         scope: scope.scope,
         scopeid: filter.extras.scopeid,
         scopeEnabled: scope.enabled,

package/src/filters/adapters/adaptDateGroupingProperty.ts

@@ -0,0 +1,18 @@
+import { IFProperty } from "..";
+import { COLUMN_PROPERTY } from "../..";
+
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Get the new property base on the old date grouping properties
+ * @param property 
+ * @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 :
+                            property;
+}

package/src/filters/adapters/adaptFilterData.ts

@@ -13,7 +13,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 = false, datasetsInfo: IQrveyDataset[] = []): IFSData | IFUData {
+export function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData = true, datasetsInfo: IQrveyDataset[] = []): IFSData | IFUData {
     if (isEmpty(filterData)) return;
     filterData = cloneDeep(filterData);
 

package/src/filters/adapters/flatUIToFD.ts

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { isEmpty } from "../../general";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { IFSData, IFSDataset, IFSection, IFSFilter, IFSScope, IFUFlattenedFilter } from "../interfaces";
@@ -83,6 +84,8 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFSDataset {
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = adaptDateGroupingProperty(uFilter.property);
+
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -109,7 +112,7 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFSFilter {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         validator: uFilter.validator,
         values: uFilter.values,
     };

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -185,10 +185,8 @@ function getGroupValue(props: OLD_IFilterDetail): IFProperty {
 
 function getProperty(props: OLD_IFilterDetail) {
   if (isEmpty(props.column.aggregate)) {
-    if (isNullValidator(props.validator)) {
+    if (isNullValidator(props.validator) || isDateColumn(props.column as any)) {
       return undefined;
-    } else if (isDateColumn(props.column as any)) {
-      return arePropertiesDateP(props.column as any, props.property) ? props.property?.split('p&')[1] as IFProperty : undefined;
     } else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
         return undefined;
     } else if (props.column.type === COLUMN.LOOKUP && props.property === COLUMN_PROPERTY.LOOKUP_DISPLAY && props.lookupDisplayIndex != null) {

package/src/filters/adapters/flatUIToUI.ts

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { isEmpty, getLastIndexFromArray } from "../../general";
 import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
@@ -89,6 +90,8 @@ function buildDataset(uFilter: IFUFlattenedFilter): IFUDataset {
  */
 function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = adaptDateGroupingProperty(uFilter.property);
+
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -122,7 +125,7 @@ function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         uiValues: getUIValues(uFilter),
         validator: uFilter.validator,
         values: uFilter.values,

package/src/filters/adapters/index.ts

@@ -1,5 +1,6 @@
 export * from './transformFilters';
 
+export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
 
 export * from './FDToFlatUI';