@qrvey/utils 1.1.0-9 → 1.1.2-1

package/dist/date/relative/Adapter.js

@@ -1,4 +1,4 @@
-import { get } from '../../general/object/index';
+import { _get } from '../../general/object/index';
 import { parseDate, formatStatement, getStatementCase } from './helpers/index';
 import { DATETIME_FORMAT } from './constants/index';
 export default class RelativeStatementAdapter {
@@ -49,7 +49,7 @@ export default class RelativeStatementAdapter {
         const path = this.cursor === "the_last" /* LAST */ ? 'gte'
             : this.cursor === "the_next" /* NEXT */ ? 'lte'
                 : '';
-        return get(value, path, new Date());
+        return _get(value, path, new Date());
     }
     /**
      * Convert verbal statement to range value

package/dist/date/relative/constants/DATE_FORMATS.d.ts

@@ -1,2 +1,2 @@
-export declare const DATETIME_FORMAT = "MM-DD-YYYY HH:mm:ss";
+export declare const DATETIME_FORMAT = "MM/DD/YYYY HH:mm:ss";
 export declare const INPUT_FORMATS: string[];

package/dist/date/relative/constants/DATE_FORMATS.js

@@ -1,9 +1,9 @@
-export const DATETIME_FORMAT = 'MM-DD-YYYY HH:mm:ss';
+export const DATETIME_FORMAT = 'MM/DD/YYYY HH:mm:ss';
 export const INPUT_FORMATS = [
+    DATETIME_FORMAT,
     'MM/DD/YYYY',
     'MM-DD-YYYY',
     'YYYY-MM-DD',
-    'MM/DD/YYYY HH:mm:ss',
+    'MM-DD-YYYY HH:mm:ss',
     'YYYY-MM-DD HH:mm:ss',
-    DATETIME_FORMAT
 ];

package/dist/date/relative/helpers/formatStatement.js

@@ -1,4 +1,4 @@
-import { get, mapValues } from '../../../general/object/index';
+import { _get, mapValues } from '../../../general/object/index';
 /**
  * Build a proper relative date statement type
  * @param {RelativeStatement} statement
@@ -7,11 +7,11 @@ import { get, mapValues } from '../../../general/object/index';
 export function formatStatement(statement) {
     const loweredStatement = mapValues(statement, s => typeof s === 'string' ? s.toLowerCase() : s);
     return {
-        cursor: get(loweredStatement, 'cursor', "this" /* THIS */),
-        unit: get(loweredStatement, 'unit', "day" /* DAY */),
-        number: get(loweredStatement, 'number', 0),
-        anchor: get(loweredStatement, 'anchor', "@now" /* NOW_TOKEN */),
-        isCalendarDate: get(loweredStatement, 'isCalendarDate', true),
-        includeCurrent: get(loweredStatement, 'includeCurrent', true)
+        cursor: _get(loweredStatement, 'cursor', "this" /* THIS */),
+        unit: _get(loweredStatement, 'unit', "day" /* DAY */),
+        number: _get(loweredStatement, 'number', 0),
+        anchor: _get(loweredStatement, 'anchor', "@now" /* NOW_TOKEN */),
+        isCalendarDate: _get(loweredStatement, 'isCalendarDate', true),
+        includeCurrent: _get(loweredStatement, 'includeCurrent', true)
     };
 }

package/dist/filters/adapters/FDToFlatUI.js

