Skip to content

Commit 5aac595

Browse files
Alessandro100Alessandro100
authored
fix: download datasets when no validation report (#1081)
* fix to download datasets when no validation report
1 parent df37dfb commit 5aac595

File tree

1 file changed

+158
-148
lines changed

1 file changed

+158
-148
lines changed

‎web-app/src/app/screens/Feed/PreviousDatasets.tsx‎

Lines changed: 158 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -154,125 +154,115 @@ export default function PreviousDatasets({
154154
)}
155155
</TableCell>
156156
<TableCell sx={{ textAlign: { xs: 'left', xl: 'center' } }}>
157-
{(dataset.validation_report === null ||
158-
dataset.validation_report === undefined) && (
157+
{dataset.validation_report == null && (
159158
<Typography sx={{ ml: '4px' }}>
160159
{t('validationReportNotAvailable')}
161160
</Typography>
162161
)}
163-
{dataset.validation_report !== null &&
164-
dataset.validation_report !== undefined && (
165-
<>
166-
<Chip
167-
component='a'
168-
clickable
169-
href={`${dataset?.validation_report?.url_html}`}
170-
target='_blank'
171-
rel='noreferrer nofollow'
172-
sx={{ m: '4px' }}
173-
icon={
174-
dataset?.validation_report
175-
?.unique_error_count !== undefined &&
176-
dataset?.validation_report?.unique_error_count >
177-
0 ? (
178-
<ReportOutlined />
179-
) : (
180-
<CheckCircle />
181-
)
182-
}
183-
label={
184-
dataset?.validation_report
185-
?.unique_error_count !== undefined &&
186-
dataset?.validation_report?.unique_error_count >
187-
0
188-
? `${dataset?.validation_report
189-
?.unique_error_count} ${t(
190-
'common:feedback.errors',
191-
)}`
192-
: t('common:feedback.noErrors')
193-
}
194-
color={
195-
dataset?.validation_report
196-
?.unique_error_count !== undefined &&
197-
dataset?.validation_report?.unique_error_count >
198-
0
199-
? 'error'
200-
: 'success'
201-
}
202-
variant='outlined'
203-
/>
204-
<Chip
205-
sx={{ m: '4px' }}
206-
component='a'
207-
clickable
208-
href={`${dataset?.validation_report?.url_html}`}
209-
target='_blank'
210-
rel='noreferrer nofollow'
211-
icon={
212-
dataset?.validation_report
213-
?.unique_warning_count !== undefined &&
214-
dataset?.validation_report
215-
?.unique_warning_count > 0 ? (
216-
<ReportOutlined />
217-
) : (
218-
<CheckCircle />
219-
)
220-
}
221-
label={
222-
dataset?.validation_report
223-
?.unique_warning_count !== undefined &&
224-
dataset?.validation_report
225-
?.unique_warning_count > 0
226-
? `${dataset?.validation_report
227-
?.unique_warning_count} ${t(
228-
'common:feedback.warnings',
229-
)}`
230-
: t('common:feedback.noWarnings')
231-
}
232-
color={
233-
dataset?.validation_report
234-
?.unique_warning_count !== undefined &&
235-
dataset?.validation_report
236-
?.unique_warning_count > 0
237-
? 'warning'
238-
: 'success'
239-
}
240-
variant='outlined'
241-
/>
242-
<Chip
243-
sx={{ m: '4px' }}
244-
component='a'
245-
clickable
246-
href={`${dataset?.validation_report?.url_html}`}
247-
target='_blank'
248-
rel='noreferrer nofollow'
249-
icon={<InfoOutlinedIcon />}
250-
label={`${
251-
dataset?.validation_report?.unique_info_count ??
252-
'0'
253-
} ${t('common:feedback.infoNotices')}`}
254-
color='primary'
255-
variant='outlined'
256-
/>
257-
</>
258-
)}
259-
</TableCell>
260-
<TableCell sx={{ textAlign: 'center' }}>
261-
{dataset.validation_report == undefined && (
262-
<Button
263-
variant='contained'
264-
sx={{ mx: 2 }}
265-
disableElevation
266-
endIcon={<LaunchOutlined />}
267-
href={WEB_VALIDATOR_LINK}
268-
target='_blank'
269-
rel='noreferrer'
270-
>
271-
{t('runValidationReportYourself')}
272-
</Button>
273-
)}
274162
{dataset.validation_report != null && (
275163
<>
164+
<Chip
165+
component='a'
166+
clickable
167+
href={`${dataset?.validation_report?.url_html}`}
168+
target='_blank'
169+
rel='noreferrer nofollow'
170+
sx={{ m: '4px' }}
171+
icon={
172+
dataset?.validation_report?.unique_error_count !=
173+
undefined &&
174+
dataset?.validation_report?.unique_error_count >
175+
0 ? (
176+
<ReportOutlined />
177+
) : (
178+
<CheckCircle />
179+
)
180+
}
181+
label={
182+
dataset?.validation_report?.unique_error_count !=
183+
undefined &&
184+
dataset?.validation_report?.unique_error_count > 0
185+
? `${dataset?.validation_report
186+
?.unique_error_count} ${t(
187+
'common:feedback.errors',
188+
)}`
189+
: t('common:feedback.noErrors')
190+
}
191+
color={
192+
dataset?.validation_report?.unique_error_count !=
193+
undefined &&
194+
dataset?.validation_report?.unique_error_count > 0
195+
? 'error'
196+
: 'success'
197+
}
198+
variant='outlined'
199+
/>
200+
<Chip
201+
sx={{ m: '4px' }}
202+
component='a'
203+
clickable
204+
href={`${dataset?.validation_report?.url_html}`}
205+
target='_blank'
206+
rel='noreferrer nofollow'
207+
icon={
208+
dataset?.validation_report
209+
?.unique_warning_count != undefined &&
210+
dataset?.validation_report?.unique_warning_count >
211+
0 ? (
212+
<ReportOutlined />
213+
) : (
214+
<CheckCircle />
215+
)
216+
}
217+
label={
218+
dataset?.validation_report
219+
?.unique_warning_count != undefined &&
220+
dataset?.validation_report?.unique_warning_count >
221+
0
222+
? `${dataset?.validation_report
223+
?.unique_warning_count} ${t(
224+
'common:feedback.warnings',
225+
)}`
226+
: t('common:feedback.noWarnings')
227+
}
228+
color={
229+
dataset?.validation_report
230+
?.unique_warning_count != undefined &&
231+
dataset?.validation_report?.unique_warning_count >
232+
0
233+
? 'warning'
234+
: 'success'
235+
}
236+
variant='outlined'
237+
/>
238+
<Chip
239+
sx={{ m: '4px' }}
240+
component='a'
241+
clickable
242+
href={`${dataset?.validation_report?.url_html}`}
243+
target='_blank'
244+
rel='noreferrer nofollow'
245+
icon={<InfoOutlinedIcon />}
246+
label={`${
247+
dataset?.validation_report?.unique_info_count ??
248+
'0'
249+
} ${t('common:feedback.infoNotices')}`}
250+
color='primary'
251+
variant='outlined'
252+
/>
253+
</>
254+
)}
255+
</TableCell>
256+
<TableCell>
257+
<Box
258+
sx={{
259+
display: 'flex',
260+
gap: 1,
261+
justifyContent: 'center',
262+
alignItems: 'center',
263+
}}
264+
>
265+
{dataset.hosted_url != null && (
276266
<Tooltip
277267
title={t('datasetHistoryTooltip.downloadReport')}
278268
placement='top'
@@ -290,44 +280,64 @@ export default function PreviousDatasets({
290280
{t('common:download')}
291281
</Button>
292282
</Tooltip>
293-
|
294-
<Tooltip
295-
title={t('datasetHistoryTooltip.viewReport')}
296-
placement='top'
283+
)}
284+
{dataset.validation_report == undefined && (
285+
<Button
286+
variant='contained'
287+
sx={{ mx: 2 }}
288+
disableElevation
289+
endIcon={<LaunchOutlined />}
290+
href={WEB_VALIDATOR_LINK}
291+
target='_blank'
292+
rel='noreferrer'
297293
>
298-
<IconButton
299-
color='primary'
300-
aria-label={t('datasetHistoryTooltip.viewReport')}
301-
size='medium'
302-
href={`${dataset?.validation_report?.url_html}`}
303-
target='_blank'
304-
rel='noreferrer nofollow'
305-
data-testid='validation-report-html'
294+
{t('runValidationReportYourself')}
295+
</Button>
296+
)}
297+
298+
{dataset.validation_report != null && (
299+
<>
300+
{dataset.hosted_url != null && <>|</>}
301+
<Tooltip
302+
title={t('datasetHistoryTooltip.viewReport')}
303+
placement='top'
306304
>
307-
<SummarizeIcon />
308-
</IconButton>
309-
</Tooltip>
310-
|
311-
<Tooltip
312-
title={t('datasetHistoryTooltip.viewJsonReport')}
313-
placement='top'
314-
>
315-
<IconButton
316-
color='primary'
317-
aria-label={t(
318-
'datasetHistoryTooltip.viewJsonReport',
319-
)}
320-
size='medium'
321-
href={`${dataset?.validation_report?.url_json}`}
322-
target='_blank'
323-
rel='noreferrer nofollow'
324-
data-testid='validation-report-json'
305+
<IconButton
306+
color='primary'
307+
aria-label={t(
308+
'datasetHistoryTooltip.viewReport',
309+
)}
310+
size='medium'
311+
href={`${dataset?.validation_report?.url_html}`}
312+
target='_blank'
313+
rel='noreferrer nofollow'
314+
data-testid='validation-report-html'
315+
>
316+
<SummarizeIcon />
317+
</IconButton>
318+
</Tooltip>
319+
|
320+
<Tooltip
321+
title={t('datasetHistoryTooltip.viewJsonReport')}
322+
placement='top'
325323
>
326-
<CodeIcon />
327-
</IconButton>
328-
</Tooltip>
329-
</>
330-
)}
324+
<IconButton
325+
color='primary'
326+
aria-label={t(
327+
'datasetHistoryTooltip.viewJsonReport',
328+
)}
329+
size='medium'
330+
href={`${dataset?.validation_report?.url_json}`}
331+
target='_blank'
332+
rel='noreferrer nofollow'
333+
data-testid='validation-report-json'
334+
>
335+
<CodeIcon />
336+
</IconButton>
337+
</Tooltip>
338+
</>
339+
)}
340+
</Box>
331341
</TableCell>
332342
</TableRow>
333343
))}

0 commit comments

Comments
 (0)