@hisptz/dhis2-analytics 1.0.52 → 1.0.54
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.
|
@@ -26,9 +26,9 @@ const analyticsQuery = {
|
|
|
26
26
|
var _dimensions$dimension;
|
|
27
27
|
return `${dimension}:${(_dimensions$dimension = dimensions[dimension]) === null || _dimensions$dimension === void 0 ? void 0 : _dimensions$dimension.join(';')}`;
|
|
28
28
|
}),
|
|
29
|
-
|
|
30
|
-
var
|
|
31
|
-
return `${dimension}:${(
|
|
29
|
+
filter: Object.keys(filters).map(dimension => {
|
|
30
|
+
var _filters$dimension;
|
|
31
|
+
return `${dimension}:${(_filters$dimension = filters[dimension]) === null || _filters$dimension === void 0 ? void 0 : _filters$dimension.join(';')}`;
|
|
32
32
|
}),
|
|
33
33
|
includeMetadataDetails: true
|
|
34
34
|
};
|
|
@@ -59,13 +59,16 @@ function AnalyticsDataProvider(_ref2) {
|
|
|
59
59
|
(0, _lodash.set)(dimensions, [dimension], analyticsDimensions === null || analyticsDimensions === void 0 ? void 0 : analyticsDimensions[dimension]);
|
|
60
60
|
});
|
|
61
61
|
(0, _lodash.forEach)([...((_layout$filters = layout === null || layout === void 0 ? void 0 : layout.filters) !== null && _layout$filters !== void 0 ? _layout$filters : [])], dimension => {
|
|
62
|
-
(0, _lodash.set)(
|
|
62
|
+
(0, _lodash.set)(filters, [dimension], analyticsDimensions === null || analyticsDimensions === void 0 ? void 0 : analyticsDimensions[dimension]);
|
|
63
63
|
});
|
|
64
64
|
return {
|
|
65
65
|
dimensions,
|
|
66
66
|
filters
|
|
67
67
|
};
|
|
68
|
-
}, [layout, analyticsDimensions
|
|
68
|
+
}, [layout, analyticsDimensions]);
|
|
69
|
+
console.log({
|
|
70
|
+
filters
|
|
71
|
+
});
|
|
69
72
|
const {
|
|
70
73
|
data: analytics,
|
|
71
74
|
error,
|
|
@@ -17,9 +17,9 @@ const analyticsQuery = {
|
|
|
17
17
|
var _dimensions$dimension;
|
|
18
18
|
return `${dimension}:${(_dimensions$dimension = dimensions[dimension]) === null || _dimensions$dimension === void 0 ? void 0 : _dimensions$dimension.join(';')}`;
|
|
19
19
|
}),
|
|
20
|
-
|
|
21
|
-
var
|
|
22
|
-
return `${dimension}:${(
|
|
20
|
+
filter: Object.keys(filters).map(dimension => {
|
|
21
|
+
var _filters$dimension;
|
|
22
|
+
return `${dimension}:${(_filters$dimension = filters[dimension]) === null || _filters$dimension === void 0 ? void 0 : _filters$dimension.join(';')}`;
|
|
23
23
|
}),
|
|
24
24
|
includeMetadataDetails: true
|
|
25
25
|
};
|
|
@@ -50,13 +50,16 @@ export function AnalyticsDataProvider(_ref2) {
|
|
|
50
50
|
set(dimensions, [dimension], analyticsDimensions === null || analyticsDimensions === void 0 ? void 0 : analyticsDimensions[dimension]);
|
|
51
51
|
});
|
|
52
52
|
forEach([...((_layout$filters = layout === null || layout === void 0 ? void 0 : layout.filters) !== null && _layout$filters !== void 0 ? _layout$filters : [])], dimension => {
|
|
53
|
-
set(
|
|
53
|
+
set(filters, [dimension], analyticsDimensions === null || analyticsDimensions === void 0 ? void 0 : analyticsDimensions[dimension]);
|
|
54
54
|
});
|
|
55
55
|
return {
|
|
56
56
|
dimensions,
|
|
57
57
|
filters
|
|
58
58
|
};
|
|
59
|
-
}, [layout, analyticsDimensions
|
|
59
|
+
}, [layout, analyticsDimensions]);
|
|
60
|
+
console.log({
|
|
61
|
+
filters
|
|
62
|
+
});
|
|
60
63
|
const {
|
|
61
64
|
data: analytics,
|
|
62
65
|
error,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hisptz/dhis2-analytics",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.54",
|
|
4
4
|
"description": "A collection of reusable react components for visualizing analytics data from DHIS2",
|
|
5
5
|
"license": "BSD-3-Clause",
|
|
6
6
|
"scripts": {
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@dhis2/app-runtime": "^3.7.0",
|
|
34
|
-
"@hisptz/dhis2-ui": "^1.0.
|
|
34
|
+
"@hisptz/dhis2-ui": "^1.0.54",
|
|
35
35
|
"@hisptz/dhis2-utils": "^1.0.52",
|
|
36
36
|
"@react-leaflet/core": "^2.1.0",
|
|
37
37
|
"async-es": "^3.2.4",
|
|
@@ -87,5 +87,5 @@
|
|
|
87
87
|
"react-hook-form": "^7.43",
|
|
88
88
|
"recoil": "*"
|
|
89
89
|
},
|
|
90
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "30869ffabdc3b83f88a8c87c5ed596691f4a3be8"
|
|
91
91
|
}
|