Skip to content

The Unified and Autonomous Development Platform

feat: AI user improvements (OD-2839)

Robin Shen8360aec4b211
diff --git a/pom.xml b/pom.xml
index 801dc6be13..8cee168194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,7 +682,7 @@
</repositories>
<properties>
<commons.version>4.0.3</commons.version>
- <agent.version>3.1.7</agent.version>
+ <agent.version>3.1.8</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
index 49aeb63b41..ca0d0487d2 100644
--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java
+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
@@ -219,7 +219,7 @@ public class TodResource {
public VersionInfo checkVersion() {
var versionInfo = new VersionInfo();
versionInfo.serverVersion = OneDev.getInstance().getVersion();
- versionInfo.minRequiredTodVersion = "4.0.0";
+ versionInfo.minRequiredTodVersion = "4.1.0";
return versionInfo;
}
@@ -547,13 +547,18 @@ public class TodResource {
@GET
public Map<String, Object> getIssueDetail(
@QueryParam("currentProject") @NotNull String currentProjectPath,
- @QueryParam("reference") @NotNull String issueReference) {
+ @QueryParam("reference") @NotNull String issueReference,
+ @QueryParam("forWrite") Boolean forWrite) {
var subject = SecurityUtils.getSubject();
if (SecurityUtils.getUser(subject) == null)
throw new UnauthenticatedException();
var currentProject = getProject(currentProjectPath);
var issue = getIssue(currentProject, issueReference);
+
+ if (forWrite != null && forWrite &&!SecurityUtils.canWriteCode(issue.getProject()))
+ throw new UnauthorizedException("No permission to write code in issue project");
+
return IssueHelper.getDetail(subject, currentProject, issue);
}
@@ -1066,12 +1071,22 @@ public class TodResource {
@GET
public Map<String, Object> getPullRequestDetail(
@QueryParam("currentProject") @NotNull String currentProjectPath,
- @QueryParam("reference") @NotNull String pullRequestReference) {
+ @QueryParam("reference") @NotNull String pullRequestReference,
+ @QueryParam("forWrite") Boolean forWrite) {
if (SecurityUtils.getUser() == null)
throw new UnauthenticatedException();
var currentProject = getProject(currentProjectPath);
var pullRequest = getPullRequest(currentProject, pullRequestReference);
+
+ if (forWrite != null && forWrite) {
+ if (pullRequest.getSourceProject() == null)
+ throw new NotAcceptableException("Pull request source project no longer exists");
+
+ if (!SecurityUtils.canWriteCode(pullRequest.getSourceProject()))
+ throw new UnauthorizedException("No permission to write code in pull request source project");
+ }
+
return PullRequestHelper.getDetail(currentProject, pullRequest);
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index f0a2317642..dfe974cffd 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -9090,4 +9090,7 @@ public class DataMigrator {
}
}
+ private void migrate230(File dataDir, Stack<Integer> versions) {
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index df38fa76c5..0f69769bb1 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -399,6 +399,9 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueMention> mentions = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue")
+ private Collection<Workspace> workspaces = new ArrayList<>();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@@ -680,6 +683,14 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
this.mentions = mentions;
}
+ public Collection<Workspace> getWorkspaces() {
+ return workspaces;
+ }
+
+ public void setWorkspaces(Collection<Workspace> workspaces) {
+ this.workspaces = workspaces;
+ }
+
public Collection<IssueAuthorization> getAuthorizations() {
return authorizations;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 11fef0de68..819f742869 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -417,6 +417,9 @@ public class PullRequest extends ProjectBelonging
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestComment> comments = new ArrayList<>();
+ @OneToMany(mappedBy="request")
+ private Collection<Workspace> workspaces = new ArrayList<>();
+
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestChange> changes = new ArrayList<>();
@@ -616,6 +619,14 @@ public class PullRequest extends ProjectBelonging
this.changes = changes;
}
+ public Collection<Workspace> getWorkspaces() {
+ return workspaces;
+ }
+
+ public void setWorkspaces(Collection<Workspace> workspaces) {
+ this.workspaces = workspaces;
+ }
+
public Collection<PullRequestReaction> getReactions() {
return reactions;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Workspace.java b/server-core/src/main/java/io/onedev/server/model/Workspace.java
index e95550d6ac..fdba77d128 100644
--- a/server-core/src/main/java/io/onedev/server/model/Workspace.java
+++ b/server-core/src/main/java/io/onedev/server/model/Workspace.java
@@ -43,6 +43,8 @@ import io.onedev.server.web.util.TextUtils;
indexes={
@Index(columnList="o_user_id"),
@Index(columnList="o_project_id"),
+ @Index(columnList="o_issue_id"),
+ @Index(columnList="o_request_id"),
@Index(columnList="o_agent_id"),
@Index(columnList=Workspace.PROP_SPEC),
@Index(columnList= Workspace.PROP_STATUS),
@@ -66,6 +68,10 @@ public class Workspace extends AbstractEntity {
public static final String PROP_PROJECT = "project";
+ public static final String PROP_ISSUE = "issue";
+
+ public static final String PROP_PULL_REQUEST = "request";
+
public static final String PROP_SPEC = "specName";
public static final String PROP_BRANCH = "branch";
@@ -86,6 +92,10 @@ public class Workspace extends AbstractEntity {
public static final String NAME_PROJECT = "Project";
+ public static final String NAME_ISSUE = "Issue";
+
+ public static final String NAME_PULL_REQUEST = "Pull Request";
+
public static final String NAME_BRANCH = "Branch";
public static final String NAME_COMMIT = "Commit";
@@ -103,7 +113,8 @@ public class Workspace extends AbstractEntity {
public static final String PROP_ACTIVE_DATE = "activeDate";
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- NAME_NUMBER, NAME_PROJECT, NAME_BRANCH, NAME_COMMIT, NAME_SPEC, NAME_CREATE_DATE, NAME_ACTIVE_DATE);
+ NAME_NUMBER, NAME_PROJECT, NAME_ISSUE, NAME_PULL_REQUEST, NAME_BRANCH, NAME_COMMIT,
+ NAME_SPEC, NAME_CREATE_DATE, NAME_ACTIVE_DATE);
public static final Map<String, SortField<Workspace>> SORT_FIELDS = new LinkedHashMap<>();
static {
@@ -141,6 +152,14 @@ public class Workspace extends AbstractEntity {
@JoinColumn(nullable=false)
private Project project;
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn
+ private Issue issue;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn
+ private PullRequest request;
+
@Column(nullable=false)
private String specName;
@@ -213,6 +232,24 @@ public class Workspace extends AbstractEntity {
this.project = project;
}
+ @Nullable
+ public Issue getIssue() {
+ return issue;
+ }
+
+ public void setIssue(@Nullable Issue issue) {
+ this.issue = issue;
+ }
+
+ @Nullable
+ public PullRequest getRequest() {
+ return request;
+ }
+
+ public void setRequest(@Nullable PullRequest request) {
+ this.request = request;
+ }
+
public String getSpecName() {
return specName;
}
@@ -318,8 +355,12 @@ public class Workspace extends AbstractEntity {
this.agent = agent;
}
- public String getRevisionDescription() {
- if (getBranch() != null)
+ public String getOnDescription() {
+ if (getIssue() != null)
+ return "issue " + getIssue().getReference().toString(getProject());
+ else if (getRequest() != null)
+ return "pull request " + getRequest().getReference().toString(getProject());
+ else if (getBranch() != null)
return "branch " + getBranch();
else
return "commit " + GitUtils.abbreviateSHA(getCommitHash());
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 17f1a888dc..c054151116 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -20,6 +20,7 @@ import javax.inject.Singleton;
import javax.mail.internet.InternetAddress;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
@@ -253,7 +254,7 @@ public class IssueNotificationManager implements Serializable {
}
}
} else if (isAiEntitled(null, issue, member) && canCreateWorkspace(member, issue)) {
- handleFieldAssignment(member, issue, entry.getKey());
+ onFieldSet(member, issue, entry.getKey());
}
}
@@ -286,7 +287,7 @@ public class IssueNotificationManager implements Serializable {
}
}
} else if (isAiEntitled(null, issue, assignedUser) && canCreateWorkspace(assignedUser, issue)) {
- handleFieldAssignment(assignedUser, issue, entry.getKey());
+ onFieldSet(assignedUser, issue, entry.getKey());
}
}
@@ -386,46 +387,46 @@ public class IssueNotificationManager implements Serializable {
}
}
+ private Pair<ObjectId, String> getWorkspaceCommitIdAndBranch(Issue issue) {
+ String branch = issue.getBranch();
+ ObjectId commitId;
+ if (branch == null) {
+ commitId = issue.getFieldCommitId();
+ if (commitId == null)
+ commitId = issue.getProject().getObjectId(Preconditions.checkNotNull(issue.getProject().getDefaultBranch()), true);
+ } else {
+ commitId = issue.getProject().getObjectId(branch, true);
+ }
+ return Pair.of(commitId, branch);
+ }
+
private void addressConcern(User ai, User commenter, Issue issue) {
+ var branchAndCommitId = getWorkspaceCommitIdAndBranch(issue);
+ String prompt;
var assignedFields = getAssignedFields(ai, issue);
if (assignedFields.isEmpty()) {
- String branch = issue.getBranch();
- ObjectId commitId;
- if (branch == null) {
- commitId = issue.getFieldCommitId();
- if (commitId == null)
- commitId = issue.getProject().getObjectId(Preconditions.checkNotNull(issue.getProject().getDefaultBranch()), true);
- } else {
- commitId = issue.getProject().getObjectId(branch, true);
- }
- var prompt = """
- Work on issue %d to address %s's concern. \
+ prompt = """
+ Work on issue %d to address %s's latest concern. \
+ Do not switch checkout if the concern does not require you to write code. \
Mention the user in your comment if you expect a response. \
- Stay on current checkout and do not modify code. \
Make sure to submit work afterwards without confirmation."""
.formatted(issue.getNumber(), commenter.getName());
- runPrompt(ai, issue, issue.getProject(), commitId, branch, prompt);
- } else if (canWriteCode(ai, issue)) {
- String branch = issue.getBranch();
- ObjectId commitId;
- if (branch == null)
- branch = issueService.ensureBranch(ai.asSubject(), issue);
- commitId = issue.getProject().getObjectId(branch, true);
- var prompt = """
- Work on issue %d as roles [%s] to address %s's concern. \
+ } else {
+ prompt = """
+ Work on issue %d as roles [%s] to address %s's latest concern. \
+ Do not switch checkout if the concern does not require you to write code. \
Mention the user in your comment if you expect a response. \
- Stay on current checkout to do the job. \
Make sure to submit work afterwards without confirmation.""".
formatted(issue.getNumber(), StringUtils.join(assignedFields, ", "), commenter.getName());
- runPrompt(ai, issue, issue.getProject(), commitId, branch, prompt);
}
+ runPrompt(ai, issue, issue.getProject(), branchAndCommitId.getLeft(), branchAndCommitId.getRight(), prompt);
}
private void runPrompt(User ai, Issue issue, Project project,
ObjectId commitId, @Nullable String branch, String prompt) {
try {
var taskFailedCallback = newTaskFailedCallback(ai.getId(), issue.getId());
- workspaceService.runPrompt(ai, project, commitId, branch, prompt, taskFailedCallback);
+ workspaceService.runPrompt(ai, project, issue, null, commitId, branch, prompt, taskFailedCallback);
} catch (Throwable t) {
var explicitException = ExceptionUtils.find(t, ExplicitException.class);
if (explicitException != null) {
@@ -463,17 +464,14 @@ public class IssueNotificationManager implements Serializable {
return assignedFieldNames;
}
- private void handleFieldAssignment(User ai, Issue issue, String field) {
- if (canWriteCode(ai, issue)) {
- var branch = issueService.ensureBranch(ai.asSubject(), issue);
- var commitId = issue.getProject().getObjectId(branch, true);
- var prompt = """
- Work on issue %d as role '%s'. \
- Stay on current checkout to do the job. \
- Make sure to submit work afterwards without confirmation."""
- .formatted(issue.getNumber(), field);
- runPrompt(ai, issue, issue.getProject(), commitId, branch, prompt);
- }
+ private void onFieldSet(User ai, Issue issue, String field) {
+ var commitIdAndBranch = getWorkspaceCommitIdAndBranch(issue);
+ var prompt = """
+ Work on issue %d as role '%s'. \
+ Do not switch checkout if your role does not need to write code. \
+ Make sure to submit work afterwards without confirmation."""
+ .formatted(issue.getNumber(), field);
+ runPrompt(ai, issue, issue.getProject(), commitIdAndBranch.getLeft(), commitIdAndBranch.getRight(), prompt);
}
private TaskFailedCallback newTaskFailedCallback(Long aiId, Long issueId) {
@@ -564,15 +562,6 @@ public class IssueNotificationManager implements Serializable {
return true;
}
- private boolean canWriteCode(User ai, Issue issue) {
- if (SecurityUtils.canWriteCode(ai.asSubject(), issue.getProject())) {
- return true;
- } else {
- createComment(ai, issue, "I need write code permission in this project to do the job");
- return false;
- }
- }
-
private boolean isAiEntitled(@Nullable User user, Issue issue, User ai) {
if (user != null && user.getId() > 0) {
if (user.isEntitledToAi(ai)) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 5aa347a63b..afb2d8d538 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -26,7 +26,6 @@ import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -312,7 +311,6 @@ public class PullRequestNotificationManager implements Serializable {
replyAddress, senderName, threadingReferences);
}
} else if (isAiEntitled(null, request, reviewer) && canCreateWorkspace(reviewer, request)) {
- var commitId = ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash());
var prompt = """
Work on pull request %d to perform the review. \
Make sure to mention @%s in review summary if you want \
@@ -320,7 +318,8 @@ public class PullRequestNotificationManager implements Serializable {
Stay on current checkout and do not modify code. \
Make sure to submit work afterwards without confirmation."""
.formatted(request.getNumber(), request.getSubmitter().getName());
- runPrompt(reviewer, request, request.getProject(), commitId, null, prompt);
+ var commitId = request.getLatestUpdate().getHeadCommit().copy();
+ runPrompt(reviewer, request, commitId, getWorkspaceBranch(request), prompt);
}
notifiedUsers.add(reviewer);
}
@@ -350,7 +349,9 @@ public class PullRequestNotificationManager implements Serializable {
getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
- } else if (!(event instanceof PullRequestCodeCommentEvent) && isAiEntitled(user, request, mentionedUser)) {
+ } else if (!(event instanceof PullRequestCodeCommentEvent)
+ && isAiEntitled(user, request, mentionedUser)
+ && canCreateWorkspace(mentionedUser, request)) {
addressConcern(mentionedUser, user, request);
}
notifiedUsers.add(mentionedUser);
@@ -404,27 +405,23 @@ public class PullRequestNotificationManager implements Serializable {
&& pullRequestBuildEvent.getBuild().isFailed()
&& !pullRequestBuildEvent.getBuild().getDependencies().stream().anyMatch(it ->
it.isRequireSuccessful() && it.getDependency().isFinished() && it.getDependency().getStatus() != Build.Status.SUCCESSFUL)
- && canWriteCode(request.getSubmitter(), request, request.getSourceProject())) {
- var commitId = Preconditions.checkNotNull(request.getSourceHead());
+ && canCreateWorkspace(request.getSubmitter(), request)) {
var prompt = """
Work on pull request %d to fix failure of build %d. \
- Do not modify code unless the reason is clear. \
- Stay on current checkout to do the job. \
Make sure to submit work afterwards without confirmation."""
.formatted(request.getNumber(), pullRequestBuildEvent.getBuild().getNumber());
- runPrompt(request.getSubmitter(), request, request.getSourceProject(), commitId, request.getSourceBranch(), prompt);
+ var commitId = request.getLatestUpdate().getHeadCommit().copy();
+ runPrompt(request.getSubmitter(), request, commitId, getWorkspaceBranch(request), prompt);
}
if (event instanceof PullRequestMergePreviewUpdated && request.getMergePreview() != null
&& request.getMergePreview().getMergeCommitHash() == null
- && canWriteCode(request.getSubmitter(), request, request.getSourceProject())
- && canReadCode(request.getSubmitter(), request, request.getTargetProject())) {
- var commitId = Preconditions.checkNotNull(request.getSourceHead());
+ && canCreateWorkspace(request.getSubmitter(), request)) {
var prompt = """
Work on pull request %d to resolve merge conflict. \
- Stay on current checkout to do the job. \
Make sure to submit work afterwards without confirmation."""
.formatted(request.getNumber());
- runPrompt(request.getSubmitter(), request, request.getSourceProject(), commitId, request.getSourceBranch(), prompt);
+ var commitId = request.getLatestUpdate().getHeadCommit().copy();
+ runPrompt(request.getSubmitter(), request, commitId, getWorkspaceBranch(request), prompt);
}
}
@@ -444,18 +441,36 @@ public class PullRequestNotificationManager implements Serializable {
if (aiAssignee != null && request.checkMergeCondition() == null
&& isAiEntitled(null, request, aiAssignee)
&& canWriteCode(aiAssignee, request, request.getTargetProject())) {
- var commitId = ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash());
var prompt = """
Work on pull request %d to review and merge if ready. \
Otherwise, mention @%s in a PR comment to request changes. \
Stay on current checkout and do not modify code. \
Make sure to submit work afterwards without confirmation."""
.formatted(request.getNumber(), request.getSubmitter().getName());
- runPrompt(aiAssignee, request, request.getTargetProject(), commitId, null, prompt);
+ var commitId = request.getLatestUpdate().getHeadCommit().copy();
+ runPrompt(aiAssignee, request, commitId, getWorkspaceBranch(request), prompt);
}
}
}
+ @Nullable
+ private String getWorkspaceBranch(PullRequest request) {
+ if (request.getSourceProject() != null) {
+ return request.getSourceBranch();
+ } else {
+ return null;
+ }
+ }
+
+ private boolean canWriteCode(User ai, PullRequest request, Project project) {
+ if (SecurityUtils.canWriteCode(ai.asSubject(), project)) {
+ return true;
+ } else {
+ createComment(ai, request, "I need write code permission in target project to do the job");
+ return false;
+ }
+ }
+
private boolean isAiEntitled(@Nullable User user, PullRequest request, User ai) {
if (user != null && user.getId() > 0) {
if (user.isEntitledToAi(ai)) {
@@ -474,46 +489,35 @@ public class PullRequestNotificationManager implements Serializable {
}
}
- private void addressConcern(User ai, User commenter, PullRequest request) {
- if (ai.equals(request.getSubmitter()) && !canWriteCode(ai, request, request.getSourceProject())
- || request.getAssignees().contains(ai) && !canWriteCode(ai, request, request.getTargetProject())
- || !canCreateWorkspace(ai, request)) {
- return;
- }
-
+ private void addressConcern(User ai, User commenter, PullRequest request) {
List<String> prompts = new ArrayList<>();
- prompts.add("Work on pull request %d to address %s's concern."
- .formatted(request.getNumber(), commenter.getName()));
- if (request.getAssignees().contains(ai) && request.checkMergeCondition() == null) {
- prompts.add("Review the pull request and merge it if ready.");
- }
- prompts.add("Stay on current checkout to do the job.");
-
- if (ai.equals(request.getSubmitter())) {
- prompts.add("""
- If code is modified, mention the user in a PR comment so that the code can be reviewed; \
- otherwise, mention the user only when you expect a response.""");
+ if (request.getSubmitter().equals(ai)) {
+ prompts.add("Work on pull request %d as submitter to address %s's latest concern."
+ .formatted(request.getNumber(), commenter.getName()));
} else {
- prompts.add("Mention the user in a PR comment ONLY if you expect a response.");
- prompts.add("Do not modify code.");
+ prompts.add("Work on pull request %d to address %s's latest concern."
+ .formatted(request.getNumber(), commenter.getName()));
}
- prompts.add("Make sure to submit work afterwards without confirmation.");
+ prompts.add("Do not switch checkout if the concern does not require you to write code.");
+ if (request.getAssignees().contains(ai) && request.checkMergeCondition() == null
+ && canWriteCode(ai, request, request.getTargetProject())) {
+ prompts.add("Also merge the pull request if your review passes.");
+ }
+
+ prompts.add("""
+ If code is modified, mention the user in a PR comment so that the code can be reviewed; \
+ otherwise, mention the user only when you expect a response. \
+ Make sure to submit work afterwards without confirmation.""");
var concatenatedPrompts = String.join(" ", prompts);
- if (ai.equals(request.getSubmitter())) {
- var commitId = Preconditions.checkNotNull(request.getSourceHead());
- runPrompt(ai, request, request.getSourceProject(), commitId, request.getSourceBranch(), concatenatedPrompts);
- } else {
- var commitId = ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash());
- runPrompt(ai, request, request.getTargetProject(), commitId, null, concatenatedPrompts);
- }
+ var commitId = request.getLatestUpdate().getHeadCommit().copy();
+ runPrompt(ai, request, commitId, getWorkspaceBranch(request), concatenatedPrompts);
}
- private void runPrompt(User ai, PullRequest request, Project project,
- ObjectId commitId, @Nullable String branch, String prompt) {
+ private void runPrompt(User ai, PullRequest request, ObjectId commitId, @Nullable String branch, String prompt) {
try {
var taskFailedCallback = newTaskFailedCallback(ai.getId(), request.getId());
- workspaceService.runPrompt(ai, project, commitId, branch, prompt, taskFailedCallback);
+ workspaceService.runPrompt(ai, request.getProject(), null, request, commitId, branch, prompt, taskFailedCallback);
} catch (Throwable t) {
var explicitException = ExceptionUtils.find(t, ExplicitException.class);
if (explicitException != null) {
@@ -545,24 +549,6 @@ public class PullRequestNotificationManager implements Serializable {
return true;
}
- private boolean canWriteCode(User ai, PullRequest request, Project project) {
- if (SecurityUtils.canWriteCode(ai.asSubject(), project)) {
- return true;
- } else {
- createComment(ai, request, "I need write code permission in project '%s' to do the job".formatted(project.getPath()));
- return false;
- }
- }
-
- private boolean canReadCode(User ai, PullRequest request, Project project) {
- if (SecurityUtils.canWriteCode(ai.asSubject(), project)) {
- return true;
- } else {
- createComment(ai, request, "I need read code permission in project '%s' to do the job".formatted(project.getPath()));
- return false;
- }
- }
-
private TaskFailedCallback newTaskFailedCallback(Long aiId, Long requestId) {
return new TaskFailedCallback() {
diff --git a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java
index f028e016d2..51e2730d25 100644
--- a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java
@@ -77,7 +77,7 @@ public class WorkspaceNotificationManager {
String summary = String.format("Workspace %s by user %s on %s",
event.getActivity(),
workspace.getUser().getDisplayName(),
- workspace.getRevisionDescription());
+ workspace.getOnDescription());
String url = urlService.urlFor(workspace, true);
String threadingReferences = "<" + workspace.getProject().getPath()
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java
index b7482d16f2..2fdc3e7fc5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java
@@ -4,10 +4,13 @@ import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.match.WildcardUtils;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.Workspace;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
@@ -33,7 +36,12 @@ public class BranchCriteria extends Criteria<Workspace> {
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Workspace, Workspace> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Workspace.PROP_BRANCH);
String normalized = value.toLowerCase().replace("*", "%");
- var predicate = builder.like(builder.lower(attribute), normalized);
+ Join<?, ?> request = from.join(Workspace.PROP_PULL_REQUEST, JoinType.LEFT);
+ var predicate = builder.and(
+ builder.like(builder.lower(attribute), normalized),
+ builder.or(
+ builder.isNull(from.get(Workspace.PROP_PULL_REQUEST)),
+ builder.equal(from.get(Workspace.PROP_PROJECT), request.get(PullRequest.PROP_SOURCE_PROJECT))));
if (operator == WorkspaceQueryLexer.IsNot)
predicate = builder.not(predicate);
return predicate;
@@ -41,7 +49,9 @@ public class BranchCriteria extends Criteria<Workspace> {
@Override
public boolean matches(Workspace workspace) {
- var matches = workspace.getBranch() != null && WildcardUtils.matchString(value.toLowerCase(), workspace.getBranch().toLowerCase());
+ var matches = workspace.getBranch() != null
+ && (workspace.getRequest() == null || workspace.getProject().equals(workspace.getRequest().getSourceProject()))
+ && WildcardUtils.matchString(value.toLowerCase(), workspace.getBranch().toLowerCase());
if (operator == WorkspaceQueryLexer.IsNot)
matches = !matches;
return matches;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java
new file mode 100644
index 0000000000..095cd4a91a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java
@@ -0,0 +1,65 @@
+package io.onedev.server.search.entity.workspace;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Workspace;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
+public class IssueCriteria extends Criteria<Workspace> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Issue issue;
+
+ private final String value;
+
+ private final int operator;
+
+ public IssueCriteria(@Nullable Project project, String value, int operator) {
+ issue = EntityQuery.getIssue(project, value);
+ this.value = value;
+ this.operator = operator;
+ }
+
+ public IssueCriteria(@Nullable Project project, Issue issue, int operator) {
+ this.issue = issue;
+ value = issue.getReference().toString(project);
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query,
+ From<Workspace, Workspace> from, CriteriaBuilder builder) {
+ Path<Issue> attribute = from.get(Workspace.PROP_ISSUE);
+ var predicate = builder.equal(attribute, issue);
+ if (operator == WorkspaceQueryLexer.IsNot)
+ predicate = builder.not(predicate);
+ return predicate;
+ }
+
+ @Override
+ public boolean matches(Workspace workspace) {
+ var matches = issue.equals(workspace.getIssue());
+ if (operator == WorkspaceQueryLexer.IsNot)
+ matches = !matches;
+ return matches;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Workspace.NAME_ISSUE) + " "
+ + WorkspaceQuery.getRuleName(operator) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java
new file mode 100644
index 0000000000..b5f45acb24
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java
@@ -0,0 +1,46 @@
+package io.onedev.server.search.entity.workspace;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Workspace;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
+public class IssueEmptyCriteria extends Criteria<Workspace> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ public IssueEmptyCriteria(int operator) {
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query,
+ From<Workspace, Workspace> from, CriteriaBuilder builder) {
+ var predicate = builder.isNull(from.get(Workspace.PROP_ISSUE));
+ if (operator == WorkspaceQueryLexer.IsNotEmpty)
+ predicate = builder.not(predicate);
+ return predicate;
+ }
+
+ @Override
+ public boolean matches(Workspace workspace) {
+ var matches = workspace.getIssue() == null;
+ if (operator == WorkspaceQueryLexer.IsNotEmpty)
+ matches = !matches;
+ return matches;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Workspace.NAME_ISSUE) + " " + WorkspaceQuery.getRuleName(operator);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java
new file mode 100644
index 0000000000..2db3d255f1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java
@@ -0,0 +1,65 @@
+package io.onedev.server.search.entity.workspace;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.Workspace;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
+public class PullRequestCriteria extends Criteria<Workspace> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final PullRequest pullRequest;
+
+ private final String value;
+
+ private final int operator;
+
+ public PullRequestCriteria(@Nullable Project project, String value, int operator) {
+ pullRequest = EntityQuery.getPullRequest(project, value);
+ this.value = value;
+ this.operator = operator;
+ }
+
+ public PullRequestCriteria(@Nullable Project project, PullRequest pullRequest, int operator) {
+ this.pullRequest = pullRequest;
+ value = pullRequest.getReference().toString(project);
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query,
+ From<Workspace, Workspace> from, CriteriaBuilder builder) {
+ Path<PullRequest> attribute = from.get(Workspace.PROP_PULL_REQUEST);
+ var predicate = builder.equal(attribute, pullRequest);
+ if (operator == WorkspaceQueryLexer.IsNot)
+ predicate = builder.not(predicate);
+ return predicate;
+ }
+
+ @Override
+ public boolean matches(Workspace workspace) {
+ var matches = pullRequest.equals(workspace.getRequest());
+ if (operator == WorkspaceQueryLexer.IsNot)
+ matches = !matches;
+ return matches;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Workspace.NAME_PULL_REQUEST) + " "
+ + WorkspaceQuery.getRuleName(operator) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java
new file mode 100644
index 0000000000..c1b744648c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java
@@ -0,0 +1,46 @@
+package io.onedev.server.search.entity.workspace;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Workspace;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
+public class PullRequestEmptyCriteria extends Criteria<Workspace> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ public PullRequestEmptyCriteria(int operator) {
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query,
+ From<Workspace, Workspace> from, CriteriaBuilder builder) {
+ var predicate = builder.isNull(from.get(Workspace.PROP_PULL_REQUEST));
+ if (operator == WorkspaceQueryLexer.IsNotEmpty)
+ predicate = builder.not(predicate);
+ return predicate;
+ }
+
+ @Override
+ public boolean matches(Workspace workspace) {
+ var matches = workspace.getRequest() == null;
+ if (operator == WorkspaceQueryLexer.IsNotEmpty)
+ matches = !matches;
+ return matches;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Workspace.NAME_PULL_REQUEST) + " " + WorkspaceQuery.getRuleName(operator);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
index 8fa47b901e..05569c029a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
@@ -5,6 +5,8 @@ import static io.onedev.server.model.Workspace.NAME_ACTIVE_DATE;
import static io.onedev.server.model.Workspace.NAME_BRANCH;
import static io.onedev.server.model.Workspace.NAME_COMMIT;
import static io.onedev.server.model.Workspace.NAME_CREATE_DATE;
+import static io.onedev.server.model.Workspace.NAME_ISSUE;
+import static io.onedev.server.model.Workspace.NAME_PULL_REQUEST;
import static io.onedev.server.model.Workspace.NAME_PROJECT;
import static io.onedev.server.model.Workspace.NAME_SPEC;
import static io.onedev.server.model.Workspace.QUERY_FIELDS;
@@ -161,7 +163,11 @@ public class WorkspaceQuery extends EntityQuery<Workspace> {
String fieldName = getValue(ctx.criteriaField.getText());
int operator = ctx.operator.getType();
checkField(fieldName, operator);
- if (fieldName.equals(NAME_BRANCH))
+ if (fieldName.equals(NAME_ISSUE))
+ return new IssueEmptyCriteria(operator);
+ else if (fieldName.equals(NAME_PULL_REQUEST))
+ return new PullRequestEmptyCriteria(operator);
+ else if (fieldName.equals(NAME_BRANCH))
return new BranchEmptyCriteria(operator);
throw new ExplicitException("Unexpected field: " + fieldName);
}
@@ -182,6 +188,12 @@ public class WorkspaceQuery extends EntityQuery<Workspace> {
case NAME_PROJECT:
criterias.add(new ProjectCriteria(value, operator));
break;
+ case NAME_ISSUE:
+ criterias.add(new IssueCriteria(project, value, operator));
+ break;
+ case NAME_PULL_REQUEST:
+ criterias.add(new PullRequestCriteria(project, value, operator));
+ break;
case NAME_BRANCH:
criterias.add(new BranchCriteria(value, operator));
break;
@@ -269,6 +281,7 @@ public class WorkspaceQuery extends EntityQuery<Workspace> {
case Is:
case IsNot:
if (!fieldName.equals(NAME_NUMBER) && !fieldName.equals(NAME_PROJECT)
+ && !fieldName.equals(NAME_ISSUE) && !fieldName.equals(NAME_PULL_REQUEST)
&& !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_COMMIT)
&& !fieldName.equals(NAME_SPEC)) {
throw newOperatorException(fieldName, operator);
@@ -276,7 +289,8 @@ public class WorkspaceQuery extends EntityQuery<Workspace> {
break;
case IsEmpty:
case IsNotEmpty:
- if (!fieldName.equals(NAME_BRANCH))
+ if (!fieldName.equals(NAME_ISSUE) && !fieldName.equals(NAME_PULL_REQUEST)
+ && !fieldName.equals(NAME_BRANCH))
throw newOperatorException(fieldName, operator);
break;
case IsGreaterThan:
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
index ebfe2a96d5..41b4842250 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
@@ -937,9 +937,18 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss
@Transactional
@Override
public void delete(Issue issue) {
+ checkNoWorkspaces(issue, "delete");
dao.remove(issue);
listenerRegistry.post(new IssueDeleted(issue));
}
+
+ private void checkNoWorkspaces(Issue issue, String operation) {
+ if (issue.getWorkspaces().size() > 0) {
+ throw new NotAcceptableException(MessageFormat.format(
+ "Cannot {0} issue \"{1}\" as it has workspaces",
+ operation, issue.getReference().toString(issue.getProject())));
+ }
+ }
private String getCacheKey(Issue issue) {
return getCacheKey(issue.getProject().getId(), issue.getNumber());
@@ -1118,6 +1127,8 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss
Map<Long, Long> numberMapping = new HashMap<>();
List<Issue> sortedIssues = new ArrayList<>(issues);
Collections.sort(sortedIssues);
+ for (Issue issue: sortedIssues)
+ checkNoWorkspaces(issue, "move");
for (Issue issue: sortedIssues) {
if (issue.getDescription() != null) {
issue.setDescription(issue.getDescription().replace(
@@ -1175,8 +1186,10 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss
@Transactional
@Override
public void delete(Collection<Issue> issues, Project project) {
- for (Issue issue: issues)
+ for (Issue issue: issues) {
+ checkNoWorkspaces(issue, "delete");
dao.remove(issue);
+ }
listenerRegistry.post(new IssuesDeleted(project, issues));
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index a6e6ec5b81..51a62cdd68 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -224,10 +224,18 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void delete(PullRequest request) {
+ checkNoWorkspaces(request);
doDelete(request);
listenerRegistry.post(new PullRequestDeleted(request));
}
+ private void checkNoWorkspaces(PullRequest request) {
+ if (request.getWorkspaces().size() > 0) {
+ throw new NotAcceptableException("Cannot delete pull request \""
+ + request.getReference().toString(request.getProject()) + "\" as it has workspaces");
+ }
+ }
+
private void doDelete(PullRequest request) {
Collection<String> refs = Lists.newArrayList(
request.getHeadRef(), request.getMergeRef(), request.getBaseRef(), request.getBuildRef());
@@ -1096,8 +1104,10 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Transactional
@Override
public void delete(Collection<PullRequest> requests, Project project) {
- for (PullRequest request: requests)
+ for (PullRequest request: requests) {
+ checkNoWorkspaces(request);
doDelete(request);
+ }
listenerRegistry.post(new PullRequestsDeleted(project, requests));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
index 8e666cbb44..4e232fad6b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
@@ -31,6 +31,7 @@ import io.onedev.server.search.entity.workspace.WorkspaceQueryParser;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
import io.onedev.server.web.util.SuggestionUtils;
@@ -107,6 +108,10 @@ public class WorkspaceQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestProjectPaths(matchWith);
else
return null;
+ case Workspace.NAME_ISSUE:
+ return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ case Workspace.NAME_PULL_REQUEST:
+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
case Workspace.NAME_BRANCH:
if (!matchWith.contains("*"))
return SuggestionUtils.suggestBranches(project, matchWith);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 73e6c319b8..6de7e4e00d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -204,6 +204,11 @@ public abstract class IssueListPanel extends Panel {
private AuditService getAuditService() {
return OneDev.getInstance(AuditService.class);
}
+
+ @Nullable
+ private Issue findIssueWithWorkspaces(Collection<Issue> issues) {
+ return issues.stream().filter(it -> !it.getWorkspaces().isEmpty()).findFirst().orElse(null);
+ }
@Override
protected void onDetach() {
@@ -1162,10 +1167,18 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Issue> issues = new ArrayList<>();
+ for (IModel<Issue> each : selectionColumn.getSelections())
+ issues.add(each.getObject());
+ var issueWithWorkspaces = findIssueWithWorkspaces(issues);
+ if (issueWithWorkspaces != null) {
+ Session.get().error(MessageFormat.format(
+ _T("Unable to delete issue \"{0}\" as it has workspaces"),
+ issueWithWorkspaces.getReference().toString(getProject())));
+ target.add(body);
+ return;
+ }
getTransactionService().run(()-> {
- Collection<Issue> issues = new ArrayList<>();
- for (IModel<Issue> each : selectionColumn.getSelections())
- issues.add(each.getObject());
getIssueService().delete(issues, getProject());
for (var issue: issues) {
var oldAuditContent = VersionedXmlDoc.fromBean(issue).toXML();
@@ -1529,10 +1542,18 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Issue> issues = new ArrayList<>();
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
+ issues.add(it.next());
+ var issueWithWorkspaces = findIssueWithWorkspaces(issues);
+ if (issueWithWorkspaces != null) {
+ Session.get().error(MessageFormat.format(
+ _T("Unable to delete issue \"{0}\" as it has workspaces"),
+ issueWithWorkspaces.getReference().toString(getProject())));
+ target.add(body);
+ return;
+ }
getTransactionService().run(()-> {
- Collection<Issue> issues = new ArrayList<>();
- for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
- issues.add(it.next());
getIssueService().delete(issues, getProject());
for (var issue: issues) {
var oldAuditContent = VersionedXmlDoc.fromBean(issue).toXML();
@@ -2240,4 +2261,3 @@ public abstract class IssueListPanel extends Panel {
}
}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 0abddc0b89..8a28ec42c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -150,10 +150,18 @@ public abstract class IssueSidePanel extends Panel {
});
- if (SecurityUtils.canManageIssues(getProject()))
- addOrReplace(newDeleteLink("delete"));
- else
+ if (SecurityUtils.canManageIssues(getProject())) {
+ Component deleteLink = newDeleteLink("delete");
+ if (getIssue().getWorkspaces().size() > 0) {
+ deleteLink.setEnabled(false);
+ deleteLink.add(AttributeAppender.append("class", "disabled"));
+ deleteLink.add(AttributeAppender.append("data-tippy-content",
+ _T("Cannot delete issue as it has workspaces")));
+ }
+ addOrReplace(deleteLink);
+ } else {
addOrReplace(new WebMarkupContainer("delete").setVisible(false));
+ }
super.onBeforeRender();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java
index 3de84db64c..74ce30a034 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java
@@ -1,69 +1,75 @@
package io.onedev.server.web.component.issue.workspaces;
+import javax.inject.Inject;
+
import org.apache.wicket.Component;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.IssueService;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;
public abstract class IssueWorkspacesLink extends DropdownLink {
- public IssueWorkspacesLink(String id) {
- super(id);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- var branch = getIssue().getBranch();
- if (branch != null) {
- return new WorkspaceSpecListPanel(id) {
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- @Override
- protected String getBranch() {
- return branch;
- }
-
- @Override
- protected ObjectId getCommitId() {
- return getIssue().getProject().getObjectId(branch, true);
- }
-
- };
- } else {
- return new NoBranchWorkspacesPanel(id) {
-
- @Override
- protected Issue getIssue() {
- return IssueWorkspacesLink.this.getIssue();
- }
-
- };
- }
- }
-
- protected abstract Issue getIssue();
+ @Inject
+ private IssueService issueService;
+
+ public IssueWorkspacesLink(String id) {
+ super(id);
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new WorkspaceSpecListPanel(id) {
+
+ private String branch;
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ @Override
+ protected String getBranch() {
+ if (branch == null) {
+ if (getIssue().getBranch() != null)
+ branch = getIssue().getBranch();
+ else
+ branch = issueService.ensureBranch(SecurityUtils.getSubject(), getIssue());
+ }
+ return branch;
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return getIssue().getProject().getObjectId(getBranch(), true);
+ }
+
+ @Override
+ protected Issue getIssue() {
+ return IssueWorkspacesLink.this.getIssue();
+ }
+
+ @Override
+ protected boolean isOnInfoVisible() {
+ return false;
+ }
+
+ };
+ }
+
+ protected abstract Issue getIssue();
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- if (getIssue().getProject().getHierarchyWorkspaceSpecs().isEmpty()) {
- setVisible(false);
- } else if (getIssue().getProject().canWriteCode(SecurityUtils.getSubject())) {
- setVisible(true);
- } else if (getIssue().getBranch() == null) {
- setVisible(false);
- } else {
- setVisible(getIssue().getProject().canCreateWorkspace(SecurityUtils.getSubject()));
- }
- }
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ var issue = getIssue();
+ setVisible(!issue.getProject().getHierarchyWorkspaceSpecs().isEmpty()
+ && issue.getProject().canCreateWorkspace(SecurityUtils.getSubject()));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesCssResourceReference.java
deleted file mode 100644
index c8b9c0fcb3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.issue.workspaces;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class NoBranchWorkspacesCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public NoBranchWorkspacesCssResourceReference() {
- super(NoBranchWorkspacesCssResourceReference.class, "no-branch-workspaces.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.html
deleted file mode 100644
index b7020e7603..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<wicket:panel>
- <div class="no-branch-workspaces">
- <div wicket:id="specs" class="spec">
- <div class="head px-3 py-2 bg-light border-top">
- <div class="d-flex text-nowrap align-items-center">
- <b wicket:id="name" class="mr-auto"></b>
- <a wicket:id="create" class="ml-2 d-flex align-items-center" t:data-tippy-content="Create workspace with this spec"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- </div>
- <div wicket:id="description" class="description text-muted font-size-sm"></div>
- </div>
- <div class="body font-italic text-nowrap"><wicket:t>No workspaces</wicket:t></div>
- </div>
- </div>
-</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.java
deleted file mode 100644
index 7c82ff4a24..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/NoBranchWorkspacesPanel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package io.onedev.server.web.component.issue.workspaces;
-
-import javax.inject.Inject;
-
-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.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.eclipse.jgit.lib.ObjectId;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.web.component.workspace.CreateWorkspaceLink;
-
-abstract class NoBranchWorkspacesPanel extends Panel {
-
- @Inject
- private IssueService issueService;
-
- private final IModel<String> branchModel = new LoadableDetachableModel<>() {
-
- @Override
- protected String load() {
- return issueService.ensureBranch(SecurityUtils.getSubject(), getIssue());
- }
-
- };
-
- public NoBranchWorkspacesPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- RepeatingView specsView = new RepeatingView("specs");
- add(specsView);
- for (WorkspaceSpec spec : getIssue().getProject().getHierarchyWorkspaceSpecs()) {
- WebMarkupContainer specItem = new WebMarkupContainer(specsView.newChildId());
- specItem.add(new Label("name", spec.getName()));
-
- specItem.add(new CreateWorkspaceLink("create") {
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- @Override
- protected WorkspaceSpec getSpec() {
- return spec;
- }
-
- @Override
- protected String getBranch() {
- return branchModel.getObject();
- }
-
- @Override
- protected ObjectId getCommitId() {
- return getIssue().getProject().getObjectId(getBranch(), true);
- }
-
- });
- specItem.add(new Label("description", spec.getDescription()).setVisible(spec.getDescription() != null));
-
- specItem.setOutputMarkupId(true);
- specsView.add(specItem);
- }
- }
-
- @Override
- protected void onDetach() {
- branchModel.detach();
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new NoBranchWorkspacesCssResourceReference()));
- }
-
- protected abstract Issue getIssue();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/no-branch-workspaces.css b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/no-branch-workspaces.css
deleted file mode 100644
index 967ef21aac..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/no-branch-workspaces.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.no-branch-workspaces {
- max-width: 480px;
-}
-.no-branch-workspaces .spec .body {
- padding: 0.5rem 1rem !important;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 581e5f9ec9..3cfd745879 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -490,7 +490,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("type", "workspace");
referenceMap.put("reference", workspace.getReference().toString(currentProject));
- String title = workspace.getUser().getDisplayName() + " on " + workspace.getRevisionDescription() + " for " + workspace.getSpecName();
+ String title = workspace.getUser().getDisplayName() + " on " + workspace.getOnDescription() + " for " + workspace.getSpecName();
referenceMap.put("title", title);
referenceMap.put("searchKey", workspace.getNumber() + " " + StringUtils.deleteWhitespace(title));
referenceList.add(referenceMap);
@@ -712,4 +712,4 @@ public class MarkdownEditor extends FormComponentPanel<String> {
target.appendJavaScript(String.format("$('#%s textarea').focus();", getMarkupId()));
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 87c06c47a6..6c466f5ac5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -310,7 +310,7 @@ public class MarkdownViewer extends GenericPanel<String> {
var workspaceRef = WorkspaceReference.of(referenceId, null);
var workspace = workspaceService.find(workspaceRef.getProject(), workspaceRef.getNumber());
if (workspace != null && SecurityUtils.canReadCode(workspace.getProject())) {
- String title = workspace.getUser().getDisplayName() + " on " + workspace.getRevisionDescription() + " for " + workspace.getSpecName() + " (" + workspace.getStatus().name() + ")";
+ String title = workspace.getUser().getDisplayName() + " on " + workspace.getOnDescription() + " for " + workspace.getSpecName() + " (" + workspace.getStatus().name() + ")";
String script = String.format("onedev.server.markdown.renderWorkspaceTooltip('%s');",
JavaScriptEscape.escapeJavaScript(title));
target.appendJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index d7c98e4105..237ade1cec 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -144,6 +144,11 @@ public abstract class PullRequestListPanel extends Panel {
@Inject
private Set<PullRequestListActionRenderer> pullRequestListActionRenderers;
+ @Nullable
+ private PullRequest findPullRequestWithWorkspaces(Collection<PullRequest> requests) {
+ return requests.stream().filter(it -> !it.getWorkspaces().isEmpty()).findFirst().orElse(null);
+ }
+
private final IModel<String> queryStringModel;
private final IModel<PullRequestQuery> queryModel = new LoadableDetachableModel<>() {
@@ -433,10 +438,18 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (IModel<PullRequest> each : selectionColumn.getSelections())
+ requests.add(each.getObject());
+ var requestWithWorkspaces = findPullRequestWithWorkspaces(requests);
+ if (requestWithWorkspaces != null) {
+ Session.get().error(MessageFormat.format(
+ _T("Unable to delete pull request \"{0}\" as it has workspaces"),
+ requestWithWorkspaces.getReference().toString(getProject())));
+ target.add(body);
+ return;
+ }
transactionService.run(()-> {
- Collection<PullRequest> requests = new ArrayList<>();
- for (IModel<PullRequest> each : selectionColumn.getSelections())
- requests.add(each.getObject());
pullRequestService.delete(requests, getProject());
for (var request: requests) {
var oldAuditContent = VersionedXmlDoc.fromBean(request).toXML();
@@ -629,10 +642,18 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
+ requests.add(it.next());
+ var requestWithWorkspaces = findPullRequestWithWorkspaces(requests);
+ if (requestWithWorkspaces != null) {
+ Session.get().error(MessageFormat.format(
+ _T("Unable to delete pull request \"{0}\" as it has workspaces"),
+ requestWithWorkspaces.getReference().toString(getProject())));
+ target.add(body);
+ return;
+ }
transactionService.run(()-> {
- Collection<PullRequest> requests = new ArrayList<>();
- for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
- requests.add(it.next());
pullRequestService.delete(requests, getProject());
for (var request: requests) {
var oldAuditContent = VersionedXmlDoc.fromBean(request).toXML();
@@ -965,17 +986,26 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected Project getProject() {
- return rowModel.getObject().getSourceProject();
+ return rowModel.getObject().getProject();
}
@Override
protected String getBranch() {
- return rowModel.getObject().getSourceBranch();
+ if (rowModel.getObject().getSourceProject() != null) {
+ return rowModel.getObject().getSourceBranch();
+ } else {
+ return null;
+ }
}
@Override
protected ObjectId getCommitId() {
- return rowModel.getObject().getSourceHead();
+ return rowModel.getObject().getLatestUpdate().getHeadCommit().copy();
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return rowModel.getObject();
}
};
@@ -985,9 +1015,8 @@ public abstract class PullRequestListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
var pullRequest = rowModel.getObject();
- setVisible(pullRequest.getSourceHead() != null
- && pullRequest.getSourceProject().canCreateWorkspace(SecurityUtils.getSubject())
- && !pullRequest.getSourceProject().getHierarchyWorkspaceSpecs().isEmpty());
+ setVisible(!pullRequest.getProject().getHierarchyWorkspaceSpecs().isEmpty()
+ && pullRequest.getProject().canCreateWorkspace(SecurityUtils.getSubject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java
index d60e652d32..956f100848 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java
@@ -7,7 +7,9 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.workspaces.detail.dashboard.WorkspaceDashboardPage;
@@ -31,9 +33,20 @@ public abstract class CreateWorkspaceLink extends AjaxLink<Void> {
protected abstract WorkspaceSpec getSpec();
+ @Nullable
+ protected Issue getIssue() {
+ return null;
+ }
+
+ @Nullable
+ protected PullRequest getPullRequest() {
+ return null;
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
- var workspace = workspaceService.create(SecurityUtils.getUser(), getProject(), getCommitId(), getBranch(), getSpec().getName(), false);
+ var workspace = workspaceService.create(SecurityUtils.getUser(), getProject(), getIssue(),
+ getPullRequest(), getCommitId(), getBranch(), getSpec().getName(), false);
setResponsePage(WorkspaceDashboardPage.class, WorkspaceDashboardPage.paramsOf(workspace));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html
index bd7bec4b70..5a08c51f4c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html
@@ -42,8 +42,8 @@
<span wicket:id="label"></span>
</a>
</wicket:fragment>
- <wicket:fragment wicket:id="revisionFrag">
- <a wicket:id="revision"></a>
+ <wicket:fragment wicket:id="referenceFrag">
+ <span wicket:id="reference"></span>
</wicket:fragment>
<wicket:fragment wicket:id="userFrag">
<a wicket:id="link"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
index 4cc607e7d6..bce945875e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
@@ -39,7 +39,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
@@ -56,13 +55,10 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateWorkspaces;
import io.onedev.server.service.ProjectService;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.WorkspaceQueryBehavior;
-import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.branch.picker.BranchSelector;
-import io.onedev.server.web.component.commit.CommitLink;
import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.AlignPlacement;
@@ -81,6 +77,7 @@ import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.workspace.invalidspec.InvalidWorkspaceSpecIcon;
+import io.onedev.server.web.component.workspace.on.WorkspaceOnPanel;
import io.onedev.server.web.component.workspace.specrunselector.WorkspaceSpecRunSelector;
import io.onedev.server.web.component.workspace.status.WorkspaceStatusIcon;
import io.onedev.server.web.page.project.workspaces.detail.dashboard.WorkspaceDashboardPage;
@@ -679,24 +676,18 @@ public abstract class WorkspaceListPanel extends Panel {
}
});
- columns.add(new AbstractColumn<>(Model.of(_T("Branch/Commit"))) {
+ columns.add(new AbstractColumn<>(Model.of(_T("On"))) {
@Override
public String getCssClass() {
- return "branch";
+ return "on";
}
@Override
public void populateItem(Item<ICellPopulator<Workspace>> cellItem, String componentId,
IModel<Workspace> rowModel) {
- Fragment fragment = new Fragment(componentId, "revisionFrag", WorkspaceListPanel.this);
- Workspace workspace = rowModel.getObject();
- if (workspace.getBranch() != null) {
- fragment.add(new BranchLink("revision",
- new ProjectAndBranch(workspace.getProject(), workspace.getBranch()), true));
- } else {
- fragment.add(new CommitLink("revision", workspace.getProject(), ObjectId.fromString(workspace.getCommitHash())));
- }
+ Fragment fragment = new Fragment(componentId, "referenceFrag", WorkspaceListPanel.this);
+ fragment.add(new WorkspaceOnPanel("reference", rowModel));
cellItem.add(fragment);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListCssResourceReference.java
deleted file mode 100644
index b7c336da55..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.workspace.minilist;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class MiniWorkspaceListCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public MiniWorkspaceListCssResourceReference() {
- super(MiniWorkspaceListCssResourceReference.class, "mini-workspace-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.html
deleted file mode 100644
index 403d23a49a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<wicket:panel>
- <div wicket:id="content" class="mini-workspace-list"></div>
- <wicket:fragment wicket:id="hasWorkspacesFrag">
- <div class="has-workspaces">
- <wicket:enclosure child="showInList">
- <div class="head d-flex align-items-center py-3 px-3 border-bottom">
- <h6 class="mb-0 mr-4"><wicket:t>Workspaces</wicket:t></h6>
- <a wicket:id="showInList" class="show-in-list" t:data-tippy-content="Show in workspace list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
- </div>
- </wicket:enclosure>
- <div class="body py-2">
- <div wicket:id="workspaces">
- <a wicket:id="workspace" class="workspace d-flex align-items-center bg-hover-light text-hover-gray-dark px-3 py-2">
- <svg wicket:id="status" class="status mr-2"></svg>
- <span wicket:id="title" class="title"></span>
- </a>
- </div>
- </div>
- </div>
- </wicket:fragment>
-</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.java
deleted file mode 100644
index bcc1124355..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/MiniWorkspaceListPanel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.onedev.server.web.component.workspace.minilist;
-
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-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.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-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.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.model.Workspace;
-import io.onedev.server.model.Workspace.Status;
-import io.onedev.server.web.component.workspace.status.WorkspaceStatusIcon;
-import io.onedev.server.web.page.project.workspaces.detail.dashboard.WorkspaceDashboardPage;
-import io.onedev.server.workspace.WorkspaceService;
-
-public class MiniWorkspaceListPanel extends GenericPanel<List<Workspace>> {
-
- public MiniWorkspaceListPanel(String id, IModel<List<Workspace>> model) {
- super(id, model);
- }
-
- protected List<Workspace> getWorkspaces() {
- return getModelObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- if (!getWorkspaces().isEmpty()) {
- Fragment fragment = new Fragment("content", "hasWorkspacesFrag", this);
- fragment.add(newListLink("showInList"));
-
- fragment.add(new ListView<Workspace>("workspaces", getModel()) {
-
- @Override
- protected void populateItem(ListItem<Workspace> item) {
- Workspace workspace = item.getModelObject();
-
- Link<Void> workspaceLink = new BookmarkablePageLink<Void>("workspace",
- WorkspaceDashboardPage.class, WorkspaceDashboardPage.paramsOf(workspace));
-
- Long workspaceId = workspace.getId();
- workspaceLink.add(new WorkspaceStatusIcon("status", new LoadableDetachableModel<Status>() {
-
- @Override
- protected Status load() {
- return OneDev.getInstance(WorkspaceService.class).load(workspaceId).getStatus();
- }
-
- }));
-
- String title = "#" + workspace.getNumber() + " (" + workspace.getUser().getDisplayName() + ")";
- workspaceLink.add(new Label("title", title));
- item.add(workspaceLink);
- }
-
- });
- add(fragment);
- } else {
- add(new Label("content", _T("No workspaces")).add(AttributeAppender.append("class", "no-workspaces font-italic text-nowrap")));
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MiniWorkspaceListCssResourceReference()));
- }
-
- protected Component newListLink(String componentId) {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/mini-workspace-list.css b/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/mini-workspace-list.css
deleted file mode 100644
index 3d52c1eabb..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/minilist/mini-workspace-list.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.mini-workspace-list.no-workspaces {
- margin: 0.5rem 1rem !important;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.html b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.html
new file mode 100644
index 0000000000..30f9e27777
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <a wicket:id="link"></a>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java
new file mode 100644
index 0000000000..f20868ba20
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java
@@ -0,0 +1,56 @@
+package io.onedev.server.web.component.workspace.on;
+
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.model.Workspace;
+import io.onedev.server.util.ProjectAndBranch;
+import io.onedev.server.web.component.branch.BranchLink;
+import io.onedev.server.web.component.commit.CommitLink;
+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
+
+public class WorkspaceOnPanel extends GenericPanel<Workspace> {
+
+ public WorkspaceOnPanel(String id, IModel<Workspace> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var workspace = getModelObject();
+ if (workspace.getIssue() != null) {
+ add(new BookmarkablePageLink<Void>("link", IssueDetailPage.class,
+ IssueDetailPage.paramsOf(workspace.getIssue()))
+ .setBody(Model.of(workspace.getOnDescription())));
+ } else if (workspace.getRequest() != null) {
+ add(new BookmarkablePageLink<Void>("link", PullRequestDetailPage.class,
+ PullRequestDetailPage.paramsOf(workspace.getRequest()))
+ .setBody(Model.of(workspace.getOnDescription())));
+ } else if (workspace.getBranch() != null) {
+ add(new BranchLink("link", new ProjectAndBranch(workspace.getProject(), workspace.getBranch())) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(workspace.getOnDescription());
+ }
+
+ });
+ } else {
+ add(new CommitLink("link", workspace.getProject(), ObjectId.fromString(workspace.getCommitHash())) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(workspace.getOnDescription());
+ }
+
+ });
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.html
index f6a2d88a1f..5e664c6c6c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.html
@@ -14,4 +14,16 @@
</div>
</div>
</div>
+ <wicket:fragment wicket:id="hasWorkspacesFrag">
+ <div class="workspace-spec-workspaces has-workspaces">
+ <div class="body py-2">
+ <div wicket:id="workspaces">
+ <a wicket:id="workspace" class="workspace d-flex align-items-center bg-hover-light text-hover-gray-dark px-3 py-2">
+ <svg wicket:id="status" class="status mr-2"></svg>
+ <span wicket:id="title" class="title"></span>
+ </a>
+ </div>
+ </div>
+ </div>
+ </wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java
index 08ec7149c4..5b88e4179b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java
@@ -1,37 +1,53 @@
package io.onedev.server.web.component.workspace.speclist;
import static io.onedev.server.search.entity.workspace.WorkspaceQueryLexer.Is;
+import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
import javax.inject.Inject;
+import org.apache.wicket.Component;
+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.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
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.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
+import io.onedev.server.OneDev;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.Workspace;
+import io.onedev.server.model.Workspace.Status;
import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;
import io.onedev.server.search.entity.workspace.BranchCriteria;
import io.onedev.server.search.entity.workspace.CommitCriteria;
+import io.onedev.server.search.entity.workspace.IssueCriteria;
import io.onedev.server.search.entity.workspace.ProjectCriteria;
+import io.onedev.server.search.entity.workspace.PullRequestCriteria;
import io.onedev.server.search.entity.workspace.SpecCriteria;
import io.onedev.server.search.entity.workspace.WorkspaceQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.workspace.CreateWorkspaceLink;
-import io.onedev.server.web.component.workspace.minilist.MiniWorkspaceListPanel;
+import io.onedev.server.web.component.workspace.status.WorkspaceStatusIcon;
import io.onedev.server.web.page.project.workspaces.ProjectWorkspacesPage;
+import io.onedev.server.web.page.project.workspaces.detail.dashboard.WorkspaceDashboardPage;
import io.onedev.server.workspace.WorkspaceService;
public abstract class WorkspaceSpecListPanel extends Panel {
@@ -50,12 +66,23 @@ public abstract class WorkspaceSpecListPanel extends Panel {
protected abstract ObjectId getCommitId();
+ @Nullable
+ protected Issue getIssue() {
+ return null;
+ }
+
+ @Nullable
+ protected PullRequest getPullRequest() {
+ return null;
+ }
+
+ protected boolean isOnInfoVisible() {
+ return true;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
-
- var branch = getBranch();
- var commitId = getCommitId();
RepeatingView specsView = new RepeatingView("specs");
add(specsView);
@@ -67,12 +94,12 @@ public abstract class WorkspaceSpecListPanel extends Panel {
@Override
protected List<Workspace> load() {
- return queryWorkspaces(commitId, branch, spec.getName());
+ return getWorkspaces(spec.getName());
}
};
- String queryString = buildWorkspaceQueryString(commitId, branch, spec.getName());
+ String queryString = buildWorkspaceQueryString(spec.getName());
specItem.add(new BookmarkablePageLink<Void>("showInList", ProjectWorkspacesPage.class,
ProjectWorkspacesPage.paramsOf(getProject(), queryString, 0)) {
@@ -83,7 +110,7 @@ public abstract class WorkspaceSpecListPanel extends Panel {
}
});
- specItem.add(new MiniWorkspaceListPanel("detail", workspacesModel));
+ specItem.add(newDetail("detail", workspacesModel));
specItem.add(new CreateWorkspaceLink("create") {
@@ -97,14 +124,24 @@ public abstract class WorkspaceSpecListPanel extends Panel {
return spec;
}
+ @Override
+ protected Issue getIssue() {
+ return WorkspaceSpecListPanel.this.getIssue();
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return WorkspaceSpecListPanel.this.getPullRequest();
+ }
+
@Override
protected String getBranch() {
- return branch;
+ return WorkspaceSpecListPanel.this.getBranch();
}
@Override
protected ObjectId getCommitId() {
- return commitId;
+ return WorkspaceSpecListPanel.this.getCommitId();
}
});
@@ -115,27 +152,91 @@ public abstract class WorkspaceSpecListPanel extends Panel {
}
}
- private Criteria<Workspace> buildWorkspaceCriteria(ObjectId commitId, @Nullable String branch, String specName) {
+ private Component newDetail(String componentId, IModel<List<Workspace>> workspacesModel) {
+ if (!workspacesModel.getObject().isEmpty()) {
+ Fragment fragment = new Fragment(componentId, "hasWorkspacesFrag", this);
+ fragment.add(new ListView<Workspace>("workspaces", workspacesModel) {
+
+ @Override
+ protected void populateItem(ListItem<Workspace> item) {
+ Workspace workspace = item.getModelObject();
+
+ Link<Void> workspaceLink = new BookmarkablePageLink<Void>("workspace",
+ WorkspaceDashboardPage.class, WorkspaceDashboardPage.paramsOf(workspace));
+
+ Long workspaceId = workspace.getId();
+ workspaceLink.add(new WorkspaceStatusIcon("status", new LoadableDetachableModel<Status>() {
+
+ @Override
+ protected Status load() {
+ return OneDev.getInstance(WorkspaceService.class).load(workspaceId).getStatus();
+ }
+
+ }));
+
+ String title = "#" + workspace.getNumber() + " (" + workspace.getUser().getDisplayName();
+ if (isOnInfoVisible())
+ title += " on " + workspace.getOnDescription();
+ title += ")";
+ workspaceLink.add(new Label("title", title));
+ item.add(workspaceLink);
+ }
+
+ });
+ return fragment;
+ } else {
+ return new Label(componentId, _T("No workspaces"))
+ .add(AttributeAppender.append("class", "workspace-spec-workspaces no-workspaces font-italic text-nowrap"));
+ }
+ }
+
+ private Criteria<Workspace> buildWorkspaceCriteria(String specName) {
var criterias = new ArrayList<Criteria<Workspace>>();
criterias.add(new ProjectCriteria(getProject().getPath(), Is));
criterias.add(new SpecCriteria(specName, Is));
- if (branch != null)
- criterias.add(new BranchCriteria(branch, Is));
- else
- criterias.add(new CommitCriteria(getProject(), commitId, Is));
+ var issue = getIssue();
+ if (issue != null) {
+ criterias.add(new IssueCriteria(getProject(), issue, Is));
+ } else {
+ var pullRequest = getPullRequest();
+ if (pullRequest != null) {
+ criterias.add(new PullRequestCriteria(getProject(), pullRequest, Is));
+ } else if (getBranch() != null) {
+ var branch = getBranch();
+ criterias.add(new BranchCriteria(branch, Is));
+ } else {
+ criterias.add(new CommitCriteria(getProject(), getCommitId(), Is));
+ }
+ }
return Criteria.andCriterias(criterias);
}
- private List<Workspace> queryWorkspaces(ObjectId commitId, @Nullable String branch, String specName) {
- var query = new WorkspaceQuery(buildWorkspaceCriteria(commitId, branch, specName));
- var workspaces = new ArrayList<>(workspaceService.query(
- SecurityUtils.getSubject(), getProject(), query, 0, Integer.MAX_VALUE));
- workspaces.sort(Comparator.comparing(Workspace::getNumber));
- return workspaces;
+ private List<Workspace> getWorkspaces(String specName) {
+ var issue = getIssue();
+ if (issue != null) {
+ return issue.getWorkspaces().stream()
+ .filter(it -> it.getSpecName().equals(specName))
+ .sorted(Comparator.comparing(Workspace::getNumber))
+ .collect(Collectors.toList());
+ } else {
+ var pullRequest = getPullRequest();
+ if (pullRequest != null) {
+ return pullRequest.getWorkspaces().stream()
+ .filter(it -> it.getSpecName().equals(specName))
+ .sorted(Comparator.comparing(Workspace::getNumber))
+ .collect(Collectors.toList());
+ } else {
+ var query = new WorkspaceQuery(buildWorkspaceCriteria(specName));
+ var workspaces = workspaceService.query(SecurityUtils.getSubject(), getProject(), query, 0, Integer.MAX_VALUE);
+ return workspaces.stream()
+ .sorted(Comparator.comparing(Workspace::getNumber))
+ .collect(Collectors.toList());
+ }
+ }
}
- private String buildWorkspaceQueryString(ObjectId commitId, @Nullable String branch, String specName) {
- return new WorkspaceQuery(buildWorkspaceCriteria(commitId, branch, specName)).toString();
+ private String buildWorkspaceQueryString(String specName) {
+ return new WorkspaceQuery(buildWorkspaceCriteria(specName)).toString();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/workspace-spec-list.css b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/workspace-spec-list.css
index 0491203407..ac4266590c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/workspace-spec-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/workspace-spec-list.css
@@ -1,3 +1,7 @@
.workspace-spec-list {
max-width: 480px;
}
+
+.workspace-spec-workspaces.no-workspaces {
+ margin: 0.5rem 1rem !important;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/img/logo.png b/server-core/src/main/java/io/onedev/server/web/img/logo.png
index 54b5e6cb6b..c1c4a0f7b4 100644
Binary files a/server-core/src/main/java/io/onedev/server/web/img/logo.png and b/server-core/src/main/java/io/onedev/server/web/img/logo.png differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 475fa27cdc..aa9e35ef66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -315,6 +315,14 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
protected Component newDeleteLink(String componentId) {
return new Link<Void>(componentId) {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (getIssue().getWorkspaces().size() == 0) {
+ add(new ConfirmClickModifier(_T("Do you really want to delete this issue?")));
+ }
+ }
+
@Override
public void onClick() {
issueService.delete(getIssue());
@@ -330,7 +338,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));
}
- }.add(new ConfirmClickModifier(_T("Do you really want to delete this issue?")));
+ };
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
index 2db8286f4f..0367e550d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
@@ -11,6 +11,7 @@ import javax.persistence.EntityNotFoundException;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -27,10 +28,10 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.service.PullRequestService;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.PullRequestService;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.MarkdownViewer;
@@ -96,6 +97,17 @@ public class InvalidPullRequestPage extends ProjectPage {
protected void onConfigure() {
super.onConfigure();
setVisible(SecurityUtils.canManageProject(getPullRequest().getTargetProject()));
+ setEnabled(getPullRequest().getWorkspaces().size() == 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.append("class", "disabled", " ");
+ tag.put("data-tippy-content", _T("Cannot delete pull request as it has workspaces"));
+ }
}
}.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete pull request #{0}?"), getPullRequest().getNumber()))));
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 da9a69c2e4..90a4aa208b 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
@@ -1260,6 +1260,14 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
actions.add(new Link<Void>("delete") {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (getPullRequest().getWorkspaces().size() == 0) {
+ add(new ConfirmClickModifier(_T("Do you really want to delete this pull request?")));
+ }
+ }
+
@Override
public void onClick() {
PullRequest request = getPullRequest();
@@ -1276,7 +1284,23 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject()));
}
- }.add(new ConfirmClickModifier(_T("Do you really want to delete this pull request?"))));
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(getPullRequest().getWorkspaces().size() == 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.append("class", "disabled", " ");
+ tag.put("data-tippy-content", _T("Cannot delete pull request as it has workspaces"));
+ }
+ }
+
+ });
} else {
actions.add(new WebMarkupContainer("synchronize"));
actions.add(new WebMarkupContainer("delete"));
@@ -1673,17 +1697,31 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Project getProject() {
- return getPullRequest().getSourceProject();
+ return getPullRequest().getProject();
}
@Override
protected String getBranch() {
- return getPullRequest().getSourceBranch();
+ if (getPullRequest().getSourceProject() != null) {
+ return getPullRequest().getSourceBranch();
+ } else {
+ return null;
+ }
}
@Override
protected ObjectId getCommitId() {
- return getPullRequest().getSourceHead();
+ return getPullRequest().getLatestUpdate().getHeadCommit().copy();
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return PullRequestDetailPage.this.getPullRequest();
+ }
+
+ @Override
+ protected boolean isOnInfoVisible() {
+ return false;
}
};
@@ -1693,9 +1731,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected void onConfigure() {
super.onConfigure();
var request = getPullRequest();
- setVisible(request.getSourceHead() != null
- && SecurityUtils.canCreateWorkspaces(request.getSourceProject())
- && !request.getSourceProject().getHierarchyWorkspaceSpecs().isEmpty());
+ setVisible(!request.getProject().getHierarchyWorkspaceSpecs().isEmpty()
+ && SecurityUtils.canCreateWorkspaces(request.getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html
index 905286edc5..695993231e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html
@@ -7,7 +7,7 @@
<span wicket:id="statusLabel" class="font-weight-bolder"></span>
</div>
<div class="summary mr-3">
- <span class="d-none d-md-inline"><a wicket:id="user"></a> on </span><a wicket:id="revision"></a> <span class="d-none d-md-inline">for <span wicket:id="spec"></span></span>
+ <span class="d-none d-md-inline"><a wicket:id="user"></a> on </span><span wicket:id="reference"></span> <span class="d-none d-md-inline">for <span wicket:id="spec"></span></span>
<span wicket:id="invalidSpec" class="text-warning ml-1"></span>
</div>
<a wicket:id="shortcuts" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-3" t:data-tippy-content="Shortcuts">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java
index 9c2aee183b..219d53e32f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java
@@ -33,7 +33,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
import io.onedev.server.cluster.ClusterService;
@@ -46,12 +45,9 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.workspace.WorkspaceQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.SettingService;
-import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.branch.BranchLink;
-import io.onedev.server.web.component.commit.CommitLink;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -62,6 +58,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.workspace.invalidspec.InvalidWorkspaceSpecIcon;
+import io.onedev.server.web.component.workspace.on.WorkspaceOnPanel;
import io.onedev.server.web.component.workspace.status.WorkspaceStatusIcon;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
@@ -149,10 +146,7 @@ public abstract class WorkspaceDetailPage extends ProjectPage {
add(head);
head.add(new UserIdentPanel("user", workspace.getUser(), Mode.AVATAR_AND_NAME));
- if (workspace.getBranch() != null)
- head.add(new BranchLink("revision", new ProjectAndBranch(workspace.getProject(), workspace.getBranch())));
- else
- head.add(new CommitLink("revision", workspace.getProject(), ObjectId.fromString(workspace.getCommitHash())));
+ head.add(new WorkspaceOnPanel("reference", workspaceModel));
head.add(new Label("spec", workspace.getSpecName()));
head.add(new InvalidWorkspaceSpecIcon("invalidSpec", workspaceModel));
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index bd3ad84c5a..888bce98c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -74,7 +74,6 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.interpolative.JobVariableInterpolator;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.workspace.WorkspaceService;
import io.onedev.server.workspace.WorkspaceVariable;
import io.onedev.server.xodus.CommitInfoService;
@@ -484,29 +483,6 @@ public class SuggestionUtils {
return suggestions;
}
- public static List<InputSuggestion> suggestWorkspaces(@Nullable Project project, String matchWith, int count) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- var scopedQuery = ProjectScopedQuery.of(project, matchWith, '#', null);
- if (scopedQuery != null) {
- var subject = SecurityUtils.getSubject();
- for (var workspace: OneDev.getInstance(WorkspaceService.class)
- .query(subject, scopedQuery.getProject(), scopedQuery.getQuery(), count)) {
- String ref;
- if (project != null && project.equals(scopedQuery.getProject()))
- ref = "#" + workspace.getNumber();
- else
- ref = workspace.getProject().getPath() + "#" + workspace.getNumber();
- suggestions.add(new InputSuggestion(ref, workspace.getRevisionDescription(), null));
- }
- }
- if (suggestions.isEmpty() && matchWith.length() == 0) {
- suggestions.add(new InputSuggestion("path/to/project#100", "An example workspace", null));
- if (project != null)
- suggestions.add(new InputSuggestion("#100", "An example workspace", null));
- }
- return suggestions;
- }
-
public static List<InputSuggestion> suggestGroups(String matchWith) {
List<String> groupNames = OneDev.getInstance(GroupService.class).query()
.stream()
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index 78937d11c3..897d1b3888 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -69,12 +69,12 @@ import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.cluster.NodeStopping;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.project.workspace.WorkspaceTerminalOpened;
import io.onedev.server.event.project.workspace.WorkspaceActive;
import io.onedev.server.event.project.workspace.WorkspaceCreated;
import io.onedev.server.event.project.workspace.WorkspaceEvent;
import io.onedev.server.event.project.workspace.WorkspaceInactive;
import io.onedev.server.event.project.workspace.WorkspacePending;
+import io.onedev.server.event.project.workspace.WorkspaceTerminalOpened;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopping;
@@ -83,7 +83,9 @@ import io.onedev.server.logging.LogService;
import io.onedev.server.logging.ServerLogger;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Agent;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.Workspace;
import io.onedev.server.model.Workspace.Status;
@@ -213,10 +215,13 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
@Transactional
@Override
- public Workspace create(User user, Project project, ObjectId commitId, @Nullable String branch, String specName, boolean forTaskAutomation) {
+ public Workspace create(User user, Project project, Issue issue, PullRequest request,
+ ObjectId commitId, String branch, String specName, boolean forTaskAutomation) {
var workspace = new Workspace();
workspace.setUser(user);
workspace.setProject(project);
+ workspace.setIssue(issue);
+ workspace.setRequest(request);
workspace.setCommitHash(commitId.name());
workspace.setBranch(branch);
workspace.setSpecName(specName);
@@ -789,7 +794,14 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
if (gitEmail == null)
throw new ExplicitException("No email address for git operations configured");
- var cloneInfo = new DefaultCloneInfo(urlService.cloneUrlFor(workspace.getProject(), false), token);
+ String cloneUrl;
+ if (workspace.getRequest() != null && workspace.getBranch() != null) {
+ Preconditions.checkState(workspace.getRequest().getSourceProject() != null, "Source project no longer exists");
+ cloneUrl = urlService.cloneUrlFor(workspace.getRequest().getSourceProject(), false);
+ } else {
+ cloneUrl = urlService.cloneUrlFor(workspace.getProject(), false);
+ }
+ var cloneInfo = new DefaultCloneInfo(cloneUrl, token);
var context = new WorkspaceContext(spec, provisioner, token, projectId, projectPath, projectGitDir,
workspaceId, workspaceNumber, workspace.getUser().getId(), workspace.getUser().getDisplayName(),
@@ -1105,7 +1117,8 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
@Transactional
@Override
- public void runPrompt(User ai, Project project, ObjectId commitId, String branch, String prompt, TaskFailedCallback taskFailedCallback) {
+ public void runPrompt(User ai, Project project, @Nullable Issue issue, @Nullable PullRequest request,
+ @Nullable ObjectId commitId, @Nullable String branch, String prompt, TaskFailedCallback taskFailedCallback) {
WorkspaceSpec applicableSpec = null;
for (var spec : project.getHierarchyWorkspaceSpecs()) {
if (spec.getTaskAutomation() != null) {
@@ -1118,7 +1131,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
if (applicableSpec != null) {
final WorkspaceSpec finalApplicableSpec = applicableSpec;
- var workspaceId = create(ai, project, commitId, branch, applicableSpec.getName(), true).getId();
+ var workspaceId = create(ai, project, issue, request, commitId, branch, applicableSpec.getName(), true).getId();
transactionService.runAfterCommit(() -> {
executorService.execute(() -> {
@@ -1136,11 +1149,10 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
var workspaceReference = workspace.getReference().toString(project);
if (workspace.getStatus() == Workspace.Status.ACTIVE) {
- String fullPrompt;
+ String fullPrompt = "### Rules\nYou are talking to an AI user.\n";
if (ai.getAiSetting().getSystemPrompt() != null)
- fullPrompt = "Rules:\n" + ai.getAiSetting().getSystemPrompt() + "\n\nUser:\n" + prompt;
- else
- fullPrompt = prompt;
+ fullPrompt += ai.getAiSetting().getSystemPrompt().trim() + "\n";
+ fullPrompt += "\n### User\n" + prompt;
var command = finalApplicableSpec.getShell().decorateRunPromptCommand(
finalApplicableSpec.getTaskAutomation().getRunTaskCmd(), fullPrompt.trim(),
diff --git a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
index bd2e72c90e..853061edb2 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
@@ -12,7 +12,9 @@ import org.jspecify.annotations.Nullable;
import io.onedev.agent.workspace.FileData;
import io.onedev.agent.workspace.GitExecutionResult;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.Workspace;
import io.onedev.server.search.entity.workspace.WorkspaceQuery;
@@ -24,7 +26,13 @@ public interface WorkspaceService extends EntityService<Workspace> {
@Nullable Workspace find(Project project, long number);
- Workspace create(User user, Project project, ObjectId commitId, @Nullable String branch, String specName, boolean forTaskAutomation);
+ default Workspace create(User user, Project project, ObjectId commitId, @Nullable String branch,
+ String specName, boolean forTaskAutomation) {
+ return create(user, project, null, null, commitId, branch, specName, forTaskAutomation);
+ }
+
+ Workspace create(User user, Project project, @Nullable Issue issue, @Nullable PullRequest pullRequest,
+ ObjectId commitId, @Nullable String branch, String specName, boolean forTaskAutomation);
void update(Workspace workspace);
@@ -76,7 +84,8 @@ public interface WorkspaceService extends EntityService<Workspace> {
@Nullable
FileData readFileData(Workspace workspace, String path);
- void runPrompt(User ai, Project project, ObjectId commitId, @Nullable String branch,
- String prompt, TaskFailedCallback taskFailedCallback);
+ void runPrompt(User ai, Project project, @Nullable Issue issue, @Nullable PullRequest request,
+ @Nullable ObjectId commitId, @Nullable String branch, String prompt,
+ TaskFailedCallback taskFailedCallback);
}
diff --git a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
index af4934be7c..ef1a789db7 100644
--- a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
+++ b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
@@ -13,6 +13,7 @@ import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.BlobTarget;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.GeneralTarget;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
import io.onedev.server.util.XmlUtils;
@@ -71,51 +72,7 @@ public class PublishRoslynatorReportStep extends PublishProblemReportStep {
xml = StringUtils.removeBOM(xml);
Document doc = reader.read(new StringReader(XmlUtils.stripDoctype(xml)));
- var codeAnalysisElement = doc.getRootElement().element("CodeAnalysis");
- Map<String, String> messages = new HashMap<>();
- for (var diagnosticElement: codeAnalysisElement.element("Summary").elements("Diagnostic")) {
- var id = diagnosticElement.attributeValue("Id");
- var message = diagnosticElement.attributeValue("Title");
- var description = diagnosticElement.elementText("Description");
- if (description != null)
- message += "\n\n" + description;
- messages.put(id, message);
- }
- for (var projectElement: codeAnalysisElement.element("Projects").elements("Project")) {
- for (var diagnosticsElement: projectElement.element("Diagnostics").elements("Diagnostic")) {
- var id = diagnosticsElement.attributeValue("Id");
- var message = messages.get(id);
- if (message == null)
- message = diagnosticsElement.elementText("Message");
- message = id + ": " + message;
- CodeProblem.Severity severity;
- switch (diagnosticsElement.elementText("Severity").trim()) {
- case "Error":
- severity = Severity.HIGH;
- break;
- case "Warning":
- severity = Severity.MEDIUM;
- break;
- default:
- severity = Severity.LOW;
- }
- var filePath = diagnosticsElement.elementText("FilePath").trim();
- var blobPath = blobPaths.get(filePath);
- if (blobPath == null) {
- blobPath = Optional.ofNullable(build.getBlobPath(filePath));
- if (blobPath.isEmpty())
- logger.warning("Unable to find blob path for file: " + filePath);
- blobPaths.put(filePath, blobPath);
- }
- if (blobPath.isPresent()) {
- var locationElement = diagnosticsElement.element("Location");
- int line = parseInt(locationElement.attributeValue("Line"));
- int character = parseInt(locationElement.attributeValue("Character"));
- var location = new PlanarRange(line-1, character-1, line-1, character);
- problems.add(new CodeProblem(severity, new BlobTarget(blobPath.get(), location), escapeHtml5(message)));
- }
- }
- }
+ problems.addAll(parse(build, doc, blobPaths, logger));
} catch (DocumentException e) {
logger.warning("Ignored Roslynator report '" + relativePath + "' as it is not a valid XML");
} catch (IOException e) {
@@ -124,5 +81,67 @@ public class PublishRoslynatorReportStep extends PublishProblemReportStep {
}
return problems;
}
+
+ static List<CodeProblem> parse(Build build, Document doc, Map<String, Optional<String>> blobPaths, TaskLogger logger) {
+ List<CodeProblem> problems = new ArrayList<>();
+ var codeAnalysisElement = doc.getRootElement().element("CodeAnalysis");
+ Map<String, String> messages = new HashMap<>();
+ for (var diagnosticElement: codeAnalysisElement.element("Summary").elements("Diagnostic")) {
+ var id = diagnosticElement.attributeValue("Id");
+ var message = diagnosticElement.attributeValue("Title");
+ var description = diagnosticElement.elementText("Description");
+ if (description != null)
+ message += "\n\n" + description;
+ messages.put(id, message);
+ }
+ for (var projectElement: codeAnalysisElement.element("Projects").elements("Project")) {
+ var projectName = StringUtils.trimToNull(projectElement.attributeValue("Name"));
+ if (projectName == null)
+ projectName = StringUtils.trimToNull(projectElement.attributeValue("FilePath"));
+ if (projectName == null)
+ projectName = "General";
+ for (var diagnosticsElement: projectElement.element("Diagnostics").elements("Diagnostic")) {
+ var id = diagnosticsElement.attributeValue("Id");
+ var message = messages.get(id);
+ if (message == null)
+ message = diagnosticsElement.elementText("Message");
+ message = id + ": " + message;
+ CodeProblem.Severity severity;
+ switch (diagnosticsElement.elementText("Severity").trim()) {
+ case "Error":
+ severity = Severity.HIGH;
+ break;
+ case "Warning":
+ severity = Severity.MEDIUM;
+ break;
+ default:
+ severity = Severity.LOW;
+ }
+ var filePath = StringUtils.trimToNull(diagnosticsElement.elementText("FilePath"));
+ if (filePath == null) {
+ problems.add(new CodeProblem(severity, new GeneralTarget(projectName), escapeHtml5(message)));
+ continue;
+ }
+ var blobPath = blobPaths.get(filePath);
+ if (blobPath == null) {
+ blobPath = Optional.ofNullable(build.getBlobPath(filePath));
+ if (blobPath.isEmpty())
+ logger.warning("Unable to find blob path for file: " + filePath);
+ blobPaths.put(filePath, blobPath);
+ }
+ if (blobPath.isPresent()) {
+ PlanarRange location = null;
+ var locationElement = diagnosticsElement.element("Location");
+ if (locationElement != null) {
+ int line = parseInt(locationElement.attributeValue("Line"));
+ int character = parseInt(locationElement.attributeValue("Character"));
+ location = new PlanarRange(line-1, character-1, line-1, character);
+ }
+ problems.add(new CodeProblem(severity, new BlobTarget(blobPath.get(), location), escapeHtml5(message)));
+ }
+ }
+ }
+ return problems;
+ }
}
diff --git a/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java
new file mode 100644
index 0000000000..9eaf2f9210
--- /dev/null
+++ b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java
@@ -0,0 +1,59 @@
+package io.onedev.server.plugin.report.roslynator;
+
+import com.google.common.io.Resources;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.codequality.BlobTarget;
+import io.onedev.server.codequality.CodeProblem;
+import io.onedev.server.codequality.GeneralTarget;
+import io.onedev.server.model.Build;
+import org.dom4j.io.SAXReader;
+import org.eclipse.jgit.lib.ObjectId;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Optional;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class PublishRoslynatorReportStepTest {
+
+ @Test
+ public void testParseDiagnosticsWithoutFilePath() {
+ try (var is = Resources.getResource(PublishRoslynatorReportStepTest.class, "report.xml").openStream()) {
+ Build build = new Build() {
+ @Override
+ public String getBlobPath(String filePath) {
+ return filePath;
+ }
+ };
+ build.setCommitHash(ObjectId.zeroId().name());
+
+ var problems = PublishRoslynatorReportStep.parse(build, new SAXReader().read(is), new HashMap<String, Optional<String>>(), new TaskLogger() {
+ @Override
+ public void log(String message, @Nullable String sessionId) {
+ }
+ });
+
+ assertEquals(3, problems.size());
+ var problem = problems.get(0);
+ assertEquals(CodeProblem.Severity.HIGH, problem.getSeverity());
+ assertEquals("supermario", problem.getTarget().getGroupKey().getName());
+ assertEquals(GeneralTarget.class, problem.getTarget().getClass());
+
+ problem = problems.get(1);
+ assertEquals(CodeProblem.Severity.LOW, problem.getSeverity());
+ assertEquals("/onedev-build/work/supermario/Dialogue.cs", problem.getTarget().getGroupKey().getName());
+ assertEquals("11.17-11.18-1", ((BlobTarget) problem.getTarget()).getLocation().toString());
+
+ problem = problems.get(2);
+ assertEquals(CodeProblem.Severity.MEDIUM, problem.getSeverity());
+ assertEquals("/onedev-build/work/supermario/Program.cs", problem.getTarget().getGroupKey().getName());
+ assertNull(((BlobTarget) problem.getTarget()).getLocation());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/report.xml b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/report.xml
new file mode 100644
index 0000000000..6c4d2ed6c6
--- /dev/null
+++ b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/report.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Roslynator>
+ <CodeAnalysis>
+ <Summary>
+ <Diagnostic Id="CA1822" Title="Mark members as static" Count="1">
+ <Description>Members that do not access instance data or call instance methods can be marked as static.</Description>
+ </Diagnostic>
+ <Diagnostic Id="CS0103" Title="" Count="1" />
+ <Diagnostic Id="CS0518" Title="" Count="1" />
+ </Summary>
+ <Projects>
+ <Project Name="supermario" FilePath="/onedev-build/work/supermario/supermario.csproj">
+ <Diagnostics>
+ <Diagnostic Id="CS0518">
+ <Severity>Error</Severity>
+ <Message></Message>
+ </Diagnostic>
+ <Diagnostic Id="CA1822">
+ <Severity>Info</Severity>
+ <Message>Mark members as static</Message>
+ <FilePath>/onedev-build/work/supermario/Dialogue.cs</FilePath>
+ <Location Line="11" Character="17" />
+ </Diagnostic>
+ <Diagnostic Id="CS0103">
+ <Severity>Warning</Severity>
+ <Message></Message>
+ <FilePath>/onedev-build/work/supermario/Program.cs</FilePath>
+ </Diagnostic>
+ </Diagnostics>
+ </Project>
+ </Projects>
+ </CodeAnalysis>
+</Roslynator>