Skip to content

Commit

Permalink
Merge pull request #2335 from saberlynx/filter-message-2
Browse files Browse the repository at this point in the history
Use the same counts in EmptyResultsReport as the TabTitle
  • Loading branch information
swaterkamp authored Jul 23, 2020
2 parents f9c63ee + 1cc25a7 commit 8b27e5a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added handling of queued task status [#2208](https://github.com/greenbone/gsa/pull/2208)

### Changed
- EmptyResultsReport uses the same counts as the results tab title in normal reports, when filtering for nonexistent results [#2335](https://github.com/greenbone/gsa/pull/2335)
- Improve error 503 message at login [#2310](https://github.com/greenbone/gsa/pull/2310)
- Use unified solution type instead of solution type nvt tag [#2268](https://github.com/greenbone/gsa/pull/2268)
- Changed queued status color [#2227](https://github.com/greenbone/gsa/pull/2227)
Expand Down
6 changes: 1 addition & 5 deletions gsa/src/web/pages/reports/details/resultstab.js
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ const mapStateToProps = (state, {reportId}) => {
resultsFilter,
resultsError: selector.getEntitiesError(resultsFilter),
results: selector.getEntities(resultsFilter),
resultsCounts: selector.getEntitiesCounts(resultsFilter),
isLoading: selector.isLoadingEntities(resultsFilter),
};
};
Expand All @@ -379,10 +378,7 @@ const mapDispatchToProps = (dispatch, {reportId, gmp}) => {

export default compose(
withGmp,
connect(
mapStateToProps,
mapDispatchToProps,
),
connect(mapStateToProps, mapDispatchToProps),
)(ResultsTabWrapper);

// vim: set ts=2 sw=2 tw=80:
1 change: 1 addition & 0 deletions gsa/src/web/pages/reports/detailscontent.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ const PageContent = ({
reportFilter={reportFilter}
reportId={reportId}
results={results.entities}
resultsCounts={resultsCounts}
sortField={sorting.results.sortField}
sortReverse={sorting.results.sortReverse}
onFilterAddLogLevelClick={onFilterAddLogLevelClick}
Expand Down

0 comments on commit 8b27e5a

Please sign in to comment.