@dhis2/analytics 4.5.36 → 4.5.41

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 (9) hide show
  1. package/CHANGELOG.md +36 -0
  2. package/build/index.js +8 -0
  3. package/build/locales/es/translations.json +6 -6
  4. package/build/locales/index.js +36 -32
  5. package/build/locales/nl/translations.json +153 -0
  6. package/build/modules/ouLevelUtils/__tests__/index.spec.js +149 -0
  7. package/build/modules/ouLevelUtils/index.js +53 -0
  8. package/build/visualizations/config/adapters/dhis_highcharts/xAxis/yearOnYear.js +10 -3
  9. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,39 @@
1
+ ## [4.5.41](https://github.com/dhis2/analytics/compare/v4.5.40...v4.5.41) (2021-11-25)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * **translations:** sync translations from transifex (4.x) ([6d351bf](https://github.com/dhis2/analytics/commit/6d351bfabad72dc24e48149515abe680e48a0ff9))
7
+
8
+ ## [4.5.40](https://github.com/dhis2/analytics/compare/v4.5.39...v4.5.40) (2021-10-07)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **translations:** sync translations from transifex (4.x) ([d128c70](https://github.com/dhis2/analytics/commit/d128c70e0e0ae71bb0c4881d9a0adcfb54e72523))
14
+
15
+ ## [4.5.39](https://github.com/dhis2/analytics/compare/v4.5.38...v4.5.39) (2021-09-15)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * add convertOuLevelsToUids (DHIS2-11016) ([#908](https://github.com/dhis2/analytics/issues/908)) ([#1046](https://github.com/dhis2/analytics/issues/1046)) ([8a52106](https://github.com/dhis2/analytics/commit/8a5210658921e5c5792dac02e92b0584474694b7))
21
+
22
+ ## [4.5.38](https://github.com/dhis2/analytics/compare/v4.5.37...v4.5.38) (2021-08-31)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * **translations:** sync translations from transifex (4.x) ([d1972b1](https://github.com/dhis2/analytics/commit/d1972b146878157ec3fb05daa098fc0383458fbe))
28
+ * **translations:** sync translations from transifex (4.x) ([0cc5a03](https://github.com/dhis2/analytics/commit/0cc5a034109a2a817d3efdfbeb67b1d985575178))
29
+
30
+ ## [4.5.37](https://github.com/dhis2/analytics/compare/v4.5.36...v4.5.37) (2021-07-14)
31
+
32
+
33
+ ### Bug Fixes
34
+
35
+ * yoy x axis title and labels (DHIS2-11411) v34 ([#992](https://github.com/dhis2/analytics/issues/992)) ([ff14cfa](https://github.com/dhis2/analytics/commit/ff14cfa28110e10a4fd9610f6bdf0f46cad1e12d))
36
+
1
37
  ## [4.5.36](https://github.com/dhis2/analytics/compare/v4.5.35...v4.5.36) (2021-07-05)
2
38
 
3
39
 
package/build/index.js CHANGED
@@ -167,6 +167,12 @@ Object.defineProperty(exports, "ouIdHelper", {
167
167
  return _ouIdHelper.ouIdHelper;
168
168
  }
169
169
  });
170
+ Object.defineProperty(exports, "convertOuLevelsToUids", {
171
+ enumerable: true,
172
+ get: function get() {
173
+ return _ouLevelUtils.convertOuLevelsToUids;
174
+ }
175
+ });
170
176
  Object.defineProperty(exports, "LAYOUT", {
171
177
  enumerable: true,
172
178
  get: function get() {
@@ -708,6 +714,8 @@ var _predefinedDimensions = require("./modules/predefinedDimensions");
708
714
 
709
715
  var _ouIdHelper = require("./modules/ouIdHelper");
710
716
 
717
+ var _ouLevelUtils = require("./modules/ouLevelUtils");
718
+
711
719
  var _layout = require("./modules/layout/layout");
712
720
 
713
721
  var _layoutFilterDimensions = require("./modules/layout/layoutFilterDimensions");
package/build/locales/es/translations.json CHANGED
@@ -43,7 +43,7 @@
43
43
  "Bi-Week {{biWeekNumber}}": "",
44
44
  "Daily": "Diario",
45
45
  "Weekly": "Semanal",
46
- "Bi-weekly": "",
46
+ "Bi-weekly": "Quincenal",
47
47
  "Weekly (Start Wednesday)": "",
48
48
  "Weekly (Start Thursday)": "",
49
49
  "Weekly (Start Saturday)": "",
@@ -69,9 +69,9 @@
69
69
  "Last 12 weeks": "Últimas 12 semanas",
70
70
  "Last 52 weeks": "Últimas 52 semanas",
71
71
  "Weeks this year": "Semanas de este año",
72
- "This bi-week": "",
73
- "Last bi-week": "",
74
- "Last 4 bi-weeks": "",
72
+ "This bi-week": "Esta quincena",
73
+ "Last bi-week": "Última quincena",
74
+ "Last 4 bi-weeks": "Últimas 4 quincenas",
75
75
  "This month": "Este mes",
76
76
  "Last month": "Mes anterior",
77
77
  "Last 3 months": "Últimos 3 meses",
@@ -81,7 +81,7 @@
81
81
  "This bi-month": "Este bimestre",
82
82
  "Last bi-month": "Bimestre anterior",
83
83
  "Last 6 bi-months": "Últimos 6 bimestres",
84
- "Bi-months this year": "",
84
+ "Bi-months this year": "Bimestres de este año",
85
85
  "This quarter": "Este trimestre",
86
86
  "Last quarter": "El trimestre pasado",
87
87
  "Last 4 quarters": "Últimos 4 trimestres",
@@ -97,7 +97,7 @@
97
97
  "Last 5 years": "Últimos 5 años",
98
98
  "Days": "Días",
99
99
  "Weeks": "Semanas",
100
- "Bi-weeks": "",
100
+ "Bi-weeks": "Quincenales",
101
101
  "Months": "Meses",
102
102
  "Bi-months": "Bimestres",
103
103
  "Quarters": "Trimestral",
package/build/locales/index.js CHANGED
@@ -37,37 +37,39 @@ var _translations13 = _interopRequireDefault(require("./my/translations.json"));
37
37
 
38
38
  var _translations14 = _interopRequireDefault(require("./nb/translations.json"));
39
39
 
40
- var _translations15 = _interopRequireDefault(require("./prs/translations.json"));
40
+ var _translations15 = _interopRequireDefault(require("./nl/translations.json"));
41
41
 
42
- var _translations16 = _interopRequireDefault(require("./ps/translations.json"));
42
+ var _translations16 = _interopRequireDefault(require("./prs/translations.json"));
43
43
 
44
- var _translations17 = _interopRequireDefault(require("./pt/translations.json"));
44
+ var _translations17 = _interopRequireDefault(require("./ps/translations.json"));
45
45
 
46
- var _translations18 = _interopRequireDefault(require("./pt_BR/translations.json"));
46
+ var _translations18 = _interopRequireDefault(require("./pt/translations.json"));
47
47
 
48
- var _translations19 = _interopRequireDefault(require("./ru/translations.json"));
48
+ var _translations19 = _interopRequireDefault(require("./pt_BR/translations.json"));
49
49
 
50
- var _translations20 = _interopRequireDefault(require("./sv/translations.json"));
50
+ var _translations20 = _interopRequireDefault(require("./ru/translations.json"));
51
51
 
52
- var _translations21 = _interopRequireDefault(require("./tet/translations.json"));
52
+ var _translations21 = _interopRequireDefault(require("./sv/translations.json"));
53
53
 
54
- var _translations22 = _interopRequireDefault(require("./tg/translations.json"));
54
+ var _translations22 = _interopRequireDefault(require("./tet/translations.json"));
55
55
 
56
- var _translations23 = _interopRequireDefault(require("./uk/translations.json"));
56
+ var _translations23 = _interopRequireDefault(require("./tg/translations.json"));
57
57
 
58
- var _translations24 = _interopRequireDefault(require("./ur/translations.json"));
58
+ var _translations24 = _interopRequireDefault(require("./uk/translations.json"));
59
59
 
60
- var _translations25 = _interopRequireDefault(require("./uz/translations.json"));
60
+ var _translations25 = _interopRequireDefault(require("./ur/translations.json"));
61
61
 
62
- var _translations26 = _interopRequireDefault(require("./uz_Cyrl/translations.json"));
62
+ var _translations26 = _interopRequireDefault(require("./uz/translations.json"));
63
63
 
64
- var _translations27 = _interopRequireDefault(require("./uz_Latn/translations.json"));
64
+ var _translations27 = _interopRequireDefault(require("./uz_Cyrl/translations.json"));
65
65
 
66
- var _translations28 = _interopRequireDefault(require("./vi/translations.json"));
66
+ var _translations28 = _interopRequireDefault(require("./uz_Latn/translations.json"));
67
67
 
68
- var _translations29 = _interopRequireDefault(require("./zh/translations.json"));
68
+ var _translations29 = _interopRequireDefault(require("./vi/translations.json"));
69
69
 
70
- var _translations30 = _interopRequireDefault(require("./zh_CN/translations.json"));
70
+ var _translations30 = _interopRequireDefault(require("./zh/translations.json"));
71
+
72
+ var _translations31 = _interopRequireDefault(require("./zh_CN/translations.json"));
71
73
 
72
74
  //------------------------------------------------------------------------------
73
75
  // <auto-generated>
@@ -107,37 +109,39 @@ _d2I18n.default.addResources('my', namespace, _translations13.default);
107
109
 
108
110
  _d2I18n.default.addResources('nb', namespace, _translations14.default);
109
111
 
110
- _d2I18n.default.addResources('prs', namespace, _translations15.default);
112
+ _d2I18n.default.addResources('nl', namespace, _translations15.default);
113
+
114
+ _d2I18n.default.addResources('prs', namespace, _translations16.default);
111
115
 
112
- _d2I18n.default.addResources('ps', namespace, _translations16.default);
116
+ _d2I18n.default.addResources('ps', namespace, _translations17.default);
113
117
 
114
- _d2I18n.default.addResources('pt', namespace, _translations17.default);
118
+ _d2I18n.default.addResources('pt', namespace, _translations18.default);
115
119
 
116
- _d2I18n.default.addResources('pt_BR', namespace, _translations18.default);
120
+ _d2I18n.default.addResources('pt_BR', namespace, _translations19.default);
117
121
 
118
- _d2I18n.default.addResources('ru', namespace, _translations19.default);
122
+ _d2I18n.default.addResources('ru', namespace, _translations20.default);
119
123
 
120
- _d2I18n.default.addResources('sv', namespace, _translations20.default);
124
+ _d2I18n.default.addResources('sv', namespace, _translations21.default);
121
125
 
122
- _d2I18n.default.addResources('tet', namespace, _translations21.default);
126
+ _d2I18n.default.addResources('tet', namespace, _translations22.default);
123
127
 
124
- _d2I18n.default.addResources('tg', namespace, _translations22.default);
128
+ _d2I18n.default.addResources('tg', namespace, _translations23.default);
125
129
 
126
- _d2I18n.default.addResources('uk', namespace, _translations23.default);
130
+ _d2I18n.default.addResources('uk', namespace, _translations24.default);
127
131
 
128
- _d2I18n.default.addResources('ur', namespace, _translations24.default);
132
+ _d2I18n.default.addResources('ur', namespace, _translations25.default);
129
133
 
130
- _d2I18n.default.addResources('uz', namespace, _translations25.default);
134
+ _d2I18n.default.addResources('uz', namespace, _translations26.default);
131
135
 
132
- _d2I18n.default.addResources('uz_Cyrl', namespace, _translations26.default);
136
+ _d2I18n.default.addResources('uz_Cyrl', namespace, _translations27.default);
133
137
 
134
- _d2I18n.default.addResources('uz_Latn', namespace, _translations27.default);
138
+ _d2I18n.default.addResources('uz_Latn', namespace, _translations28.default);
135
139
 
136
- _d2I18n.default.addResources('vi', namespace, _translations28.default);
140
+ _d2I18n.default.addResources('vi', namespace, _translations29.default);
137
141
 
138
- _d2I18n.default.addResources('zh', namespace, _translations29.default);
142
+ _d2I18n.default.addResources('zh', namespace, _translations30.default);
139
143
 
140
- _d2I18n.default.addResources('zh_CN', namespace, _translations30.default);
144
+ _d2I18n.default.addResources('zh_CN', namespace, _translations31.default);
141
145
 
142
146
  var _default = _d2I18n.default;
143
147
  exports.default = _default;
package/build/locales/nl/translations.json ADDED
@@ -0,0 +1,153 @@
1
+ {
2
+ "Data": "",
3
+ "Data Type": "",
4
+ "Totals": "",
5
+ "Details": "",
6
+ "Detail": "",
7
+ "Move to {{axisName}}": "",
8
+ "Add to {{axisName}}": "",
9
+ "Remove": "",
10
+ "Not available for {{visualizationType}}": "",
11
+ "Requires 2 or more data items": "",
12
+ "Only available when data is in Series": "",
13
+ "Remove Assigned Categories": "",
14
+ "Add Assigned Categories": "",
15
+ "Manage chart axes": "",
16
+ "Filter dimensions": "",
17
+ "Main dimensions": "",
18
+ "Your dimensions": "",
19
+ "Dimension recommended with selected data": "",
20
+ "Search": "",
21
+ "Selected Data": "",
22
+ "Deselect All": "",
23
+ "Select all": "",
24
+ "Organisation units": "",
25
+ "Period": "Periode",
26
+ "Year": "",
27
+ "Relative periods": "",
28
+ "Fixed periods": "",
29
+ "Period type": "",
30
+ "January": "",
31
+ "February": "",
32
+ "March": "",
33
+ "April": "",
34
+ "May": "",
35
+ "June": "",
36
+ "July": "",
37
+ "August": "",
38
+ "September": "",
39
+ "October": "",
40
+ "November": "",
41
+ "December": "",
42
+ "Week {{weekNumber}}": "",
43
+ "Bi-Week {{biWeekNumber}}": "",
44
+ "Daily": "",
45
+ "Weekly": "",
46
+ "Bi-weekly": "",
47
+ "Weekly (Start Wednesday)": "",
48
+ "Weekly (Start Thursday)": "",
49
+ "Weekly (Start Saturday)": "",
50
+ "Weekly (Start Sunday)": "",
51
+ "Monthly": "",
52
+ "Bi-monthly": "",
53
+ "Quarterly": "",
54
+ "Six-monthly": "",
55
+ "Six-monthly April": "",
56
+ "Yearly": "",
57
+ "Financial year (Start November)": "",
58
+ "Financial year (Start October)": "",
59
+ "Financial year (Start July)": "",
60
+ "Financial year (Start April)": "",
61
+ "Today": "",
62
+ "Yesterday": "",
63
+ "Last 3 days": "",
64
+ "Last 7 days": "",
65
+ "Last 14 days": "",
66
+ "This week": "",
67
+ "Last week": "",
68
+ "Last 4 weeks": "",
69
+ "Last 12 weeks": "",
70
+ "Last 52 weeks": "",
71
+ "Weeks this year": "",
72
+ "This bi-week": "",
73
+ "Last bi-week": "",
74
+ "Last 4 bi-weeks": "",
75
+ "This month": "",
76
+ "Last month": "",
77
+ "Last 3 months": "",
78
+ "Last 6 months": "",
79
+ "Last 12 months": "",
80
+ "Months this year": "",
81
+ "This bi-month": "",
82
+ "Last bi-month": "",
83
+ "Last 6 bi-months": "",
84
+ "Bi-months this year": "",
85
+ "This quarter": "",
86
+ "Last quarter": "",
87
+ "Last 4 quarters": "",
88
+ "Quarters this year": "",
89
+ "This six-month": "",
90
+ "Last six-month": "",
91
+ "Last 2 six-month": "",
92
+ "This financial year": "",
93
+ "Last financial year": "",
94
+ "Last 5 financial years": "",
95
+ "This year": "",
96
+ "Last year": "",
97
+ "Last 5 years": "",
98
+ "Days": "",
99
+ "Weeks": "",
100
+ "Bi-weeks": "",
101
+ "Months": "",
102
+ "Bi-months": "",
103
+ "Quarters": "",
104
+ "Six-months": "",
105
+ "Financial Years": "",
106
+ "Years": "",
107
+ "Series": "",
108
+ "Category": "",
109
+ "Filter": "",
110
+ "Columns": "",
111
+ "Rows": "",
112
+ "Reporting rate": "",
113
+ "Reporting rate on time": "",
114
+ "Actual reports": "",
115
+ "Actual reports on time": "",
116
+ "Expected reports": "",
117
+ "Program": "",
118
+ "Indicators": "",
119
+ "Select indicator group": "",
120
+ "[ All groups ]": "",
121
+ "Data elements": "Gegevenselementen",
122
+ "Select data element group": "",
123
+ "[ All data elements ]": "",
124
+ "Data sets": "",
125
+ "Select data sets": "",
126
+ "[ All metrics ]": "",
127
+ "Event data items": "",
128
+ "Select a program": "",
129
+ "Program indicators": "",
130
+ "{{dynamicOuNames}} and {{lastOuName}}": "",
131
+ "{{allDynamicOuNames}} levels": "",
132
+ "{{allDynamicOuNames}} groups": "",
133
+ "{{allDynamicOuNames}} levels in {{staticOuNames}}": "",
134
+ "{{allDynamicOuNames}} groups in {{staticOuNames}}": "",
135
+ "Organisation Unit": "",
136
+ "Assigned Categories": "",
137
+ "Column": "",
138
+ "Stacked column": "",
139
+ "Bar": "",
140
+ "Stacked bar": "",
141
+ "Line": "",
142
+ "Area": "",
143
+ "Pie": "",
144
+ "Radar": "",
145
+ "Gauge": "",
146
+ "Year over year (line)": "",
147
+ "Year over year (column)": "",
148
+ "Single value": "",
149
+ "Pivot table": "",
150
+ "Target": "",
151
+ "Base": "",
152
+ "No data": ""
153
+ }
package/build/modules/ouLevelUtils/__tests__/index.spec.js ADDED
@@ -0,0 +1,149 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
6
+
7
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
8
+
9
+ var _ = require("..");
10
+
11
+ var ouLevels = [{
12
+ level: 2,
13
+ id: '2nd-floor'
14
+ }];
15
+ describe('convertOuLevelsToUids', function () {
16
+ var vis;
17
+ beforeEach(function () {
18
+ vis = {
19
+ other: 'abc',
20
+ filters: [],
21
+ rows: [],
22
+ columns: []
23
+ };
24
+ });
25
+ it('does nothing when no ou', function () {
26
+ vis.filters = [{
27
+ dimension: 'facility_type',
28
+ items: [{
29
+ id: 'factype1',
30
+ name: 'Facility Type 1'
31
+ }]
32
+ }];
33
+ var updatedVis = (0, _.convertOuLevelsToUids)(ouLevels, vis);
34
+ expect(updatedVis).toEqual({
35
+ filters: [{
36
+ dimension: 'facility_type',
37
+ items: [{
38
+ id: 'factype1',
39
+ name: 'Facility Type 1'
40
+ }]
41
+ }],
42
+ rows: [],
43
+ columns: [],
44
+ other: 'abc'
45
+ });
46
+ });
47
+ it('converts ou filters', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
48
+ var updatedVis;
49
+ return _regenerator.default.wrap(function _callee$(_context) {
50
+ while (1) {
51
+ switch (_context.prev = _context.next) {
52
+ case 0:
53
+ vis.filters = [{
54
+ dimension: 'ou',
55
+ items: [{
56
+ id: 'fluttershy',
57
+ name: 'Fluttershy'
58
+ }, {
59
+ id: 'LEVEL-2',
60
+ name: 'LEVEL-2'
61
+ }, {
62
+ id: 'rainbow',
63
+ name: 'Rainbow Dash'
64
+ }]
65
+ }, {
66
+ dimension: 'facility_type',
67
+ items: [{
68
+ id: 'factype1',
69
+ name: 'Facility Type 1'
70
+ }]
71
+ }];
72
+ updatedVis = (0, _.convertOuLevelsToUids)(ouLevels, vis);
73
+ expect(updatedVis).toEqual({
74
+ filters: [{
75
+ dimension: 'ou',
76
+ items: [{
77
+ id: 'fluttershy',
78
+ name: 'Fluttershy'
79
+ }, {
80
+ id: 'LEVEL-2nd-floor',
81
+ name: 'LEVEL-2'
82
+ }, {
83
+ id: 'rainbow',
84
+ name: 'Rainbow Dash'
85
+ }]
86
+ }, {
87
+ dimension: 'facility_type',
88
+ items: [{
89
+ id: 'factype1',
90
+ name: 'Facility Type 1'
91
+ }]
92
+ }],
93
+ rows: [],
94
+ columns: [],
95
+ other: 'abc'
96
+ });
97
+
98
+ case 3:
99
+ case "end":
100
+ return _context.stop();
101
+ }
102
+ }
103
+ }, _callee);
104
+ })));
105
+ it('converts ou rows', function () {
106
+ vis.rows = [{
107
+ dimension: 'ou',
108
+ items: [{
109
+ id: 'LEVEL-2',
110
+ name: 'LEVEL-2'
111
+ }]
112
+ }];
113
+ var updatedVis = (0, _.convertOuLevelsToUids)(ouLevels, vis);
114
+ expect(updatedVis).toEqual({
115
+ filters: [],
116
+ columns: [],
117
+ rows: [{
118
+ dimension: 'ou',
119
+ items: [{
120
+ id: 'LEVEL-2nd-floor',
121
+ name: 'LEVEL-2'
122
+ }]
123
+ }],
124
+ other: 'abc'
125
+ });
126
+ });
127
+ it('converts ou columns', function () {
128
+ vis.columns = [{
129
+ dimension: 'ou',
130
+ items: [{
131
+ id: 'LEVEL-2',
132
+ name: 'LEVEL-2'
133
+ }]
134
+ }];
135
+ var updatedVis = (0, _.convertOuLevelsToUids)(ouLevels, vis);
136
+ expect(updatedVis).toEqual({
137
+ filters: [],
138
+ rows: [],
139
+ columns: [{
140
+ dimension: 'ou',
141
+ items: [{
142
+ id: 'LEVEL-2nd-floor',
143
+ name: 'LEVEL-2'
144
+ }]
145
+ }],
146
+ other: 'abc'
147
+ });
148
+ });
149
+ });
package/build/modules/ouLevelUtils/index.js ADDED
@@ -0,0 +1,53 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.convertOuLevelsToUids = void 0;
7
+
8
+ var _dimensionGetItems = require("../layout/dimensionGetItems");
9
+
10
+ var _layoutReplaceDimension = require("../layout/layoutReplaceDimension");
11
+
12
+ var _layoutGetDimension = require("../layout/layoutGetDimension");
13
+
14
+ var _ouIdHelper = require("../ouIdHelper");
15
+
16
+ var _predefinedDimensions = require("../predefinedDimensions");
17
+
18
+ var isOuLevelIntId = function isOuLevelIntId(id) {
19
+ return _ouIdHelper.ouIdHelper.hasLevelPrefix(id) ? Number.isInteger(parseInt(_ouIdHelper.ouIdHelper.removePrefix(id), 10)) : false;
20
+ };
21
+
22
+ var replaceNumericOuLevelWithUid = function replaceNumericOuLevelWithUid(ouLevels) {
23
+ return function (item) {
24
+ if (!isOuLevelIntId(item.id)) {
25
+ return item;
26
+ }
27
+
28
+ var ouIntId = parseInt(_ouIdHelper.ouIdHelper.removePrefix(item.id), 10);
29
+ var ouUid = ouLevels.find(function (l) {
30
+ return parseInt(l.level, 10) === ouIntId;
31
+ }).id;
32
+ return Object.assign({}, item, {
33
+ id: _ouIdHelper.ouIdHelper.addLevelPrefix(ouUid)
34
+ });
35
+ };
36
+ };
37
+
38
+ var convertOuLevelsToUids = function convertOuLevelsToUids(ouLevels, layout) {
39
+ var ouDimension = (0, _layoutGetDimension.layoutGetDimension)(layout, _predefinedDimensions.DIMENSION_ID_ORGUNIT);
40
+ var hasNumericOuLevels = ouDimension && (0, _dimensionGetItems.dimensionGetItems)(ouDimension).some(function (item) {
41
+ return isOuLevelIntId(item.id);
42
+ });
43
+
44
+ if (hasNumericOuLevels) {
45
+ var replaceNumericOuLevel = replaceNumericOuLevelWithUid(ouLevels);
46
+ var updatedOuItems = (0, _dimensionGetItems.dimensionGetItems)(ouDimension).map(replaceNumericOuLevel);
47
+ return (0, _layoutReplaceDimension.layoutReplaceDimension)(layout, _predefinedDimensions.DIMENSION_ID_ORGUNIT, updatedOuItems);
48
+ }
49
+
50
+ return layout;
51
+ };
52
+
53
+ exports.convertOuLevelsToUids = convertOuLevelsToUids;
package/build/visualizations/config/adapters/dhis_highcharts/xAxis/yearOnYear.js CHANGED
@@ -1,10 +1,16 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports.default = _default;
7
9
 
10
+ var _objectClean = _interopRequireDefault(require("d2-utilizr/lib/objectClean"));
11
+
12
+ var _getAxisTitle = _interopRequireDefault(require("../getAxisTitle"));
13
+
8
14
  function _default(store, layout, extraOptions) {
9
15
  var categories;
10
16
 
@@ -32,7 +38,8 @@ function _default(store, layout, extraOptions) {
32
38
  }, []);
33
39
  }
34
40
 
35
- return {
36
- categories: categories
37
- };
41
+ return (0, _objectClean.default)({
42
+ categories: categories,
43
+ title: (0, _getAxisTitle.default)(layout.domainAxisLabel)
44
+ });
38
45
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "4.5.36",
3
+ "version": "4.5.41",
4
4
  "main": "./build/index.js",
5
5
  "sideEffects": [
6
6
  "./src/locales/index.js"