diff options
Diffstat (limited to 'server/sonar-web/src/main/js')
-rw-r--r-- | server/sonar-web/src/main/js/app/components/DefaultHelmetContainer.js | 8 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/GlobalFooter.js | 10 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/GlobalFooterContainer.js | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.js (renamed from server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js) | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.js | 6 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterSonarCloud-test.js (renamed from server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterForSonarQubeDotCom-test.js) | 4 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.js.snap | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.js.snap (renamed from server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterForSonarQubeDotCom-test.js.snap) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutApp.js | 12 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js) | 16 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloudLazyLoader.js (renamed from server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotComLazyLoader.js) | 16 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutQualityModelSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js) | 14 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutRulesSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/AboutRulesForSonarQubeDotCom.js) | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/BugIconSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/BugIconForSonarQubeDotCom.js) | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/CodeSmellIconSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/CodeSmellIconForSonarQubeDotCom.js) | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js) | 14 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconSonarCloud.js (renamed from server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconForSonarQubeDotCom.js) | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/about/sonarcloud-styles.css (renamed from server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css) | 0 |
18 files changed, 56 insertions, 58 deletions
diff --git a/server/sonar-web/src/main/js/app/components/DefaultHelmetContainer.js b/server/sonar-web/src/main/js/app/components/DefaultHelmetContainer.js index 8a3be89e41f..0ba3947f417 100644 --- a/server/sonar-web/src/main/js/app/components/DefaultHelmetContainer.js +++ b/server/sonar-web/src/main/js/app/components/DefaultHelmetContainer.js @@ -22,13 +22,11 @@ import { connect } from 'react-redux'; import Helmet from 'react-helmet'; import { getGlobalSettingValue } from '../../store/rootReducer'; -function DefaultHelmetContainer({ children, sonarqubeDotCom }) { +function DefaultHelmetContainer({ children, onSonarCloud }) { return ( <div> <Helmet - defaultTitle={ - sonarqubeDotCom && sonarqubeDotCom.value === 'true' ? 'SonarCloud' : 'SonarQube' - } + defaultTitle={onSonarCloud && onSonarCloud.value === 'true' ? 'SonarCloud' : 'SonarQube'} /> {children} </div> @@ -36,7 +34,7 @@ function DefaultHelmetContainer({ children, sonarqubeDotCom }) { } const mapStateToProps = state => ({ - sonarqubeDotCom: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') + onSonarCloud: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') }); export default connect(mapStateToProps)(DefaultHelmetContainer); diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.js b/server/sonar-web/src/main/js/app/components/GlobalFooter.js index 2f104f6958f..6cd008827fa 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooter.js +++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.js @@ -20,7 +20,7 @@ // @flow import React from 'react'; import { Link } from 'react-router'; -import GlobalFooterForSonarQubeDotCom from './GlobalFooterForSonarQubeDotCom'; +import GlobalFooterSonarCloud from './GlobalFooterSonarCloud'; import GlobalFooterBranding from './GlobalFooterBranding'; import { translate, translateWithParameters } from '../../helpers/l10n'; @@ -28,16 +28,16 @@ import { translate, translateWithParameters } from '../../helpers/l10n'; type Props = { hideLoggedInInfo?: boolean, productionDatabase: boolean, - sonarqubeDotCom?: { value: string }, + onSonarCloud?: { value: string }, sonarqubeVersion?: string }; */ export default function GlobalFooter( - { hideLoggedInInfo, productionDatabase, sonarqubeDotCom, sonarqubeVersion } /*: Props */ + { hideLoggedInInfo, productionDatabase, onSonarCloud, sonarqubeVersion } /*: Props */ ) { - if (sonarqubeDotCom && sonarqubeDotCom.value === 'true') { - return <GlobalFooterForSonarQubeDotCom hideLoggedInInfo={hideLoggedInInfo} />; + if (onSonarCloud && onSonarCloud.value === 'true') { + return <GlobalFooterSonarCloud hideLoggedInInfo={hideLoggedInInfo} />; } return ( diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.js b/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.js index 4a2a7725cef..8d68f322369 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.js +++ b/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.js @@ -25,7 +25,7 @@ import GlobalFooter from './GlobalFooter'; const mapStateToProps = state => ({ sonarqubeVersion: getAppState(state).version, productionDatabase: getAppState(state).productionDatabase, - sonarqubeDotCom: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') + onSonarCloud: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') }); export default connect(mapStateToProps)(GlobalFooter); diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.js index f05bb330fda..d81f101e78b 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.js @@ -22,7 +22,7 @@ import React from 'react'; import { Link } from 'react-router'; import { translate } from '../../helpers/l10n'; -export default function GlobalFooterForSonarQubeDotCom() { +export default function GlobalFooterSonarCloud() { return ( <div id="footer" className="page-footer page-container"> <div> diff --git a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.js b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.js index 54b528bb743..74ef097213f 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.js +++ b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.js @@ -31,7 +31,7 @@ it('should not render the only logged in information', () => { <GlobalFooter hideLoggedInInfo={true} productionDatabase={true} - sonarqubeDotCom={{ value: 'false' }} + onSonarCloud={{ value: 'false' }} sonarqubeVersion="6.4-SNAPSHOT" /> ) @@ -48,8 +48,8 @@ it('should display the sq version', () => { ).toMatchSnapshot(); }); -it('should render SonarqubeDotCom footer', () => { +it('should render SonarCloud footer', () => { expect( - shallow(<GlobalFooter productionDatabase={true} sonarqubeDotCom={{ value: 'true' }} />) + shallow(<GlobalFooter productionDatabase={true} onSonarCloud={{ value: 'true' }} />) ).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterForSonarQubeDotCom-test.js b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterSonarCloud-test.js index 38610ea8353..2f41d408c61 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterForSonarQubeDotCom-test.js +++ b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooterSonarCloud-test.js @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import React from 'react'; -import GlobalFooterForSonarQubeDotCom from '../GlobalFooterForSonarQubeDotCom'; +import GlobalFooterSonarCloud from '../GlobalFooterSonarCloud'; it('should render correctly', () => { - expect(shallow(<GlobalFooterForSonarQubeDotCom />)).toMatchSnapshot(); + expect(shallow(<GlobalFooterSonarCloud />)).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.js.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.js.snap index 19b4e955356..438127ce0bc 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.js.snap +++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.js.snap @@ -98,7 +98,7 @@ exports[`should not render the only logged in information 1`] = ` </div> `; -exports[`should render SonarqubeDotCom footer 1`] = `<GlobalFooterForSonarQubeDotCom />`; +exports[`should render SonarCloud footer 1`] = `<GlobalFooterSonarCloud />`; exports[`should render the only logged in information 1`] = ` <div diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterForSonarQubeDotCom-test.js.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.js.snap index 9abb73d6d77..9abb73d6d77 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterForSonarQubeDotCom-test.js.snap +++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.js.snap diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutApp.js b/server/sonar-web/src/main/js/apps/about/components/AboutApp.js index c748fa60444..dbb199b9b59 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutApp.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutApp.js @@ -36,7 +36,7 @@ import { getFacet } from '../../../api/issues'; import { getAppState, getCurrentUser, getGlobalSettingValue } from '../../../store/rootReducer'; import { translate } from '../../../helpers/l10n'; import { fetchAboutPageSettings } from '../actions'; -import AboutAppForSonarQubeDotComLazyLoader from './AboutAppForSonarQubeDotComLazyLoader'; +import AboutAppSonarCloudLazyLoader from './AboutAppSonarCloudLazyLoader'; import '../styles.css'; /*:: @@ -62,7 +62,7 @@ class AboutApp extends React.PureComponent { currentUser: { isLoggedIn: boolean }, customText?: string, fetchAboutPageSettings: () => Promise<*>, - sonarqubeDotCom?: { value: string } + onSonarCloud?: { value: string } }; */ @@ -107,7 +107,7 @@ class AboutApp extends React.PureComponent { } render() { - const { customText, sonarqubeDotCom } = this.props; + const { customText, onSonarCloud } = this.props; const { loading, issueTypes, projectsCount } = this.state; let bugs; @@ -119,9 +119,9 @@ class AboutApp extends React.PureComponent { codeSmells = issueTypes['CODE_SMELL'] && issueTypes['CODE_SMELL'].count; } - if (sonarqubeDotCom && sonarqubeDotCom.value === 'true') { + if (onSonarCloud && onSonarCloud.value === 'true') { return ( - <AboutAppForSonarQubeDotComLazyLoader + <AboutAppSonarCloudLazyLoader appState={this.props.appState} bugs={bugs} codeSmells={codeSmells} @@ -203,7 +203,7 @@ const mapStateToProps = state => ({ appState: getAppState(state), currentUser: getCurrentUser(state), customText: getGlobalSettingValue(state, 'sonar.lf.aboutText'), - sonarqubeDotCom: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') + onSonarCloud: getGlobalSettingValue(state, 'sonar.sonarcloud.enabled') }); const mapDispatchToProps = { fetchAboutPageSettings }; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloud.js index b3e048a1d1e..8373d23cc12 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloud.js @@ -20,16 +20,16 @@ // @flow import React from 'react'; import AboutProjects from './AboutProjects'; -import EntryIssueTypesForSonarQubeDotCom from './EntryIssueTypesForSonarQubeDotCom'; -import AboutRulesForSonarQubeDotCom from './AboutRulesForSonarQubeDotCom'; +import EntryIssueTypesSonarCloud from './EntryIssueTypesSonarCloud'; +import AboutRulesSonarCloud from './AboutRulesSonarCloud'; import AboutCleanCode from './AboutCleanCode'; -import AboutQualityModelForSonarQubeDotCom from './AboutQualityModelForSonarQubeDotCom'; +import AboutQualityModelSonarCloud from './AboutQualityModelSonarCloud'; import AboutQualityGates from './AboutQualityGates'; import AboutLeakPeriod from './AboutLeakPeriod'; import AboutStandards from './AboutStandards'; import AboutScanners from './AboutScanners'; import SonarCloudGetStarted from './SonarCloudGetStarted'; -import '../sonarqube-dot-com-styles.css'; +import '../sonarcloud-styles.css'; /*:: type Props = { @@ -47,7 +47,7 @@ type Props = { }; */ -export default function AboutAppForSonarQubeDotCom(props /*: Props */) { +export default function AboutAppSonarCloud(props /*: Props */) { const { customText } = props; return ( @@ -63,7 +63,7 @@ export default function AboutAppForSonarQubeDotCom(props /*: Props */) { <div className="sqcom-about-page-instance"> <AboutProjects count={props.projectsCount} loading={props.loading} /> - <EntryIssueTypesForSonarQubeDotCom + <EntryIssueTypesSonarCloud bugs={props.bugs} codeSmells={props.codeSmells} loading={props.loading} @@ -73,7 +73,7 @@ export default function AboutAppForSonarQubeDotCom(props /*: Props */) { </div> </div> - <AboutRulesForSonarQubeDotCom appState={props.appState} /> + <AboutRulesSonarCloud appState={props.appState} /> <div className="page-limited"> {customText != null && @@ -84,7 +84,7 @@ export default function AboutAppForSonarQubeDotCom(props /*: Props */) { /> )} - <AboutQualityModelForSonarQubeDotCom /> + <AboutQualityModelSonarCloud /> <div className="flex-columns"> <div className="flex-column flex-column-half about-page-group-boxes"> diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotComLazyLoader.js b/server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloudLazyLoader.js index 8d22b8f8b43..b18c0780e7b 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotComLazyLoader.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutAppSonarCloudLazyLoader.js @@ -19,26 +19,26 @@ */ import React from 'react'; -export default class AboutAppForSonarQubeDotComLazyLoader extends React.PureComponent { +export default class AboutAppSonarCloudLazyLoader extends React.PureComponent { constructor(props) { super(props); this.state = { - AboutAppForSonarQubeDotCom: null + AboutAppSonarCloud: null }; } componentDidMount() { - if (!this.state.AboutAppForSonarQubeDotCom) { - import('./AboutAppForSonarQubeDotCom').then(({ default: AboutAppForSonarQubeDotCom }) => - this.setState({ AboutAppForSonarQubeDotCom }) + if (!this.state.AboutAppSonarCloud) { + import('./AboutAppSonarCloud').then(({ default: AboutAppSonarCloud }) => + this.setState({ AboutAppSonarCloud }) ); } } render() { - const { AboutAppForSonarQubeDotCom } = this.state; - if (AboutAppForSonarQubeDotCom) { - return <AboutAppForSonarQubeDotCom {...this.props} />; + const { AboutAppSonarCloud } = this.state; + if (AboutAppSonarCloud) { + return <AboutAppSonarCloud {...this.props} />; } return null; } diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelSonarCloud.js index 277c1ea2036..df5d87996eb 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelSonarCloud.js @@ -19,11 +19,11 @@ */ import React from 'react'; import { translate } from '../../../helpers/l10n'; -import BugIconForSonarQubeDotCom from './BugIconForSonarQubeDotCom'; -import VulnerabilityIconForSonarQubeDotCom from './VulnerabilityIconForSonarQubeDotCom'; -import CodeSmellIconForSonarQubeDotCom from './CodeSmellIconForSonarQubeDotCom'; +import BugIconSonarCloud from './BugIconSonarCloud'; +import VulnerabilityIconSonarCloud from './VulnerabilityIconSonarCloud'; +import CodeSmellIconSonarCloud from './CodeSmellIconSonarCloud'; -export default function AboutQualityModelForSonarQubeDotCom() { +export default function AboutQualityModelSonarCloud() { return ( <div className="boxed-group about-quality-model sqcom-about-quality-model"> <h2>{translate('about_page.quality_model')}</h2> @@ -32,7 +32,7 @@ export default function AboutQualityModelForSonarQubeDotCom() { <div className="flex-columns"> <div className="flex-column flex-column-third"> <div className="pull-left little-spacer-right"> - <BugIconForSonarQubeDotCom /> + <BugIconSonarCloud /> </div> <p className="about-page-text overflow-hidden"> <strong>{translate('issue.type.BUG.plural')}</strong>{' '} @@ -42,7 +42,7 @@ export default function AboutQualityModelForSonarQubeDotCom() { <div className="flex-column flex-column-third"> <div className="pull-left little-spacer-right"> - <VulnerabilityIconForSonarQubeDotCom /> + <VulnerabilityIconSonarCloud /> </div> <p className="about-page-text overflow-hidden"> <strong>{translate('issue.type.VULNERABILITY.plural')}</strong>{' '} @@ -52,7 +52,7 @@ export default function AboutQualityModelForSonarQubeDotCom() { <div className="flex-column flex-column-third"> <div className="pull-left little-spacer-right"> - <CodeSmellIconForSonarQubeDotCom /> + <CodeSmellIconSonarCloud /> </div> <p className="about-page-text overflow-hidden"> <strong>{translate('issue.type.CODE_SMELL.plural')}</strong>{' '} diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutRulesForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutRulesSonarCloud.js index 1669da98c6a..67f3037edb2 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutRulesForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutRulesSonarCloud.js @@ -31,7 +31,7 @@ type Props = { }; */ -export default function AboutRulesForSonarQubeDotCom(props /*: Props */) { +export default function AboutRulesSonarCloud(props /*: Props */) { const organization = props.appState.defaultOrganization; return ( diff --git a/server/sonar-web/src/main/js/apps/about/components/BugIconForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/BugIconSonarCloud.js index 808b95d011f..7ba3dadede8 100644 --- a/server/sonar-web/src/main/js/apps/about/components/BugIconForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/BugIconSonarCloud.js @@ -20,7 +20,7 @@ // @flow import React from 'react'; -export default function BugIconForSonarQubeDotCom() { +export default function BugIconSonarCloud() { /* eslint-disable max-len */ return ( <svg viewBox="0 0 26 26" width="26" height="26"> diff --git a/server/sonar-web/src/main/js/apps/about/components/CodeSmellIconForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/CodeSmellIconSonarCloud.js index e4c0df6452b..dc9030b2273 100644 --- a/server/sonar-web/src/main/js/apps/about/components/CodeSmellIconForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/CodeSmellIconSonarCloud.js @@ -20,7 +20,7 @@ // @flow import React from 'react'; -export default function CodeSmellIconForSonarQubeDotCom() { +export default function CodeSmellIconSonarCloud() { /* eslint-disable max-len */ return ( <svg viewBox="0 0 26 26" width="26" height="26"> diff --git a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesSonarCloud.js index 582bf582d38..8a46248ae16 100644 --- a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesSonarCloud.js @@ -23,9 +23,9 @@ import { Link } from 'react-router'; import { formatMeasure } from '../../../helpers/measures'; import { translate } from '../../../helpers/l10n'; import { getIssuesUrl } from '../../../helpers/urls'; -import BugIconForSonarQubeDotCom from './BugIconForSonarQubeDotCom'; -import VulnerabilityIconForSonarQubeDotCom from './VulnerabilityIconForSonarQubeDotCom'; -import CodeSmellIconForSonarQubeDotCom from './CodeSmellIconForSonarQubeDotCom'; +import BugIconSonarCloud from './BugIconSonarCloud'; +import VulnerabilityIconSonarCloud from './VulnerabilityIconSonarCloud'; +import CodeSmellIconSonarCloud from './CodeSmellIconSonarCloud'; /*:: type Props = { @@ -36,7 +36,7 @@ type Props = { }; */ -export default function EntryIssueTypesForSonarQubeDotCom( +export default function EntryIssueTypesSonarCloud( { bugs, codeSmells, loading, vulnerabilities } /*: Props */ ) { return ( @@ -55,7 +55,7 @@ export default function EntryIssueTypesForSonarQubeDotCom( </td> <td> <span className="little-spacer-right"> - <BugIconForSonarQubeDotCom /> + <BugIconSonarCloud /> </span> {translate('issue.type.BUG.plural')} </td> @@ -74,7 +74,7 @@ export default function EntryIssueTypesForSonarQubeDotCom( </td> <td> <span className="little-spacer-right"> - <VulnerabilityIconForSonarQubeDotCom /> + <VulnerabilityIconSonarCloud /> </span> {translate('issue.type.VULNERABILITY.plural')} </td> @@ -89,7 +89,7 @@ export default function EntryIssueTypesForSonarQubeDotCom( </td> <td> <span className="little-spacer-right"> - <CodeSmellIconForSonarQubeDotCom /> + <CodeSmellIconSonarCloud /> </span> {translate('issue.type.CODE_SMELL.plural')} </td> diff --git a/server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconSonarCloud.js index 8f666af2f04..442d15a1b7e 100644 --- a/server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/VulnerabilityIconSonarCloud.js @@ -20,7 +20,7 @@ // @flow import React from 'react'; -export default function VulnerabilityIconForSonarQubeDotCom() { +export default function VulnerabilityIconSonarCloud() { /* eslint-disable max-len */ return ( <svg viewBox="0 0 26 26" width="26" height="26"> diff --git a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css b/server/sonar-web/src/main/js/apps/about/sonarcloud-styles.css index 88db615075e..88db615075e 100644 --- a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css +++ b/server/sonar-web/src/main/js/apps/about/sonarcloud-styles.css |