The Unified and Autonomous Development Platform
Able to switch between different builds when stay on html report page
Robin Shenad31fa72b805
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.htmlindex aa9dc91262..8b538e115f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html@@ -2,7 +2,7 @@<div wicket:id="content" class="changes"></div><wicket:fragment wicket:id="availableFrag"><div wicket:id="commits"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes in the build compared to all previous builds in job '<span wicket:id="jobName"></span>'</div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since all previous builds in job '<span wicket:id="jobName"></span>'</div></wicket:fragment><wicket:fragment wicket:id="notAvailableFrag"><div class="alert alert-warning">Changes not calcualted yet, please wait a while and refresh again</div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex bc95c4d7c1..0ef52e8650 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -324,8 +324,7 @@ public abstract class BuildDetailPage extends ProjectPage {@Overridepublic void navTo(AjaxRequestTarget target, Build entity, QueryPosition position) {- PageParameters params = BuildDetailPage.paramsOf(entity, position);- setResponsePage(getPageClass(), params);+ BuildDetailPage.this.navTo(target, entity, position);}};@@ -382,4 +381,9 @@ public abstract class BuildDetailPage extends ProjectPage {return params;}+ protected void navTo(AjaxRequestTarget target, Build entity, QueryPosition position) {+ PageParameters params = BuildDetailPage.paramsOf(entity, position);+ setResponsePage(getPageClass(), params);+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.htmlindex 9add108715..ddf36397c7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html@@ -2,7 +2,7 @@<div wicket:id="content" class="issues"></div><wicket:fragment wicket:id="availableFrag"><div wicket:id="issues"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues in the build compared to all previous builds in job '<span wicket:id="jobName"></span>'</div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since all previous builds in job '<span wicket:id="jobName"></span>'</div></wicket:fragment><wicket:fragment wicket:id="notAvailableFrag"><div class="alert alert-warning">Fixed issues not calcualted yet, please wait a while and refresh again</div>diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.javaindex 10b273be4e..a8e3e2a902 100644--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java@@ -58,130 +58,134 @@ public class BuildArtifactsPage extends BuildDetailPage {public void onInitialize() {super.onInitialize();- List<IColumn<File, Void>> columns = new ArrayList<>();-- columns.add(new TreeColumn<File, Void>(Model.of("Name")));- columns.add(new AbstractColumn<File, Void>(Model.of("Size")) {-- @Override- public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {- File file = rowModel.getObject();- if (file.isDirectory())- cellItem.add(new Label(componentId, ""));- else- cellItem.add(new Label(componentId, FileUtils.byteCountToDisplaySize(file.length())));- }+ if (getArtifactsDir().exists()) {+ List<IColumn<File, Void>> columns = new ArrayList<>();- });- columns.add(new AbstractColumn<File, Void>(Model.of("Last Modified")) {-- @Override- public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {- File file = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(file.lastModified()))));- }+ columns.add(new TreeColumn<File, Void>(Model.of("Name")));+ columns.add(new AbstractColumn<File, Void>(Model.of("Size")) {++ @Override+ public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {+ File file = rowModel.getObject();+ if (file.isDirectory())+ cellItem.add(new Label(componentId, ""));+ else+ cellItem.add(new Label(componentId, FileUtils.byteCountToDisplaySize(file.length())));+ }++ });+ columns.add(new AbstractColumn<File, Void>(Model.of("Last Modified")) {++ @Override+ public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {+ File file = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(file.lastModified()))));+ }++ });- });-- ITreeProvider<File> dataProvider = new ITreeProvider<File>() {+ ITreeProvider<File> dataProvider = new ITreeProvider<File>() {- @Override- public void detach() {- }+ @Override+ public void detach() {+ }- @Override- public Iterator<? extends File> getChildren(File node) {- List<File> dirs = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {+ @Override+ public Iterator<? extends File> getChildren(File node) {+ List<File> dirs = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {- @Override- public boolean accept(File pathname) {- return pathname.isDirectory();- }-- })));- dirs.sort(Comparator.comparing(File::getName));+ @Override+ public boolean accept(File pathname) {+ return pathname.isDirectory();+ }++ })));+ dirs.sort(Comparator.comparing(File::getName));- List<File> files = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {+ List<File> files = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {- @Override- public boolean accept(File pathname) {- return pathname.isFile();- }+ @Override+ public boolean accept(File pathname) {+ return pathname.isFile();+ }++ })));+ files.sort(Comparator.comparing(File::getName));++ List<File> children = new ArrayList<>();+ children.addAll(dirs);+ children.addAll(files);- })));- files.sort(Comparator.comparing(File::getName));+ return children.iterator();+ }- List<File> children = new ArrayList<>();- children.addAll(dirs);- children.addAll(files);+ @Override+ public Iterator<? extends File> getRoots() {+ return getChildren(getArtifactsDir());+ }++ @Override+ public boolean hasChildren(File node) {+ return node.isDirectory() && node.listFiles().length != 0;+ }++ @Override+ public IModel<File> model(File object) {+ return Model.of(object);+ }- return children.iterator();- }-- @Override- public Iterator<? extends File> getRoots() {- return getChildren(getArtifactsDir());- }-- @Override- public boolean hasChildren(File node) {- return node.isDirectory() && node.listFiles().length != 0;- }-- @Override- public IModel<File> model(File object) {- return Model.of(object);- }+ };- };-- add(new TableTree<File, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {-- @Override- protected void onInitialize() {- super.onInitialize();- getTable().addTopToolbar(new HeadersToolbar<Void>(getTable(), null));- getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));- add(new HumanTheme());- }-- @Override- protected Item<File> newRowItem(String id, int index, IModel<File> model) {- return new OddEvenItem<File>(id, index, model);- }-- @Override- protected Component newContentComponent(String id, IModel<File> model) {- Fragment fragment = new Fragment(id, "contentFrag", BuildArtifactsPage.this);- File file = model.getObject();- WebMarkupContainer link;- if (file.isDirectory()) {- link = new AjaxLink<Void>("link") {+ add(new TableTree<File, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getTable().addTopToolbar(new HeadersToolbar<Void>(getTable(), null));+ getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));+ add(new HumanTheme());+ }- @Override- public void onClick(AjaxRequestTarget target) {- if (getState(file) == State.EXPANDED)- collapse(file);- else- expand(file);- }-- };- link.add(AttributeAppender.append("class", "folder"));- } else {- String artifactPath = getArtifactsDir().toURI().relativize(file.toURI()).getPath();- PageParameters params = ArtifactDownloadResource.paramsOf(- getBuild().getProject(), getBuild().getNumber(), artifactPath);- link = new ResourceLink<Void>("link", new ArtifactDownloadResourceReference(), params);- link.add(AttributeAppender.append("class", "file"));+ @Override+ protected Item<File> newRowItem(String id, int index, IModel<File> model) {+ return new OddEvenItem<File>(id, index, model);+ }++ @Override+ protected Component newContentComponent(String id, IModel<File> model) {+ Fragment fragment = new Fragment(id, "contentFrag", BuildArtifactsPage.this);+ File file = model.getObject();+ WebMarkupContainer link;+ if (file.isDirectory()) {+ link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (getState(file) == State.EXPANDED)+ collapse(file);+ else+ expand(file);+ }++ };+ link.add(AttributeAppender.append("class", "folder"));+ } else {+ String artifactPath = getArtifactsDir().toURI().relativize(file.toURI()).getPath();+ PageParameters params = ArtifactDownloadResource.paramsOf(+ getBuild().getProject(), getBuild().getNumber(), artifactPath);+ link = new ResourceLink<Void>("link", new ArtifactDownloadResourceReference(), params);+ link.add(AttributeAppender.append("class", "file"));+ }+ link.add(new Label("label", file.getName()));+ fragment.add(link);++ return fragment;}- link.add(new Label("label", file.getName()));- fragment.add(link);- return fragment;- }-- });+ });+ } else {+ add(new Label("artifacts", "No artifacts published").add(AttributeAppender.append("class", "alert alert-warning")));+ }}private File getArtifactsDir() {diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.javaindex f9d5c0c587..2094bf8627 100644--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java@@ -8,17 +8,19 @@ import java.util.concurrent.Callable;import javax.annotation.Nullable;import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.OneException;import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;import io.onedev.server.security.SecurityUtils;@@ -72,7 +74,15 @@ public class HtmlReportPage extends BuildDetailPage {}.add(AttributeAppender.append("src", startPageUrl.toString())));} else {- throw new OneException("Unable to find html report: " + reportName);+ add(new Label("htmlReport", "No html report published: " + reportName) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("div");+ }++ }.add(AttributeAppender.append("class", "alert alert-warning")));}}@@ -85,6 +95,13 @@ public class HtmlReportPage extends BuildDetailPage {return reportName;}+ @Override+ protected void navTo(AjaxRequestTarget target, Build entity, QueryPosition position) {+ PageParameters params = BuildDetailPage.paramsOf(entity, position);+ params.add(PARAM_REPORT, getReportName());+ setResponsePage(getPageClass(), params);+ }+public static PageParameters paramsOf(Build build, @Nullable QueryPosition position, String reportName) {PageParameters params = paramsOf(build, position);params.add(PARAM_REPORT, reportName);