The Unified and Autonomous Development Platform
Show build report statistics link as a tab option
Robin Shen3d6250bfd6aa
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.javaindex f878158862..051d71b9df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.builds.detail.report;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.markup.html.link.Link;@@ -8,33 +10,44 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.stats.buildmetric.BuildMetricStatsPage;public class BuildReportTab extends BuildTab {private static final long serialVersionUID = 1L;- public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass) {+ private final Class<? extends BuildMetricStatsPage<?>> statsPageClass;++ public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,+ @Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {super(title, mainPageClass);+ this.statsPageClass = statsPageClass;}public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,- Class<? extends BuildReportPage> additionalPageClass1) {+ Class<? extends BuildReportPage> additionalPageClass1,+ @Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {super(title, mainPageClass, additionalPageClass1);+ this.statsPageClass = statsPageClass;}public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,Class<? extends BuildReportPage> additionalPageClass1,- Class<? extends BuildReportPage> additionalPageClass2) {+ Class<? extends BuildReportPage> additionalPageClass2,+ @Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {super(title, mainPageClass, additionalPageClass1, additionalPageClass2);+ this.statsPageClass = statsPageClass;}public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,Class<? extends BuildReportPage> additionalPageClass1,Class<? extends BuildReportPage> additionalPageClass2,- Class<? extends BuildReportPage> additionalPageClass3) {+ Class<? extends BuildReportPage> additionalPageClass3,+ @Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {super(title, mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ this.statsPageClass = statsPageClass;}-+@Overridepublic Component render(String componentId) {return new PageTabHead(componentId, this) {@@ -51,6 +64,14 @@ public class BuildReportTab extends BuildTab {};}+ @Override+ protected Component renderOptions(String componentId) {+ if (statsPageClass != null)+ return new BuildReportTabOptionPanel(componentId, statsPageClass, getTitle());+ else+ return super.renderOptions(componentId);+ }+@Overridepublic boolean isActive(Page currentPage) {if (super.isActive(currentPage)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.htmlnew file mode 100644index 0000000000..85d61f929d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="link" title="View statistics" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="stats" class="icon"/></a>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.javanew file mode 100644index 0000000000..ec711fc557--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTabOptionPanel.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.project.builds.detail.report;++import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Project;+import io.onedev.server.model.support.BuildMetric;+import io.onedev.server.search.buildmetric.BuildMetricQuery;+import io.onedev.server.search.buildmetric.BuildMetricQueryParser;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.stats.buildmetric.BuildMetricStatsPage;++@SuppressWarnings("serial")+class BuildReportTabOptionPanel extends Panel {++ private final Class<? extends BuildMetricStatsPage<?>> statsPageClass;++ private final String reportName;++ public BuildReportTabOptionPanel(String id, Class<? extends BuildMetricStatsPage<?>> statsPageClass, String reportName) {+ super(id);+ this.statsPageClass = statsPageClass;+ this.reportName = reportName;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ String query = String.format("%s \"last month\" and \"%s\" %s \"%s\"",+ BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since),+ BuildMetric.NAME_REPORT,+ BuildMetricQuery.getRuleName(BuildMetricQueryParser.Is),+ reportName);+ PageParameters params = BuildMetricStatsPage.paramsOf(Project.get(), query);+ add(new ViewStateAwarePageLink<>("link", statsPageClass, params));+ }++}diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.javaindex 6ee9284180..e07a9e7551 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.java@@ -132,8 +132,8 @@ public class CheckstylePluginModule extends AbstractPluginModule {if (build.getReportDir(JobCheckstyleReport.DIR).exists()) {for (File reportDir: build.getReportDir(JobCheckstyleReport.DIR).listFiles()) {if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName())) {- tabs.add(new BuildReportTab(reportDir.getName(),- CheckstyleFilesPage.class, CheckstyleRulesPage.class));+ tabs.add(new BuildReportTab(reportDir.getName(), CheckstyleFilesPage.class,+ CheckstyleRulesPage.class, CheckstyleStatsPage.class));}}}diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.html b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.htmlindex 405fb492ab..797ccbf519 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.html+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.html@@ -3,7 +3,4 @@<ul wicket:id="reportTabs" class="tabs nav nav-tabs nav-tabs-line mb-5 flex-shrink-0"></ul><wicket:child></wicket:child></div>- <wicket:fragment wicket:id="trendingFrag">- <a wicket:id="link" title="Checkstyle trending" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="stats" class="icon"/></a>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.javaindex cc5d05c71b..7c6b9916f4 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.java@@ -13,16 +13,12 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.LockUtils;import io.onedev.server.code.CodeProblem.Severity;-import io.onedev.server.model.support.BuildMetric;-import io.onedev.server.search.buildmetric.BuildMetricQuery;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.tabbable.PageTabHead;@@ -114,20 +110,6 @@ public class CheckstyleReportPage extends BuildReportPage {super(title, pageClass);}- @Override- protected Component renderOptions(String componentId) {- Fragment fragment = new Fragment(componentId, "trendingFrag", CheckstyleReportPage.this);-- String query = String.format("%s \"last month\" and \"%s\" %s \"%s\"",- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since),- BuildMetric.NAME_REPORT,- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Is),- getReportName());- PageParameters params = CheckstyleStatsPage.paramsOf(getProject(), query);- fragment.add(new ViewStateAwarePageLink<>("link", CheckstyleStatsPage.class, params));- return fragment;- }-@Overridepublic Component render(String componentId) {return new PageTabHead(componentId, this) {diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.javaindex 0edf5e610f..7f12bd3fc5 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java@@ -129,8 +129,10 @@ public class CloverPluginModule extends AbstractPluginModule {public Void call() throws Exception {if (build.getReportDir(JobCloverReport.DIR).exists()) {for (File reportDir: build.getReportDir(JobCloverReport.DIR).listFiles()) {- if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName()))- tabs.add(new BuildReportTab(reportDir.getName(), CloverReportPage.class));+ if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName())) {+ tabs.add(new BuildReportTab(reportDir.getName(), CloverReportPage.class,+ CloverStatsPage.class));+ }}}return null;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.htmlindex 68019e084d..e61178f2a9 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html@@ -2,31 +2,29 @@<div class="clover-report"><div wicket:id="cloverTitle" class="title h4 mb-3 text-break"></div><div wicket:id="coverages" class="coverages mb-5"></div>- <div class="items rounded border">- <div wicket:id="itemsTitle" class="title p-3 font-weight-bold border-bottom bg-light"></div>- <div class="p-4">- <form wicket:id="form">- <div class="operations d-flex flex-nowrap">- <div class="clearable-wrapper flex-grow-1 mr-3">- <div class="input-group">- <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off">- <span class="input-group-append">- <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>- </span>- </div>+ <div class="items">+ <div wicket:id="itemsTitle" class="title h4 mb-3 font-weight-bold"></div>+ <form wicket:id="form">+ <div class="operations d-flex flex-nowrap">+ <div class="clearable-wrapper flex-grow-1 mr-3">+ <div class="input-group">+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off">+ <span class="input-group-append">+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span></div>- <a wicket:id="orderBy" class="order-by btn btn-primary flex-shrink-0">Order By <wicket:svg href="arrow" class="dropdown-caret icon rotate-90"/></a></div>- <div wicket:id="feedback" class="mt-3"></div>- </form>- <div wicket:id="itemsContainer">- <div wicket:id="items" class="item border-top border-secondary mt-4 pt-4">- <a wicket:id="name" class="name font-weight-bold text-break"><span wicket:id="label"></span></a>- <div wicket:id="coverages" class="coverages mt-3"></div>- </div>- <div wicket:id="pagingNavigator" class="mt-4"></div>- <div wicket:id="noRecords"></div>+ <a wicket:id="orderBy" class="order-by btn btn-primary flex-shrink-0">Order By <wicket:svg href="arrow" class="dropdown-caret icon rotate-90"/></a>+ </div>+ <div wicket:id="feedback" class="mt-3"></div>+ </form>+ <div wicket:id="itemsContainer">+ <div wicket:id="items" class="item mt-4">+ <a wicket:id="name" class="name font-weight-bold text-break"><span wicket:id="label"></span></a>+ <div wicket:id="coverages" class="coverages mt-3"></div></div>+ <div wicket:id="pagingNavigator" class="mt-4"></div>+ <div wicket:id="noRecords"></div></div></div></div>diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.cssindex 748e246d3c..2ac9539f34 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css@@ -1,7 +1,3 @@-.clover-report .items .item {- border-top-style: dashed !important;-}-.coverages>.coverage {margin-right: 1.2rem;width: 10%;diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.javaindex 1fbd479988..cd3110a972 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java@@ -66,8 +66,10 @@ public class JestTestReportModule extends AbstractPluginModule {public Void call() throws Exception {if (build.getReportDir(JobJestReport.DIR).exists()) {for (File reportDir: build.getReportDir(JobJestReport.DIR).listFiles()) {- if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName()))- tabs.add(new BuildReportTab(reportDir.getName(), JestTestSuitesPage.class, JestTestCasesPage.class));+ if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName())) {+ tabs.add(new BuildReportTab(reportDir.getName(), JestTestSuitesPage.class,+ JestTestCasesPage.class, JestTestStatsPage.class));+ }}}return null;diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.html b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.htmlindex 550de86aba..4d87115770 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.html+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.html@@ -3,7 +3,4 @@<ul wicket:id="reportTabs" class="tabs nav nav-tabs nav-tabs-line mb-5 flex-shrink-0 test-detail"></ul><wicket:child></wicket:child></div>- <wicket:fragment wicket:id="trendingFrag">- <a wicket:id="link" title="Jest test trending" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="stats" class="icon"/></a>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.javaindex 2420b10c9b..783a34c11b 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java@@ -12,15 +12,11 @@ import org.apache.wicket.Page;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.model.support.BuildMetric;-import io.onedev.server.search.buildmetric.BuildMetricQuery;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;@@ -86,20 +82,6 @@ public abstract class JestTestReportPage extends BuildReportPage {public JestReportTab(String title, Class<? extends JestTestReportPage> pageClass) {super(title, pageClass);}-- @Override- protected Component renderOptions(String componentId) {- Fragment fragment = new Fragment(componentId, "trendingFrag", JestTestReportPage.this);-- String query = String.format("%s \"last month\" and \"%s\" %s \"%s\"",- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since),- BuildMetric.NAME_REPORT,- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Is),- getReportName());- PageParameters params = JestTestStatsPage.paramsOf(getProject(), query);- fragment.add(new ViewStateAwarePageLink<>("link", JestTestStatsPage.class, params));- return fragment;- }@Overridepublic Component render(String componentId) {