From ba27ffd947674243067e1093b8a69a938cf8bb37 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 16:46:41 +0100 Subject: [PATCH 1/6] Don't grow toolbar at dashboard (start page) --- gsa/src/web/pages/start/page.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gsa/src/web/pages/start/page.js b/gsa/src/web/pages/start/page.js index d6e43d2099..8d0f80aabf 100644 --- a/gsa/src/web/pages/start/page.js +++ b/gsa/src/web/pages/start/page.js @@ -401,7 +401,11 @@ class StartPage extends React.Component { return ( - + + {' '} + {/* span prevents Toolbar from growing */} + +
}> {isLoading ? ( @@ -557,10 +561,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({ export default compose( withGmp, - connect( - mapStateToProps, - mapDispatchToProps, - ), + connect(mapStateToProps, mapDispatchToProps), )(StartPage); // vim: set ts=2 sw=2 tw=80: From 7d822fc48c378123f6c3f70d3fa65f53e8416c83 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 16:47:42 +0100 Subject: [PATCH 2/6] Don't grow toolbar on CVSS calculator page --- gsa/src/web/pages/extras/cvsscalculatorpage.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gsa/src/web/pages/extras/cvsscalculatorpage.js b/gsa/src/web/pages/extras/cvsscalculatorpage.js index e3121bc25a..bab4840c93 100644 --- a/gsa/src/web/pages/extras/cvsscalculatorpage.js +++ b/gsa/src/web/pages/extras/cvsscalculatorpage.js @@ -198,7 +198,11 @@ const CvssCalculator = ({gmp, onInteraction, ...props}) => { return ( - + + {' '} + {/* span prevents Toolbar from growing */} + +
} title={_('CVSSv2 Base Score Calculator')} @@ -370,10 +374,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({ export default compose( withGmp, - connect( - undefined, - mapDispatchToProps, - ), + connect(undefined, mapDispatchToProps), )(CvssCalculator); // vim: set ts=2 sw=2 tw=80: From 8e73246aca1dba6fbe95e138d847df78862c9350 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 16:49:15 +0100 Subject: [PATCH 3/6] Don't grow toolbar on trashcan page --- gsa/src/web/pages/extras/trashcanpage.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gsa/src/web/pages/extras/trashcanpage.js b/gsa/src/web/pages/extras/trashcanpage.js index 898f1e2906..4e04fd7482 100644 --- a/gsa/src/web/pages/extras/trashcanpage.js +++ b/gsa/src/web/pages/extras/trashcanpage.js @@ -372,7 +372,11 @@ class Trashcan extends React.Component { - + + {' '} + {/* span prevents Toolbar from growing */} + + {error && ( ({ export default compose( withGmp, - connect( - undefined, - mapDispatchToProps, - ), + connect(undefined, mapDispatchToProps), )(Trashcan); // vim: set ts=2 sw=2 tw=80: From 1a5663ad3ad117419fee5e5f3669500d1a4191cd Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 16:50:23 +0100 Subject: [PATCH 4/6] Don't grow toolbar on feed status page --- gsa/src/web/pages/extras/feedstatuspage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gsa/src/web/pages/extras/feedstatuspage.js b/gsa/src/web/pages/extras/feedstatuspage.js index fe99886c01..e9b4e53149 100644 --- a/gsa/src/web/pages/extras/feedstatuspage.js +++ b/gsa/src/web/pages/extras/feedstatuspage.js @@ -105,7 +105,11 @@ const FeedStatus = ({feeds}) => { - + + {' '} + {/* span prevents Toolbar from growing */} + +
} title={_('Feed Status')} /> From 6bbfb52266712152dde0a8ea3b8b0d3ac1a6c3e6 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 16:59:14 +0100 Subject: [PATCH 5/6] Adjust start page test for newly added span --- gsa/src/web/pages/start/__tests__/page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsa/src/web/pages/start/__tests__/page.js b/gsa/src/web/pages/start/__tests__/page.js index c65569fdc5..77d4d06e51 100644 --- a/gsa/src/web/pages/start/__tests__/page.js +++ b/gsa/src/web/pages/start/__tests__/page.js @@ -110,7 +110,7 @@ describe('StartPage tests', () => { expect(icons[0]).toHaveAttribute('title', 'Help: Dashboards'); // Tabs - expect(spans[2]).toHaveTextContent('Overview'); + expect(spans[3]).toHaveTextContent('Overview'); expect(icons[2]).toHaveAttribute('title', 'Add new Dashboard'); // Dashboard Controls From f44223cdc488a7041d06dc505beff581b8917c56 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Mon, 21 Dec 2020 17:06:41 +0100 Subject: [PATCH 6/6] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1058d8c80..6bad4fa09e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Use to disable feed object editing and filter creation on feed status page [#2398](https://github.com/greenbone/gsa/pull/2398) ### Fixed +- Stop growing of toolbars which only have the help icon [#2641](https://github.com/greenbone/gsa/pull/2641) - Fixed initial value of dropdown for including related resources for permissions [#2632](https://github.com/greenbone/gsa/pull/2632) - Fixed compiling gsad with libmicrohttp 0.9.71 and later [#2625](https://github.com/greenbone/gsa/pull/2625) - Fixed display of alert condition "Severity changed" [#2623](https://github.com/greenbone/gsa/pull/2623)