Skip to content

Commit c419c61

Browse files
Alessandro100Alessandro100
committed
display dataset size in table
1 parent 5a41671 commit c419c61

File tree

4 files changed

+215
-94
lines changed

4 files changed

+215
-94
lines changed

‎messages/en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"errors": "errors",
4848
"noErrors": "No errors",
4949
"noWarnings": "No warnings",
50+
"noInfoNotices": "No info notices",
5051
"warnings": "warnings",
5152
"infoNotices": "info notices"
5253
},
@@ -266,6 +267,8 @@
266267
"datasetHistoryColumns": {
267268
"downloadedAt": "Downloaded At",
268269
"serviceDateRange": "Service Date Range",
270+
"sizeZipped": "Size Zipped (MB)",
271+
"sizeUnzipped": "Size Unzipped (MB)",
269272
"validationReport": "Validation Report",
270273
"actions": "Actions"
271274
},

‎messages/fr.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"errors": "errors",
4848
"noErrors": "No errors",
4949
"noWarnings": "No warnings",
50+
"noInfoNotices": "Aucune notice d'information",
5051
"warnings": "warnings",
5152
"infoNotices": "info notices"
5253
},
@@ -266,6 +267,8 @@
266267
"datasetHistoryColumns": {
267268
"downloadedAt": "Téléchargé le",
268269
"serviceDateRange": "Plage de dates de service",
270+
"sizeZipped": "Taille compressée (Mo)",
271+
"sizeUnzipped": "Taille décompressée (Mo)",
269272
"validationReport": "Rapport de validation",
270273
"actions": "Actions"
271274
},

