diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2017-02-09 17:16:58 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2017-02-09 17:16:58 +0100 |
| commit | 6af6d4f6f19b632be68853f21a65cf247451aa1c (patch) | |
| tree | f0fe07d8da610c109bdd6150f694b1bbdfe173c0 /server | |
| parent | 1d235fc3ffc56983908426619b7c5c116f00c68e (diff) | |
| download | sonarqube-6af6d4f6f19b632be68853f21a65cf247451aa1c.tar.gz sonarqube-6af6d4f6f19b632be68853f21a65cf247451aa1c.zip | |
fix project header when organization is not shown
Diffstat (limited to 'server')
2 files changed, 13 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js index 3f09a2c637b..41e616e5496 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js @@ -36,11 +36,18 @@ class ComponentNavBreadcrumbs extends React.Component { return null; } + const displayOrganization = organization != null && shouldOrganizationBeDisplayed; + const lastItem = breadcrumbs[breadcrumbs.length - 1]; const items = breadcrumbs.map((item, index) => { return ( <span key={item.key}> + {!displayOrganization && index === 0 && ( + <span className="navbar-context-title-qualifier little-spacer-right"> + <QualifierIcon qualifier={lastItem.qualifier}/> + </span> + )} <Link to={{ pathname: '/dashboard', query: { id: item.key } }} className="link-base-color"> {index === breadcrumbs.length - 1 ? ( <strong>{item.name}</strong> @@ -57,7 +64,7 @@ class ComponentNavBreadcrumbs extends React.Component { return ( <h2 className="navbar-context-title"> - {organization != null && shouldOrganizationBeDisplayed && ( + {displayOrganization && ( <span> <span className="navbar-context-title-qualifier little-spacer-right"> <QualifierIcon qualifier={lastItem.qualifier}/> diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBreadcrumbs-test.js.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBreadcrumbs-test.js.snap index 40c7c51d3b3..d9bd895c7b1 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBreadcrumbs-test.js.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBreadcrumbs-test.js.snap @@ -2,6 +2,11 @@ exports[`test should not render breadcrumbs with one element 1`] = ` <h2 className="navbar-context-title"> <span> + <span + className="navbar-context-title-qualifier little-spacer-right"> + <qualifier-icon + qualifier="TRK" /> + </span> <Link className="link-base-color" onlyActiveOnIndex={false} |