Skip to content

The Unified and Autonomous Development Platform

fix: Repository line stats is incorrect sometimes (OD-2083)

Robin Shena09dd10ac0ac
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
index 33202b12e9..5fb2eae43a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
@@ -10,8 +10,9 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.TreeSet;
@SuppressWarnings("serial")
public class SourceLinesPage extends CodeStatsPage {
@@ -26,9 +27,9 @@ public class SourceLinesPage extends CodeStatsPage {
Map<Integer, Map<String, Integer>> lineIncrements = OneDev.getInstance(CommitInfoManager.class)
.getLineIncrements(getProject().getId());
- Map<Integer, Map<String, Integer>> data = new HashMap<>();
- for (Map.Entry<Integer, Map<String, Integer>> entry: lineIncrements.entrySet())
- data.put(entry.getKey(), entry.getValue());
+ Map<Integer, Map<String, Integer>> data = new LinkedHashMap<>();
+ for (var key: new TreeSet<>(lineIncrements.keySet()))
+ data.put(key, lineIncrements.get(key));
try {
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
String jsonOfData = mapper.writeValueAsString(data);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
index 88cffed34b..bb8e77a7e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
@@ -362,9 +362,6 @@ onedev.server.codeStats = {
languageLines[language] = dailyLinesByLanguages;
}
}
- incrementDays.sort(function(day1, day2) {
- return day1 - day2;
- });
var languages = Object.keys(languageLines);
languages.sort(function(a, b) {
@@ -384,10 +381,13 @@ onedev.server.codeStats = {
for (var language in dailyLinesByLanguages) {
var dailyLines = dailyLinesByLanguages[language];
var increments;
- if (incrementsOnCurrentDay)
+ if (incrementsOnCurrentDay) {
increments = incrementsOnCurrentDay[language];
- if (increments == undefined)
+ if (increments == undefined)
+ increments = 0;
+ } else {
increments = 0;
+ }
if (dailyLines.length != 0)
dailyLines.push(dailyLines[dailyLines.length-1] + increments);
@@ -397,6 +397,7 @@ onedev.server.codeStats = {
xAxisData.push(onedev.server.codeStats.formatDay(currentDay));
currentDay++;
}
+ console.log(dailyLinesByLanguages["HTML"]);
var chart = echarts.init($chart[0]);