From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 27 Dec 2016 13:53:05 +0000 (+0100)
Subject: SONAR-8554 reorder project menu items
X-Git-Tag: 6.3-RC1~674
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a23197d0af2f5f29e10b96131ec1c0052fc7601;p=sonarqube.git

SONAR-8554 reorder project menu items
---

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
index c41a461f35b..5a277ce6d42 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.js
@@ -143,7 +143,7 @@ export default class ComponentNavMenu extends React.Component {
             {this.renderPermissionsLink()}
             {this.renderBackgroundTasksLink()}
             {this.renderUpdateKeyLink()}
-            {this.renderExtensions()}
+            {this.renderAdminExtensions()}
             {this.renderDeletionLink()}
           </ul>
         </li>
@@ -299,17 +299,15 @@ export default class ComponentNavMenu extends React.Component {
     );
   };
 
-  renderExtensions () {
+  renderAdminExtensions () {
     const extensions = this.props.conf.extensions || [];
     return extensions.map(e => this.renderExtension(e, true));
   }
 
-  renderTools () {
+  renderExtensions () {
     const extensions = this.props.component.extensions || [];
     const withoutGovernance = extensions.filter(ext => ext.name !== 'Governance');
-    const tools = withoutGovernance.map(this.renderExtension);
-
-    if (!tools.length) {
+    if (!withoutGovernance.length) {
       return null;
     }
 
@@ -320,7 +318,7 @@ export default class ComponentNavMenu extends React.Component {
             <i className="icon-dropdown"/>
           </a>
           <ul className="dropdown-menu">
-            {tools}
+            {withoutGovernance.map(this.renderExtension)}
           </ul>
         </li>
     );
@@ -334,8 +332,8 @@ export default class ComponentNavMenu extends React.Component {
           {this.renderComponentMeasuresLink()}
           {this.renderCodeLink()}
           {this.renderActivityLink()}
-          {this.renderTools()}
           {this.renderAdministration()}
+          {this.renderExtensions()}
         </ul>
     );
   }