SONAR-5877 Update component viewer coverage popup

diff --git a/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
index 065db092f50cc7973ec8d971740af993e68129b0..f6fc34b7794c7365514528486a1c11b3a32e8203 100644 (file)
--- a/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
@@ -60,3 +60,4 @@ define [
         file: files[fileRef]
         tests: testSet
       testFiles: testFiles
+      row: @options.row

diff --git a/server/sonar-web/src/main/coffee/component-viewer/source.coffee b/server/sonar-web/src/main/coffee/component-viewer/source.coffee
index cf6843ed1a6d68220af76d749e7055cb2d23817d..2b1cc7c3de47aa9d1cd749278fd55a09f8fb6653 100644 (file)
--- a/server/sonar-web/src/main/coffee/component-viewer/source.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/source.coffee
@@ -43,6 +43,7 @@ define [
 
       'click .source-line-covered': 'showCoveragePopup'
       'click .source-line-partially-covered': 'showCoveragePopup'
+      'click .source-line-uncovered': 'showCoveragePopup'
 
       'click .source-line-duplications-extra': 'showDuplicationPopup'
 
@@ -208,11 +209,13 @@ define [
       e.stopPropagation()
       $('body').click()
       line = $(e.currentTarget).closest('.source-line').data 'line-number'
+      row = _.findWhere @options.main.source.get('formattedSource'), lineNumber: line
       $.get API_COVERAGE_TESTS, key: @options.main.component.get('key'), line: line, (data) =>
         popup = new CoveragePopupView
           model: new Backbone.Model data
           triggerEl: $(e.currentTarget)
           main: @options.main
+          row: row
         popup.render()
 
 

diff --git a/server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs
index be7d99c755af4fdda90d1aedb729697bd6d8acc9..7a88f3828aa56f72f6ec79e331d6a3dd70a586bf 100644 (file)
--- a/server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs
+++ b/server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs
@@ -1,5 +1,17 @@
 <div class="bubble-popup-container">
-  <div class="bubble-popup-title">{{t 'component_viewer.transition.coverage'}}</div>
+  <div class="bubble-popup-title">
+    {{#if row.coverage.covered}}
+      {{t 'source_viewer.covered'}}
+      {{#if row.coverage.branches}}
+        ({{default row.coverage.coveredBranches 0}} of {{row.coverage.branches}} {{t 'source_viewer.conditions'}})
+      {{/if}}
+    {{else}}
+      {{t 'source_viewer.not_covered'}}
+      {{#if row.coverage.branches}}
+        ({{row.coverage.branches}} {{t 'source_viewer.conditions'}})
+      {{/if}}
+    {{/if}}
+  </div>
 
   {{#each testFiles}}
     <div class="bubble-popup-section">