Skip to content

Commit 9b419ed

Browse files
edoardoedoardo
committed
Merge remote-tracking branch 'origin/master' into feat/option-set-selector-DHIS2-17872
2 parents b25b6a4 + 215bf83 commit 9b419ed

21 files changed

Lines changed: 2317 additions & 1175 deletions

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [26.12.3](https://github.com/dhis2/analytics/compare/v26.12.2...v26.12.3) (2025-03-04)
2+
3+
4+
### Bug Fixes
5+
6+
* **dimensions-panel:** prevent movement of content in dimension item on hover [DHIS2-19046] ([#1762](https://github.com/dhis2/analytics/issues/1762)) ([e47b168](https://github.com/dhis2/analytics/commit/e47b168a7d1b33c8b1ac2e826ffe857dd1d11eb0))
7+
18
## [26.12.2](https://github.com/dhis2/analytics/compare/v26.12.1...v26.12.2) (2025-02-25)
29

310

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dhis2/analytics",
3-
"version": "26.12.2",
3+
"version": "26.12.3",
44
"main": "./build/cjs/index.js",
55
"module": "./build/es/index.js",
66
"exports": {

‎src/__demo__/DimensionsPanel.stories.js‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,19 @@ const fixedDimensions = [
2424
const dynamicDimensions = [
2525
{
2626
id: '0000001',
27-
name: 'One',
27+
name: 'Dietary diversity score based on variety of consumed food groups over a weekly period',
2828
},
2929
{
3030
id: '0000002',
31-
name: 'Two',
31+
name: 'Healthcare services access and utilization frequency including preventive check-ups and specialist care',
3232
},
3333
{
3434
id: '0000003',
35-
name: 'Three',
35+
name: 'Sleep quality index incorporating duration, time to sleep, frequency of awakenings, and restfulness',
36+
},
37+
{
38+
id: '0000004',
39+
name: 'Malaria incidence rate',
3640
},
3741
]
3842

@@ -156,3 +160,30 @@ export const WithMenu = () => {
156160
WithMenu.story = {
157161
name: 'with menu',
158162
}
163+
164+
export const TextWrapping = () => {
165+
return (
166+
<div
167+
style={{
168+
width: '260px',
169+
height: '400px',
170+
borderInlineEnd: '1px dotted #CCC',
171+
resize: 'both',
172+
overflow: 'auto',
173+
}}
174+
>
175+
<DimensionsPanel
176+
dimensions={[...fixedDimensions, ...dynamicDimensions]}
177+
onDimensionClick={onDimensionClick}
178+
onDimensionOptionsClick={() => alert('options click')}
179+
recommendedDimension={(dimension) => dimension === '0000002'}
180+
lockedDimension={(dimension) => dimension === '0000003'}
181+
selectedIds={['0000003', '0000002']}
182+
/>
183+
</div>
184+
)
185+
}
186+
187+
TextWrapping.story = {
188+
name: 'text wrapping',
189+
}

‎src/__demo__/FileMenu.stories.js‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ const visObject = {
2020
id: 'a8LrqsBQlHP',
2121
created: '2012-11-05T09:17:23.388',
2222
name: 'ANC: 1-3 dropout rate Yearly',
23-
publicAccess: '--------',
2423
displayDescription: 'some _italic (10%)_ and some *bold (10%)*',
2524
displayName: 'ANC: 1-3 dropout rate Yearly',
2625
description: 'some _italic (10%)_ and some *bold (10%)*',
27-
externalAccess: false,
2826
access: {
2927
read: true,
3028
update: true,
@@ -36,14 +34,6 @@ const visObject = {
3634
lastUpdatedBy: user,
3735
user,
3836
translations: [],
39-
userAccesses: [
40-
{
41-
access: 'rw------',
42-
displayName: 'John Barnes',
43-
id: 'DXyJmlo9rge',
44-
userUid: 'DXyJmlo9rge',
45-
},
46-
],
4737
}
4838

4939
const visReadonlyObject = {

‎src/__demo__/data/avgTotalAggregationType.visualization.json‎

Lines changed: 256 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,256 @@
1-
{"lastUpdated":"2021-02-16T15:49:51.280","id":"y7HNJWxKvfp","created":"2014-11-26T13:12:08.949","name":"TEST: Column percentage aggregation","publicAccess":"--------","legendDisplayStyle":"FILL","type":"PIVOT_TABLE","hideEmptyColumns":false,"subscribed":false,"rowSubTotals":true,"cumulativeValues":false,"showDimensionLabels":true,"sortOrder":0,"fontSize":"NORMAL","favorite":false,"topLimit":0,"displayName":"TEST: Column percentage aggregation","percentStackedValues":false,"noSpaceBetweenColumns":false,"showHierarchy":false,"hideTitle":false,"colorSet":"DEFAULT","skipRounding":false,"showData":false,"numberType":"VALUE","hideEmptyRows":true,"parentGraphMap":{"bG0PlyD0iP3":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","nX05QLraDhO":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","WAjjFMDJKcx":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","Umh4HKqqFp6":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","AnXoUM1tfNT":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","RzgSFJ9E46G":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","ZpE2POxvl9P":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","KfUCAQoOIae":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","azRICFoILuh":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","pMEnu7BjqMz":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","jNb63DIHuwU":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","EuoA3Crpqts":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","TSyzvBiovKh":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS","egv5Es0QlQP":"ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS"},"displayDensity":"NORMAL","regressionType":"NONE","completedOnly":false,"colTotals":true,"hideEmptyRowItems":"NONE","aggregationType":"DEFAULT","hideSubtitle":false,"hideLegend":false,"colSubTotals":true,"legendDisplayStrategy":"FIXED","rowTotals":false,"digitGroupSeparator":"SPACE","regression":false,"fontStyle":{},"access":{"read":true,"update":true,"externalize":true,"delete":true,"write":true,"manage":true},"reportingParams":{"parentOrganisationUnit":false,"reportingPeriod":false,"organisationUnit":false,"grandParentOrganisationUnit":false},"lastUpdatedBy":{"displayName":"Tom Wakiki","id":"GOLswS44mh8","username":"system"},"user":{"displayName":"Tom Wakiki"},"translations":[],"yearlySeries":[],"interpretations":[],"userGroupAccesses":[],"subscribers":[],"columns":[{"dimension":"dx","items":[{"name":"ANC 1 Coverage","id":"Uvn6LCg7dVU","displayName":"ANC 1 Coverage","displayShortName":"ANC 1 Coverage","dimensionItemType":"INDICATOR"},{"name":"ANC 3 Coverage","id":"sB79w2hiLp8","displayName":"ANC 3 Coverage","displayShortName":"ANC 3 Coverage","dimensionItemType":"INDICATOR"}]},{"dimension":"pe","items":[{"name":"LAST_4_QUARTERS","id":"LAST_4_QUARTERS","displayName":"LAST_4_QUARTERS","displayShortName":"LAST_4_QUARTERS","dimensionItemType":"PERIOD"}]}],"series":[],"userAccesses":[],"favorites":[],"filters":[],"rows":[{"dimension":"ou","items":[{"name":"Baoma Station CHP","id":"jNb63DIHuwU","displayName":"Baoma Station CHP","displayShortName":"Baoma Station CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Blamawo MCHP","id":"WAjjFMDJKcx","displayName":"Blamawo MCHP","displayShortName":"Blamawo MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Faabu CHP","id":"ZpE2POxvl9P","displayName":"Faabu CHP","displayShortName":"Faabu CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Gerehun CHC","id":"TSyzvBiovKh","displayName":"Gerehun CHC","displayShortName":"Gerehun CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Golu MCHP","id":"azRICFoILuh","displayName":"Golu MCHP","displayShortName":"Golu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Jembe CHC","id":"Umh4HKqqFp6","displayName":"Jembe CHC","displayShortName":"Jembe CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Jormu MCHP","id":"RzgSFJ9E46G","displayName":"Jormu MCHP","displayShortName":"Jormu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Kigbai MCHP","id":"egv5Es0QlQP","displayName":"Kigbai MCHP","displayShortName":"Kigbai MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Kpumbu MCHP","id":"pMEnu7BjqMz","displayName":"Kpumbu MCHP","displayShortName":"Kpumbu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Mbundorbu MCHP","id":"EuoA3Crpqts","displayName":"Mbundorbu MCHP","displayShortName":"Mbundorbu MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Pelewahun (Baoma) MCHP","id":"KfUCAQoOIae","displayName":"Pelewahun (Baoma) MCHP","displayShortName":"PelewahunBaomaMCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Tugbebu CHP","id":"bG0PlyD0iP3","displayName":"Tugbebu CHP","displayShortName":"Tugbebu CHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Yakaji MCHP","id":"AnXoUM1tfNT","displayName":"Yakaji MCHP","displayShortName":"Yakaji MCHP","dimensionItemType":"ORGANISATION_UNIT"},{"name":"Yamandu CHC","id":"nX05QLraDhO","displayName":"Yamandu CHC","displayShortName":"Yamandu CHC","dimensionItemType":"ORGANISATION_UNIT"},{"name":"LEVEL-4","id":"LEVEL-4","displayName":"LEVEL-4"}]},{"dimension":"uIuxlbV1vRT","items":[{"name":"Eastern Area","id":"nlX2VoouN63","displayName":"Eastern Area","displayShortName":"Eastern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Northern Area","id":"J40PpdN4Wkk","displayName":"Northern Area","displayShortName":"Northern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Southern Area","id":"jqBqIXoXpfy","displayName":"Southern Area","displayShortName":"Southern Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"},{"name":"Western Area","id":"b0EsAxm8Nge","displayName":"Western Area","displayShortName":"Western Area","dimensionItemType":"ORGANISATION_UNIT_GROUP"}]}]}
1+
{
2+
"lastUpdated": "2021-02-16T15:49:51.280",
3+
"id": "y7HNJWxKvfp",
4+
"created": "2014-11-26T13:12:08.949",
5+
"name": "TEST: Column percentage aggregation",
6+
"legendDisplayStyle": "FILL",
7+
"type": "PIVOT_TABLE",
8+
"hideEmptyColumns": false,
9+
"subscribed": false,
10+
"rowSubTotals": true,
11+
"cumulativeValues": false,
12+
"showDimensionLabels": true,
13+
"sortOrder": 0,
14+
"fontSize": "NORMAL",
15+
"favorite": false,
16+
"topLimit": 0,
17+
"displayName": "TEST: Column percentage aggregation",
18+
"percentStackedValues": false,
19+
"noSpaceBetweenColumns": false,
20+
"showHierarchy": false,
21+
"hideTitle": false,
22+
"colorSet": "DEFAULT",
23+
"skipRounding": false,
24+
"showData": false,
25+
"numberType": "VALUE",
26+
"hideEmptyRows": true,
27+
"parentGraphMap": {
28+
"bG0PlyD0iP3": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
29+
"nX05QLraDhO": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
30+
"WAjjFMDJKcx": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
31+
"Umh4HKqqFp6": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
32+
"AnXoUM1tfNT": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
33+
"RzgSFJ9E46G": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
34+
"ZpE2POxvl9P": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
35+
"KfUCAQoOIae": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
36+
"azRICFoILuh": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
37+
"pMEnu7BjqMz": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
38+
"jNb63DIHuwU": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
39+
"EuoA3Crpqts": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
40+
"TSyzvBiovKh": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS",
41+
"egv5Es0QlQP": "ImspTQPwCqd/O6uvpzGd5pu/vWbkYPRmKyS"
42+
},
43+
"displayDensity": "NORMAL",
44+
"regressionType": "NONE",
45+
"completedOnly": false,
46+
"colTotals": true,
47+
"hideEmptyRowItems": "NONE",
48+
"aggregationType": "DEFAULT",
49+
"hideSubtitle": false,
50+
"hideLegend": false,
51+
"colSubTotals": true,
52+
"legendDisplayStrategy": "FIXED",
53+
"rowTotals": false,
54+
"digitGroupSeparator": "SPACE",
55+
"regression": false,
56+
"fontStyle": {},
57+
"access": {
58+
"read": true,
59+
"update": true,
60+
"externalize": true,
61+
"delete": true,
62+
"write": true,
63+
"manage": true
64+
},
65+
"reportingParams": {
66+
"parentOrganisationUnit": false,
67+
"reportingPeriod": false,
68+
"organisationUnit": false,
69+
"grandParentOrganisationUnit": false
70+
},
71+
"lastUpdatedBy": {
72+
"displayName": "Tom Wakiki",
73+
"id": "GOLswS44mh8",
74+
"username": "system"
75+
},
76+
"user": { "displayName": "Tom Wakiki" },
77+
"translations": [],
78+
"yearlySeries": [],
79+
"interpretations": [],
80+
"subscribers": [],
81+
"columns": [
82+
{
83+
"dimension": "dx",
84+
"items": [
85+
{
86+
"name": "ANC 1 Coverage",
87+
"id": "Uvn6LCg7dVU",
88+
"displayName": "ANC 1 Coverage",
89+
"displayShortName": "ANC 1 Coverage",
90+
"dimensionItemType": "INDICATOR"
91+
},
92+
{
93+
"name": "ANC 3 Coverage",
94+
"id": "sB79w2hiLp8",
95+
"displayName": "ANC 3 Coverage",
96+
"displayShortName": "ANC 3 Coverage",
97+
"dimensionItemType": "INDICATOR"
98+
}
99+
]
100+
},
101+
{
102+
"dimension": "pe",
103+
"items": [
104+
{
105+
"name": "LAST_4_QUARTERS",
106+
"id": "LAST_4_QUARTERS",
107+
"displayName": "LAST_4_QUARTERS",
108+
"displayShortName": "LAST_4_QUARTERS",
109+
"dimensionItemType": "PERIOD"
110+
}
111+
]
112+
}
113+
],
114+
"series": [],
115+
"favorites": [],
116+
"filters": [],
117+
"rows": [
118+
{
119+
"dimension": "ou",
120+
"items": [
121+
{
122+
"name": "Baoma Station CHP",
123+
"id": "jNb63DIHuwU",
124+
"displayName": "Baoma Station CHP",
125+
"displayShortName": "Baoma Station CHP",
126+
"dimensionItemType": "ORGANISATION_UNIT"
127+
},
128+
{
129+
"name": "Blamawo MCHP",
130+
"id": "WAjjFMDJKcx",
131+
"displayName": "Blamawo MCHP",
132+
"displayShortName": "Blamawo MCHP",
133+
"dimensionItemType": "ORGANISATION_UNIT"
134+
},
135+
{
136+
"name": "Faabu CHP",
137+
"id": "ZpE2POxvl9P",
138+
"displayName": "Faabu CHP",
139+
"displayShortName": "Faabu CHP",
140+
"dimensionItemType": "ORGANISATION_UNIT"
141+
},
142+
{
143+
"name": "Gerehun CHC",
144+
"id": "TSyzvBiovKh",
145+
"displayName": "Gerehun CHC",
146+
"displayShortName": "Gerehun CHC",
147+
"dimensionItemType": "ORGANISATION_UNIT"
148+
},
149+
{
150+
"name": "Golu MCHP",
151+
"id": "azRICFoILuh",
152+
"displayName": "Golu MCHP",
153+
"displayShortName": "Golu MCHP",
154+
"dimensionItemType": "ORGANISATION_UNIT"
155+
},
156+
{
157+
"name": "Jembe CHC",
158+
"id": "Umh4HKqqFp6",
159+
"displayName": "Jembe CHC",
160+
"displayShortName": "Jembe CHC",
161+
"dimensionItemType": "ORGANISATION_UNIT"
162+
},
163+
{
164+
"name": "Jormu MCHP",
165+
"id": "RzgSFJ9E46G",
166+
"displayName": "Jormu MCHP",
167+
"displayShortName": "Jormu MCHP",
168+
"dimensionItemType": "ORGANISATION_UNIT"
169+
},
170+
{
171+
"name": "Kigbai MCHP",
172+
"id": "egv5Es0QlQP",
173+
"displayName": "Kigbai MCHP",
174+
"displayShortName": "Kigbai MCHP",
175+
"dimensionItemType": "ORGANISATION_UNIT"
176+
},
177+
{
178+
"name": "Kpumbu MCHP",
179+
"id": "pMEnu7BjqMz",
180+
"displayName": "Kpumbu MCHP",
181+
"displayShortName": "Kpumbu MCHP",
182+
"dimensionItemType": "ORGANISATION_UNIT"
183+
},
184+
{
185+
"name": "Mbundorbu MCHP",
186+
"id": "EuoA3Crpqts",
187+
"displayName": "Mbundorbu MCHP",
188+
"displayShortName": "Mbundorbu MCHP",
189+
"dimensionItemType": "ORGANISATION_UNIT"
190+
},
191+
{
192+
"name": "Pelewahun (Baoma) MCHP",
193+
"id": "KfUCAQoOIae",
194+
"displayName": "Pelewahun (Baoma) MCHP",
195+
"displayShortName": "PelewahunBaomaMCHP",
196+
"dimensionItemType": "ORGANISATION_UNIT"
197+
},
198+
{
199+
"name": "Tugbebu CHP",
200+
"id": "bG0PlyD0iP3",
201+
"displayName": "Tugbebu CHP",
202+
"displayShortName": "Tugbebu CHP",
203+
"dimensionItemType": "ORGANISATION_UNIT"
204+
},
205+
{
206+
"name": "Yakaji MCHP",
207+
"id": "AnXoUM1tfNT",
208+
"displayName": "Yakaji MCHP",
209+
"displayShortName": "Yakaji MCHP",
210+
"dimensionItemType": "ORGANISATION_UNIT"
211+
},
212+
{
213+
"name": "Yamandu CHC",
214+
"id": "nX05QLraDhO",
215+
"displayName": "Yamandu CHC",
216+
"displayShortName": "Yamandu CHC",
217+
"dimensionItemType": "ORGANISATION_UNIT"
218+
},
219+
{ "name": "LEVEL-4", "id": "LEVEL-4", "displayName": "LEVEL-4" }
220+
]
221+
},
222+
{
223+
"dimension": "uIuxlbV1vRT",
224+
"items": [
225+
{
226+
"name": "Eastern Area",
227+
"id": "nlX2VoouN63",
228+
"displayName": "Eastern Area",
229+
"displayShortName": "Eastern Area",
230+
"dimensionItemType": "ORGANISATION_UNIT_GROUP"
231+
},
232+
{
233+
"name": "Northern Area",
234+
"id": "J40PpdN4Wkk",
235+
"displayName": "Northern Area",
236+
"displayShortName": "Northern Area",
237+
"dimensionItemType": "ORGANISATION_UNIT_GROUP"
238+
},
239+
{
240+
"name": "Southern Area",
241+
"id": "jqBqIXoXpfy",
242+
"displayName": "Southern Area",
243+
"displayShortName": "Southern Area",
244+
"dimensionItemType": "ORGANISATION_UNIT_GROUP"
245+
},
246+
{
247+
"name": "Western Area",
248+
"id": "b0EsAxm8Nge",
249+
"displayName": "Western Area",
250+
"displayShortName": "Western Area",
251+
"dimensionItemType": "ORGANISATION_UNIT_GROUP"
252+
}
253+
]
254+
}
255+
]
256+
}

0 commit comments

Comments
 (0)