The Unified and Autonomous Development Platform
Able to show problems and coverages from specified report in source view
Robin Shen70582f65af2e
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 7bc451b099..3ff34497fc 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -498,7 +498,7 @@ public class CoreModule extends AbstractPluginModule {contribute(CodeProblemContribution.class, new CodeProblemContribution() {@Override- public List<CodeProblem> getCodeProblems(Build build, String blobPath) {+ public List<CodeProblem> getCodeProblems(Build build, String blobPath, String reportName) {return Lists.newArrayList();}@@ -507,7 +507,7 @@ public class CoreModule extends AbstractPluginModule {contribute(LineCoverageContribution.class, new LineCoverageContribution() {@Override- public List<LineCoverage> getLineCoverages(Build build, String blobPath) {+ public List<LineCoverage> getLineCoverages(Build build, String blobPath, String reportName) {return Lists.newArrayList();}diff --git a/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.javaindex 0924ac9dce..0cf0092449 100644--- a/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java+++ b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java@@ -2,12 +2,14 @@ package io.onedev.server.code;import java.util.List;+import javax.annotation.Nullable;+import io.onedev.commons.launcher.loader.ExtensionPoint;import io.onedev.server.model.Build;@ExtensionPointpublic interface CodeProblemContribution {- List<CodeProblem> getCodeProblems(Build build, String blobPath);+ List<CodeProblem> getCodeProblems(Build build, String blobPath, @Nullable String reportName);}diff --git a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.javaindex 4f1bffc918..f0d4d36aea 100644--- a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java+++ b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java@@ -2,12 +2,14 @@ package io.onedev.server.code;import java.util.List;+import javax.annotation.Nullable;+import io.onedev.commons.launcher.loader.ExtensionPoint;import io.onedev.server.model.Build;@ExtensionPointpublic interface LineCoverageContribution {- List<LineCoverage> getLineCoverages(Build build, String blobPath);+ List<LineCoverage> getLineCoverages(Build build, String blobPath, @Nullable String reportName);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 641f4e9620..cf9b1adc61 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -142,6 +142,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sprivate static final String PARAM_POSITION = "position";+ private static final String PARAM_COVERAGE_REPORT = "coverage-report";++ private static final String PARAM_PROBLEM_REPORT = "problem-report";+private static final String PARAM_RAW = "raw";private static final String REVISION_PICKER_ID = "revisionPicker";@@ -196,14 +200,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SresolvedRevision = getProject().getRevCommit(state.blobIdent.revision, true).copy();state.position = params.get(PARAM_POSITION).toString();-state.requestId = params.get(PARAM_REQUEST).toOptionalLong();-state.commentId = params.get(PARAM_COMMENT).toOptionalLong();-state.query = params.get(PARAM_QUERY).toString();-state.initialNewPath = params.get(PARAM_INITIAL_NEW_PATH).toString();+ state.coverageReport = params.get(PARAM_COVERAGE_REPORT).toOptionalString();+ state.problemReport = params.get(PARAM_PROBLEM_REPORT).toOptionalString();if (state.mode == Mode.ADD || state.mode == Mode.EDIT || state.mode == Mode.DELETE) {if (!isOnBranch())@@ -959,6 +961,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sparams.add(PARAM_URL_BEFORE_EDIT, state.urlBeforeEdit);if (state.urlAfterEdit != null)params.add(PARAM_URL_AFTER_EDIT, state.urlAfterEdit);+ if (state.coverageReport != null)+ params.add(PARAM_COVERAGE_REPORT, state.coverageReport);+ if (state.problemReport != null)+ params.add(PARAM_PROBLEM_REPORT, state.problemReport);if (state.query != null)params.add(PARAM_QUERY, state.query);@@ -1199,6 +1205,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S*/public boolean viewPlain;+ public String coverageReport;++ public String problemReport;+public String urlBeforeEdit;public String urlAfterEdit;@@ -1396,6 +1406,16 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}}+ @Override+ public String getCoverageReport() {+ return state.coverageReport;+ }++ @Override+ public String getProblemReport() {+ return state.problemReport;+ }+@Overridepublic String getAutosaveKey() {if (state.mode == Mode.ADD) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex 51bb465dd6..fb30e05ac3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -37,6 +37,12 @@ public interface BlobRenderContext extends Serializable {@NullableString getPosition();+ @Nullable+ String getCoverageReport();++ @Nullable+ String getProblemReport();+void onPosition(AjaxRequestTarget target, String position);String getPositionUrl(String position);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.javaindex 781b7bb2f2..29e5bf54aa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java@@ -8,6 +8,8 @@ import java.util.List;import java.util.Map;import java.util.Set;+import javax.annotation.Nullable;+import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;@@ -39,12 +41,19 @@ class AnnotationInfoResource extends AbstractResource {private static final String PARAM_PATH = "path";+ private static final String PARAM_PROBLEM_REPORT = "problem-report";++ private static final String PARAM_COVERAGE_REPORT = "coverage-report";+@Overrideprotected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- final Long projectId = params.get(PARAM_PROJECT).toLong();- final ObjectId commitId = ObjectId.fromString(params.get(PARAM_COMMIT).toString());- final String path = params.get(PARAM_PATH).toString();++ Long projectId = params.get(PARAM_PROJECT).toLong();+ ObjectId commitId = ObjectId.fromString(params.get(PARAM_COMMIT).toString());+ String path = params.get(PARAM_PATH).toString();+ String problemReport = params.get(PARAM_PROBLEM_REPORT).toOptionalString();+ String coverageReport = params.get(PARAM_COVERAGE_REPORT).toOptionalString();ResourceResponse response = new ResourceResponse();response.setContentType("application/json");@@ -82,7 +91,7 @@ class AnnotationInfoResource extends AbstractResource {BuildManager buildManager = OneDev.getInstance(BuildManager.class);for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>())) {for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {- for (CodeProblem problem: contribution.getCodeProblems(build, path)) {+ for (CodeProblem problem: contribution.getCodeProblems(build, path, problemReport)) {if (problemDuplicationCheck.add(problem)) {PlanarRange position = problem.getPosition();int line = position.getFromRow();@@ -97,7 +106,7 @@ class AnnotationInfoResource extends AbstractResource {}for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {- for (LineCoverage coverage: contribution.getLineCoverages(build, path)) {+ for (LineCoverage coverage: contribution.getLineCoverages(build, path, coverageReport)) {for (int line = coverage.getFromLine(); line <= coverage.getToLine(); line++) {Integer testCount = annotationInfo.coverages.get(line);if (testCount != null)@@ -121,11 +130,17 @@ class AnnotationInfoResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Project project, String commitHash, String path) {+ public static PageParameters paramsOf(Project project, String commitHash, String path,+ @Nullable String problemReport, @Nullable String coverageReport) {PageParameters params = new PageParameters();- params.set(PARAM_PROJECT, project.getId());- params.set(PARAM_COMMIT, commitHash);- params.set(PARAM_PATH, path);+ params.add(PARAM_PROJECT, project.getId());+ params.add(PARAM_COMMIT, commitHash);+ params.add(PARAM_PATH, path);++ if (problemReport != null)+ params.add(PARAM_PROBLEM_REPORT, problemReport);+ if (coverageReport != null)+ params.add(PARAM_COVERAGE_REPORT, coverageReport);return params;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 501d2f90b2..ed245a5f7c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -790,7 +790,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searexplicit("param3"), explicit("param4"), explicit("param5"));PageParameters params = AnnotationInfoResource.paramsOf(context.getProject(),- context.getCommit().name(), context.getBlobIdent().path);+ context.getCommit().name(), context.getBlobIdent().path,+ context.getProblemReport(), context.getCoverageReport());String jsonOfInitialRange = convertToJson(initialRange);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.cssindex 3e626512ed..505866908f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css@@ -59,7 +59,7 @@width: 20px;}.CodeMirror-comment, .CodeMirror-problem {- padding-left: 4px;+ text-align: right;}.comment-indicator.active, .comment-trigger.active {color: var(--dark) !important;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.jsindex bcdff1d4de..c5de7836df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -109,6 +109,11 @@ onedev.server.sourceView = {});if (cm.lineCount() > 0) {+ var $gutter = $(document.createElement("div"));+ $gutter.addClass("CodeMirror-problem").attr("title", "Loading annotations");+ $gutter.append(`<svg class='icon spin'><use xlink:href='${onedev.server.icons}#loading'/></svg>`);+ cm.setGutterMarker(0, "CodeMirror-problems", $gutter[0]);+$.ajax({url: annotationInfoUrl,cache: false,@@ -117,6 +122,7 @@ onedev.server.sourceView = {xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');},success: function(annotationInfo) {+ cm.setGutterMarker(0, "CodeMirror-problems", null);if (jQuery.contains(document, $sourceView[0])) {for (var line in annotationInfo.comments) {if (annotationInfo.comments.hasOwnProperty(line))@@ -137,7 +143,7 @@ onedev.server.sourceView = {}}});- }+ }},checkShortcutsBinding() {if (!($(document).data("SourceViewShortcutsBinded"))) {@@ -241,7 +247,7 @@ onedev.server.sourceView = {if (testCount > 0)tooltip = `Tested ${testCount} times`;else- tooltip = "Not tested";+ tooltip = "Not covered by any test";let $gutter = $(`<a class='CodeMirror-coverage d-block' title='${tooltip}'> </a>`);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.htmlindex 29707201c6..40a7a0be9d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html@@ -9,9 +9,6 @@<span class="text-muted">|</span></wicket:enclosure><span wicket:id="size"></span>- <span class="loading-annotations ml-4 text-warning">- <wicket:svg href="loading" class="icon spin"/>- Loading annotations...</span></div><div class="tools d-flex align-items-center"><div class="actions d-flex align-items-center">diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.javaindex 242c57018e..6c6743f703 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java@@ -6,17 +6,19 @@ import java.util.Collection;import java.util.List;import java.util.concurrent.Callable;-import com.google.common.collect.Lists;+import org.apache.wicket.protocol.http.WebApplication;+import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.buildspec.job.JobReport;-import io.onedev.server.code.LineCoverage;-import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.model.Build;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.DynamicPathResourceMapper;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;@@ -69,7 +71,6 @@ public class HtmlReportModule extends AbstractPluginModule {});- /*contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {@Override@@ -81,31 +82,36 @@ public class HtmlReportModule extends AbstractPluginModule {});+ /*contribute(CodeProblemContribution.class, new CodeProblemContribution() {@Override- public List<CodeProblem> getCodeProblems(Build build, String blobPath) {- String longMessage = "This is a very long message and we have a very good practice oover This is a very long message and we have a very good practice oover This is a very long message and we have a very good practice oover";+ public List<CodeProblem> getCodeProblems(Build build, String blobPath, String reportName) {+ String longMessage = "This is a very long message and we have a very \n"+ + "good practice oover This <b>is a very</b> long message and \n"+ + "we have a very good practice oover This is a very long message and we have a very good practice oover";return Lists.newArrayList(- new CodeProblem(new PlanarRange(9, 1, 9, 5), longMessage, Severity.ERROR),- new CodeProblem(new PlanarRange(9, 6, 9, 10), "This is a warning message", Severity.WARNING),+ new CodeProblem(new PlanarRange(0, 1, 1, 5), longMessage, Severity.ERROR),+ new CodeProblem(new PlanarRange(8, 6, 9, 10), reportName, Severity.WARNING),new CodeProblem(new PlanarRange(14, 1, 14, 5), "This is an error message", Severity.ERROR),new CodeProblem(new PlanarRange(19, 6, 19, 10), longMessage + "\n" + longMessage, Severity.WARNING));}});- */contribute(LineCoverageContribution.class, new LineCoverageContribution() {@Override- public List<LineCoverage> getLineCoverages(Build build, String blobPath) {- return Lists.newArrayList(new LineCoverage(5, 8, 1), new LineCoverage(12, 15, 0));+ public List<LineCoverage> getLineCoverages(Build build, String blobPath, String reportName) {+ if (reportName == null)+ return Lists.newArrayList(new LineCoverage(5, 8, 1), new LineCoverage(12, 15, 0));+ else+ return Lists.newArrayList(new LineCoverage(5, 8, 1));}});-+ */}}