Skip to content

The Unified and Autonomous Development Platform

Fix issue #1152 - Able to run pull request manually

Robin Shen35b8595ac62f
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 3c23066d10..885097841d 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -344,6 +344,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
private transient List<Milestone> sortedMilestones;
private transient Optional<UUID> storageServerUUID;
+
+ private transient Map<ObjectId, Collection<Build>> buildsCache;
@Editable(order=100)
@ProjectName
@@ -1624,5 +1626,17 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
public static String getSiteLockName(Long projectId) {
return "project-site:" + projectId;
}
-
+
+ public Collection<Build> getBuilds(ObjectId commitId) {
+ if (buildsCache == null)
+ buildsCache = new HashMap<>();
+ Collection<Build> builds = buildsCache.get(commitId);
+ if (builds == null) {
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ builds = buildManager.query(this, commitId, null, null, null, new HashMap<>(), null);
+ buildsCache.put(commitId, builds);
+ }
+ return builds;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 6ef9bf4ec1..238c5df339 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -327,6 +327,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModify(PullRequest request) {
User user = SecurityUtils.getUser();
return user != null && user.equals(request.getSubmitter())
+ || user != null && request.getAssignees().contains(user)
|| canManagePullRequests(request.getTargetProject());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 35c94003b4..fb55b9f769 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -260,6 +260,10 @@ public abstract class CommitListPanel extends Panel {
protected abstract Project getProject();
+ protected String getRefName() {
+ return null;
+ }
+
@Nullable
protected String getCompareWith() {
return null;
@@ -658,7 +662,7 @@ public abstract class CommitListPanel extends Panel {
});
- item.add(new CommitStatusLink("buildStatus", commit.copy(), null) {
+ item.add(new CommitStatusLink("buildStatus", commit.copy(), getRefName()) {
@Override
protected Project getProject() {
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.java
index b6f3728ce5..f85eb21da5 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
@@ -1,45 +1,8 @@
package io.onedev.server.web.page.project;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityNotFoundException;
-import javax.servlet.http.HttpServletResponse;
-
-import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
-import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.Request;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-
import com.google.common.collect.Lists;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Build;
@@ -91,21 +54,49 @@ import io.onedev.server.web.page.project.setting.ProjectSettingContribution;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
-import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;
import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;
import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;
import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;
import io.onedev.server.web.page.project.setting.build.JobSecretsPage;
import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;
+import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;
+import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
+import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;
+import io.onedev.server.web.page.project.setting.code.tagprotection.TagProtectionsPage;
import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;
import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;
import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;
-import io.onedev.server.web.page.project.setting.code.tagprotection.TagProtectionsPage;
import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
import io.onedev.server.web.page.project.stats.ProjectContribsPage;
import io.onedev.server.web.page.project.stats.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.util.ProjectAware;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.persistence.EntityNotFoundException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@@ -545,18 +536,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
protected abstract Component newProjectTitle(String componentId);
- protected Collection<Build> getBuilds(ObjectId commitId) {
- if (buildsCache == null)
- buildsCache = new HashMap<>();
- Collection<Build> builds = buildsCache.get(commitId);
- if (builds == null) {
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- builds = buildManager.query(getProject(), commitId, null, null, null, new HashMap<>(), null);
- buildsCache.put(commitId, builds);
- }
- return builds;
- }
-
public static PageParameters paramsOf(Long projectId) {
ProjectFacade project = getProjectManager().findFacadeById(projectId);
return paramsOf(project.getPath());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index d98cc50cfe..7ff745d5bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -788,7 +788,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public Collection<CodeProblem> getOldProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
- for (Build build: getBuilds(getCompareWith())) {
+ for (Build build: getProject().getBuilds(getCompareWith())) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -798,7 +798,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public Collection<CodeProblem> getNewProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
- for (Build build: getBuilds(getCommit())) {
+ for (Build build: getProject().getBuilds(getCommit())) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -808,7 +808,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public Map<Integer, CoverageStatus> getOldCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
- for (Build build: getBuilds(getCompareWith())) {
+ for (Build build: getProject().getBuilds(getCompareWith())) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
@@ -821,7 +821,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public Map<Integer, CoverageStatus> getNewCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
- for (Build build: getBuilds(getCommit())) {
+ for (Build build: getProject().getBuilds(getCommit())) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index b3eec291bb..a18c2ea060 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -256,8 +256,8 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
if (leftCommitId != null && rightCommitId != null) {
mergeBase = getGitService().getMergeBase(
- state.leftSide.getProject(), leftCommitId,
- state.rightSide.getProject(), rightCommitId);
+ state.rightSide.getProject(), rightCommitId,
+ state.leftSide.getProject(), leftCommitId);
}
}
@@ -708,7 +708,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
protected Project getProject() {
- return RevisionComparePage.this.getProject();
+ return state.rightSide.getProject();
}
};
@@ -931,7 +931,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
public Collection<CodeProblem> getOldProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;
- for (Build build: getBuilds(oldCommitId)) {
+ for (Build build: state.leftSide.getProject().getBuilds(oldCommitId)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -941,7 +941,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
public Collection<CodeProblem> getNewProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
- for (Build build: getBuilds(rightCommitId)) {
+ for (Build build: state.rightSide.getProject().getBuilds(rightCommitId)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -952,7 +952,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
public Map<Integer, CoverageStatus> getOldCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;
- for (Build build: getBuilds(oldCommitId)) {
+ for (Build build: state.leftSide.getProject().getBuilds(oldCommitId)) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
@@ -965,7 +965,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
public Map<Integer, CoverageStatus> getNewCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
- for (Build build: getBuilds(rightCommitId)) {
+ for (Build build: state.rightSide.getProject().getBuilds(rightCommitId)) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 8d05316bd5..8f4484e593 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -466,6 +466,11 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
}
+ @Override
+ protected String getRefName() {
+ return NewPullRequestPage.this.getPullRequest().getSourceRef();
+ }
+
@Override
protected Project getProject() {
return NewPullRequestPage.this.getPullRequest().getSourceProject();
@@ -993,7 +998,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
public Collection<CodeProblem> getOldProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
ObjectId baseCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());
- for (Build build: getBuilds(baseCommitId)) {
+ for (Build build: target.getProject().getBuilds(baseCommitId)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -1003,7 +1008,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
@Override
public Collection<CodeProblem> getNewProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
- for (Build build: getBuilds(source.getObjectId())) {
+ for (Build build: source.getProject().getBuilds(source.getObjectId())) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, blobPath, null));
}
@@ -1014,7 +1019,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
public Map<Integer, CoverageStatus> getOldCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
ObjectId baseCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());
- for (Build build: getBuilds(baseCommitId)) {
+ for (Build build: target.getProject().getBuilds(baseCommitId)) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
@@ -1027,7 +1032,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
@Override
public Map<Integer, CoverageStatus> getNewCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
- for (Build build: getBuilds(source.getObjectId())) {
+ for (Build build: source.getProject().getBuilds(source.getObjectId())) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {
coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 1786171f4a..c338e6541d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -78,7 +78,12 @@
</div>
<wicket:enclosure child="untriggeredJobs">
<div class="untriggered-builds text-warning">
- <wicket:svg href="warning" class="icon"></wicket:svg> <span wicket:id="untriggeredJobs"></span>
+ <wicket:svg href="warning" class="icon"></wicket:svg>
+ Jobs required to be successful on merge commit:
+ <span wicket:id="untriggeredJobs" class="d-inline-block mr-2">
+ <span wicket:id="jobName"></span>
+ <a wicket:id="runJob" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
+ </span>
</div>
</wicket:enclosure>
<div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">
@@ -192,14 +197,14 @@
</wicket:fragment>
<wicket:fragment wicket:id="cloneFrag">
<div class="p-4">
- <h6>Checkout Pull Request Head</h6>
- <div class="code">
+ <div class="font-weight-bolder font-size-lg mb-2">Checkout Pull Request Head</div>
+ <div class="code font-size-sm">
<div>git fetch origin <span wicket:id="headRef"></span></div>
<div>git checkout FETCH_HEAD</div>
</div>
<wicket:enclosure child="mergeRef">
- <h6 class="mt-4">Checkout Pull Request Merge Preview</h6>
- <div class="code">
+ <div class="font-weight-bolder font-size-lg mt-4 mb-2">Checkout Pull Request Merge Preview</div>
+ <div class="code font-size-sm">
<div>git fetch origin <span wicket:id="mergeRef"></span></div>
<div>git checkout FETCH_HEAD</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index afa5effa33..b080fc2b6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -1,82 +1,14 @@
package io.onedev.server.web.page.project.pullrequests.detail;
-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;
-import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
-import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.persistence.EntityNotFoundException;
-import javax.validation.ValidationException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-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.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import com.google.common.collect.Sets;
-
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.entitymanager.PullRequestLabelManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.PullRequestReviewManager;
-import io.onedev.server.entitymanager.PullRequestWatchManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.RefFacade;
import io.onedev.server.infomanager.VisitInfoManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestLabel;
-import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
-import io.onedev.server.model.PullRequestWatch;
-import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -98,6 +30,7 @@ import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.reference.ReferencePanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.menu.MenuItem;
@@ -127,12 +60,52 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.CommentableOperationConfirmPanel;
import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.MergeConfirmPanel;
-import io.onedev.server.web.util.ConfirmClickModifier;
-import io.onedev.server.web.util.Cursor;
-import io.onedev.server.web.util.CursorSupport;
-import io.onedev.server.web.util.PullRequestAware;
-import io.onedev.server.web.util.ReferenceTransformer;
+import io.onedev.server.web.util.*;
import io.onedev.server.web.util.editablebean.LabelsBean;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+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.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.*;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+import org.jetbrains.annotations.Nullable;
+
+import javax.persistence.EntityNotFoundException;
+import javax.validation.ValidationException;
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;
@SuppressWarnings("serial")
public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {
@@ -590,29 +563,55 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
- summaryContainer.add(new Label("untriggeredJobs", new LoadableDetachableModel<String>() {
-
+ summaryContainer.add(new ListView<String>("untriggeredJobs", new LoadableDetachableModel<List<String>>() {
@Override
- protected String load() {
- Collection<String> requiredJobs = new ArrayList<>(getPullRequest().getRequiredJobs());
- requiredJobs.removeAll(getPullRequest().getCurrentBuilds().stream().map(it->it.getJobName()).collect(Collectors.toSet()));
- if (requiredJobs.size() > 1) {
- return "Jobs \"" + StringUtils.join(requiredJobs, ", ") + "\" are required to be successful, "
- + "however no applicable pull request trigger is defined for these jobs in build spec";
- } else if (requiredJobs.size() == 1) {
- return "Job '" + requiredJobs.iterator().next() + "' is required to be successful, "
- + "however no applicable pull request trigger is defined for this job in build spec";
- } else {
- return null;
- }
+ protected List<String> load() {
+ List<String> requiredJobs = new ArrayList<>(getPullRequest().getRequiredJobs());
+ requiredJobs.removeAll(getPullRequest().getCurrentBuilds().stream().map(Build::getJobName).collect(Collectors.toSet()));
+ return requiredJobs;
}
}) {
-
+
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ String jobName = item.getModelObject();
+ item.add(new Label("jobName", jobName));
+ item.add(new RunJobLink("runJob",
+ ObjectId.fromString(getPullRequest().getMergePreview().getMergeCommitHash()),
+ jobName, getPullRequest().getMergeRef()) {
+
+ @Override
+ protected Project getProject() {
+ return PullRequestDetailPage.this.getProject();
+ }
+
+ @Override
+ protected String getPipeline() {
+ return UUID.randomUUID().toString();
+ }
+
+ @Nullable
+ @Override
+ protected PullRequest getPullRequest() {
+ return PullRequestDetailPage.this.getPullRequest();
+ }
+
+ @Override
+ protected void onConfigure() {
+ setVisible(SecurityUtils.canRunJob(getProject(), jobName)
+ || SecurityUtils.canModify(getPullRequest()));
+ }
+ });
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getPullRequest().isOpen() && getDefaultModelObject() != null);
+ setVisible(getPullRequest().isOpen()
+ && getPullRequest().getMergePreview() != null
+ && getPullRequest().getMergePreview().getMergeCommitHash() != null
+ && !getModelObject().isEmpty());
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index 2b37a99c7b..1452c00394 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -101,17 +102,36 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
}
});
- item.add(new CommitStatusLink("buildStatus", commit.copy(), null) {
+
+ String refName = getUpdate().getRequest().getSourceRef();
+ item.add(new CommitStatusLink("buildStatus", commit.copy(), refName) {
@Override
protected Project getProject() {
- return getUpdate().getRequest().getTarget().getProject();
+ return getUpdate().getRequest().getSourceProject();
}
@Override
protected PullRequest getPullRequest() {
return null;
}
+
+ @Override
+ protected Collection<String> getWebSocketObservables() {
+ if (getUpdate().getRequest().getSourceProject() != null)
+ return super.getWebSocketObservables();
+ else
+ return new ArrayList<>();
+ }
+
+ @Override
+ protected void onConfigure() {
+ if (getUpdate().getRequest().getSourceProject() != null) {
+ super.onConfigure();
+ } else {
+ setVisible(false);
+ }
+ }
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index e568c80daa..ff0eab8bd0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -968,7 +968,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
public Collection<CodeProblem> getOldProblems(String blobPath) {
Set<CodeProblem> problems = new HashSet<>();
ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);
- for (Build build: getBuilds(buildCommitId)) {
+ for (Build build: getProject().getBuilds(buildCommitId)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {
if (!buildCommitId.equals(getComparisonBase())) {
@@ -990,16 +990,23 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
@Override
public Collection<CodeProblem> getNewProblems(String blobPath) {
ObjectId buildCommitId;
+ Collection<Build> builds;
MergePreview preview = getPullRequest().getMergePreview();
if (preview != null && preview.getMergeCommitHash() != null
- && state.newCommitHash.equals(preview.getHeadCommitHash())) {
+ && state.newCommitHash.equals(preview.getHeadCommitHash())
+ && !getPullRequest().getCurrentBuilds().isEmpty()) {
buildCommitId = ObjectId.fromString(preview.getMergeCommitHash());
+ builds = getProject().getBuilds(buildCommitId);
} else {
buildCommitId = ObjectId.fromString(state.newCommitHash);
+ if (getPullRequest().getSourceProject() != null)
+ builds = getPullRequest().getSourceProject().getBuilds(buildCommitId);
+ else
+ builds = new ArrayList<>();
}
-
+
Set<CodeProblem> problems = new HashSet<>();
- for (Build build: getBuilds(buildCommitId)) {
+ for (Build build: builds) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {
if (!state.newCommitHash.equals(buildCommitId.name())) {
@@ -1023,7 +1030,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
public Map<Integer, CoverageStatus> getOldCoverages(String blobPath) {
Map<Integer, CoverageStatus> coverages = new HashMap<>();
ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);
- for (Build build: getBuilds(buildCommitId)) {
+ for (Build build: getProject().getBuilds(buildCommitId)) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
for (Map.Entry<Integer, CoverageStatus> entry: contribution.getLineCoverages(build, blobPath, null).entrySet()) {
if (!buildCommitId.equals(getComparisonBase())) {
@@ -1042,21 +1049,28 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
@Override
public Map<Integer, CoverageStatus> getNewCoverages(String blobPath) {
- ObjectId commitId;
+ ObjectId buildCommitId;
+ Collection<Build> builds;
MergePreview preview = getPullRequest().getMergePreview();
if (preview != null && preview.getMergeCommitHash() != null
- && state.newCommitHash.equals(preview.getHeadCommitHash())) {
- commitId = ObjectId.fromString(preview.getMergeCommitHash());
+ && state.newCommitHash.equals(preview.getHeadCommitHash())
+ && !getPullRequest().getCurrentBuilds().isEmpty()) {
+ buildCommitId = ObjectId.fromString(preview.getMergeCommitHash());
+ builds = getProject().getBuilds(buildCommitId);
} else {
- commitId = ObjectId.fromString(state.newCommitHash);
+ buildCommitId = ObjectId.fromString(state.newCommitHash);
+ if (getPullRequest().getSourceProject() != null)
+ builds = getPullRequest().getSourceProject().getBuilds(buildCommitId);
+ else
+ builds = new ArrayList<>();
}
Map<Integer, CoverageStatus> coverages = new HashMap<>();
- for (Build build: getBuilds(commitId)) {
+ for (Build build: builds) {
for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
for (Map.Entry<Integer, CoverageStatus> entry: contribution.getLineCoverages(build, blobPath, null).entrySet()) {
- if (!state.newCommitHash.equals(commitId.name())) {
- Map<Integer, Integer> lineMapping = getLineMapping(commitId,
+ if (!state.newCommitHash.equals(buildCommitId.name())) {
+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId,
ObjectId.fromString(state.newCommitHash), blobPath);
Integer mappedLine = lineMapping.get(entry.getKey());
if (mappedLine != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 8174d2ba23..841b3df155 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -34,12 +34,18 @@
margin-left: -2px;
margin-right: 4px;
}
+.pull-request-detail>.card-body>.main>.summary .untriggered-builds .icon {
+ width: 16px;
+ height: 16px;
+ margin-bottom: 1px;
+}
.pull-request-detail>.card-body>.main>.summary>.contribution {
border-top: 1px dashed var(--light-gray);
padding-top: 1rem;
margin-top: 1rem;
font-size: 1rem !important;
}
+
.dark-mode .pull-request-detail>.card-body>.main>.summary>.contribution {
border-top-color: var(--dark-mode-dark-gray);
}