From 15849bc5b5ebbc69d28435d5f62bb558246146dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Fri, 28 Apr 2017 15:21:51 +0200 Subject: [PATCH] Fix organization admin extension nav menu highlight --- .../organizations/navigation/OrganizationNavigation.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 ( -- 2.39.5