fix quality flaws

diff --git a/server/sonar-web/src/main/js/app/components/nav/app.js b/server/sonar-web/src/main/js/app/components/nav/app.js
index 629c686c071907187ca16ea0c517ab2d8f8bfbfd..2a5526bbbe35874cb12e2ebcb261d4629286cab2 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/nav/app.js
+++ b/server/sonar-web/src/main/js/app/components/nav/app.js
@@ -32,7 +32,7 @@ export default class App {
 
     require('../../../components/workspace/main');
 
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       const response = {};
       const requests = [];
 

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/component-nav-menu.js b/server/sonar-web/src/main/js/app/components/nav/component/component-nav-menu.js
index 3321670d281655ad7246de90e06e9c92996837ec..e00f58efa03feddca2267ca81dcc47854c7303f8 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/nav/component/component-nav-menu.js
+++ b/server/sonar-web/src/main/js/app/components/nav/component/component-nav-menu.js
@@ -64,6 +64,10 @@ export default React.createClass({
     return path.indexOf(window.baseUrl + '/dashboard') === 0 || path.indexOf(window.baseUrl + '/governance') === 0;
   },
 
+  shouldShowAdministration() {
+    return Object.keys(this.props.conf).some(key => this.props.conf[key]);
+  },
+
   renderDashboardLink() {
     const url = getComponentUrl(this.props.component.key);
     const name = <i className="icon-home"/>;
@@ -96,22 +100,10 @@ export default React.createClass({
   },
 
   renderAdministration() {
-    const shouldShowAdministration =
-        this.props.conf.showBackgroundTasks ||
-        this.props.conf.showHistory ||
-        this.props.conf.showLinks ||
-        this.props.conf.showManualMeasures ||
-        this.props.conf.showPermissions ||
-        this.props.conf.showQualityGates ||
-        this.props.conf.showQualityProfiles ||
-        this.props.conf.showSettings ||
-        this.props.conf.showUpdateKey;
-    if (!shouldShowAdministration) {
+    if (!this.shouldShowAdministration()) {
       return null;
     }
-    const isSettingsActive = SETTINGS_URLS.some(url => {
-      return window.location.href.indexOf(url) !== -1;
-    });
+    const isSettingsActive = SETTINGS_URLS.some(url => window.location.href.indexOf(url) !== -1);
     const className = 'dropdown' + (isSettingsActive ? ' active' : '');
     return (
         <li className={className}>