diff options
author | Stas Vilchik <stas-vilchik@users.noreply.github.com> | 2017-04-20 11:10:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 11:10:13 +0200 |
commit | f6e90fdc19e222b3b238f0f5995a8039b7db158e (patch) | |
tree | 69c22415cb50a650b046ce4b9a9ac99e57695dfd /server/sonar-web/src/main/js/app/components | |
parent | 36c9fa041018d7eed91f1d22e0c5eda075737ebc (diff) | |
download | sonarqube-f6e90fdc19e222b3b238f0f5995a8039b7db158e.tar.gz sonarqube-f6e90fdc19e222b3b238f0f5995a8039b7db158e.zip |
upgrade prettier (#1954)
Diffstat (limited to 'server/sonar-web/src/main/js/app/components')
9 files changed, 23 insertions, 23 deletions
diff --git a/server/sonar-web/src/main/js/app/components/App.js b/server/sonar-web/src/main/js/app/components/App.js index 578556bbb3f..f2c392bc4ef 100644 --- a/server/sonar-web/src/main/js/app/components/App.js +++ b/server/sonar-web/src/main/js/app/components/App.js @@ -49,7 +49,8 @@ class App extends React.PureComponent { this.props.fetchAppState(), this.props.fetchOrganizations(), this.props.fetchLanguages() - ])) + ]) + ) .then(this.finishLoading, this.finishLoading); } diff --git a/server/sonar-web/src/main/js/app/components/Landing.js b/server/sonar-web/src/main/js/app/components/Landing.js index 42a3bd47a77..9cd07a0d4ba 100644 --- a/server/sonar-web/src/main/js/app/components/Landing.js +++ b/server/sonar-web/src/main/js/app/components/Landing.js @@ -25,10 +25,8 @@ import { getCurrentUser } from '../../store/rootReducer'; class Landing extends React.PureComponent { static propTypes = { - currentUser: React.PropTypes.oneOfType([ - React.PropTypes.bool, - React.PropTypes.object - ]).isRequired + currentUser: React.PropTypes.oneOfType([React.PropTypes.bool, React.PropTypes.object]) + .isRequired }; componentDidMount() { diff --git a/server/sonar-web/src/main/js/app/components/ProjectContainer.js b/server/sonar-web/src/main/js/app/components/ProjectContainer.js index 3023b1a7628..7277845431b 100644 --- a/server/sonar-web/src/main/js/app/components/ProjectContainer.js +++ b/server/sonar-web/src/main/js/app/components/ProjectContainer.js @@ -38,7 +38,7 @@ class ProjectContainer extends React.PureComponent { configuration: {}, qualifier: string }, - fetchProject: (string) => Promise<*> + fetchProject: string => Promise<*> }; componentDidMount() { this.fetchProject(); diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.js b/server/sonar-web/src/main/js/app/components/extensions/Extension.js index 1013c2c2823..f5d145918b1 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/Extension.js +++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.js @@ -33,7 +33,7 @@ type Props = { key: string, title: string }, - onFail: (string) => void, + onFail: string => void, options?: {}, router: Object }; @@ -86,7 +86,7 @@ class Extension extends React.PureComponent { render() { return ( <div> - <div ref={container => this.container = container} /> + <div ref={container => (this.container = container)} /> </div> ); } diff --git a/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js b/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js index 9e01ad26655..2b271712002 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js +++ b/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js @@ -41,7 +41,8 @@ type Props = { function ProjectAdminPageExtension(props: Props) { const { extensionKey, pluginKey } = props.params; const { component } = props; - const extension = component.configuration && + const extension = + component.configuration && component.configuration.extensions.find(p => p.key === `${pluginKey}/${extensionKey}`); return extension ? <Extension extension={extension} options={{ component }} /> diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.js b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.js index 63246b7407b..6fe26c1cbb4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.js +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.js @@ -26,7 +26,8 @@ export default class ComponentNavMeta extends React.PureComponent { render() { const metaList = []; const canSeeBackgroundTasks = this.props.conf.showBackgroundTasks; - const backgroundTasksUrl = window.baseUrl + + const backgroundTasksUrl = + window.baseUrl + `/project/background_tasks?id=${encodeURIComponent(this.props.component.key)}`; if (this.props.isInProgress) { diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.js index 996391f2fd0..168ab4f188a 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.js @@ -39,8 +39,8 @@ class GlobalNavBranding extends React.PureComponent { render() { const homeController = this.props.currentUser.isLoggedIn ? '/projects' : '/about'; - const homeLinkClassName = 'navbar-brand' + - (this.props.customLogoUrl ? ' navbar-brand-custom' : ''); + const homeLinkClassName = + 'navbar-brand' + (this.props.customLogoUrl ? ' navbar-brand-custom' : ''); return ( <div className="navbar-header"> <Link to={homeController} className={homeLinkClassName}>{this.renderLogo()}</Link> diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js index 004d3c20eb2..c84707129f4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js @@ -30,7 +30,7 @@ class GlobalNavUser extends React.PureComponent { name: string }, location: Object, - router: { push: (string) => void } + router: { push: string => void } }; handleLogin = e => { @@ -38,8 +38,8 @@ class GlobalNavUser extends React.PureComponent { const shouldReturnToCurrentPage = window.location.pathname !== `${window.baseUrl}/about`; if (shouldReturnToCurrentPage) { const returnTo = encodeURIComponent(window.location.pathname + window.location.search); - window.location = window.baseUrl + - `/sessions/new?return_to=${returnTo}${window.location.hash}`; + window.location = + window.baseUrl + `/sessions/new?return_to=${returnTo}${window.location.hash}`; } else { window.location = `${window.baseUrl}/sessions/new`; } diff --git a/server/sonar-web/src/main/js/app/components/nav/global/SearchView.js b/server/sonar-web/src/main/js/app/components/nav/global/SearchView.js index 9277cb5acb5..f0aecd4d887 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/SearchView.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/SearchView.js @@ -126,12 +126,9 @@ export default Marionette.LayoutView.extend({ onRender() { const that = this; this.resultsRegion.show(this.resultsView); - setTimeout( - () => { - that.$('.js-search-input').focus(); - }, - 0 - ); + setTimeout(() => { + that.$('.js-search-input').focus(); + }, 0); }, onKeyDown(e) { @@ -191,7 +188,8 @@ export default Marionette.LayoutView.extend({ const recentHistory = RecentHistory.get(); const customOrganizations = areThereCustomOrganizations(); const history = recentHistory.map((historyItem, index) => { - const url = window.baseUrl + + const url = + window.baseUrl + '/dashboard/index?id=' + encodeURIComponent(historyItem.key) + window.dashboardParameters(true); @@ -229,7 +227,8 @@ export default Marionette.LayoutView.extend({ const collection = []; r.results.forEach(({ items, q }) => { items.forEach((item, index) => { - const showOrganization = customOrganizations && + const showOrganization = + customOrganizations && item.organization != null && SHOW_ORGANIZATION_FOR_QUALIFIERS.includes(q); const organization = showOrganization ? getOrganization(item.organization) : null; |