aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/app/components/nav/global
diff options
context:
space:
mode:
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>2019-03-25 14:10:40 +0100
committersonartech <sonartech@sonarsource.com>2019-03-29 09:44:59 +0100
commit1355d080cfa97eadfde70e6945e30f49a38ac28e (patch)
tree2e5b41f5898b00249f51bfd5b5267580c2e1b2ae /server/sonar-web/src/main/js/app/components/nav/global
parenta289d7ab1248e465064129dc0e4b8d858fee2b79 (diff)
downloadsonarqube-1355d080cfa97eadfde70e6945e30f49a38ac28e.tar.gz
sonarqube-1355d080cfa97eadfde70e6945e30f49a38ac28e.zip
Update prettier to last version
* Prettier format all modules
Diffstat (limited to 'server/sonar-web/src/main/js/app/components/nav/global')
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx44
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx15
2 files changed, 27 insertions, 32 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
index 958a537094f..d106c1236d6 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
@@ -180,17 +180,15 @@ export class GlobalNav extends React.PureComponent<Props, State> {
<GlobalNavMenu {...this.props} />
<ul className="global-navbar-menu global-navbar-menu-right">
- {isSonarCloud() &&
- isLoggedIn(currentUser) &&
- news.length > 0 && (
- <NavLatestNotification
- lastNews={news[0]}
- notificationsLastReadDate={this.props.notificationsLastReadDate}
- notificationsOptOut={this.props.notificationsOptOut}
- onClick={this.handleOpenNotificationSidebar}
- setCurrentUserSetting={this.props.setCurrentUserSetting}
- />
- )}
+ {isSonarCloud() && isLoggedIn(currentUser) && news.length > 0 && (
+ <NavLatestNotification
+ lastNews={news[0]}
+ notificationsLastReadDate={this.props.notificationsLastReadDate}
+ notificationsOptOut={this.props.notificationsOptOut}
+ onClick={this.handleOpenNotificationSidebar}
+ setCurrentUserSetting={this.props.setCurrentUserSetting}
+ />
+ )}
{isSonarCloud() && <GlobalNavExplore location={this.props.location} />}
<EmbedDocsPopupHelper />
<Search appState={appState} currentUser={currentUser} />
@@ -207,19 +205,17 @@ export class GlobalNav extends React.PureComponent<Props, State> {
)}
<GlobalNavUserContainer appState={appState} currentUser={currentUser} />
</ul>
- {isSonarCloud() &&
- isLoggedIn(currentUser) &&
- this.state.notificationSidebar && (
- <NotificationsSidebar
- fetchMoreFeatureNews={this.fetchMoreFeatureNews}
- loading={this.state.loadingNews}
- loadingMore={this.state.loadingMoreNews}
- news={news}
- notificationsLastReadDate={this.props.notificationsLastReadDate}
- onClose={this.handleCloseNotificationSidebar}
- paging={this.state.newsPaging}
- />
- )}
+ {isSonarCloud() && isLoggedIn(currentUser) && this.state.notificationSidebar && (
+ <NotificationsSidebar
+ fetchMoreFeatureNews={this.fetchMoreFeatureNews}
+ loading={this.state.loadingNews}
+ loadingMore={this.state.loadingMoreNews}
+ news={news}
+ notificationsLastReadDate={this.props.notificationsLastReadDate}
+ onClose={this.handleCloseNotificationSidebar}
+ paging={this.state.newsPaging}
+ />
+ )}
</NavBar>
);
}
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
index b8a7c30bffb..01401510728 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
@@ -188,14 +188,13 @@ export class GlobalNavPlus extends React.PureComponent<Props & WithRouterProps,
<PlusIcon />
</a>
</Dropdown>
- {this.state.governanceReady &&
- this.state.createPortfolio && (
- <CreateFormShim
- defaultQualifier={defaultQualifier}
- onClose={this.closeCreatePortfolioForm}
- onCreate={this.handleCreatePortfolio}
- />
- )}
+ {this.state.governanceReady && this.state.createPortfolio && (
+ <CreateFormShim
+ defaultQualifier={defaultQualifier}
+ onClose={this.closeCreatePortfolioForm}
+ onCreate={this.handleCreatePortfolio}
+ />
+ )}
</>
);
}