diff options
Diffstat (limited to 'server')
6 files changed, 59 insertions, 58 deletions
diff --git a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx index c1d88989529..9ad1391425d 100644 --- a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx @@ -296,8 +296,9 @@ export class CodeApp extends React.Component<Props, State> { return ( <div className="page page-limited"> + <A11ySkipTarget anchor="code_main" /> {!canBrowseAllChildProjects && isPortfolioLike(qualifier) && ( - <StyledAlert variant="warning"> + <StyledAlert variant="warning" className="it__portfolio_warning"> <AlertContent> {translate('component_measures.not_all_measures_are_shown')} <HelpTooltip @@ -313,8 +314,6 @@ export class CodeApp extends React.Component<Props, State> { defer={false} title={sourceViewer !== undefined ? sourceViewer.name : defaultTitle} /> - <A11ySkipTarget anchor="code_main" /> - {!hasComponents && ( <Search branchLike={branchLike} diff --git a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap index 04fb66277ed..0e98dd30dc6 100644 --- a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap @@ -172,7 +172,11 @@ exports[`should render a warning message when user does not have access to all p <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Styled(Alert) + className="it__portfolio_warning" variant="warning" > <Styled(div)> @@ -192,9 +196,6 @@ exports[`should render a warning message when user does not have access to all p encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <div className="code-components" > @@ -215,6 +216,9 @@ exports[`should render correclty when no sub component for APP 1`] = ` <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -223,9 +227,6 @@ exports[`should render correclty when no sub component for APP 1`] = ` encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <div className="code-components" > @@ -246,6 +247,9 @@ exports[`should render correclty when no sub component for APP: no search 1`] = <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -254,9 +258,6 @@ exports[`should render correclty when no sub component for APP: no search 1`] = encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -302,6 +303,9 @@ exports[`should render correclty when no sub component for APP: with sub compone <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -310,9 +314,6 @@ exports[`should render correclty when no sub component for APP: with sub compone encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -408,6 +409,9 @@ exports[`should render correclty when no sub component for SVW 1`] = ` <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -416,9 +420,6 @@ exports[`should render correclty when no sub component for SVW 1`] = ` encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <div className="code-components" > @@ -439,6 +440,9 @@ exports[`should render correclty when no sub component for SVW: no search 1`] = <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -447,9 +451,6 @@ exports[`should render correclty when no sub component for SVW: no search 1`] = encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -495,6 +496,9 @@ exports[`should render correclty when no sub component for SVW: with sub compone <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -503,9 +507,6 @@ exports[`should render correclty when no sub component for SVW: with sub compone encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -591,6 +592,9 @@ exports[`should render correclty when no sub component for TRK 1`] = ` <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -599,9 +603,6 @@ exports[`should render correclty when no sub component for TRK 1`] = ` encodeSpecialCharacters={true} title="code.page" /> - <A11ySkipTarget - anchor="code_main" - /> <div className="code-components" > @@ -622,6 +623,9 @@ exports[`should render correclty when no sub component for TRK: no search 1`] = <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -630,9 +634,6 @@ exports[`should render correclty when no sub component for TRK: no search 1`] = encodeSpecialCharacters={true} title="code.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -678,6 +679,9 @@ exports[`should render correclty when no sub component for TRK: with sub compone <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -686,9 +690,6 @@ exports[`should render correclty when no sub component for TRK: with sub compone encodeSpecialCharacters={true} title="code.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -784,6 +785,9 @@ exports[`should render correclty when no sub component for VW 1`] = ` <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -792,9 +796,6 @@ exports[`should render correclty when no sub component for VW 1`] = ` encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <div className="code-components" > @@ -815,6 +816,9 @@ exports[`should render correclty when no sub component for VW: no search 1`] = ` <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -823,9 +827,6 @@ exports[`should render correclty when no sub component for VW: no search 1`] = ` encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { @@ -871,6 +872,9 @@ exports[`should render correclty when no sub component for VW: with sub componen <div className="page page-limited" > + <A11ySkipTarget + anchor="code_main" + /> <Suggestions suggestions="code" /> @@ -879,9 +883,6 @@ exports[`should render correclty when no sub component for VW: with sub componen encodeSpecialCharacters={true} title="projects.page" /> - <A11ySkipTarget - anchor="code_main" - /> <withRouter(Search) component={ Object { diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx index 079f77ed1fb..080358d770f 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx @@ -307,7 +307,7 @@ export class App extends React.PureComponent<Props, State> { <div className="layout-page-side-inner"> {!canBrowseAllChildProjects && isPortfolioLike(qualifier) && ( <Alert - className="big-spacer-top big-spacer-right big-spacer-left" + className="big-spacer-top big-spacer-right big-spacer-left it__portfolio_warning" variant="warning"> <AlertContent> {translate('component_measures.not_all_measures_are_shown')} diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/__snapshots__/App-test.tsx.snap b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/__snapshots__/App-test.tsx.snap index 68daeb9cdb4..fec80c05446 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/__snapshots__/App-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/__snapshots__/App-test.tsx.snap @@ -69,7 +69,7 @@ exports[`should render a warning message when user does not have access to all p className="layout-page-side-inner" > <Alert - className="big-spacer-top big-spacer-right big-spacer-left" + className="big-spacer-top big-spacer-right big-spacer-left it__portfolio_warning" variant="warning" > <Styled(div)> diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx index 62d45cd1d01..c64244bb8f6 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx @@ -956,9 +956,16 @@ export default class App extends React.PureComponent<Props, State> { className="layout-page-side" style={{ top }}> <div className="layout-page-side-inner"> + <A11ySkipTarget + anchor="issues_sidebar" + label={ + openIssue ? translate('issues.skip_to_list') : translate('issues.skip_to_filters') + } + weight={10} + /> {!canBrowseAllChildProjects && isPortfolioLike(qualifier) && ( <Alert - className="big-spacer-top big-spacer-right big-spacer-left" + className="big-spacer-top big-spacer-right big-spacer-left it__portfolio_warning" variant="warning"> <AlertContent> {translate('issues.not_all_issue_show')} @@ -970,13 +977,7 @@ export default class App extends React.PureComponent<Props, State> { </AlertContent> </Alert> )} - <A11ySkipTarget - anchor="issues_sidebar" - label={ - openIssue ? translate('issues.skip_to_list') : translate('issues.skip_to_filters') - } - weight={10} - /> + {openIssue ? this.renderConciseIssuesList() : this.renderFacets()} </div> </section> diff --git a/server/sonar-web/src/main/js/apps/issues/components/__tests__/__snapshots__/IssuesApp-test.tsx.snap b/server/sonar-web/src/main/js/apps/issues/components/__tests__/__snapshots__/IssuesApp-test.tsx.snap index 01994952a65..23f2efc6a8c 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/__tests__/__snapshots__/IssuesApp-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/issues/components/__tests__/__snapshots__/IssuesApp-test.tsx.snap @@ -36,8 +36,13 @@ exports[`should show warnning when not all projects are accessible 1`] = ` <div className="layout-page-side-inner" > + <A11ySkipTarget + anchor="issues_sidebar" + label="issues.skip_to_filters" + weight={10} + /> <Alert - className="big-spacer-top big-spacer-right big-spacer-left" + className="big-spacer-top big-spacer-right big-spacer-left it__portfolio_warning" variant="warning" > <Styled(div)> @@ -49,11 +54,6 @@ exports[`should show warnning when not all projects are accessible 1`] = ` /> </Styled(div)> </Alert> - <A11ySkipTarget - anchor="issues_sidebar" - label="issues.skip_to_filters" - weight={10} - /> <div className="layout-page-filters" > |