@dhis2/analytics 23.7.2 → 23.7.3
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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [23.7.3](https://github.com/dhis2/analytics/compare/v23.7.2...v23.7.3) (2022-03-31)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* get stage id and filter string for filters just like for columns and rows([#1191](https://github.com/dhis2/analytics/issues/1191)) ([4550517](https://github.com/dhis2/analytics/commit/45505179f9c1bf359d900d05d22f267c356d72cf))
|
|
7
|
+
|
|
1
8
|
## [23.7.2](https://github.com/dhis2/analytics/compare/v23.7.1...v23.7.2) (2022-03-26)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -87,9 +87,21 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
87
87
|
|
|
88
88
|
const fixedIds = Object.keys((0, _predefinedDimensions.getFixedDimensions)());
|
|
89
89
|
filters.forEach(f => {
|
|
90
|
-
|
|
90
|
+
if (passFilterAsDimension && fixedIds.includes(f.dimension)) {
|
|
91
|
+
var _f$items;
|
|
91
92
|
|
|
92
|
-
|
|
93
|
+
request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
|
|
94
|
+
} else {
|
|
95
|
+
var _f$programStage, _f$items2;
|
|
96
|
+
|
|
97
|
+
let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
|
|
98
|
+
|
|
99
|
+
if (f.filter) {
|
|
100
|
+
filterString += ":".concat(f.filter);
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
|
|
104
|
+
}
|
|
93
105
|
});
|
|
94
106
|
return request;
|
|
95
107
|
}
|
|
@@ -74,9 +74,21 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
|
|
|
74
74
|
|
|
75
75
|
const fixedIds = Object.keys(getFixedDimensions());
|
|
76
76
|
filters.forEach(f => {
|
|
77
|
-
|
|
77
|
+
if (passFilterAsDimension && fixedIds.includes(f.dimension)) {
|
|
78
|
+
var _f$items;
|
|
78
79
|
|
|
79
|
-
|
|
80
|
+
request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
|
|
81
|
+
} else {
|
|
82
|
+
var _f$programStage, _f$items2;
|
|
83
|
+
|
|
84
|
+
let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
|
|
85
|
+
|
|
86
|
+
if (f.filter) {
|
|
87
|
+
filterString += ":".concat(f.filter);
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
|
|
91
|
+
}
|
|
80
92
|
});
|
|
81
93
|
return request;
|
|
82
94
|
}
|