From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Wed, 28 Mar 2018 09:15:39 +0000 (+0200)
Subject: SONAR-10262 Disable flagging a branch component as favorite
X-Git-Tag: 7.5~1444
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d83499117dfcdfb1664e98d61ddd511a7248f135;p=sonarqube.git

SONAR-10262 Disable flagging a branch component as favorite
---

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
index 5c5205077cb..f18f16b55e2 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
@@ -298,6 +298,7 @@ export default class MeasureContent extends React.PureComponent {
               {component.key !== rootComponent.key &&
                 isLoggedIn && (
                   <MeasureFavoriteContainer
+                    branchLike={branchLike}
                     component={component.key}
                     className="measure-favorite spacer-right"
                   />
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureFavoriteContainer.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureFavoriteContainer.js
index f1aac5309b1..9eacba92a32 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureFavoriteContainer.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureFavoriteContainer.js
@@ -23,10 +23,12 @@ import { connect } from 'react-redux';
 import FavoriteContainer from '../../../components/controls/FavoriteContainer';
 import { getComponentForSourceViewer } from '../../../api/components';
 import { receiveFavorites } from '../../../store/favorites/duck';
+import { isMainBranch } from '../../../helpers/branches';
 
 /*:: type FavComponent = { key: string, canMarkAsFavorite: boolean, fav: boolean }; */
 
 /*:: type Props = {
+  branchLike?: { id?: string; name: string },
   className?: string,
   component: string,
   onReceiveComponent: (component: FavComponent) => void
@@ -65,7 +67,11 @@ class MeasureFavoriteContainer extends React.PureComponent {
 
   render() {
     const { component } = this.state;
-    if (component == null || !component.canMarkAsFavorite) {
+    if (
+      component == null ||
+      !component.canMarkAsFavorite ||
+      (this.props.branchLike && !isMainBranch(this.props.branchLike))
+    ) {
       return null;
     }
     return (
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
index 9255f0d7e51..041856e2426 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
+++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
@@ -38,7 +38,7 @@ import {
 } from '../../helpers/urls';
 import { collapsedDirFromPath, fileFromPath } from '../../helpers/path';
 import { translate } from '../../helpers/l10n';
-import { getBranchLikeQuery } from '../../helpers/branches';
+import { getBranchLikeQuery, isMainBranch } from '../../helpers/branches';
 import { formatMeasure } from '../../helpers/measures';
 import { omitNil } from '../../helpers/request';
 
@@ -120,9 +120,10 @@ export default class SourceViewerHeader extends React.PureComponent<Props, State
             <div className="component-name-path">
               <QualifierIcon qualifier={q} /> <span>{collapsedDirFromPath(path)}</span>
               <span className="component-name-file">{fileFromPath(path)}</span>
-              {this.props.sourceViewerFile.canMarkAsFavorite && (
-                <FavoriteContainer className="component-name-favorite" componentKey={key} />
-              )}
+              {this.props.sourceViewerFile.canMarkAsFavorite &&
+                (!this.props.branchLike || isMainBranch(this.props.branchLike)) && (
+                  <FavoriteContainer className="component-name-favorite" componentKey={key} />
+                )}
             </div>
           </div>
         </div>