The Unified and Autonomous Development Platform
feat: Workspaces for issues and pull requests
Robin Shenbf6268e8df34
diff --git a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.javaindex 33bf707ead..fccab927b3 100644--- a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java+++ b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java@@ -8,6 +8,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import org.apache.shiro.subject.Subject;+import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;@@ -15,6 +17,7 @@ import io.onedev.server.OneDev;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.UrlService;public class IssueHelper {@@ -67,8 +70,10 @@ public class IssueHelper {return comments;}- public static Map<String, Object> getDetail(Project currentProject, Issue issue) {+ public static Map<String, Object> getDetail(Subject subject, Project currentProject, Issue issue) {var detail = getSummary(currentProject, issue);+ if (SecurityUtils.canReadCode(subject, issue.getProject()))+ detail.put("branch", issue.getBranch());for (var entry : issue.getFieldInputs().entrySet()) {detail.put(entry.getKey(), entry.getValue().getValues());}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.javaindex df7b56feee..5a4b48a05e 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@@ -554,12 +554,13 @@ public class TodResource {public Map<String, Object> getIssue(@QueryParam("currentProject") @NotNull String currentProjectPath,@QueryParam("reference") @NotNull String issueReference) {- if (SecurityUtils.getUser() == null)+ var subject = SecurityUtils.getSubject();+ if (SecurityUtils.getUser(subject) == null)throw new UnauthenticatedException();var currentProject = getProject(currentProjectPath);var issue = getIssue(currentProject, issueReference);- return IssueHelper.getDetail(currentProject, issue);+ return IssueHelper.getDetail(subject, currentProject, issue);}@Path("/get-project-key")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 3320a2a306..659ba14322 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -2623,4 +2623,39 @@ public class BuildSpec implements Serializable, Validatable {});}+ @SuppressWarnings("unused")+ private void migrate48(VersionedYamlDoc doc, Stack<Integer> versions) {+ migrateSteps(doc, versions, stepsNode -> {+ for (Node stepsNodeItem : stepsNode.getValue()) {+ MappingNode stepNode = (MappingNode) stepsNodeItem;+ if (!"CreateBranchStep".equals(getStepType(stepNode)))+ continue;+ for (var stepTuple : stepNode.getValue()) {+ var propName = ((ScalarNode) stepTuple.getKeyNode()).getValue();+ if (!propName.equals("branchNameProvider"))+ continue;+ MappingNode providerNode = (MappingNode) stepTuple.getValueNode();+ String providerType = null;+ for (var providerTuple : providerNode.getValue()) {+ var providerPropName = ((ScalarNode) providerTuple.getKeyNode()).getValue();+ if (providerPropName.equals("type")) {+ providerType = ((ScalarNode) providerTuple.getValueNode()).getValue();+ break;+ }+ }+ if ("GeneratedBranchName".equals(providerType)) {+ for (var itProviderTuple = providerNode.getValue().iterator(); itProviderTuple.hasNext();) {+ var providerTuple = itProviderTuple.next();+ var providerPropName = ((ScalarNode) providerTuple.getKeyNode()).getValue();+ if (providerPropName.equals("prefix")) {+ itProviderTuple.remove();+ break;+ }+ }+ }+ }+ }+ });+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/GeneratedBranchName.java b/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/GeneratedBranchName.javaindex 7c05c14ec6..ace9800a3f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/GeneratedBranchName.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/GeneratedBranchName.java@@ -1,13 +1,8 @@package io.onedev.server.buildspec.step.branchnameprovider;-import java.util.List;--import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.model.Build;import io.onedev.server.service.IssueService;@@ -18,33 +13,13 @@ public class GeneratedBranchName implements BranchNameProvider {private static final long serialVersionUID = 1L;- private String prefix;-- @Editable(order=100, name="Branch Prefix", placeholder = "No prefix", description="Optionally specify a prefix to be prepended to generated branch name")- @Interpolative(variableSuggester="suggestVariables")- public String getPrefix() {- return prefix;- }-- public void setPrefix(String prefix) {- this.prefix = prefix;- }-@Overridepublic String getBranchName(Build build) {if (build.getIssue() != null) {- var branchName = OneDev.getInstance(IssueService.class).suggestBranch(build.getIssue());- if (prefix != null)- branchName = prefix + branchName;- return branchName;+ return OneDev.getInstance(IssueService.class).suggestBranch(build.getIssue());} else {throw new ExplicitException("Generated branch name is only available when issue state triggers are used");}}- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, true, true, false);- }-}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.javaindex 9e2ab84a14..69decdf8e9 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@@ -37,6 +37,7 @@ import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;import java.util.Stack;import java.util.UUID;@@ -69,6 +70,7 @@ import org.jspecify.annotations.Nullable;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.JsonNode;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@ -85,6 +87,7 @@ import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entityreference.EntityReference;import io.onedev.server.entityreference.IssueReference;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.ProjectBelonging;@@ -427,6 +430,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportprivate transient Collection<User> participants;private transient Collection<User> authorizedUsers;++ private transient Optional<String> branchOptional;public String getState() {return state;@@ -1380,7 +1385,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportvar issue = getIssue(issueId);if (!SecurityUtils.canAccessIssue(subject, issue))throw new UnauthorizedException();- return new ToolExecutionResult(convertToJson(IssueHelper.getDetail(issue.getProject(), issue)), false);+ return new ToolExecutionResult(convertToJson(IssueHelper.getDetail(subject, issue.getProject(), issue)), false);}},@@ -1405,8 +1410,31 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport});}+ @Nullable+ public String getBranch() {+ if (branchOptional == null) {+ String fixedPart = "issue-" + getNumber();+ for (var ref : getProject().getBranchRefs()) {+ String branch = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));+ int index = branch.toLowerCase().indexOf(fixedPart);+ if (index < 0)+ continue;+ if (index > 0 && branch.charAt(index - 1) != '/')+ continue;+ int end = index + fixedPart.length();+ if (end < branch.length() && branch.charAt(end) != '-')+ continue;+ branchOptional = Optional.of(branch);+ break;+ }+ if (branchOptional == null)+ branchOptional = Optional.empty();+ }+ return branchOptional.orElse(null);+ }+private static Issue getIssue(Long issueId) {return OneDev.getInstance(IssueService.class).load(issueId);}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 144d3d68e2..15831250e9 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -2066,6 +2066,18 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn "**";}+ @Nullable+ public String findIssueBranchPrefix() {+ Project current = this;+ do {+ if (current.getIssueSetting().getBranchPrefix() != null)+ return current.getIssueSetting().getBranchPrefix();+ current = current.getParent();+ } while (current != null);++ return null;+ }+public MergeStrategy findDefaultPullRequestMergeStrategy() {Project current = this;do {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex 506238da23..8338890362 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -15,6 +15,7 @@ import javax.validation.Valid;import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;+import io.onedev.server.annotation.BranchName;import io.onedev.server.annotation.Editable;import io.onedev.server.service.SettingService;import io.onedev.server.model.Issue;@@ -45,6 +46,8 @@ public class ProjectIssueSetting implements Serializable {private List<TransitionSpec> transitionSpecs = new ArrayList<>();private Map<String, TimesheetSetting> timesheetSettings = new LinkedHashMap<>();++ private String branchPrefix;private transient GlobalIssueSetting setting;@@ -111,6 +114,20 @@ public class ProjectIssueSetting implements Serializable {this.transitionSpecs = transitionSpecs;}+ @Editable(name="Branch Prefix", placeholder="Inherit from parent", rootPlaceholder="No prefix", description="""+ Optionally specify a prefix to be prepended (as a path segment) when generate issue branch.+ For instance with prefix <code>feature</code>, generated issue branch will be+ <code>feature/issue-100-some-title</code>""")+ @BranchName+ @Nullable+ public String getBranchPrefix() {+ return branchPrefix;+ }++ public void setBranchPrefix(@Nullable String branchPrefix) {+ this.branchPrefix = branchPrefix;+ }+public void onRenameUser(String oldName, String newName) {if (boardSpecs != null) {for (BoardSpec board: boardSpecs)@@ -267,5 +284,5 @@ public class ProjectIssueSetting implements Serializable {it.remove();}}-+}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 476fb5ee7f..95ca3171aa 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -248,6 +248,8 @@ public class PullRequestResource {User reviewer = userService.load(reviewerId);if (reviewer.equals(request.getSubmitter()))return Response.status(NOT_ACCEPTABLE).entity("Pull request submitter cannot be reviewer").build();+ if (!SecurityUtils.canReadCode(request.getProject()))+ throw new NotAcceptableException("Reviewer should have code read permission: " + reviewer.getName());if (request.getReview(reviewer) == null) {PullRequestReview review = new PullRequestReview();@@ -262,7 +264,10 @@ public class PullRequestResource {for (Long assigneeId : data.getAssigneeIds()) {PullRequestAssignment assignment = new PullRequestAssignment();assignment.setRequest(request);- assignment.setUser(userService.load(assigneeId));+ var assignee = userService.load(assigneeId);+ if (!SecurityUtils.canWriteCode(request.getProject()))+ throw new NotAcceptableException("Assignee should have code write permission: " + assignee.getName());+ assignment.setUser(assignee);request.getAssignments().add(assignment);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.javaindex c66b407058..fb555c21fd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java@@ -54,7 +54,6 @@ public class FuzzyCriteria extends Criteria<Project> {elsenameOrPathCriteria = new PathCriteria("**/*" + part + "*/**", Is);partCriterias.add(nameOrPathCriteria);- partCriterias.add(new DescriptionCriteria(part));if (NumberUtils.isDigits(part))partCriterias.add(new IdCriteria(Integer.parseInt(part), Is));criterias.add(new OrCriteria<Project>(partCriterias));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.javaindex c916e1f9ac..ce697985a8 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@@ -1329,6 +1329,8 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss@Sessional@Overridepublic String suggestBranch(Issue issue) {+ String prefix = issue.getProject().findIssueBranchPrefix();+ String prefixWithSlash = prefix != null ? prefix + "/" : "";var chatModel = settingService.getAiSetting().getLiteModel();if (chatModel != null) {var systemMessage = new SystemMessage("""@@ -1341,7 +1343,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issvar response = chatModel.chat(systemMessage, userMessage).aiMessage().text();response = StringUtils.trimToNull(response);if (response != null && Repository.isValidRefName(GitUtils.branch2ref(response)))- return "issue-" + issue.getNumber() + "-" + response;+ return prefixWithSlash + "issue-" + issue.getNumber() + "-" + response;} catch (Exception e) {logger.warn("Error calling AI model to get normalized title for branch: {}", e);break;@@ -1351,9 +1353,9 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issvar normalizedTitle = GitUtils.normalizeForBranch(issue.getTitle());if (normalizedTitle != null)- return "issue-" + issue.getNumber() + "-" + normalizedTitle;+ return prefixWithSlash + "issue-" + issue.getNumber() + "-" + normalizedTitle;else- return "issue-" + issue.getNumber();+ return prefixWithSlash + "issue-" + issue.getNumber();}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 667863b5c9..0ca6fa69df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -1,8 +1,9 @@<wicket:panel><div class="issue-operations d-flex flex-wrap row-gap-3">- <a wicket:id="state" class="state">+ <a wicket:id="state" class="state mr-3"><span wicket:id="name"></span></a>+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this issue" class="workspace mr-3 btn btn-outline-secondary btn-sm flex-shrink-0">Workspaces <wicket:svg href="arrow" class="icon rotate-90"/></a><a wicket:id="newIssue" class="new-issue btn btn-primary btn-sm btn-icon ml-auto" t:data-tippy-content="Create new issue"><wicket:svg href="plus" class="icon"/></a></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 4322fa8d7b..04093869ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -1,17 +1,25 @@package io.onedev.server.web.component.issue.operation;-import com.google.common.collect.Lists;-import io.onedev.server.model.Issue;-import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.component.issue.IssueStateBadge;-import io.onedev.server.web.page.project.issues.create.NewIssuePage;+import java.util.Collection;++import org.apache.wicket.Component;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import java.util.Collection;+import com.google.common.collect.Lists;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.issue.IssueStateBadge;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;+import io.onedev.server.web.page.project.issues.create.NewIssuePage;public abstract class IssueOperationsPanel extends Panel {@@ -30,7 +38,31 @@ public abstract class IssueOperationsPanel extends Panel {};addOrReplace(transitionMenuLink);-++ addOrReplace(new DropdownLink("workspaces") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new WorkspaceSpecListPanel(id, getIssue().getBranch()) {++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canWriteCode(getIssue().getProject())+ && getIssue().getBranch() != null+ && !getIssue().getProject().getHierarchyWorkspaceSpecs().isEmpty());+ }++ });+transitionMenuLink.add(new IssueStateBadge("name", new LoadableDetachableModel<>() {@Overrideprotected Issue load() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.cssindex be5e83fd67..51a4bbba10 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css@@ -1,14 +1,3 @@-.issue-operations>.state {- margin-right: 1.2rem;- padding-right: 1.2rem;-}-.issue-operations>.state.with-separator {- border-right: 1px solid var(--light-gray);-}-.dark-mode .issue-operations>.state.with-separator {- border-right-color: var(--dark-mode-lighter-dark);-}-.issue-operations>.state>.issue-state {padding: 0.55rem 0.75rem;font-size: 0.925rem;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex e925c05682..60900ab2d1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -38,6 +38,16 @@</wicket:enclosure></ul></div>+ <div wicket:id="branch" class="branch">+ <div class="head"><wicket:t>Associated Branch</wicket:t></div>+ <div class="body d-flex align-items-center">+ <wicket:enclosure child="link">+ <wicket:svg href="branch" class="icon mr-2 flex-shrink-0"></wicket:svg>+ <a wicket:id="link" class="text-truncate mr-2"></a>+ </wicket:enclosure>+ <a wicket:id="create" class="btn btn-outline-secondary btn-sm flex-shrink-0"><wicket:svg href="plus" class="icon mr-2"></wicket:svg><wicket:t>Create</wicket:t></a>+ </div>+ </div><div wicket:id="votes" class="votes"><div class="head"><wicket:t>Issue Votes</wicket:t> (<span wicket:id="count"></span>)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.javaindex 72527c2045..9149df5179 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@@ -15,6 +15,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;+import javax.inject.Inject;import javax.mail.internet.InternetAddress;import org.apache.wicket.Component;@@ -42,15 +43,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.Input;-import io.onedev.server.service.IssueChangeService;-import io.onedev.server.service.IssueVoteService;-import io.onedev.server.service.IssueWatchService;import io.onedev.server.entityreference.EntityReference;+import io.onedev.server.git.service.GitService;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueVote;@@ -64,11 +64,17 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.IssueChangeService;+import io.onedev.server.service.IssueService;+import io.onedev.server.service.IssueVoteService;+import io.onedev.server.service.IssueWatchService;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.Similarities;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.entity.reference.EntityReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;@@ -90,7 +96,13 @@ import io.onedev.server.web.page.security.LoginPage;public abstract class IssueSidePanel extends Panel {private static final int MAX_DISPLAY_AVATARS = 20;-++ @Inject+ private IssueService issueService;++ @Inject+ private GitService gitService;+private boolean confidential;private Component watchesContainer;@@ -105,6 +117,7 @@ public abstract class IssueSidePanel extends Panel {addOrReplace(newFieldsContainer());addOrReplace(newConfidentialContainer());addOrReplace(newIterationsContainer());+ addOrReplace(newBranchContainer());addOrReplace(newVotesContainer());addOrReplace(watchesContainer = new EntityWatchesPanel("watches") {@@ -381,7 +394,81 @@ public abstract class IssueSidePanel extends Panel {return container;}-++ private Component newBranchContainer() {+ String branch = getIssue().getBranch();+ boolean canCreate = branch == null && canCreateAssociatedBranch();+ WebMarkupContainer container = new WebMarkupContainer("branch") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canReadCode(getProject()) && (branch != null || canCreate));+ }++ };+ if (branch != null) {+ container.add(new BranchLink("link", new ProjectAndBranch(getProject(), branch), true)+ .add(AttributeAppender.replace("title", branch)));+ } else {+ container.add(new WebMarkupContainer("link").setVisible(false));+ }++ AjaxLink<Void> createLink = new AjaxLink<Void>("create") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new AttachAjaxIndicatorListener(false));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(canCreate);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ User user = SecurityUtils.getAuthUser();+ if (user == null)+ throw new RestartResponseAtInterceptPageException(LoginPage.class);++ Project project = getProject();+ String suggestedBranch = issueService.suggestBranch(getIssue());++ if (project.getBranchRef(suggestedBranch) != null) {+ getSession().error(MessageFormat.format(_T("Branch \"{0}\" already exists"), suggestedBranch));+ } else {+ String defaultBranch = project.getDefaultBranch();+ if (defaultBranch == null) {+ getSession().error(_T("Default branch is not available"));+ } else {+ RevCommit commit = project.getRevCommit(defaultBranch, true);+ if (!project.isCommitSignatureRequirementSatisfied(user, suggestedBranch, commit)) {+ getSession().error(_T("Valid signature required for head commit of this branch per branch protection rule"));+ } else {+ gitService.createBranch(project, suggestedBranch, defaultBranch);+ getSession().success(MessageFormat.format(_T("Branch \"{0}\" created"), suggestedBranch));+ }+ }+ }+ target.add(IssueSidePanel.this);+ onBranchCreated(target);+ }++ };+ container.add(createLink);++ return container;+ }++ private boolean canCreateAssociatedBranch() {+ String prefix = getProject().findIssueBranchPrefix();+ String branchName = (prefix != null ? prefix + "/" : "") + "issue-" + getIssue().getNumber();+ return SecurityUtils.canCreateBranch(getProject(), branchName);+ }+private List<IssueVote> getSortedVotes() {List<IssueVote> votes = new ArrayList<>(getIssue().getVotes());Collections.sort(votes, new Comparator<IssueVote>() {@@ -584,6 +671,8 @@ public abstract class IssueSidePanel extends Panel {protected abstract Component newDeleteLink(String componentId);+ protected abstract void onBranchCreated(AjaxRequestTarget target);+private void notifyIssueChange(IPartialPageRequestHandler handler, Issue issue) {((BasePage)getPage()).notifyObservablesChange(handler, issue.getChangeObservables(true));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.cssindex 3cdcda6f50..52944b2f62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css@@ -61,6 +61,9 @@.issue-side>.iterations li+li, .issue-side>.links li+li {margin-top: 1.2rem;}+.issue-side>.branch>.body>a.text-truncate {+ min-width: 0;+}.issue-side>.links .state {border-bottom: 2px dotted transparent;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.javaindex d13a6f8300..c487990631 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java@@ -4,10 +4,12 @@ import java.util.ArrayList;import java.util.List;import io.onedev.server.OneDev;-import io.onedev.server.service.UserService;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.service.UserService;import io.onedev.server.util.Similarities;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.WebConstants;@@ -23,8 +25,9 @@ public abstract class ReviewerProvider extends AbstractUserChoiceProvider {public void query(String term, int page, Response<User> response) {PullRequest request = getPullRequest();+ List<User> users = new ArrayList<>(SecurityUtils.getAuthorizedUsers(request.getProject(), new ReadCode()));+UserCache cache = OneDev.getInstance(UserService.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());users.sort(cache.comparingDisplayName(request.getParticipants()));for (PullRequestReview review: request.getReviews()) {diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 8867eac0e5..d6ae6874c8 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -153,6 +153,7 @@ import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;import io.onedev.server.web.page.project.setting.code.tagprotection.TagProtectionsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;+import io.onedev.server.web.page.project.setting.issuesetting.IssueBranchPrefixPage;import io.onedev.server.web.page.project.setting.issuesetting.ProjectStateTransitionListPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ServiceDeskSettingPage;@@ -499,6 +500,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new ProjectPageMapper("${project}/~settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));add(new ProjectPageMapper("${project}/~settings/build/cache-management", CacheManagementPage.class));add(new ProjectPageMapper("${project}/~settings/issue/state-transitions", ProjectStateTransitionListPage.class));+ add(new ProjectPageMapper("${project}/~settings/issue/branch-prefix", IssueBranchPrefixPage.class));add(new ProjectPageMapper("${project}/~settings/service-desk", ServiceDeskSettingPage.class));add(new ProjectPageMapper("${project}/~settings/web-hooks", WebHooksPage.class));add(new ProjectPageMapper("${project}/~settings/ai", ProjectAiSettingPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 656f4a73c8..936284c942 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -105,6 +105,7 @@ import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;import io.onedev.server.web.page.project.setting.code.tagprotection.TagProtectionsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;+import io.onedev.server.web.page.project.setting.issuesetting.IssueBranchPrefixPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;@@ -116,7 +117,6 @@ import io.onedev.server.web.page.project.workspaces.ProjectWorkspacesPage;import io.onedev.server.web.page.project.workspaces.detail.WorkspaceDetailPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ProjectAware;-import io.onedev.server.web.util.WicketUtils;public abstract class ProjectPage extends LayoutPage implements ProjectAware {@@ -309,8 +309,12 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {settingMenuItems.add(new SidebarMenuItem.Page(null, _T("Pull Request"),PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject())));- if (getProject().isIssueManagement() && WicketUtils.isSubscriptionActive())- settingMenuItems.add(new SidebarMenuItem.SubMenu(null, _T("Issue"), new ArrayList<>()));+ if (getProject().isIssueManagement()) {+ List<SidebarMenuItem> issueSettingMenuItems = new ArrayList<>();+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Branch Prefix"),+ IssueBranchPrefixPage.class, IssueBranchPrefixPage.paramsOf(getProject())));+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, _T("Issue"), issueSettingMenuItems));+ }List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 2473db3c99..40dee70ebe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -101,7 +101,8 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteadd(new SideInfoLink("moreInfoTrigger"));- add(new IssueOperationsPanel("operations") {+ Component operationsPanel;+ add(operationsPanel = new IssueOperationsPanel("operations") {@Overrideprotected Issue getIssue() {@@ -223,7 +224,12 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected Component newBody(String componentId) {return new IssueSidePanel(componentId) {-++ @Override+ protected void onBranchCreated(AjaxRequestTarget target) {+ target.add(operationsPanel);+ }+@Overrideprotected Issue getIssue() {return CardDetailPanel.this.getIssue();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.javaindex 272166c25a..6ffc9bfaf6 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@@ -156,7 +156,8 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputadd(new SideInfoLink("moreInfo"));- add(new IssueOperationsPanel("operations") {+ Component operationsPanel;+ add(operationsPanel = new IssueOperationsPanel("operations") {@Overrideprotected Issue getIssue() {@@ -302,6 +303,11 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputreturn IssueDetailPage.this.getIssue();}+ @Override+ protected void onBranchCreated(AjaxRequestTarget target) {+ target.add(operationsPanel);+ }+@Overrideprotected Component newDeleteLink(String componentId) {return new Link<Void>(componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex da2e971b45..02fdfdeb40 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -22,7 +22,8 @@<div class="main flex-grow-1"><div wicket:id="statusBar" class="status-bar d-flex mb-4"><div wicket:id="status" class="badge status mr-3"></div>- <a wicket:id="clone" t:data-tippy-content="Check out to local directory" class="btn btn-primary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a>+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces on source branch" class="btn btn-outline-secondary btn-sm mr-3">Workspaces <wicket:svg href="arrow" class="icon rotate-90"/></a>+ <a wicket:id="clone" t:data-tippy-content="Check out to local directory" class="btn btn-outline-secondary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a><a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" t:data-tippy-content="Open new pull request"><wicket:svg href="plus" class="icon"/></a></div><div class="primary border border-dashed border-primary rounded p-4 mb-4">@@ -153,7 +154,9 @@</tr><tr><td class="name"><wicket:t>Source</wicket:t></td>- <td class="value text-right text-break"><a wicket:id="sourceBranch"></a></td>+ <td class="value text-right text-break">+ <a wicket:id="sourceBranch"></a>+ </td></tr></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 2c2a5414cb..d78c4bc396 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@@ -149,6 +149,7 @@ import io.onedev.server.web.component.tabbable.Tab;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.speclist.WorkspaceSpecListPanel;import io.onedev.server.web.editable.InplacePropertyEditLink;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.ProjectPage;@@ -1039,6 +1040,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});+ fragment.add(new WebMarkupContainer("sourceWorkspaces").setVisible(false));}fragment.add(newMergeStrategyContainer());@@ -1653,6 +1655,31 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});+ statusBarContainer.add(new DropdownLink("workspaces") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new WorkspaceSpecListPanel(id, getPullRequest().getSourceBranch()) {++ @Override+ protected Project getProject() {+ return getPullRequest().getSourceProject();+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ var request = getPullRequest();+ setVisible(request.getSourceProject() != null+ && SecurityUtils.canWriteCode(request.getSourceProject())+ && !request.getSourceProject().getHierarchyWorkspaceSpecs().isEmpty());+ }++ });+statusBarContainer.add(new DropdownLink("clone") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.htmlnew file mode 100644index 0000000000..576113844c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.html@@ -0,0 +1,17 @@+<wicket:extend>+ <div class="alert alert-notice bg-white shadow mb-5 text-gray">+ <wicket:svg href="bulb" class="icon mr-2"/>+ <wicket:t>+ This setting is inherited from parent project when left empty. The first non-empty value+ found while walking up the project hierarchy will be used.+ </wicket:t>+ </div>+ <div class="card">+ <div class="card-body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <input class="btn btn-primary dirty-aware" t:value="Save" type="submit">+ </form>+ </div>+ </div>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.javanew file mode 100644index 0000000000..8e94d6bf25--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/IssueBranchPrefixPage.java@@ -0,0 +1,68 @@+package io.onedev.server.web.page.project.setting.issuesetting;++import static io.onedev.server.web.translation.Translation._T;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.data.migration.VersionedXmlDoc;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.ProjectIssueSetting;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;++public class IssueBranchPrefixPage extends ProjectIssueSettingPage {++ public IssueBranchPrefixPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ProjectIssueSetting bean = getProject().getIssueSetting();+ var oldAuditContent = VersionedXmlDoc.fromBean(bean).toXML();+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ var newAuditContent = VersionedXmlDoc.fromBean(bean).toXML();+ getProject().setIssueSetting(bean);+ OneDev.getInstance(ProjectService.class).update(getProject());+ auditService.audit(getProject(), "changed issue branch prefix", oldAuditContent, newAuditContent);+ setResponsePage(IssueBranchPrefixPage.class, IssueBranchPrefixPage.paramsOf(getProject()));+ Session.get().success(_T("Issue branch prefix updated"));+ }++ };+ form.add(BeanContext.edit("editor", bean));++ add(form);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, _T("Issue Branch Prefix"));+ }++ @Override+ protected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {+ if (SecurityUtils.canManageProject(project))+ return new ViewStateAwarePageLink<Void>(componentId, IssueBranchPrefixPage.class, paramsOf(project.getId()));+ else+ return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));+ }++}