@qrvey/filters 0.2.2 → 0.2.4

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.2*
+# [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.4*
 
 > Helpers and logic for Filtering Data in Qrvey app
 

package/dist/cjs/classes/FilterAdapter.js

@@ -27,7 +27,7 @@ class FilterAdapter {
         return (0, filter_adapt_legacy_helpers_1.filterToLegacyVisual)(this._filters, this.datasets, this.interactiveTable);
     }
     filterToLogic() {
-        return (0, filter_adapt_logic_helpers_1.filterToLogic)(this._filters);
+        return (0, filter_adapt_logic_helpers_1.filterToLogic)(this._filters, this.datasets);
     }
     filterToVisual() {
         return (0, filter_adapt_helpers_1.filterToVisual)(this._filters, this.datasets, this.interactiveTable);

package/dist/cjs/classes/FilterResources.js

@@ -39,7 +39,7 @@ class FilterResources {
         return groupingInfo == null ? groupingInfoList[0] : groupingInfo;
     }
     static getGroupingInfoByFilter(filter, settings) {
-        if (!FilterValidation_1.FilterValidation.isGroupingValid(filter.columnType, filter.validator))
+        if (!FilterValidation_1.FilterValidation.isGroupingValid({ type: filter.columnType, formulaType: filter.formulaType }, filter.validator))
             return;
         return this.getGroupingInfoByColumnType({ type: filter.columnType, formulaType: filter.formulaType }, filter.grouping, settings);
     }

package/dist/cjs/classes/FilterValidation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterValidation = void 0;
+const utils_1 = require("@qrvey/utils");
 const getFilterType_1 = require("../helpers/getFilterType");
 const filter_grouping_resources_1 = require("../resources/filter-grouping.resources");
 const filters_resources_1 = require("../resources/filters.resources");
@@ -51,8 +52,10 @@ class FilterValidation {
     static isFilterRankingValueDuplicated(_values1, _values2) {
         return false;
     }
-    static isGroupingValid(columnType, validator) {
-        return (filter_grouping_resources_1.FILTER_GROUPING_COLUMNS.includes(columnType) &&
+    static isGroupingValid(type, validator) {
+        if (type.formulaType === utils_1.FORMULA.DATE)
+            return true;
+        return (filter_grouping_resources_1.FILTER_GROUPING_COLUMNS.includes(type.type) &&
             filter_grouping_resources_1.FILTER_GROUPING_VALIDATORS.includes(validator));
     }
 }

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

@@ -97,7 +97,9 @@ 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,
+        formulaType: columnInfo?.formulaType ||
+            filter.formulaType ||
+            filter_visual_resources_1.DEFAULT_UI_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.logic.helpers.js

@@ -13,10 +13,10 @@ const filter_logic_resources_1 = require("../resources/filter-logic.resources");
 const filter_operators_resources_1 = require("../resources/filter-operators.resources");
 const filter_validators_resources_1 = require("../resources/filter-validators.resources");
 const filters_resources_1 = require("../resources/filters.resources");
-function filterToLogic(filters) {
+function filterToLogic(filters, datasets = []) {
     if ((0, utils_1.isEmpty)(filters))
         return [];
-    const visual = (0, filter_adapt_helpers_1.filterToVisual)(filters);
+    const visual = (0, filter_adapt_helpers_1.filterToVisual)(filters, datasets);
     return visualToLogic(visual);
 }
 function visualToLogic(visual) {

package/dist/classes/FilterAdapter.js

@@ -24,7 +24,7 @@ export class FilterAdapter {
         return filterToLegacyVisual(this._filters, this.datasets, this.interactiveTable);
     }
     filterToLogic() {
-        return filterToLogic(this._filters);
+        return filterToLogic(this._filters, this.datasets);
     }
     filterToVisual() {
         return filterToVisual(this._filters, this.datasets, this.interactiveTable);

package/dist/classes/FilterResources.js

@@ -36,7 +36,7 @@ export class FilterResources {
         return groupingInfo == null ? groupingInfoList[0] : groupingInfo;
     }
     static getGroupingInfoByFilter(filter, settings) {
-        if (!FilterValidation.isGroupingValid(filter.columnType, filter.validator))
+        if (!FilterValidation.isGroupingValid({ type: filter.columnType, formulaType: filter.formulaType }, filter.validator))
             return;
         return this.getGroupingInfoByColumnType({ type: filter.columnType, formulaType: filter.formulaType }, filter.grouping, settings);
     }

package/dist/classes/FilterValidation.d.ts

@@ -1,5 +1,5 @@
+import { IColumnVsFormulaType } from "@qrvey/utils";
 import { IFilterValidator } from "../resources";
-import { IColumnTypeWithGrouping } from "../resources/filter-grouping.resources";
 import { IFilter } from "../resources/filters.resources";
 export declare class FilterValidation {
     static isDuplicated(filters: IFilter[], filter: IFilter): boolean;
@@ -8,5 +8,5 @@ export declare class FilterValidation {
     private static isFilterRangeValueDuplicated;
     private static isFilterRelativeValueDuplicated;
     private static isFilterRankingValueDuplicated;
-    static isGroupingValid(columnType: IColumnTypeWithGrouping, validator: IFilterValidator): boolean;
+    static isGroupingValid(type: IColumnVsFormulaType, validator: IFilterValidator): boolean;
 }

package/dist/classes/FilterValidation.js

@@ -1,3 +1,4 @@
+import { FORMULA } from "@qrvey/utils";
 import { getFilterType } from "../helpers/getFilterType";
 import { FILTER_GROUPING_COLUMNS, FILTER_GROUPING_VALIDATORS, } from "../resources/filter-grouping.resources";
 import { FILTER_TYPE } from "../resources/filters.resources";
@@ -48,8 +49,10 @@ export class FilterValidation {
     static isFilterRankingValueDuplicated(_values1, _values2) {
         return false;
     }
-    static isGroupingValid(columnType, validator) {
-        return (FILTER_GROUPING_COLUMNS.includes(columnType) &&
+    static isGroupingValid(type, validator) {
+        if (type.formulaType === FORMULA.DATE)
+            return true;
+        return (FILTER_GROUPING_COLUMNS.includes(type.type) &&
             FILTER_GROUPING_VALIDATORS.includes(validator));
     }
 }

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

@@ -93,7 +93,9 @@ 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,
+        formulaType: columnInfo?.formulaType ||
+            filter.formulaType ||
+            DEFAULT_UI_FILTER.formulaType,
         icon: filter.icon ?? DEFAULT_UI_FILTER.icon,
         iconTooltip: filter.iconTooltip ?? DEFAULT_UI_FILTER.iconTooltip,
     };

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

@@ -1,7 +1,8 @@
+import { IDataset } from "@qrvey/utils";
 import { IFilterLogic, IFilterLogicExpression, IFilterLogicExpressionValue } from "../resources/filter-logic.resources";
 import { IFilterUI, IFilterVisual } from "../resources/filter-visual.resources";
 import { IFilter } from "../resources/filters.resources";
-export declare function filterToLogic(filters: IFilter[]): IFilterLogic[];
+export declare function filterToLogic(filters: IFilter[], datasets?: IDataset[]): IFilterLogic[];
 export declare function visualToLogic(visual: IFilterVisual): IFilterLogic[];
 export declare function buildLogicExpression(filter: IFilterUI): IFilterLogicExpression;
 export declare function getFilterLogicValues(filter: IFilterUI): IFilterLogicExpressionValue[];

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

@@ -7,10 +7,10 @@ import { FILTER_LOGIC_VALIDATOR, } from "../resources/filter-logic.resources";
 import { FILTER_OPERATOR, } from "../resources/filter-operators.resources";
 import { FILTER_LOGIC_VALIDATOR_BY_VALIDATOR, FILTER_VALIDATOR, } from "../resources/filter-validators.resources";
 import { FILTER_TYPE } from "../resources/filters.resources";
-export function filterToLogic(filters) {
+export function filterToLogic(filters, datasets = []) {
     if (isEmpty(filters))
         return [];
-    const visual = filterToVisual(filters);
+    const visual = filterToVisual(filters, datasets);
     return visualToLogic(visual);
 }
 export function visualToLogic(visual) {

package/package.json

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