SONAR-5209 Show real data inside the issues bar

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 671dcfaaee76d3590fdb3407a4bc8b3b79dccc58..1cdde9a823a73b0c8a5b2f21119051d1007c4cd9 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -36,7 +36,8 @@ define [
     'it_coverage,it_line_coverage,it_lines_to_cover,it_covered_lines,it_uncovered_lines,' +
     'it_branch_coverage,it_conditions_to_cover,it_uncovered_conditions'
 
-  ISSUES_METRIC_LIST = 'blocker_violations,critical_violations,major_violations,minor_violations,info_violations'
+  ISSUES_METRIC_LIST = 'blocker_violations,critical_violations,major_violations,minor_violations,info_violations,' +
+    'false_positive_issues'
 
   DUPLICATIONS_METRIC_LIST = 'duplicated_lines_density,duplicated_blocks,duplicated_files,duplicated_lines'
 

diff --git a/sonar-server/src/main/hbs/component-viewer/header/_issues-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_issues-header.hbs
index f13b40a9ec70421c2861a9296c6e776541c568bb..3298f8bbac03d372a3f8d0fe957ae34ac065e826 100644 (file)
--- a/sonar-server/src/main/hbs/component-viewer/header/_issues-header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header/_issues-header.hbs
@@ -1,62 +1,63 @@
 <div class="component-viewer-header-expanded-bar-section">
-  <div class="component-viewer-header-expanded-bar-section-title">Rules</div>
+  <div class="component-viewer-header-expanded-bar-section-title">Severities</div>
   <ul class="component-viewer-header-expanded-bar-section-list">
-    <li><a class="item">
-      <span>Array designators "[]" should be located after the type in method signatures</span>
-      <span class="number">2</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span>Avoid Array Loops</span>
-      <span class="number">1</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span>Useless Operation On Immutable</span>
-      <span class="number">4</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
+    {{#if component.msr.blocker_violations}}
+      <li><a class="item">
+        <span><i class="icon-severity-blocker"></i> {{t 'severity.BLOCKER'}}</span>
+        <span class="number">{{component.msr.blocker_violations}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
+    {{#if component.msr.critical_violations}}
+      <li><a class="item">
+        <span><i class="icon-severity-critical"></i> {{t 'severity.CRITICAL'}}</span>
+        <span class="number">{{component.msr.critical_violations}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
+    {{#if component.msr.major_violations}}
+      <li><a class="item">
+        <span><i class="icon-severity-major"></i> {{t 'severity.MAJOR'}}</span>
+        <span class="number">{{component.msr.major_violations}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
+    {{#if component.msr.minor_violations}}
+      <li><a class="item">
+        <span><i class="icon-severity-minor"></i> {{t 'severity.MINOR'}}</span>
+        <span class="number">{{component.msr.minor_violations}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
+    {{#if component.msr.info_violations}}
+      <li><a class="item">
+        <span><i class="icon-severity-info"></i> {{t 'severity.INFO'}}</span>
+        <span class="number">{{component.msr.info_violations}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
   </ul>
 </div>
+
 <div class="component-viewer-header-expanded-bar-section">
+  <div class="component-viewer-header-expanded-bar-section-title">Rules</div>
   <ul class="component-viewer-header-expanded-bar-section-list">
-    <li><a class="item">
-      <span><i class="icon-severity-blocker"></i> {{t 'severity.BLOCKER'}}</span>
-      <span class="number">{{component.measures.blocker_issues}}</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span><i class="icon-severity-critical"></i> {{t 'severity.CRITICAL'}}</span>
-      <span class="number">{{component.measures.critical_issues}}</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span><i class="icon-severity-major"></i> {{t 'severity.MAJOR'}}</span>
-      <span class="number">{{component.measures.major_issues}}</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span><i class="icon-severity-minor"></i> {{t 'severity.MINOR'}}</span>
-      <span class="number">{{component.measures.minor_issues}}</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
-    <li><a class="item">
-      <span><i class="icon-severity-info"></i> {{t 'severity.INFO'}}</span>
-      <span class="number">{{component.measures.info_issues}}</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
   </ul>
 </div>
+
 <div class="component-viewer-header-expanded-bar-section">
+  <div class="component-viewer-header-expanded-bar-section-title">&nbsp;</div>
   <ul class="component-viewer-header-expanded-bar-section-list">
     <li><a class="item">
       <span>Current issue</span>
       <i class="icon-chevron-right"></i>
     </a></li>
-    <li><a class="item">
-      <span>False Positive</span>
-      <span class="number">3</span>
-      <i class="icon-chevron-right"></i>
-    </a></li>
+    {{#if component.msr.false_positive_issues}}
+      <li><a class="item">
+        <span>False Positive</span>
+        <span class="number">{{component.msr.false_positive_issues}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
   </ul>
 </div>
\ No newline at end of file

diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/sonar-server/src/main/js/common/handlebars-extensions.js
index 48665f61d228eeb6301ebe10b386ee2efa5f7241..c0433bd337d385d52e129c3ed2ce660a16373060 100644 (file)
--- a/sonar-server/src/main/js/common/handlebars-extensions.js
+++ b/sonar-server/src/main/js/common/handlebars-extensions.js
@@ -31,6 +31,10 @@ define(['handlebars'], function (Handlebars) {
     );
   });
 
+  Handlebars.registerHelper('default', function(value, defaultValue) {
+    return value != null ? value : defaultValue;
+  });
+
   Handlebars.registerHelper('percent', function(value, total) {
     return (value || 0) / total * 100;
   });