@@ -26,7 +26,7 @@ export function FDToFlatUI(filterData, datasetsInfo = []) {
  * @returns a flattened UI filters array
  */
 function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
-    let uFilters = [];
+    const uFilters = [];
     if (scopes.length === 0)
         return uFilters;
     scopes.forEach(scope => {
@@ -38,6 +38,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         let columnInfo;
                         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 uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -55,29 +56,21 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             dateSection: filter.dateSection,
                             displayed: filter.displayed,
                             enabled: filter.enabled,
-                            extras: {
-                                panelid: filter.extras.panelid,
-                                filterLabel: filter.extras.filterLabel,
-                                scope: filter.extras.scope,
-                                scopeid: filter.extras.scopeid,
-                                section: filter.extras.section,
-                                scopeInfo: {
+                            extras: Object.assign(Object.assign({}, filter.extras), { panelid: filter.extras.panelid, filterLabel: filter.extras.filterLabel, info, scope: filter.extras.scope, scopeid: filter.extras.scopeid, section: filter.extras.section, scopeInfo: {
                                     collapsed: scope.collapsed,
                                     enabled: scope.enabled,
                                     displayed: scope.displayed,
                                     label: scope.label,
                                     scope: scope.scope,
                                     scopeid: scope.scopeid,
-                                },
-                                dataset: {
+                                }, dataset: {
                                     qrveyid: dataset.qrveyid,
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name,
                                     linkid: dataset.linkid,
-                                },
-                            },
+                                } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,

package/dist/filters/adapters/FDToUI.js

@@ -29,10 +29,9 @@ export function FDToUI(filterData, datasetsInfo = []) {
  * @returns a UI filter Structure
  */
 function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, datasetsInfo = [], version = FILTER_STRUCTURE_VERSION) {
-    let ufData;
     if (scopes.length === 0)
-        return ufData;
-    ufData = {
+        return;
+    const ufData = {
         enabled,
         section,
         version,

package/dist/filters/adapters/UIToFlatUI.js

@@ -25,7 +25,7 @@ export function UIToFlatUI(filterData, datasetsInfo = []) {
  * @returns a flattened UI filters array
  */
 function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
-    let uFilters = [];
+    const uFilters = [];
     if (scopes.length === 0)
         return uFilters;
     scopes.forEach(scope => {
@@ -37,6 +37,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                         let columnInfo;
                         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 uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -54,29 +55,21 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             dateSection: filter.dateSection,
                             displayed: filter.displayed,
                             enabled: filter.enabled,
-                            extras: {
-                                panelid: filter.extras.panelid,
-                                filterLabel: filter.extras.filterLabel,
-                                scope: filter.extras.scope,
-                                scopeid: filter.extras.scopeid,
-                                section: filter.extras.section,
-                                scopeInfo: {
+                            extras: Object.assign(Object.assign({}, filter.extras), { panelid: filter.extras.panelid, filterLabel: filter.extras.filterLabel, info, scope: filter.extras.scope, scopeid: filter.extras.scopeid, section: filter.extras.section, scopeInfo: {
                                     collapsed: scope.collapsed,
                                     enabled: scope.enabled,
                                     displayed: scope.displayed,
                                     label: scope.label,
                                     scope: scope.scope,
                                     scopeid: scope.scopeid,
-                                },
-                                dataset: {
+                                }, dataset: {
                                     qrveyid: dataset.qrveyid,
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name) || dataset.label,
                                     linkid: dataset.linkid,
-                                },
-                            },
+                                } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,

package/dist/filters/adapters/UIToOldLogic.js

@@ -75,7 +75,7 @@ function buildExpressions(filterSection, scope, dataset) {
     }, []);
 }
 const getFilterDetail = (filter, scope, dataset) => {
-    let aggregate, calculation;
+    let aggregate, calculation, info;
     if (filter.column.aggregate != null) {
         aggregate = {
             abbreviation: undefined,
@@ -93,6 +93,12 @@ const getFilterDetail = (filter, scope, dataset) => {
             value: filter.column.calculation,
         };
     }
+    if (!isEmpty(filter.extras.info)) {
+        info = {
+            icon: filter.extras.info.icon,
+            label: filter.extras.info.label,
+        };
+    }
     return {
         collapsed: filter.collapsed,
         column: {
@@ -115,6 +121,8 @@ const getFilterDetail = (filter, scope, dataset) => {
         },
         dateSection: filter.dateSection,
         enabled: filter.enabled,
+        extras: filter.extras,
+        info,
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,

package/dist/filters/adapters/adaptFilterData.js

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

package/dist/filters/adapters/flatUIToFD.js

@@ -1,3 +1,4 @@
+import { isEmpty } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 /**
  * Generates a filter data structure from the flatttened UI filters.
@@ -74,6 +75,7 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -88,13 +90,7 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: {
-            panelid: uFilter.extras.panelid,
-            filterLabel: uFilter.extras.filterLabel,
-            scope: uFilter.extras.scope,
-            scopeid: uFilter.extras.scopeid,
-            section: uFilter.extras.section,
-        },
+        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -1,7 +1,7 @@
 import { FILTER_VALIDATOR_VALUE } from "../constants";
 import { cloneDeep, flattenDeep, isEmpty, isNull, _get } from "../../general";
 import { COLUMN } from "../../constants";
-import { getBackendValidator, isNullValidator } from "../helpers";
+import { arePropertiesDateP, getBackendValidator, getUIValues, isNullValidator } from "../helpers";
 import { RELATIVE_CURSOR_VALUE } from "../../date";
 import { isDateColumn } from "../../qrvey/isDateColumn";
 /**
@@ -64,7 +64,9 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             },
             dateSection: filter.dateSection,
             enabled: filter.enabled,
+            extras: filter.extras,
             lookupDisplayIndex: filter.lookupDisplayIndex,
+            info: filter.extras.info,
             nullValues: filter.nullValues,
             operator: filter.operator,
             property: filter.property,
@@ -74,9 +76,10 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             panelid: filter.extras.panelid,
             panelName: filter.extras.filterLabel,
             section: filter.extras.section,
-            // uiValue: getUIValues(filter, true),
+            uiValue: getUIValues(filter, true),
             validator: filter.validator,
-            values: filter.values
+            values: filter.values,
+            _newFilters: Object.assign({}, filter)
         };
     });
 };
@@ -101,7 +104,7 @@ export function getLogicBody(uFilters) {
                 filters: [filterItem],
                 uiExtras: {
                     scopeid: props.scopeid,
-                    collapsed: props.collapsed,
+                    collapsed: _get(props, '_newFilters.extras.scopeInfo.collapsed', false),
                 }
             });
         }
@@ -137,11 +140,11 @@ function getRankingExpressions(props) {
     const values = props.values;
     return values.map((_value, index) => {
         const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props.validator) });
-        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValues(props, index) }) });
+        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
     });
 }
 function getRegularExpression(props) {
-    const uiValue = getUIValues(props);
+    const uiValue = getUIValuess(props);
     return {
         enabled: props.enabled,
         groupValue: getGroupValue(props),
@@ -157,16 +160,20 @@ function getRegularExpression(props) {
     };
 }
 function getGroupValue(props) {
-    if (isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
+    if (!arePropertiesDateP(props.column, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
         return props.property;
     }
 }
 function getProperty(props) {
+    var _a;
     if (isEmpty(props.column.aggregate)) {
-        if ((isDateColumn(props.column) && props.property) || isNullValidator(props.validator))
+        if (isNullValidator(props.validator)) {
             return undefined;
-        if ((props.column.type === COLUMN.EXPRESSION && props.property != null)
-        /*|| (props.column.type === QUESTIONS_TYPES.DATE && props.property === PROPERTY_TYPE.DATE_DAY)*/ ) {
+        }
+        else if (isDateColumn(props.column)) {
+            return arePropertiesDateP(props.column, props.property) ? (_a = props.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
+        }
+        else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
             return undefined;
         }
         else if (props.column.type === COLUMN.LOOKUP && props.property === "display" /* LOOKUP_DISPLAY */ && props.lookupDisplayIndex != null) {
@@ -247,66 +254,36 @@ function getValues(props, rankingGroupIndex) {
         case "NOT_START_WITH" /* NOT_START_WITH */:
         case "ENDS_WITH" /* ENDS_WITH */:
         case "NOT_END_WITH" /* NOT_END_WITH */:
-            return props.values.map(value => value.value);
+            return props.values.map(value => value.enabled ? value.value : undefined);
         case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
-            // return rangeValues.map(value => ({
-            //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max,
-            //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-            // }));
-            return props.values.map(value => ({
-                lte: value.max,
-                gte: value.min
-            }));
+            return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
         case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
-            return props.values.map(value => {
-                // const { min, max } = getExclusiveRangeValuesByProperty(value, props);
-                // return {
-                //   [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max,
-                //   [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min
-                // };
-                return {
-                    lt: value.max,
-                    gt: value.min
-                };
-            });
+            return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
         case "BEFORE" /* BEFORE */:
         case "LESS_THAN" /* LESS_THAN */:
-            return props.values.map(value => {
-                // const { max } = getExclusiveRangeValuesByProperty(value, props);
-                // return { [isDateProperty && !includeDateTokens(max, dateFormat) ? 'lte' : 'lt'] : isDateProperty ? getDateRange(max, props.property).to : max };
-                return { lt: value.max };
-            });
+            return props.values.map(value => value.enabled ? ({ lt: value.max }) : undefined).filter(Boolean);
         case "BEFORE_ON" /* BEFORE_ON */:
         case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
-            return props.values.map(value => (
-            // {
-            //   lte: isDateProperty ? getDateRange(value.max, props.property).to : value.max
-            // }
-            { lte: value.max }));
+            return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
-            return props.values.map(value => {
-                // const { min } = getExclusiveRangeValuesByProperty(value, props);
-                // return { [isDateProperty && !includeDateTokens(min, dateFormat) ? 'gte' : 'gt'] : isDateProperty ? getDateRange(min, props.property).from : min };
-                return { gt: value.min };
-            });
+            return props.values.map(value => value.enabled ? ({ gt: value.min }) : undefined).filter(Boolean);
         case "AFTER_ON" /* AFTER_ON */:
         case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
-            return props.values.map(value => (
-            // {
-            //   gte: isDateProperty ? getDateRange(value.min, props.property).from : value.min
-            // }
-            { gte: value.min }));
+            return props.values.map(value => value.enabled ? ({ gte: value.min }) : undefined).filter(Boolean);
         case "IS_NULL" /* IS_NULL */:
-        case "IS_NOT_NULL" /* IS_NOT_NULL */:
-            return [FILTER_VALIDATOR_VALUE[props.validator].label];
+        case "IS_NOT_NULL" /* IS_NOT_NULL */: {
+            const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
+            return addValue ? [FILTER_VALIDATOR_VALUE[props.validator].label] : [];
+        }
         case "IN" /* IN */:
-            return _get(props, 'values', []);
+            return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
 }
-function getUIValues(props, rankingGroupIndex) {
+function getUIValuess(props, rankingGroupIndex) {
+    var _a, _b;
     switch (props.validator) {
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
@@ -323,7 +300,7 @@ function getUIValues(props, rankingGroupIndex) {
             return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
         case "IS_NULL" /* IS_NULL */:
         case "IS_NOT_NULL" /* IS_NOT_NULL */:
-            return [{ value: FILTER_VALIDATOR_VALUE[props.validator].label, enabled: props.enabled }];
+            return [{ value: FILTER_VALIDATOR_VALUE[props.validator].label, enabled: (_b = (_a = props.values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
         case "IN" /* IN */:
             return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_VALUE[value.cursor].label} ${value.cursor !== "this" /* THIS */ && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== "this" /* THIS */ ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
         default:
@@ -338,10 +315,10 @@ function getValueUiUnitRelativeDate(relative) {
 }
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => ({
+    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
         position: rankingValue.position - 1,
         value: rankingValue.value.value
-    }));
+    }) : undefined).filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
@@ -354,13 +331,15 @@ function getRankingUIValues(values, rankingGroupIndex) {
 }
 function getResultValues(values, props) {
     return values.map((value) => {
-        if (props.column.type === COLUMN.IMAGE) {
-            return value.valueid;
-        }
-        else {
-            return value.value;
+        if (value.enabled) {
+            if (props.column.type === COLUMN.IMAGE) {
+                return value.valueid;
+            }
+            else {
+                return value.value;
+            }
         }
-    }).filter(value => value);
+    }).filter(Boolean);
     // return values.map((value: IFBResultValue) => {
     //   if (!isEmpty(props.column.aggregate)) {
     //     return value.value || '';

package/dist/filters/adapters/flatUIToUI.js

@@ -1,4 +1,4 @@
-import { getLastIndexFromArray } from "../../general";
+import { isEmpty, getLastIndexFromArray } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
 /**
@@ -82,6 +82,7 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
+    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -103,13 +104,7 @@ function buildFilter(uFilter) {
         displayed: uFilter.displayed,
         filterid: uFilter.filterid,
         enabled: uFilter.enabled,
-        extras: {
-            panelid: uFilter.extras.panelid,
-            filterLabel: uFilter.extras.filterLabel,
-            scope: uFilter.extras.scope,
-            scopeid: uFilter.extras.scopeid,
-            section: uFilter.extras.section,
-        },
+        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,