Skip to content

Commit

Permalink
Use the latest version of ECharts
Browse files Browse the repository at this point in the history
The latest version contains the automatic computation
of the valid range.
  • Loading branch information
uhafner committed Feb 24, 2025
1 parent 97266a0 commit 3600e76
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
1 change: 1 addition & 0 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Check warning on line 51 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/MetricsTrendChart.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 51 is not covered by tests
}
return model;
}
Expand Down

0 comments on commit 3600e76

Please sign in to comment.