@qrvey/filters 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/classes/FilterResources.js +1 -1
  3. package/dist/cjs/classes/FilterValidation.js +5 -2
  4. package/dist/classes/FilterResources.js +1 -1
  5. package/dist/classes/FilterValidation.d.ts +2 -2
  6. package/dist/classes/FilterValidation.js +5 -2
  7. package/package.json +1 -1
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.3*
1
+ # [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.4*
2
2
 
3
3
  > Helpers and logic for Filtering Data in Qrvey app
4
4
 
package/dist/cjs/classes/FilterResources.js CHANGED
@@ -39,7 +39,7 @@ class FilterResources {
39
39
  return groupingInfo == null ? groupingInfoList[0] : groupingInfo;
40
40
  }
41
41
  static getGroupingInfoByFilter(filter, settings) {
42
- if (!FilterValidation_1.FilterValidation.isGroupingValid(filter.columnType, filter.validator))
42
+ if (!FilterValidation_1.FilterValidation.isGroupingValid({ type: filter.columnType, formulaType: filter.formulaType }, filter.validator))
43
43
  return;
44
44
  return this.getGroupingInfoByColumnType({ type: filter.columnType, formulaType: filter.formulaType }, filter.grouping, settings);
45
45
  }
package/dist/cjs/classes/FilterValidation.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.FilterValidation = void 0;
4
+ const utils_1 = require("@qrvey/utils");
4
5
  const getFilterType_1 = require("../helpers/getFilterType");
5
6
  const filter_grouping_resources_1 = require("../resources/filter-grouping.resources");
6
7
  const filters_resources_1 = require("../resources/filters.resources");
@@ -51,8 +52,10 @@ class FilterValidation {
51
52
  static isFilterRankingValueDuplicated(_values1, _values2) {
52
53
  return false;
53
54
  }
54
- static isGroupingValid(columnType, validator) {
55
- return (filter_grouping_resources_1.FILTER_GROUPING_COLUMNS.includes(columnType) &&
55
+ static isGroupingValid(type, validator) {
56
+ if (type.formulaType === utils_1.FORMULA.DATE)
57
+ return true;
58
+ return (filter_grouping_resources_1.FILTER_GROUPING_COLUMNS.includes(type.type) &&
56
59
  filter_grouping_resources_1.FILTER_GROUPING_VALIDATORS.includes(validator));
57
60
  }
58
61
  }
package/dist/classes/FilterResources.js CHANGED
@@ -36,7 +36,7 @@ export class FilterResources {
36
36
  return groupingInfo == null ? groupingInfoList[0] : groupingInfo;
37
37
  }
38
38
  static getGroupingInfoByFilter(filter, settings) {
39
- if (!FilterValidation.isGroupingValid(filter.columnType, filter.validator))
39
+ if (!FilterValidation.isGroupingValid({ type: filter.columnType, formulaType: filter.formulaType }, filter.validator))
40
40
  return;
41
41
  return this.getGroupingInfoByColumnType({ type: filter.columnType, formulaType: filter.formulaType }, filter.grouping, settings);
42
42
  }
package/dist/classes/FilterValidation.d.ts CHANGED
@@ -1,5 +1,5 @@
1
+ import { IColumnVsFormulaType } from "@qrvey/utils";
1
2
  import { IFilterValidator } from "../resources";
2
- import { IColumnTypeWithGrouping } from "../resources/filter-grouping.resources";
3
3
  import { IFilter } from "../resources/filters.resources";
4
4
  export declare class FilterValidation {
5
5
  static isDuplicated(filters: IFilter[], filter: IFilter): boolean;
@@ -8,5 +8,5 @@ export declare class FilterValidation {
8
8
  private static isFilterRangeValueDuplicated;
9
9
  private static isFilterRelativeValueDuplicated;
10
10
  private static isFilterRankingValueDuplicated;
11
- static isGroupingValid(columnType: IColumnTypeWithGrouping, validator: IFilterValidator): boolean;
11
+ static isGroupingValid(type: IColumnVsFormulaType, validator: IFilterValidator): boolean;
12
12
  }
package/dist/classes/FilterValidation.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { FORMULA } from "@qrvey/utils";
1
2
  import { getFilterType } from "../helpers/getFilterType";
2
3
  import { FILTER_GROUPING_COLUMNS, FILTER_GROUPING_VALIDATORS, } from "../resources/filter-grouping.resources";
3
4
  import { FILTER_TYPE } from "../resources/filters.resources";
@@ -48,8 +49,10 @@ export class FilterValidation {
48
49
  static isFilterRankingValueDuplicated(_values1, _values2) {
49
50
  return false;
50
51
  }
51
- static isGroupingValid(columnType, validator) {
52
- return (FILTER_GROUPING_COLUMNS.includes(columnType) &&
52
+ static isGroupingValid(type, validator) {
53
+ if (type.formulaType === FORMULA.DATE)
54
+ return true;
55
+ return (FILTER_GROUPING_COLUMNS.includes(type.type) &&
53
56
  FILTER_GROUPING_VALIDATORS.includes(validator));
54
57
  }
55
58
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/filters",
3
- "version": "0.2.3",
3
+ "version": "0.2.4",
4
4
  "description": "Helpers and logic for Filtering Data in Qrvey app",
5
5
  "main": "dist/cjs/index.js",
6
6
  "module": "dist/index.js",