From ba1f0d9998d30b5a22f969604625397fcb943f39 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Fri, 17 May 2019 17:18:01 +0200
Subject: [PATCH] SONAR-12113 Fix line permalink in new exec flow

---
 .../ComponentSourceSnippetViewer.tsx          |  2 +-
 .../CrossComponentSourceViewerWrapper.tsx     | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetViewer.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetViewer.tsx
index 72f972d71d9..a58e208b876 100644
--- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetViewer.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetViewer.tsx
@@ -235,7 +235,7 @@ export default class ComponentSourceSnippetViewer extends React.PureComponent<Pr
 
     return (
       <Line
-        branchLike={undefined}
+        branchLike={this.props.branchLike}
         displayAllIssues={false}
         displayCoverage={true}
         displayDuplications={displayDuplications}
diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx
index 8cdcbbdfd62..4b8262b38a0 100644
--- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx
@@ -22,6 +22,7 @@ import ComponentSourceSnippetViewer from './ComponentSourceSnippetViewer';
 import { groupLocationsByComponent } from './utils';
 import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import DuplicationPopup from '../../../components/SourceViewer/components/DuplicationPopup';
+import { SourceViewerContext } from '../../../components/SourceViewer/SourceViewerContext';
 import { WorkspaceContext } from '../../../components/workspace/context';
 import { getIssueFlowSnippets } from '../../../api/issues';
 import {
@@ -221,25 +222,28 @@ export default class CrossComponentSourceViewerWrapper extends React.PureCompone
             };
           }
           return (
-            <ComponentSourceSnippetViewer
-              branchLike={this.props.branchLike}
-              highlightedLocationMessage={this.props.highlightedLocationMessage}
-              issue={this.props.issue}
-              issuePopup={this.state.issuePopup}
-              issuesByLine={issuesByComponent[snippetGroup.component.key] || {}}
+            <SourceViewerContext.Provider
               key={`${this.props.issue.key}-${this.props.selectedFlowIndex}-${i}`}
-              last={i === locationsByComponent.length - 1}
-              loadDuplications={this.fetchDuplications}
-              locations={snippetGroup.locations || []}
-              onIssueChange={this.props.onIssueChange}
-              onIssuePopupToggle={this.handleIssuePopupToggle}
-              onLinePopupToggle={this.handleLinePopupToggle}
-              onLocationSelect={this.props.onLocationSelect}
-              renderDuplicationPopup={this.renderDuplicationPopup}
-              scroll={this.props.scroll}
-              snippetGroup={snippetGroup}
-              {...componentProps}
-            />
+              value={{ branchLike: this.props.branchLike, file: snippetGroup.component }}>
+              <ComponentSourceSnippetViewer
+                branchLike={this.props.branchLike}
+                highlightedLocationMessage={this.props.highlightedLocationMessage}
+                issue={this.props.issue}
+                issuePopup={this.state.issuePopup}
+                issuesByLine={issuesByComponent[snippetGroup.component.key] || {}}
+                last={i === locationsByComponent.length - 1}
+                loadDuplications={this.fetchDuplications}
+                locations={snippetGroup.locations || []}
+                onIssueChange={this.props.onIssueChange}
+                onIssuePopupToggle={this.handleIssuePopupToggle}
+                onLinePopupToggle={this.handleLinePopupToggle}
+                onLocationSelect={this.props.onLocationSelect}
+                renderDuplicationPopup={this.renderDuplicationPopup}
+                scroll={this.props.scroll}
+                snippetGroup={snippetGroup}
+                {...componentProps}
+              />
+            </SourceViewerContext.Provider>
           );
         })}
       </div>
-- 
2.39.5