‎src/app/screens/Feed/components/DataQualitySummary.tsx‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,29 @@ export default async function DataQualitySummary({
112112

113113
<Chip
114114
data-testid='info-count'
115-
icon={<InfoOutlinedIcon />}
115+
icon={
116+
(latestDataset?.validation_report?.unique_info_count ?? 0) >
117+
0 ? (
118+
<InfoOutlinedIcon />
119+
) : (
120+
<CheckCircle />
121+
)
122+
}
116123
clickable
117124
component='a'
118125
href={latestDataset?.validation_report?.url_html}
119126
target='_blank'
120127
rel='noopener noreferrer nofollow'
121-
label={`${
122-
latestDataset?.validation_report?.unique_info_count ?? '0'
123-
} ${tCommon('feedback.infoNotices')}`}
124-
color='primary'
128+
label={
129+
(latestDataset?.validation_report?.unique_info_count ?? 0) > 0
130+
? `${latestDataset?.validation_report?.unique_info_count} ${tCommon('feedback.infoNotices')}`
131+
: tCommon('feedback.noInfoNotices')
132+
}
133+
color={
134+
(latestDataset?.validation_report?.unique_info_count ?? 0) > 0
135+
? 'primary'
136+
: 'success'
137+
}
125138
variant='outlined'
126139
/>
127140
</>

‎src/app/screens/Feed/components/PreviousDatasets.tsx‎

Lines changed: 191 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,22 @@ export default function PreviousDatasets({
162162
>
163163
{t('datasetHistoryColumns.serviceDateRange')}
164164
</TableCell>
165+
<TableCell
166+
component='th'
167+
scope='col'
168+
sx={{ fontWeight: 'bold' }}
169+
align='right'
170+
>
171+
{t('datasetHistoryColumns.sizeZipped')}
172+
</TableCell>
173+
<TableCell
174+
component='th'
175+
scope='col'
176+
sx={{ fontWeight: 'bold' }}
177+
align='right'
178+
>
179+
{t('datasetHistoryColumns.sizeUnzipped')}
180+
</TableCell>
165181
<TableCell
166182
component='th'
167183
scope='col'
@@ -216,6 +232,20 @@ export default function PreviousDatasets({
216232
</Box>
217233
)}
218234
</TableCell>
235+
<TableCell align='right'>
236+
<Typography variant='body1'>
237+
{dataset?.zipped_folder_size_mb != null
238+
? dataset.zipped_folder_size_mb
239+
: '–'}
240+
</Typography>
241+
</TableCell>
242+
<TableCell align='right'>
243+
<Typography variant='body1'>
244+
{dataset?.unzipped_folder_size_mb != null
245+
? dataset.unzipped_folder_size_mb
246+
: '–'}
247+
</Typography>
248+
</TableCell>
219249
<TableCell sx={{ textAlign: { xs: 'left', xl: 'center' } }}>
220250
{dataset.validation_report == null && (
221251
<Typography sx={{ ml: '4px' }}>
@@ -224,106 +254,178 @@ export default function PreviousDatasets({
224254
)}
225255
{dataset.validation_report != null && (
226256
<>
227-
<Chip
228-
component='a'
229-
clickable
230-
href={`${dataset?.validation_report?.url_html}`}
231-
target='_blank'
232-
rel='noreferrer nofollow'
233-
sx={{ m: '4px' }}
234-
icon={
235-
dataset?.validation_report?.unique_error_count !=
236-
undefined &&
237-
dataset?.validation_report?.unique_error_count >
238-
0 ? (
239-
<ReportOutlined aria-hidden />
240-
) : (
241-
<CheckCircle aria-hidden />
242-
)
243-
}
244-
label={
257+
<Tooltip
258+
title={
245259
dataset?.validation_report?.unique_error_count !=
246260
undefined &&
247261
dataset?.validation_report?.unique_error_count > 0
248-
? `${
249-
dataset?.validation_report?.unique_error_count
250-
} ${tCommon('feedback.errors')}`
262+
? `${dataset.validation_report.unique_error_count} ${tCommon('feedback.errors')}`
251263
: tCommon('feedback.noErrors')
252264
}
253-
aria-label={
254-
dataset?.validation_report?.unique_error_count !=
255-
undefined &&
256-
dataset?.validation_report?.unique_error_count > 0
257-
? `${dataset.validation_report.unique_error_count} ${tCommon('feedback.errors')} – ${t('datasetHistoryTooltip.viewReport')}`
258-
: `${tCommon('feedback.noErrors')} – ${t('datasetHistoryTooltip.viewReport')}`
259-
}
260-
color={
261-
dataset?.validation_report?.unique_error_count !=
262-
undefined &&
263-
dataset?.validation_report?.unique_error_count > 0
264-
? 'error'
265-
: 'success'
266-
}
267-
variant='outlined'
268-
/>
269-
<Chip
270-
sx={{ m: '4px' }}
271-
component='a'
272-
clickable
273-
href={`${dataset?.validation_report?.url_html}`}
274-
target='_blank'
275-
rel='noreferrer nofollow'
276-
icon={
277-
dataset?.validation_report?.unique_warning_count !=
278-
undefined &&
279-
dataset?.validation_report?.unique_warning_count >
280-
0 ? (
281-
<ReportOutlined aria-hidden />
282-
) : (
283-
<CheckCircle aria-hidden />
284-
)
285-
}
286-
label={
287-
dataset?.validation_report?.unique_warning_count !=
288-
undefined &&
289-
dataset?.validation_report?.unique_warning_count > 0
290-
? `${
265+
placement='top'
266+
>
267+
<Chip
268+
component='a'
269+
clickable
270+
href={`${dataset?.validation_report?.url_html}`}
271+
target='_blank'
272+
rel='noreferrer nofollow'
273+
sx={{
274+
m: '4px',
275+
'.MuiChip-label': {
276+
pr:
291277
dataset?.validation_report
292-
?.unique_warning_count
293-
} ${tCommon('feedback.warnings')}`
294-
: tCommon('feedback.noWarnings')
295-
}
296-
aria-label={
278+
?.unique_error_count === 0
279+
? 0
280+
: undefined,
281+
},
282+
}}
283+
icon={
284+
dataset?.validation_report?.unique_error_count !=
285+
undefined &&
286+
dataset?.validation_report?.unique_error_count >
287+
0 ? (
288+
<ReportOutlined aria-hidden />
289+
) : (
290+
<CheckCircle aria-hidden />
291+
)
292+
}
293+
label={
294+
dataset?.validation_report?.unique_error_count !=
295+
undefined &&
296+
dataset?.validation_report?.unique_error_count > 0
297+
? dataset.validation_report.unique_error_count
298+
: undefined
299+
}
300+
aria-label={
301+
dataset?.validation_report?.unique_error_count !=
302+
undefined &&
303+
dataset?.validation_report?.unique_error_count > 0
304+
? `${dataset.validation_report.unique_error_count} ${tCommon('feedback.errors')} – ${t('datasetHistoryTooltip.viewReport')}`
305+
: `${tCommon('feedback.noErrors')} – ${t('datasetHistoryTooltip.viewReport')}`
306+
}
307+
color={
308+
dataset?.validation_report?.unique_error_count !=
309+
undefined &&
310+
dataset?.validation_report?.unique_error_count > 0
311+
? 'error'
312+
: 'success'
313+
}
314+
variant='outlined'
315+
/>
316+
</Tooltip>
317+
<Tooltip
318+
title={
297319
dataset?.validation_report?.unique_warning_count !=
298320
undefined &&
299321
dataset?.validation_report?.unique_warning_count > 0
300-
? `${dataset.validation_report.unique_warning_count} ${tCommon('feedback.warnings')} – ${t('datasetHistoryTooltip.viewReport')}`
301-
: `${tCommon('feedback.noWarnings')} – ${t('datasetHistoryTooltip.viewReport')}`
322+
? `${dataset.validation_report.unique_warning_count} ${tCommon('feedback.warnings')}`
323+
: tCommon('feedback.noWarnings')
302324
}
303-
color={
304-
dataset?.validation_report?.unique_warning_count !=
305-
undefined &&
306-
dataset?.validation_report?.unique_warning_count > 0
307-
? 'warning'
308-
: 'success'
325+
placement='top'
326+
>
327+
<Chip
328+
sx={{
329+
m: '4px',
330+
'.MuiChip-label': {
331+
pr:
332+
dataset?.validation_report
333+
?.unique_warning_count === 0
334+
? 0
335+
: undefined,
336+
},
337+
}}
338+
component='a'
339+
clickable
340+
href={`${dataset?.validation_report?.url_html}`}
341+
target='_blank'
342+
rel='noreferrer nofollow'
343+
icon={
344+
dataset?.validation_report
345+
?.unique_warning_count != undefined &&
346+
dataset?.validation_report?.unique_warning_count >
347+
0 ? (
348+
<ReportOutlined aria-hidden />
349+
) : (
350+
<CheckCircle aria-hidden />
351+
)
352+
}
353+
label={
354+
dataset?.validation_report
355+
?.unique_warning_count != undefined &&
356+
dataset?.validation_report?.unique_warning_count >
357+
0
358+
? dataset.validation_report.unique_warning_count
359+
: undefined
360+
}
361+
aria-label={
362+
dataset?.validation_report
363+
?.unique_warning_count != undefined &&
364+
dataset?.validation_report?.unique_warning_count >
365+
0
366+
? `${dataset.validation_report.unique_warning_count} ${tCommon('feedback.warnings')} – ${t('datasetHistoryTooltip.viewReport')}`
367+
: `${tCommon('feedback.noWarnings')} – ${t('datasetHistoryTooltip.viewReport')}`
368+
}
369+
color={
370+
dataset?.validation_report
371+
?.unique_warning_count != undefined &&
372+
dataset?.validation_report?.unique_warning_count >
373+
0
374+
? 'warning'
375+
: 'success'
376+
}
377+
variant='outlined'
378+
/>
379+
</Tooltip>
380+
<Tooltip
381+
title={
382+
(dataset?.validation_report?.unique_info_count ??
383+
0) > 0
384+
? `${dataset?.validation_report?.unique_info_count} ${tCommon('feedback.infoNotices')}`
385+
: tCommon('feedback.noInfoNotices')
309386
}
310-
variant='outlined'
311-
/>
312-
<Chip
313-
sx={{ m: '4px' }}
314-
component='a'
315-
clickable
316-
href={`${dataset?.validation_report?.url_html}`}
317-
target='_blank'
318-
rel='noreferrer nofollow'
319-
icon={<InfoOutlinedIcon aria-hidden />}
320-
label={`${
321-
dataset?.validation_report?.unique_info_count ?? '0'
322-
} ${tCommon('feedback.infoNotices')}`}
323-
aria-label={`${dataset?.validation_report?.unique_info_count ?? '0'} ${tCommon('feedback.infoNotices')} – ${t('datasetHistoryTooltip.viewReport')}`}
324-
color='primary'
325-
variant='outlined'
326-
/>
387+
placement='top'
388+
>
389+
<Chip
390+
sx={{
391+
m: '4px',
392+
'.MuiChip-label': {
393+
pr:
394+
(dataset?.validation_report
395+
?.unique_info_count ?? 0) === 0
396+
? 0
397+
: undefined,
398+
},
399+
}}
400+
component='a'
401+
clickable
402+
href={`${dataset?.validation_report?.url_html}`}
403+
target='_blank'
404+
rel='noreferrer nofollow'
405+
icon={
406+
(dataset?.validation_report?.unique_info_count ??
407+
0) > 0 ? (
408+
<InfoOutlinedIcon aria-hidden />
409+
) : (
410+
<CheckCircle aria-hidden />
411+
)
412+
}
413+
label={
414+
(dataset?.validation_report?.unique_info_count ??
415+
0) > 0
416+
? dataset?.validation_report?.unique_info_count
417+
: undefined
418+
}
419+
aria-label={`${dataset?.validation_report?.unique_info_count ?? '0'} ${tCommon('feedback.infoNotices')} – ${t('datasetHistoryTooltip.viewReport')}`}
420+
color={
421+
(dataset?.validation_report?.unique_info_count ??
422+
0) > 0
423+
? 'primary'
424+
: 'success'
425+
}
426+
variant='outlined'
427+
/>
428+
</Tooltip>
327429
</>
328430
)}
329431
</TableCell>

0 commit comments

Comments
 (0)