SONAR-10374 Support pull request in the web app

6 files changed, 10 insertions, 10 deletions

diff --git a/server/sonar-web/src/main/js/components/issue/Issue.d.ts b/server/sonar-web/src/main/js/components/issue/Issue.d.ts
index 6930914f170..389a01a09a2 100644
--- a/server/sonar-web/src/main/js/components/issue/Issue.d.ts
+++ b/server/sonar-web/src/main/js/components/issue/Issue.d.ts
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { Issue as IssueType } from '../../app/types';
+import { BranchLike, Issue as IssueType } from '../../app/types';
 
 interface IssueProps {
-  branch?: string;
+  branchLike?: BranchLike;
   checked?: boolean;
   displayLocationsCount?: boolean;
   displayLocationsLink?: boolean;
diff --git a/server/sonar-web/src/main/js/components/issue/Issue.js b/server/sonar-web/src/main/js/components/issue/Issue.js
index 47bf09dab76..715d4a2d725 100644
--- a/server/sonar-web/src/main/js/components/issue/Issue.js
+++ b/server/sonar-web/src/main/js/components/issue/Issue.js
@@ -29,7 +29,7 @@ import { setIssueAssignee } from '../../api/issues';
 
 /*::
 type Props = {|
-  branch?: string,
+  branchLike?: { id?: string; name: string },
   checked?: boolean,
   displayLocationsCount?: boolean;
   displayLocationsLink?: boolean;
@@ -150,7 +150,7 @@ export default class Issue extends React.PureComponent {
   render() {
     return (
       <IssueView
-        branch={this.props.branch}
+        branchLike={this.props.branchLike}
         checked={this.props.checked}
         currentPopup={this.props.openPopup}
         displayLocationsCount={this.props.displayLocationsCount}
diff --git a/server/sonar-web/src/main/js/components/issue/IssueView.js b/server/sonar-web/src/main/js/components/issue/IssueView.js
index b7a658e77ba..5f814a5347e 100644
--- a/server/sonar-web/src/main/js/components/issue/IssueView.js
+++ b/server/sonar-web/src/main/js/components/issue/IssueView.js
@@ -29,7 +29,7 @@ import { deleteIssueComment, editIssueComment } from '../../api/issues';
 
 /*::
 type Props = {|
-  branch?: string,
+  branchLike?: { id?: string; name: string },
   checked?: boolean,
   currentPopup: ?string,
   displayLocationsCount?: boolean;
@@ -90,7 +90,7 @@ export default class IssueView extends React.PureComponent {
         role="listitem"
         tabIndex={0}>
         <IssueTitleBar
-          branch={this.props.branch}
+          branchLike={this.props.branchLike}
           currentPopup={this.props.currentPopup}
           displayLocationsCount={this.props.displayLocationsCount}
           displayLocationsLink={this.props.displayLocationsLink}
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
index 7a1cf1d5d67..13de79da203 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
@@ -26,6 +26,7 @@ import SimilarIssuesFilter from './SimilarIssuesFilter';
 import LinkIcon from '../../../components/icons-components/LinkIcon';
 import LocationIndex from '../../common/LocationIndex';
 import Tooltip from '../../controls/Tooltip';
+import { getBranchLikeQuery } from '../../../helpers/branches';
 import { getComponentIssuesUrl } from '../../../helpers/urls';
 import { formatMeasure } from '../../../helpers/measures';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
@@ -33,7 +34,7 @@ import { translate, translateWithParameters } from '../../../helpers/l10n';
 
 /*::
 type Props = {|
-  branch?: string,
+  branchLike?: { id?: string; name: string },
   currentPopup: ?string,
   displayLocationsCount?: boolean;
   displayLocationsLink?: boolean;
@@ -68,7 +69,7 @@ export default function IssueTitleBar(props /*: Props */) {
   const displayLocations = props.displayLocationsCount && locationsCount > 0;
 
   const issueUrl = getComponentIssuesUrl(issue.project, {
-    branch: props.branch,
+    ...getBranchLikeQuery(props.branchLike),
     issues: issue.key,
     open: issue.key
   });
diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js
index f3efe9d2904..9134a0c1f79 100644
--- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js
+++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js
@@ -48,7 +48,7 @@ const issueWithLocations = {
 it('should render the titlebar correctly', () => {
   const element = shallow(
     <IssueTitleBar
-      branch="feature-1.0"
+      branchLike={{ isMain: false, name: 'feature-1.0', type: 'SHORT' }}
       issue={issue}
       currentPopup={null}
       onFail={jest.fn()}
diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueTitleBar-test.js.snap b/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueTitleBar-test.js.snap
index d9f6c77f6b9..30fc9e84c33 100644
--- a/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueTitleBar-test.js.snap
+++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueTitleBar-test.js.snap
@@ -160,7 +160,6 @@ exports[`should render the titlebar with the filter 1`] = `
             Object {
               "pathname": "/project/issues",
               "query": Object {
-                "branch": undefined,
                 "id": "myproject",
                 "issues": "AVsae-CQS-9G3txfbFN2",
                 "open": "AVsae-CQS-9G3txfbFN2",