SONAR-5606 Timeline chart does not behave correctly when measures don't have the...

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
index 5cc449a0fe854a5ba7c24d1bfab9e12291732b0a..6e5c662f1041efad4bc785198e6d39a36a02443b 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
@@ -167,7 +167,7 @@
 <%   else %>
   <% timeline = 'timeline' + widget.id.to_s %>
 
-  <div id="timeline-chart-<%= widget.id -%>" style="height: <%= chartHeight -%>px;"></div>
+  <div id="timeline-chart-<%= widget.id -%>"></div>
   <script>
     function d(y, m, d, h, min, s) {
       return new Date(y, m, d, h, min, s);
@@ -182,6 +182,7 @@
       .snapshots(snapshots)
       .metrics(metrics)
       .events(events);
+    <%= timeline -%>.limitedHistoricalData = '<%= message('widget.timeline.limited_histortical_data') -%>';
     <%= timeline -%>.render();
 
     autoResize(200, function() {

diff --git a/server/sonar-web/src/main/js/widgets/timeline.js b/server/sonar-web/src/main/js/widgets/timeline.js
index 23ab743cd23aa6bef0f8902bf2da009b783a0056..3718852e1bdad9e84ad5bf2cfe3e7a8dec7900fd 100644 (file)
--- a/server/sonar-web/src/main/js/widgets/timeline.js
+++ b/server/sonar-web/src/main/js/widgets/timeline.js
@@ -153,6 +153,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets;
         .ticks(5);
 
 
+    this.showLimitHistoryMessage();
+
+
     // Configure lines and points
     this.lines = [];
     this.glines = [];
@@ -281,6 +284,17 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets;
   };
 
 
+  window.SonarWidgets.Timeline.prototype.showLimitHistoryMessage = function () {
+    var minEvent = d3.min(this.events(), function (d) {
+          return d.d;
+        }),
+        minData = this.time.domain()[0];
+    if (minEvent < minData) {
+      var maxResultsReachedLabel = this.container.append('div').text(this.limitedHistoricalData);
+      maxResultsReachedLabel.classed('max-results-reached-message', true);
+    }
+  };
+
 
   window.SonarWidgets.Timeline.prototype.update = function() {
     var widget = this,

diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less
index 2d73427824afe28cc4d84bf1b8d665561f23b971..d8638486ccb8f9ef6eca04ca9650a7d0523a167b 100644 (file)
--- a/server/sonar-web/src/main/less/style.less
+++ b/server/sonar-web/src/main/less/style.less
@@ -2800,17 +2800,17 @@ div.rule-title {
   }
 }
 
-.sonar-d3 .max-results-reached-message {
+.max-results-reached-message {
   font-size: 12px;
 }
 
-.sonar-d3 div.max-results-reached-message {
+div.max-results-reached-message {
   margin-top: 10px;
   color: #777;
   text-align: center;
 }
 
-.sonar-d3 text.max-results-reached-message {
+text.max-results-reached-message {
   fill: #777;
 }
 

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index ccb8accde9975999dced54fd595a596aae41ff80..5c7a8ea65633a616cdf0e6841c7ed4437fda8445 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1106,6 +1106,7 @@ widget.timeline.property.metric2.name=Metric 2
 widget.timeline.property.metric3.name=Metric 3
 widget.timeline.property.hideEvents.name=Hide events
 widget.timeline.property.chartHeight.name=Chart Height
+widget.timeline.limited_histortical_data=Current timeline is reduced to a shorter period because of limited historical data for one of the metric.
 
 widget.bubble_chart.name=Project File Bubble Chart
 widget.bubble_chart.description=Display a component's source files in a Bubble chart. Both axes and bubble size are configurable.