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 d00979a843197016df57891199b9f533c221dd3b..b71ded908316cf77641a865c2d7293749dd38cbb 100644 (file)
--- 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 (