The Unified and Autonomous Development Platform
Prompt to delete build if associated commit does not exist
Robin Shened49893a9998
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex e2531497c7..d10adde1cd 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -734,6 +734,10 @@ public class Build extends AbstractEntity implements Referenceable {stack.get().pop();}+ public boolean isValid() {+ return getProject().getRevCommit(getCommitHash(), false) != null;+ }+@Nullablepublic static Build get() {if (!stack.get().isEmpty()) {diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex d6f119d9de..4501e556d3 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -54,6 +54,7 @@ import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;@@ -216,6 +217,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));add(new OnePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));add(new OnePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex cbeda7a063..a881382baa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -41,6 +41,7 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;@@ -202,7 +203,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {0, ProjectTagsPage.class));tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, ProjectPullRequestsPage.class, NewPullRequestPage.class, PullRequestDetailPage.class, InvalidPullRequestPage.class) {+ 0, ProjectPullRequestsPage.class, NewPullRequestPage.class, PullRequestDetailPage.class,+ InvalidPullRequestPage.class) {@Overridepublic Component render(String componentId) {@@ -212,8 +214,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});}- tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, ProjectIssueListPage.class, ProjectIssuesPage.class,- IssueDetailPage.class, NewIssuePage.class) {+ tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, ProjectIssueListPage.class,+ ProjectIssuesPage.class, IssueDetailPage.class, NewIssuePage.class) {@Overridepublic Component render(String componentId) {@@ -222,7 +224,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});- tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-cubes", 0, ProjectBuildsPage.class, BuildDetailPage.class) {+ tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-cubes", 0, ProjectBuildsPage.class,+ BuildDetailPage.class, InvalidBuildPage.class) {@Overridepublic Component render(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex a5f140bfd3..284d36d7e2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -12,6 +12,7 @@ import javax.annotation.Nullable;import javax.persistence.EntityNotFoundException;import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;@@ -108,6 +109,9 @@ public abstract class BuildDetailPage extends ProjectPage};+ if (!getBuild().isValid())+ throw new RestartResponseException(InvalidBuildPage.class, InvalidBuildPage.paramsOf(getBuild()));+position = QueryPosition.from(params);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.htmlnew file mode 100644index 0000000000..d54d9b371e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html@@ -0,0 +1,19 @@+<wicket:extend>+ <div class="invalid-build alert alert-danger">+ <div class="head">+ Unable to show build as corresponding commit no longer exist in the underlying git repository+ </div>+ <div class="body">+ This might happen for two reasons:+ <ul>+ <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,+ or make sure that the correct global storage directory is specified.</li>+ <li> The commit is no longer needed and have been garbage collected.+ <wicket:enclosure child="delete">+ In this case, you may also <a wicket:id="delete">delete the build</a>+ </wicket:enclosure>+ </li>+ </ul>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.javanew file mode 100644index 0000000000..72b54b84b8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java@@ -0,0 +1,94 @@+package io.onedev.server.web.page.project.builds.detail;++import javax.persistence.EntityNotFoundException;++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.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.util.ConfirmOnClick;++@SuppressWarnings("serial")+public class InvalidBuildPage extends ProjectPage {++ public static final String PARAM_BUILD = "build";++ private IModel<Build> buildModel;++ public InvalidBuildPage(PageParameters params) {+ super(params);++ buildModel = new LoadableDetachableModel<Build>() {++ @Override+ protected Build load() {+ Long buildNumber = params.get(PARAM_BUILD).toLong();+ Build build = OneDev.getInstance(BuildManager.class).find(getProject(), buildNumber);+ if (build == null)+ throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());+ Preconditions.checkState(!build.isValid());+ return build;+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ OneDev.getInstance(BuildManager.class).delete(getBuild());+ setResponsePage(ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(getProject()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getBuild()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete build #" + getBuild().getNumber() + "?")));+ }++ public static PageParameters paramsOf(Build build) {+ PageParameters params = ProjectPage.paramsOf(build.getProject());+ params.add(PARAM_BUILD, build.getNumber());+ return params;+ }++ private Build getBuild() {+ return buildModel.getObject();+ }++ @Override+ protected void onDetach() {+ buildModel.detach();+ super.onDetach();+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccess(getBuild());+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new InvalidBuildResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.javanew file mode 100644index 0000000000..7137d83dd7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.builds.detail;++import org.apache.wicket.request.resource.CssResourceReference;++public class InvalidBuildResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public InvalidBuildResourceReference() {+ super(InvalidBuildResourceReference.class, "invalid-build.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.cssnew file mode 100644index 0000000000..a31239ed05--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.css@@ -0,0 +1,5 @@+.invalid-build>.head {+ font-size: 18px;+ font-weight: bold;+ margin-bottom: 20px;+}\ No newline at end of file