Merge pull request #342 from jenkinsci/simplify-charts

Use the latest version of ECharts
jenkinsci · Feb 25, 2025 · a19ffe7 · a19ffe7
2 parents ad8d045 + 3600e76
commit a19ffe7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -132,6 +132,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>echarts-api</artifactId>
+      <version>5.6.0-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>

diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/CoverageTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/CoverageTrendChart.java
@@ -4,7 +4,6 @@
 import edu.hm.hafner.echarts.BuildResult;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
 import edu.hm.hafner.echarts.JacksonFacade;
-import edu.hm.hafner.echarts.line.LineSeries;
 import edu.hm.hafner.echarts.line.LinesChartModel;
 import edu.hm.hafner.util.VisibleForTesting;
 
@@ -64,8 +63,8 @@ public LinesChartModel create(final Iterable<BuildResult<CoverageStatistics>> re
             addSeriesIfAvailable(dataSet, model, Metric.FUNCTION_CALL, JenkinsPalette.RED.dark());
 
             model.useContinuousRangeAxis();
+            model.computeVisibleRange();
             model.setRangeMax(100); // Restrict the range to 100%
-            model.setRangeMin(model.getSeries().stream().map(LineSeries::getData).flatMap(List::stream).mapToDouble(Number::doubleValue).min().orElse(0));
         }
         return model;
     }

diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/MetricsTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/MetricsTrendChart.java
@@ -4,11 +4,9 @@
 import edu.hm.hafner.echarts.BuildResult;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
 import edu.hm.hafner.echarts.JacksonFacade;
-import edu.hm.hafner.echarts.line.LineSeries;
 import edu.hm.hafner.echarts.line.LinesChartModel;
 import edu.hm.hafner.echarts.line.LinesDataSet;
 
-import java.util.List;
 import java.util.Set;
 
 import io.jenkins.plugins.coverage.metrics.model.CoverageStatistics;
@@ -50,21 +48,7 @@ public LinesChartModel create(final Iterable<BuildResult<CoverageStatistics>> re
             }
 
             model.useContinuousRangeAxis();
-            // FIXME: once part of ECharts we should remove this code
-            model.setRangeMax(model.getSeries()
-                    .stream()
-                    .map(LineSeries::getData)
-                    .flatMap(List::stream)
-                    .mapToDouble(Number::doubleValue)
-                    .max()
-                    .orElse(0));
-            model.setRangeMin(model.getSeries()
-                    .stream()
-                    .map(LineSeries::getData)
-                    .flatMap(List::stream)
-                    .mapToDouble(Number::doubleValue)
-                    .min()
-                    .orElse(0));
+            model.computeVisibleRange();
         }
         return model;
     }