From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Fri, 28 Apr 2017 13:21:51 +0000 (+0200)
Subject: Fix organization admin extension nav menu highlight
X-Git-Tag: 6.4-RC1~157
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=15849bc5b5ebbc69d28435d5f62bb558246146dc;p=sonarqube.git

Fix organization admin extension nav menu highlight
---

diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
index d00979a8431..b71ded90831 100644
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
@@ -135,10 +135,13 @@ export default class OrganizationNavigation extends React.PureComponent {
       location.pathname === `organizations/${organization.key}/projects` ||
       location.pathname === `organizations/${organization.key}/projects/favorite`;
 
-    const adminActive = ADMIN_PATHS.some(path =>
+    const adminPathsWithExtensions = (organization.adminPages || [])
+      .map(e => `extension/${e.key}`)
+      .concat(ADMIN_PATHS);
+
+    const adminActive = adminPathsWithExtensions.some(path =>
       location.pathname.endsWith(`organizations/${organization.key}/${path}`)
     );
-
     const moreActive = !adminActive && location.pathname.includes('/extension/');
 
     return (