@qrvey/filters 0.0.31 → 0.0.32

package/CHANGELOG.md

@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.0.32](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.32..v0.0.31)
+
+- feat: :Zap: added the formulaType into the filter object [`#9`](https://bitbucket.org/qrvey/qrvey_filters/pull-requests/9)
+
 #### [v0.0.31](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.31..v0.0.30)
 
+> 26 February 2025
+
 - fix: :bug: fixed the ordering filters by scope, datasets and columns [`#8`](https://bitbucket.org/qrvey/qrvey_filters/pull-requests/8)
 
 #### [v0.0.30](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.30..v0.0.29)

package/dist/cjs/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/cjs/classes/FilterBuilder.js

@@ -546,6 +546,7 @@ class FilterBuilder {
             editable: filter.editable ?? filters_resources_1.DEFAULT_FILTER.editable,
             enableable: filter.enableable ?? filters_resources_1.DEFAULT_FILTER.enableable,
             enabled: filter.enabled ?? filters_resources_1.DEFAULT_FILTER.enabled,
+            formulaType: filter.formulaType ?? filters_resources_1.DEFAULT_FILTER.formulaType,
             id: filter.id || "",
             operator: filter.operator || filters_resources_1.DEFAULT_FILTER.operator,
             scope: filter.scope || filters_resources_1.DEFAULT_FILTER.scope,

package/dist/cjs/helpers/filter-adapt.helpers.js

@@ -140,6 +140,7 @@ function buildFilter(filter, dataset) {
         collapsed: filter.collapsed ?? filters_resources_1.DEFAULT_FILTER.collapsed,
         datasetLabel: dataset?.label ?? filter_visual_resources_1.DEFAULT_UI_FILTER.datasetLabel,
         columnLabel: columnInfo?.label ?? filter_visual_resources_1.DEFAULT_UI_FILTER.columnLabel,
+        formulaType: columnInfo?.formulaType ?? filter.formulaType,
         icon: filter.icon ?? filter_visual_resources_1.DEFAULT_UI_FILTER.icon,
         iconTooltip: filter.iconTooltip ?? filter_visual_resources_1.DEFAULT_UI_FILTER.iconTooltip,
     };

package/dist/cjs/helpers/filter-adapt.legacy.helpers.js

@@ -193,7 +193,7 @@ function buildLegacyFilter(filter, dataset) {
         collapsed: filter.collapsed ?? false,
         column: {
             id: filter.columnId,
-            formulaType: columnInfo?.formulaType,
+            formulaType: columnInfo?.formulaType || filter.formulaType,
             label: columnInfo?.label || "",
             qrveyid: filter.datasetId,
             aggregate: filter.aggregateType,

package/dist/cjs/helpers/filter-adapt.logic.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-adapt.logic.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-adapt.logic.helpers.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,EAO5B,MAAM,qCAAqC,CAAC;AAe7C,OAAO,EACL,SAAS,EACT,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAe,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,EAAE,CAgBnE;AAkID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,sBAAsB,CAaxB;AAoFD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,2BAA2B,EAAE,CA0C/B"}
+{"version":3,"file":"filter-adapt.logic.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-adapt.logic.helpers.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,EAO5B,MAAM,qCAAqC,CAAC;AAe7C,OAAO,EACL,SAAS,EACT,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAe,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,EAAE,CAgBnE;AAkID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,sBAAsB,CAaxB;AAsFD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,2BAA2B,EAAE,CA0C/B"}

package/dist/cjs/helpers/filter-adapt.logic.helpers.js

@@ -172,6 +172,7 @@ exports.buildLogicExpression = buildLogicExpression;
 function getLogicExpressionGroupValue(filter) {
     if (filter.aggregateType == null &&
         (0, utils_1.isDateColumn)({
+            formulaType: filter.formulaType,
             type: filter.columnType,
             id: filter.columnId,
             qrveyid: filter.datasetId,
@@ -190,6 +191,7 @@ function getLogicExpressionProperty(filter) {
     if ((0, utils_1.isEmpty)(filter.aggregateType)) {
         if ((0, filter_validators_helpers_1.isNullValidator)(filter.validator) ||
             (0, utils_1.isDateColumn)({
+                formulaType: filter.formulaType,
                 type: filter.columnType,
                 id: filter.columnId,
                 qrveyid: filter.datasetId,
@@ -249,9 +251,9 @@ function getFilterLogicValues(filter) {
                 return getRankingValues(values);
             return getResultValues(values, filter);
         case filter_validators_resources_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return getExclusiveRange(values);
-        case filter_validators_resources_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
             return getInclusiveRange(values);
+        case filter_validators_resources_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
+            return getExclusiveRange(values);
         case filter_validators_resources_1.FILTER_VALIDATOR.BEFORE:
         case filter_validators_resources_1.FILTER_VALIDATOR.LESS_THAN:
             return getBeforeValues(values);

package/dist/cjs/resources/filters.resources.d.ts

@@ -1,4 +1,4 @@
-import { IAggregateType, IColumnType, IFUData } from "@qrvey/utils";
+import { IAggregateType, IColumnType, IFormulaType, IFUData } from "@qrvey/utils";
 import { IFilterGrouping } from "./filter-grouping.resources";
 import { IFilterLogic } from "./filter-logic.resources";
 import { IFilterOperator } from "./filter-operators.resources";
@@ -64,6 +64,10 @@ export interface IFilter {
      * More information for this filter
      */
     extras?: Record<string, unknown>;
+    /**
+     * The Formula Type
+     */
+    formulaType?: IFormulaType;
     /**
      * Index of the selected Lookup display.
      * It is mandatory for Lookup column type.

package/dist/cjs/resources/filters.resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filters.resources.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filters.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filters.resources.ts"],"names":[],"mappings":"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"}

package/dist/cjs/resources/filters.resources.js

@@ -31,6 +31,7 @@ exports.DEFAULT_FILTER = {
     enabled: true,
     enableable: true,
     extras: undefined,
+    formulaType: undefined,
     grouping: undefined,
     icon: undefined,
     iconTooltip: undefined,

package/dist/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/classes/FilterBuilder.js

@@ -543,6 +543,7 @@ export class FilterBuilder {
             editable: filter.editable ?? DEFAULT_FILTER.editable,
             enableable: filter.enableable ?? DEFAULT_FILTER.enableable,
             enabled: filter.enabled ?? DEFAULT_FILTER.enabled,
+            formulaType: filter.formulaType ?? DEFAULT_FILTER.formulaType,
             id: filter.id || "",
             operator: filter.operator || DEFAULT_FILTER.operator,
             scope: filter.scope || DEFAULT_FILTER.scope,

package/dist/helpers/filter-adapt.helpers.js

@@ -135,6 +135,7 @@ function buildFilter(filter, dataset) {
         collapsed: filter.collapsed ?? DEFAULT_FILTER.collapsed,
         datasetLabel: dataset?.label ?? DEFAULT_UI_FILTER.datasetLabel,
         columnLabel: columnInfo?.label ?? DEFAULT_UI_FILTER.columnLabel,
+        formulaType: columnInfo?.formulaType ?? filter.formulaType,
         icon: filter.icon ?? DEFAULT_UI_FILTER.icon,
         iconTooltip: filter.iconTooltip ?? DEFAULT_UI_FILTER.iconTooltip,
     };

package/dist/helpers/filter-adapt.legacy.helpers.js

@@ -187,7 +187,7 @@ function buildLegacyFilter(filter, dataset) {
         collapsed: filter.collapsed ?? false,
         column: {
             id: filter.columnId,
-            formulaType: columnInfo?.formulaType,
+            formulaType: columnInfo?.formulaType || filter.formulaType,
             label: columnInfo?.label || "",
             qrveyid: filter.datasetId,
             aggregate: filter.aggregateType,

package/dist/helpers/filter-adapt.logic.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-adapt.logic.helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/filter-adapt.logic.helpers.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,EAO5B,MAAM,qCAAqC,CAAC;AAe7C,OAAO,EACL,SAAS,EACT,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAe,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,EAAE,CAgBnE;AAkID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,sBAAsB,CAaxB;AAoFD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,2BAA2B,EAAE,CA0C/B"}
+{"version":3,"file":"filter-adapt.logic.helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/filter-adapt.logic.helpers.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,EAO5B,MAAM,qCAAqC,CAAC;AAe7C,OAAO,EACL,SAAS,EACT,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAe,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,EAAE,CAgBnE;AAkID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,sBAAsB,CAaxB;AAsFD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,2BAA2B,EAAE,CA0C/B"}

package/dist/helpers/filter-adapt.logic.helpers.js

@@ -166,6 +166,7 @@ export function buildLogicExpression(filter) {
 function getLogicExpressionGroupValue(filter) {
     if (filter.aggregateType == null &&
         isDateColumn({
+            formulaType: filter.formulaType,
             type: filter.columnType,
             id: filter.columnId,
             qrveyid: filter.datasetId,
@@ -184,6 +185,7 @@ function getLogicExpressionProperty(filter) {
     if (isEmpty(filter.aggregateType)) {
         if (isNullValidator(filter.validator) ||
             isDateColumn({
+                formulaType: filter.formulaType,
                 type: filter.columnType,
                 id: filter.columnId,
                 qrveyid: filter.datasetId,
@@ -243,9 +245,9 @@ export function getFilterLogicValues(filter) {
                 return getRankingValues(values);
             return getResultValues(values, filter);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return getExclusiveRange(values);
-        case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
             return getInclusiveRange(values);
+        case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
+            return getExclusiveRange(values);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
             return getBeforeValues(values);

package/dist/resources/filters.resources.d.ts

@@ -1,4 +1,4 @@
-import { IAggregateType, IColumnType, IFUData } from "@qrvey/utils";
+import { IAggregateType, IColumnType, IFormulaType, IFUData } from "@qrvey/utils";
 import { IFilterGrouping } from "./filter-grouping.resources";
 import { IFilterLogic } from "./filter-logic.resources";
 import { IFilterOperator } from "./filter-operators.resources";
@@ -64,6 +64,10 @@ export interface IFilter {
      * More information for this filter
      */
     extras?: Record<string, unknown>;
+    /**
+     * The Formula Type
+     */
+    formulaType?: IFormulaType;
     /**
      * Index of the selected Lookup display.
      * It is mandatory for Lookup column type.

package/dist/resources/filters.resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.resources.d.ts","sourceRoot":"","sources":["../../src/resources/filters.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,cAAc,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAmB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAgB,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAEL,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;AAEtC,MAAM,MAAM,sBAAsB,GAAG;KAAG,GAAG,IAAI,gBAAgB,GAAG,WAAW;CAAE,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,WAAW,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,gBAAgB,CAAC;IAC5B;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,cAAc,SAAS,oBAAoB,GAAG,oBAAoB;IAElE,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,4BAA4B,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,oBAAY,mBAAmB;IAC7B,KAAK,UAAU;IACf,IAAI,SAAS;IACb,EAAE,OAAO;IACT,IAAI,SAAS;CACd;AAED;;GAEG;AACH,UAAU,iBAAiB;IACzB,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5C,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACpC,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC3C;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,OAwB5B,CAAC;AAEF;;GAEG;AACH,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,sBAsBtC,CAAC"}
+{"version":3,"file":"filters.resources.d.ts","sourceRoot":"","sources":["../../src/resources/filters.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,WAAW,EACX,YAAY,EACZ,OAAO,EACR,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAmB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAgB,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAEL,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;AAEtC,MAAM,MAAM,sBAAsB,GAAG;KAAG,GAAG,IAAI,gBAAgB,GAAG,WAAW;CAAE,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,WAAW,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,gBAAgB,CAAC;IAC5B;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,cAAc,SAAS,oBAAoB,GAAG,oBAAoB;IAElE,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,4BAA4B,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,oBAAY,mBAAmB;IAC7B,KAAK,UAAU;IACf,IAAI,SAAS;IACb,EAAE,OAAO;IACT,IAAI,SAAS;CACd;AAED;;GAEG;AACH,UAAU,iBAAiB;IACzB,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5C,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACpC,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC3C;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,OAyB5B,CAAC;AAEF;;GAEG;AACH,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,sBAsBtC,CAAC"}

package/dist/resources/filters.resources.js

@@ -1,4 +1,4 @@
-import { COLUMN } from "@qrvey/utils";
+import { COLUMN, } from "@qrvey/utils";
 import { FILTER_OPERATOR } from "./filter-operators.resources";
 import { FILTER_SCOPE } from "./filter-scopes.resources";
 import { FILTER_VALIDATOR, } from "./filter-validators.resources";
@@ -28,6 +28,7 @@ export const DEFAULT_FILTER = {
     enabled: true,
     enableable: true,
     extras: undefined,
+    formulaType: undefined,
     grouping: undefined,
     icon: undefined,
     iconTooltip: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/filters",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "Helpers and logic for Filtering Data in Qrvey app",
   "main": "dist/index.js",
   "engines": {

package/src/classes/FilterBuilder.ts

@@ -723,6 +723,7 @@ export class FilterBuilder
       editable: filter.editable ?? DEFAULT_FILTER.editable,
       enableable: filter.enableable ?? DEFAULT_FILTER.enableable,
       enabled: filter.enabled ?? DEFAULT_FILTER.enabled,
+      formulaType: filter.formulaType ?? DEFAULT_FILTER.formulaType,
       id: filter.id || "",
       operator: filter.operator || DEFAULT_FILTER.operator,
       scope: filter.scope || DEFAULT_FILTER.scope,

package/src/helpers/filter-adapt.helpers.ts

@@ -197,6 +197,7 @@ function buildFilter(filter: IFilter, dataset?: IDataset): IFilterUI {
     collapsed: filter.collapsed ?? DEFAULT_FILTER.collapsed,
     datasetLabel: dataset?.label ?? DEFAULT_UI_FILTER.datasetLabel,
     columnLabel: columnInfo?.label ?? DEFAULT_UI_FILTER.columnLabel,
+    formulaType: columnInfo?.formulaType ?? filter.formulaType,
     icon: filter.icon ?? DEFAULT_UI_FILTER.icon,
     iconTooltip: filter.iconTooltip ?? DEFAULT_UI_FILTER.iconTooltip,
   };

package/src/helpers/filter-adapt.legacy.helpers.ts

@@ -261,7 +261,7 @@ function buildLegacyFilter(filter: IFilter, dataset?: IDataset): IFUFilter {
     collapsed: filter.collapsed ?? false,
     column: {
       id: filter.columnId,
-      formulaType: columnInfo?.formulaType,
+      formulaType: columnInfo?.formulaType || filter.formulaType,
       label: columnInfo?.label || "",
       qrveyid: filter.datasetId,
       aggregate: filter.aggregateType,

package/src/helpers/filter-adapt.logic.helpers.ts

@@ -246,6 +246,7 @@ function getLogicExpressionGroupValue(
   if (
     filter.aggregateType == null &&
     isDateColumn({
+      formulaType: filter.formulaType,
       type: filter.columnType,
       id: filter.columnId,
       qrveyid: filter.datasetId,
@@ -270,6 +271,7 @@ function getLogicExpressionProperty(
     if (
       isNullValidator(filter.validator) ||
       isDateColumn({
+        formulaType: filter.formulaType,
         type: filter.columnType,
         id: filter.columnId,
         qrveyid: filter.datasetId,
@@ -343,9 +345,9 @@ export function getFilterLogicValues(
         return getRankingValues(values as IFilterValueRanking[][]);
       return getResultValues(values as IFilterValueRegular[], filter);
     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-      return getExclusiveRange(values as IFilterValueRange[]);
-    case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
       return getInclusiveRange(values as IFilterValueRange[]);
+    case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
+      return getExclusiveRange(values as IFilterValueRange[]);
     case FILTER_VALIDATOR.BEFORE:
     case FILTER_VALIDATOR.LESS_THAN:
       return getBeforeValues(values as IFilterValueRange[]);

package/src/resources/filters.resources.ts

@@ -1,4 +1,10 @@
-import { COLUMN, IAggregateType, IColumnType, IFUData } from "@qrvey/utils";
+import {
+  COLUMN,
+  IAggregateType,
+  IColumnType,
+  IFormulaType,
+  IFUData,
+} from "@qrvey/utils";
 
 import { IFilterGrouping } from "./filter-grouping.resources";
 import { IFilterLogic } from "./filter-logic.resources";
@@ -69,6 +75,10 @@ export interface IFilter {
    * More information for this filter
    */
   extras?: Record<string, unknown>;
+  /**
+   * The Formula Type
+   */
+  formulaType?: IFormulaType;
   /**
    * Index of the selected Lookup display.
    * It is mandatory for Lookup column type.
@@ -170,6 +180,7 @@ export const DEFAULT_FILTER: IFilter = {
   enabled: true,
   enableable: true,
   extras: undefined,
+  formulaType: undefined,
   grouping: undefined,
   icon: undefined,
   iconTooltip: undefined,

package/tests/classes/FilterAdapter.test.ts

@@ -6,12 +6,16 @@ import {
 import { __datasets1 } from "../mock/datasets.mock";
 import {
   __legacyVisualFilters1,
+  __legacyVisualFilters2,
   __logicFilters1,
+  __logicFilters2,
   __v3Filters1,
+  __v3Filters2,
   __visualFilters1,
+  __visualFilters2,
 } from "../mock/filters-adapter.mock";
 import { __interactiveTable1 } from "../mock/filters-interactive-table.mock";
-import { __mockFilters1 } from "../mock/filters.mock";
+import { __mockFilters1, __mockFilters5 } from "../mock/filters.mock";
 
 describe("Testing wrong arguments", () => {
   const emptyFilters: IFilterVersion<FILTER_VERSION_TYPE.V3> = {
@@ -99,3 +103,22 @@ describe("Adapting Filters 2", () => {
     expect(visual).toEqual(__visualFilters1);
   });
 });
+
+describe("Adapting Filters 3 - Existed Filter Formulas", () => {
+  let adapter: FilterAdapter;
+  beforeEach(() => {
+    adapter = new FilterAdapter(__mockFilters5, [], __interactiveTable1);
+  });
+
+  test("Getting the adapted filters", () => {
+    const legacy = adapter.legacyVisual;
+    const v3 = adapter.filters;
+    const logic = adapter.logic;
+    const visual = adapter.visual;
+
+    expect(legacy).toEqual(__legacyVisualFilters2);
+    expect(v3).toEqual(__v3Filters2);
+    expect(logic).toEqual(__logicFilters2);
+    expect(visual).toEqual(__visualFilters2);
+  });
+});

package/tests/mock/filters-adapter.mock.ts

@@ -4,6 +4,7 @@ import {
   FILTER_SCOPE,
   FILTER_SECTION,
   FILTER_VALIDATOR,
+  FORMULA,
   IColumnPropertyType,
 } from "@qrvey/utils";
 
@@ -303,12 +304,12 @@ export const __logicFilters1: IFilterVersion<FILTER_VERSION_TYPE.LOGIC> = {
               validationType: FILTER_LOGIC_VALIDATOR.RANGE,
               value: [
                 {
-                  gt: "1",
-                  lt: "10",
+                  gte: "1",
+                  lte: "10",
                 },
                 {
-                  gt: "20",
-                  lt: "30",
+                  gte: "20",
+                  lte: "30",
                 },
               ],
             },
@@ -451,3 +452,197 @@ export const __visualFilters1: IFilterVersion<FILTER_VERSION_TYPE.UI_3> = {
   },
   version: FILTER_VERSION_TYPE.UI_3,
 };
+
+export const __legacyVisualFilters2: IFilterVersion<FILTER_VERSION_TYPE.UI_2> =
+  {
+    filters: {
+      enabled: true,
+      section: FILTER_SECTION.DX,
+      version: "2.1",
+      scopes: [
+        {
+          collapsed: false,
+          datasets: [
+            {
+              collapsed: false,
+              qrveyid: "D124",
+              label: "",
+              displayed: true,
+              enabled: true,
+              filters: [
+                {
+                  collapsed: true,
+                  column: {
+                    aggregate: undefined,
+                    id: "C461",
+                    label: "",
+                    formulaType: FORMULA.DATE,
+                    qrveyid: "D124",
+                    type: COLUMN.FORMULA,
+                  },
+                  deletable: true,
+                  displayed: true,
+                  editable: true,
+                  enableable: true,
+                  enabled: true,
+                  filterid: "F461",
+                  extras: {
+                    filterLabel: undefined,
+                    panelid: undefined,
+                    info: undefined,
+                    scope: FILTER_SCOPE.GLOBAL,
+                    scopeid: undefined,
+                  },
+                  lookupDisplayIndex: undefined,
+                  nullValues: false,
+                  operator: FILTER_OPERATOR.AND,
+                  property: "day" as IColumnPropertyType,
+                  selectAll: false,
+                  validator: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+                  values: [
+                    {
+                      displayed: true,
+                      enabled: true,
+                      max: "02/13/2024 00:00:00",
+                      min: "02/12/2024 00:00:00",
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+          displayed: true,
+          enabled: true,
+          scope: FILTER_SCOPE.GLOBAL,
+          scopeid: undefined,
+        },
+      ],
+    },
+    version: FILTER_VERSION_TYPE.UI_2,
+  };
+
+export const __v3Filters2: IFilterVersion<FILTER_VERSION_TYPE.V3> = {
+  filters: [
+    {
+      aggregateType: undefined,
+      collapsed: true,
+      columnId: "C461",
+      columnType: COLUMN.FORMULA,
+      customLabel: undefined,
+      datasetId: "D124",
+      deletable: true,
+      displayed: true,
+      editable: true,
+      enabled: true,
+      enableable: true,
+      extras: undefined,
+      formulaType: FORMULA.DATE,
+      grouping: FILTER_GROUPING.DAY,
+      icon: undefined,
+      iconTooltip: undefined,
+      id: "F461",
+      lookupDisplayIndex: undefined,
+      operator: FILTER_OPERATOR.AND,
+      selectAll: false,
+      scope: FILTER_SCOPE.GLOBAL,
+      scopeId: undefined,
+      validator: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+      values: [
+        {
+          displayed: true,
+          enabled: true,
+          max: "02/13/2024 00:00:00",
+          min: "02/12/2024 00:00:00",
+        },
+      ],
+    },
+  ],
+  version: FILTER_VERSION_TYPE.V3,
+};
+
+export const __logicFilters2: IFilterVersion<FILTER_VERSION_TYPE.LOGIC> = {
+  filters: [
+    {
+      filters: [
+        {
+          expressions: [
+            {
+              enabled: true,
+              groupValue: FILTER_GROUPING.DAY,
+              property: undefined,
+              questionid: "C461",
+              validationType: FILTER_LOGIC_VALIDATOR.RANGE,
+              value: [
+                {
+                  lt: "02/13/2024 00:00:00",
+                  gt: "02/12/2024 00:00:00",
+                },
+              ],
+            },
+          ],
+          operator: FILTER_OPERATOR.AND,
+        },
+      ],
+      scope: FILTER_SCOPE.GLOBAL,
+      scopeid: undefined,
+    },
+  ],
+  version: FILTER_VERSION_TYPE.LOGIC,
+};
+
+export const __visualFilters2: IFilterVersion<FILTER_VERSION_TYPE.UI_3> = {
+  filters: {
+    scopes: [
+      {
+        collapsed: false,
+        datasets: [
+          {
+            collapsed: false,
+            id: "D124",
+            label: "",
+            filters: [
+              {
+                aggregateType: undefined,
+                collapsed: true,
+                columnId: "C461",
+                columnType: COLUMN.FORMULA,
+                customLabel: undefined,
+                datasetId: "D124",
+                deletable: true,
+                displayed: true,
+                editable: true,
+                enabled: true,
+                enableable: true,
+                extras: undefined,
+                formulaType: FORMULA.DATE,
+                grouping: FILTER_GROUPING.DAY,
+                id: "F461",
+                lookupDisplayIndex: undefined,
+                operator: FILTER_OPERATOR.AND,
+                selectAll: false,
+                scope: FILTER_SCOPE.GLOBAL,
+                scopeId: undefined,
+                validator: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+                datasetLabel: "Dataset",
+                columnLabel: "Column",
+                values: [
+                  {
+                    displayed: true,
+                    enabled: true,
+                    max: "02/13/2024 00:00:00",
+                    min: "02/12/2024 00:00:00",
+                  },
+                ],
+                icon: undefined,
+                iconTooltip: undefined,
+              },
+            ],
+          },
+        ],
+        scope: FILTER_SCOPE.GLOBAL,
+        id: undefined,
+      },
+    ],
+  },
+  version: FILTER_VERSION_TYPE.UI_3,
+};

package/tests/mock/filters.mock.ts

@@ -1,4 +1,9 @@
-import { COLUMN, DATE_GROUPING_PROPERTY, RELATIVE_CURSOR } from "@qrvey/utils";
+import {
+  COLUMN,
+  DATE_GROUPING_PROPERTY,
+  FORMULA,
+  RELATIVE_CURSOR,
+} from "@qrvey/utils";
 
 import { FILTER_GROUPING } from "../../src/resources/filter-grouping.resources";
 import { FILTER_OPERATOR } from "../../src/resources/filter-operators.resources";
@@ -210,6 +215,8 @@ export const __mockFilter10: IFilter = {
   validator: FILTER_VALIDATOR.EQUALS,
   values: [
     {
+      displayed: true,
+      enabled: true,
       value: "02/12/2024 00:00:00",
     },
   ],
@@ -225,6 +232,28 @@ export const __mockFilter11: IFilter = {
   validator: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
   values: [
     {
+      displayed: true,
+      enabled: true,
+      min: "02/12/2024 00:00:00",
+      max: "02/13/2024 00:00:00",
+    },
+  ],
+};
+
+export const __mockFilter12: IFilter = {
+  ...DEFAULT_FILTER,
+  columnId: "C461",
+  columnType: COLUMN.FORMULA,
+  datasetId: "D124",
+  enabled: true,
+  formulaType: FORMULA.DATE,
+  grouping: FILTER_GROUPING.DAY,
+  id: "F461",
+  validator: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+  values: [
+    {
+      displayed: true,
+      enabled: true,
       min: "02/12/2024 00:00:00",
       max: "02/13/2024 00:00:00",
     },
@@ -250,3 +279,5 @@ export const __mockFilters4: IFilter[] = [
   __mockFilter10,
   __mockFilter11,
 ];
+
+export const __mockFilters5: IFilter[] = [__mockFilter12];