Skip to content

Commit

Permalink
Merge pull request #3126 from greenbone/mergify/bp/gsa-21.04/pr-3124
Browse files Browse the repository at this point in the history
[AP1032] Show dead hosts as possible reason in empty report when scan finishes (backport #3124)
  • Loading branch information
swaterkamp authored Aug 6, 2021
2 parents 2c457af + 5abb496 commit 40e785d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 9 deletions.
18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Don't crash target table when port_list is undefined [#3120](https://github.com/greenbone/gsa/pull/3120)


[Unreleased]: https://github.com/greenbone/gsa/compare/v21.4.2...gsa-21.04

## [21.4.2] 2021-08-03
Expand Down Expand Up @@ -114,7 +113,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

[21.4.0]: https://github.com/greenbone/gsa/compare/gsa-20.08...v21.4.0

## [20.8.3] (unreleased)
## [20.8.4] (unreleased)
### Added
### Changed
### Deprecated
### Removed
### Fixed
- Fixed setting/displaying timeout in EditNvtDetailsDialog [#3057](https://github.com/greenbone/gsa/pull/3057)

[Unreleased]: https://github.com/greenbone/gsa/compare/v20.8.3...gsa-20.08

### Fixed
- Show dead hosts as possible reason in empty report when scan finishes [#3124](https://github.com/greenbone/gsa/pull/3124)

## [20.8.3] 2021-08-03
### Added
### Changed
* Changed default Content-Security-Policy (CSP) Header to
Expand All @@ -128,7 +140,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Fixed setting/displaying timeout in EditNvtDetailsDialog [#3057](https://github.com/greenbone/gsa/pull/3057)

[Unreleased]: https://github.com/greenbone/gsa/compare/v20.8.2...gsa-20.08
[20.8.3]: https://github.com/greenbone/gsa/compare/v20.8.2...v20.8.3

## [20.8.2] - 2021-06-25

Expand Down
28 changes: 22 additions & 6 deletions gsa/src/web/pages/reports/details/emptyreport.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,28 @@ const EmptyReport = ({
/>
<Divider wrap>
{!isActiveReport && (
<ReportPanel
icon={props => <TaskIcon {...props} />}
title={_('The scan did not collect any results')}
>
{_('If the scan got interrupted you can try to re-start the task.')}
</ReportPanel>
<React.Fragment>
<ReportPanel
icon={props => <TaskIcon {...props} />}
title={_('The scan did not collect any results')}
>
{_(
'If the scan got interrupted you can try to re-start the task.',
)}
</ReportPanel>
<ReportPanel
icon={props => <TargetIcon {...props} />}
title={_('The target hosts could be regarded dead')}
onClick={may_edit_target ? onTargetEditClick : undefined}
>
{_(
'You should change the Alive Test Method of the ' +
'target for the next scan. However, if the target hosts ' +
'are indeed dead, the scan duration might increase ' +
'significantly.',
)}
</ReportPanel>
</React.Fragment>
)}
{isActiveReport && progress === 1 && (
<ReportPanel
Expand Down

0 comments on commit 40e785d

Please sign in to comment.