@sankhyalabs/core 7.1.1-rc.1 → 7.2.1-dev.1
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.
- package/.docs/classes/ColumnFilterManager.md +6 -6
- package/dist/utils/ColumnFilterManager.js +17 -1
- package/dist/utils/ColumnFilterManager.js.map +1 -1
- package/package.json +1 -1
- package/reports/test-report.xml +341 -338
- package/src/utils/ColumnFilterManager.ts +16 -2
- package/test/util/ColumnFilterManager.spec.ts +59 -1
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
|
|
35
35
|
#### Source
|
|
36
36
|
|
|
37
|
-
src/utils/ColumnFilterManager.ts:
|
|
37
|
+
src/utils/ColumnFilterManager.ts:74
|
|
38
38
|
|
|
39
39
|
***
|
|
40
40
|
|
|
@@ -56,7 +56,7 @@ src/utils/ColumnFilterManager.ts:60
|
|
|
56
56
|
|
|
57
57
|
#### Source
|
|
58
58
|
|
|
59
|
-
src/utils/ColumnFilterManager.ts:
|
|
59
|
+
src/utils/ColumnFilterManager.ts:80
|
|
60
60
|
|
|
61
61
|
***
|
|
62
62
|
|
|
@@ -80,7 +80,7 @@ src/utils/ColumnFilterManager.ts:66
|
|
|
80
80
|
|
|
81
81
|
#### Source
|
|
82
82
|
|
|
83
|
-
src/utils/ColumnFilterManager.ts:
|
|
83
|
+
src/utils/ColumnFilterManager.ts:85
|
|
84
84
|
|
|
85
85
|
***
|
|
86
86
|
|
|
@@ -100,7 +100,7 @@ src/utils/ColumnFilterManager.ts:71
|
|
|
100
100
|
|
|
101
101
|
#### Source
|
|
102
102
|
|
|
103
|
-
src/utils/ColumnFilterManager.ts:
|
|
103
|
+
src/utils/ColumnFilterManager.ts:12
|
|
104
104
|
|
|
105
105
|
***
|
|
106
106
|
|
|
@@ -120,7 +120,7 @@ src/utils/ColumnFilterManager.ts:11
|
|
|
120
120
|
|
|
121
121
|
#### Source
|
|
122
122
|
|
|
123
|
-
src/utils/ColumnFilterManager.ts:
|
|
123
|
+
src/utils/ColumnFilterManager.ts:31
|
|
124
124
|
|
|
125
125
|
***
|
|
126
126
|
|
|
@@ -142,4 +142,4 @@ src/utils/ColumnFilterManager.ts:30
|
|
|
142
142
|
|
|
143
143
|
#### Source
|
|
144
144
|
|
|
145
|
-
src/utils/ColumnFilterManager.ts:
|
|
145
|
+
src/utils/ColumnFilterManager.ts:44
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { FieldComparator } from '../dataunit/sorting/FieldComparator.js';
|
|
2
|
+
import { DataType } from '../dataunit/metadata/DataType.js';
|
|
2
3
|
const COLUMN_FILTER_PATTERN = /FILTRO_COLUNA_(.+)/;
|
|
3
4
|
export class ColumnFilterManager {
|
|
4
5
|
static getColumnFilters(filters, fieldName) {
|
|
@@ -33,9 +34,24 @@ export class ColumnFilterManager {
|
|
|
33
34
|
if (!columnFilter.params || !fieldDescriptor)
|
|
34
35
|
return false;
|
|
35
36
|
const fieldValue = record[columnFilter.columnName];
|
|
37
|
+
/**
|
|
38
|
+
* Casa datas pelo valor FORMATADO — a mesma granularidade que o funil exibe/agrupa
|
|
39
|
+
* (dia p/ data pura, minuto p/ DATETIME). Nem por dia nem por timestamp exato. KB-171175.
|
|
40
|
+
*/
|
|
41
|
+
const isDate = fieldDescriptor.dataType === DataType.DATE;
|
|
36
42
|
for (let param of columnFilter.params) {
|
|
37
43
|
const paramValue = dataUnit.valueFromString(columnFilter.columnName, param.value);
|
|
38
|
-
|
|
44
|
+
let matches;
|
|
45
|
+
if (isDate) {
|
|
46
|
+
matches = (fieldValue == undefined || paramValue == undefined)
|
|
47
|
+
? fieldValue == paramValue
|
|
48
|
+
: dataUnit.getFormattedValue(columnFilter.columnName, fieldValue)
|
|
49
|
+
=== dataUnit.getFormattedValue(columnFilter.columnName, paramValue);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
matches = FieldComparator.compareValues(fieldDescriptor, fieldValue, paramValue) === 0;
|
|
53
|
+
}
|
|
54
|
+
if (matches) {
|
|
39
55
|
return true;
|
|
40
56
|
}
|
|
41
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnFilterManager.js","sourceRoot":"","sources":["../../src/utils/ColumnFilterManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"ColumnFilterManager.js","sourceRoot":"","sources":["../../src/utils/ColumnFilterManager.ts"],"names":[],"mappings":"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"}
|