SONAR-9966 Page extensions are shown for branches

2 files changed, 14 insertions, 3 deletions

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
index 0cee6379a78..3d38f0517a6 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
@@ -434,13 +434,16 @@ export default class ComponentNavMenu extends React.PureComponent<Props> {
   };
 
   renderAdminExtensions() {
+    if (this.props.branch && !this.props.branch.isMain) {
+      return [];
+    }
     const extensions = this.getConfiguration().extensions || [];
     return extensions.map(e => this.renderExtension(e, true));
   }
 
   renderExtensions() {
     const extensions = this.props.component.extensions || [];
-    if (!extensions.length) {
+    if (!extensions.length || (this.props.branch && !this.props.branch.isMain)) {
       return null;
     }
 
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavMenu-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavMenu-test.tsx
index 8405e371da7..68bb1f5c458 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavMenu-test.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavMenu-test.tsx
@@ -71,7 +71,11 @@ it('should work for short-living branches', () => {
     name: 'feature',
     type: BranchType.SHORT
   };
-  const component = { ...baseComponent, configuration: { showSettings: true } };
+  const component = {
+    ...baseComponent,
+    configuration: { showSettings: true },
+    extensions: [{ key: 'component-foo', name: 'ComponentFoo' }]
+  };
   expect(
     shallow(<ComponentNavMenu branch={branch} component={component} />, {
       context: { branchesEnabled: true }
@@ -86,7 +90,11 @@ it('should work for long-living branches', () => {
       shallow(
         <ComponentNavMenu
           branch={branch}
-          component={{ ...baseComponent, configuration: { showSettings } }}
+          component={{
+            ...baseComponent,
+            configuration: { showSettings },
+            extensions: [{ key: 'component-foo', name: 'ComponentFoo' }]
+          }}
         />,
         { context: { branchesEnabled: true } }
       )