The Unified and Autonomous Development Platform
Refactor branch and tag creation
Robin Shen7c49a1e985ee
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.javaindex f1ac0a6838..4d9b8e077e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java@@ -3,6 +3,7 @@ package io.onedev.server.buildspec.job;import java.util.stream.Collectors;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;public enum JobVariable {@@ -30,6 +31,28 @@ public enum JobVariable {return build.getUpdatedRef();}+ },+ UPDATED_BRANCH {++ @Override+ public String getValue(Build build) {+ if (build.getUpdatedRef() != null)+ return GitUtils.ref2branch(build.getUpdatedRef());+ else+ return null;+ }++ },+ UPDATED_TAG {++ @Override+ public String getValue(Build build) {+ if (build.getUpdatedRef() != null)+ return GitUtils.ref2tag(build.getUpdatedRef());+ else+ return null;+ }+},COMMIT_HASH {diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.javanew file mode 100644index 0000000000..f5f547de1c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.java@@ -0,0 +1,47 @@+package io.onedev.server.web.component.branch.create;++import java.io.Serializable;++import javax.validation.ConstraintValidatorContext;++import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.Repository;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable+@ClassValidating+public class BranchBean implements Validatable, Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ @Editable(order=100, name="Branch Name")+ @NotEmpty+ @OmitName+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (!Repository.isValidRefName(Constants.R_HEADS + getName())) {+ context.buildConstraintViolationWithTemplate("Invalid branch name")+ .addPropertyNode("name").addConstraintViolation()+ .disableDefaultConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.htmlindex be931578eb..0792c5956d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html@@ -2,11 +2,11 @@<form wicket:id="form" class="create-branch"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>- <h4 class="modal-title">Specify Branch Name</h4>+ <h4 class="modal-title">Create Branch</h4></div><div class="modal-body"><div wicket:id="feedback"></div>- <input wicket:id="name" class="form-control">+ <div wicket:id="editor"></div></div><div class="modal-footer"><button wicket:id="create" class="btn btn-primary">Create</button>diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.javaindex ffa6797ce6..adffe968ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java@@ -4,11 +4,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.Repository;import com.google.common.base.Preconditions;@@ -16,8 +13,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.BranchProtection;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")abstract class CreateBranchPanel extends Panel {@@ -26,7 +26,7 @@ abstract class CreateBranchPanel extends Panel {private final String revision;- private String branchName;+ private BranchBean helperBean = new BranchBean();public CreateBranchPanel(String id, IModel<Project> projectModel, String revision) {super(id);@@ -42,25 +42,8 @@ abstract class CreateBranchPanel extends Panel {form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));- final TextField<String> nameInput;- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return branchName;- }-- @Override- public void setObject(String object) {- branchName = object;- }-- }));- nameInput.setOutputMarkupId(true);+ BeanEditor editor;+ form.add(editor = BeanContext.edit("editor", helperBean));form.add(new AjaxButton("create") {@@ -68,34 +51,28 @@ abstract class CreateBranchPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (branchName == null) {- form.error("Branch name is required.");- target.focusComponent(nameInput);+ Project project = projectModel.getObject();+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());+ String branchName = helperBean.getName();+ if (project.getObjectId(GitUtils.branch2ref(branchName), false) != null) {+ editor.error(new Path(new PathNode.Named("name")),+ "Branch '" + branchName + "' already exists, please choose a different name");target.add(form);- } else if (!Repository.isValidRefName(Constants.R_HEADS + branchName)) {- form.error("Invalid branch name.");- target.focusComponent(nameInput);- target.add(form);- } else if (projectModel.getObject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {- form.error("Branch '" + branchName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);+ } else if (project.getBranchProtection(branchName, user).isPreventCreation()) {+ editor.error(new Path(new PathNode.Named("name")), "Unable to create protected branch");target.add(form);} else {- Project project = projectModel.getObject();- User user = Preconditions.checkNotNull(SecurityUtils.getUser());-- BranchProtection protection = project.getBranchProtection(branchName, user);- if (protection.isPreventCreation()) {- form.error("Unable to create protected branch");- target.focusComponent(nameInput);- target.add(form);- } else {- project.createBranch(branchName, revision);- onCreate(target, branchName);- }+ project.createBranch(branchName, revision);+ onCreate(target, branchName);}}+ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }+});form.add(new AjaxLink<Void>("cancel") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.htmlindex 12faa2989f..cf958aacfd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html@@ -6,16 +6,7 @@</div><div class="modal-body"><div wicket:id="feedback"></div>- <wicket:enclosure child="name">- <div class="form-group">- <label>Tag Name *</label>- <input wicket:id="name" class="form-control">- </div>- </wicket:enclosure>- <div class="form-group">- <label>Tag Message</label>- <textarea wicket:id="message" rows="10" class="form-control"></textarea>- </div>+ <div wicket:id="editor"></div></div><div class="modal-footer"><button wicket:id="create" class="btn btn-primary">Create</button>diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.javaindex ae373f310b..d255edd389 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java@@ -2,18 +2,12 @@ package io.onedev.server.web.component.createtag;import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.Repository;import com.google.common.base.Preconditions;@@ -21,8 +15,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.TagProtection;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")public abstract class CreateTagPanel extends Panel {@@ -31,15 +28,13 @@ public abstract class CreateTagPanel extends Panel {private final String revision;- private String tagName;-- private String tagMessage;+ private TagBean helperBean = new TagBean();public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {super(id);this.projectModel = projectModel;- this.tagName = tagName;this.revision = revision;+ helperBean.setName(tagName);}@Override@@ -50,81 +45,37 @@ public abstract class CreateTagPanel extends Panel {form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));- Component nameInput;- if (tagName == null) {- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagName;- }-- @Override- public void setObject(String object) {- tagName = object;- }-- }));- nameInput.setOutputMarkupId(true);- } else {- form.add(nameInput = new WebMarkupContainer("name").setVisible(false));- }+ BeanEditor editor;+ form.add(editor = BeanContext.edit("editor", helperBean));- form.add(new TextArea<String>("message", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagMessage;- }-- @Override- public void setObject(String object) {- tagMessage = object;- }-- }));form.add(new AjaxButton("create") {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);-- if (tagName == null) {- form.error("Tag name is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (!Repository.isValidRefName(Constants.R_TAGS + tagName)) {- form.error("Tag name is not valid.");- target.focusComponent(nameInput);- target.add(form);- } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {- form.error("Tag '" + tagName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);- target.add(form);- } else {- Project project = projectModel.getObject();- User user = Preconditions.checkNotNull(SecurityUtils.getUser());- TagProtection protection = project.getTagProtection(tagName, user);- if (protection.isPreventCreation()) {- form.error("Unable to create protected tag");- target.focusComponent(nameInput);+ Project project = projectModel.getObject();+ String tagName = helperBean.getName();+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());+ if (project.getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ editor.error(new Path(new PathNode.Named("name")),+ "Tag '" + helperBean.getName() + "' already exists, please choose a different name.");+ target.add(form);+ } else if (project.getTagProtection(tagName, user).isPreventCreation()) {+ editor.error(new Path(new PathNode.Named("name")), "Unable to create protected tag");target.add(form);- } else {- project.createTag(tagName, revision, user.asPerson(), tagMessage);- onCreate(target, tagName);- }+ } else {+ project.createTag(tagName, revision, user.asPerson(), helperBean.getMessage());+ onCreate(target, tagName);}}+ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }+});form.add(new AjaxLink<Void>("cancel") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.javanew file mode 100644index 0000000000..7f1b52e5ee--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.java@@ -0,0 +1,61 @@+package io.onedev.server.web.component.createtag;++import java.io.Serializable;++import javax.validation.ConstraintValidatorContext;++import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.Repository;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable+@ClassValidating+public class TagBean implements Validatable, Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private String message;++ @Editable(order=100, name="Tag Name")+ @NotEmpty+ @OmitName+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200, name="Tag Message")+ @Multiline+ @OmitName+ public String getMessage() {+ return message;+ }++ public void setMessage(String message) {+ this.message = message;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (!Repository.isValidRefName(Constants.R_TAGS + getName())) {+ context.buildConstraintViolationWithTemplate("Invalid tag name")+ .addPropertyNode("name").addConstraintViolation()+ .disableDefaultConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.javaindex c83386c97a..1f810faae5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java@@ -96,8 +96,8 @@ public abstract class RevisionPicker extends DropdownLink {}label = HtmlEscape.escapeHtml5(label);} else {- label = "<i>choose</i>";- iconClass = "fa fa-ext fa-commit";+ label = "Choose Revision";+ iconClass = "";}return Model.of(String.format("<i class='%s'></i> <span>%s</span> <i class='fa fa-caret-down'></i>", iconClass, label));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.javanew file mode 100644index 0000000000..2fda02b5a4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.java@@ -0,0 +1,11 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target(ElementType.METHOD)+@Retention(RetentionPolicy.RUNTIME)+public @interface RevisionPick {+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.javanew file mode 100644index 0000000000..106fb5bcfc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java@@ -0,0 +1,61 @@+package io.onedev.server.web.editable.revisionpick;++import java.lang.reflect.Method;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.server.web.editable.annotation.RevisionPick;++@SuppressWarnings("serial")+public class RevisionPickEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ if (propertyGetter.getAnnotation(RevisionPick.class) != null) {+ if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null)+ return new Label(id, model.getObject());+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new RevisionPickEditor(componentId, descriptor, model);+ }++ };+ } else {+ throw new RuntimeException("Annotation 'RevisionPick' should be applied to property with type 'String'");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.htmlnew file mode 100644index 0000000000..96cf9b806f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="picker" class="btn btn-default"></a>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.javanew file mode 100644index 0000000000..72d13d397d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java@@ -0,0 +1,56 @@+package io.onedev.server.web.editable.revisionpick;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.Project;+import io.onedev.server.web.component.revisionpicker.RevisionPicker;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class RevisionPickEditor extends PropertyEditor<String> {++ private String revision;++ public RevisionPickEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newRevisionPicker());+ }++ private RevisionPicker newRevisionPicker() {+ return new RevisionPicker("picker", new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return Project.get();+ }++ }, revision) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ RevisionPickEditor.this.revision = revision;+ RevisionPicker revisionPicker = newRevisionPicker();+ getParent().replace(revisionPicker);+ target.add(revisionPicker);+ }++ };+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return revision;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.javanew file mode 100644index 0000000000..778dba7bad--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java@@ -0,0 +1,29 @@+package io.onedev.server.web.page.project.branches;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.component.branch.create.BranchBean;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.RevisionPick;++@Editable+public class BranchBeanWithRevision extends BranchBean {++ private static final long serialVersionUID = 1L;++ private String revision;++ @Editable(order=1000)+ @RevisionPick+ @NotEmpty(message="Please choose revision to create branch from")+ @OmitName+ public String getRevision() {+ return revision;+ }++ public void setRevision(String revision) {+ this.revision = revision;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.htmlindex 067c4401bf..5d5d76b248 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html@@ -54,16 +54,7 @@</div><div class="modal-body"><div wicket:id="feedback"></div>- <div class="form-group">- <label>Branch Name *</label>- <input wicket:id="name" class="form-control">- </div>- <div class="form-group">- <label>Create From *</label>- <div>- <a wicket:id="revision" class="btn btn-default"></a>- </div>- </div>+ <div wicket:id="editor"></div></div><div class="modal-footer"><div class="form-group">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 456710db10..5facaf1892 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -51,7 +51,6 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Ref;-import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.revwalk.filter.RevFilter;@@ -68,11 +67,13 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.User;import io.onedev.server.search.entity.pullrequest.OpenCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;@@ -83,7 +84,8 @@ import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.revisionpicker.RevisionPicker;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -405,9 +407,7 @@ public class ProjectBranchesPage extends ProjectPage {add(new ModalLink("createBranch") {- private String branchName;-- private String branchRevision = getProject().getDefaultBranch();+ private BranchBeanWithRevision helperBean = new BranchBeanWithRevision();@Overrideprotected void onConfigure() {@@ -416,90 +416,49 @@ public class ProjectBranchesPage extends ProjectPage {setVisible(SecurityUtils.canCreateBranch(getProject(), Constants.R_HEADS));}- private RevisionPicker newRevisionPicker() {- return new RevisionPicker("revision", projectModel, branchRevision) {-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- branchRevision = revision;- RevisionPicker revisionPicker = newRevisionPicker();- getParent().replace(revisionPicker);- target.add(revisionPicker);- }-- };- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {Fragment fragment = new Fragment(id, "createBranchFrag", ProjectBranchesPage.this);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));-- branchRevision = getProject().getDefaultBranch();- branchName = null;-- final TextField<String> nameInput;- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return branchName;- }- @Override- public void setObject(String object) {- branchName = object;- }-- }));- nameInput.setOutputMarkupId(true);+ helperBean.setName(null);+ helperBean.setRevision(null);++ BeanEditor editor;+ form.add(editor = BeanContext.edit("editor", helperBean));- form.add(newRevisionPicker());form.add(new AjaxButton("create") {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (branchName == null) {- form.error("Branch name is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (branchRevision == null) {- form.error("Create from is required.");- target.focusComponent(nameInput);+ String branchName = helperBean.getName();+ User user = Preconditions.checkNotNull(getLoginUser());+ if (getProject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {+ editor.error(new Path(new PathNode.Named("name")),+ "Branch '" + branchName + "' already exists, please choose a different name");target.add(form);- } else if (!Repository.isValidRefName(Constants.R_HEADS + branchName)) {- form.error("Invalid branch name.");- target.focusComponent(nameInput);- target.add(form);- } else if (getProject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {- form.error("Branch '" + branchName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);+ } else if (getProject().getBranchProtection(branchName, user).isPreventCreation()) {+ editor.error(new Path(new PathNode.Named("name")), "Unable to create protected branch");target.add(form);} else {- Project project = getProject();- BranchProtection protection = project.getBranchProtection(branchName, getLoginUser());- if (protection.isPreventCreation()) {- form.error("Unable to create protected branch");- target.focusComponent(nameInput);- target.add(form);- } else {- project.createBranch(branchName, branchRevision);- modal.close();- target.add(branchesTable);-- getSession().success("Branch '" + branchName + "' created");- }+ getProject().createBranch(branchName, helperBean.getRevision());+ modal.close();+ target.add(branchesTable);++ getSession().success("Branch '" + branchName + "' created");}}+ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }+});form.add(new AjaxLink<Void>("cancel") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.htmlindex d9acee8ef8..638a7f7faa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html@@ -47,20 +47,7 @@</div><div class="modal-body"><div wicket:id="feedback"></div>- <div class="form-group">- <label>Tag Name *</label>- <input wicket:id="name" class="form-control">- </div>- <div class="form-group">- <label>Tag Message</label>- <textarea wicket:id="message" rows="10" class="form-control"></textarea>- </div>- <div class="form-group">- <label>Create From *</label>- <div>- <a wicket:id="revision" class="btn btn-default"></a>- </div>- </div>+ <div wicket:id="editor"></div></div><div class="modal-footer"><div class="form-group">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 41824d02a8..447809ea70 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -24,7 +24,6 @@ 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.form.Form;-import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.panel.Fragment;@@ -39,10 +38,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTag;+import com.google.common.base.Preconditions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;@@ -52,8 +52,10 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;-import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.OnTypingDoneBehavior;@@ -65,9 +67,10 @@ import io.onedev.server.web.component.link.ArchiveMenuLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.revisionpicker.RevisionPicker;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.PersonIdentPanel;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -193,11 +196,7 @@ public class ProjectTagsPage extends ProjectPage {add(new ModalLink("createTag") {- private String tagName;-- private String tagMessage;-- private String tagRevision = getProject().getDefaultBranch();+ private TagBeanWithRevision helperBean = new TagBeanWithRevision();@Overrideprotected void onConfigure() {@@ -206,105 +205,50 @@ public class ProjectTagsPage extends ProjectPage {setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));}- private RevisionPicker newRevisionPicker() {- return new RevisionPicker("revision", projectModel, tagRevision) {-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- tagRevision = revision;- RevisionPicker revisionPicker = newRevisionPicker();- getParent().replace(revisionPicker);- target.add(revisionPicker);- }-- };- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));- tagName = null;- final TextField<String> nameInput;- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagName;- }-- @Override- public void setObject(String object) {- tagName = object;- }-- }));- nameInput.setOutputMarkupId(true);+ helperBean.setName(null);+ helperBean.setMessage(null);+ helperBean.setRevision(null);++ BeanEditor editor;+ form.add(editor = BeanContext.edit("editor", helperBean));- tagMessage = null;- form.add(new TextArea<String>("message", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagMessage;- }-- @Override- public void setObject(String object) {- tagMessage = object;- }-- }));- form.add(newRevisionPicker());form.add(new AjaxButton("create") {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (tagName == null) {- form.error("Tag name is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (tagRevision == null) {- form.error("Create from is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {- form.error("Invalid tag name.");- target.focusComponent(nameInput);+ String tagName = helperBean.getName();+ User user = Preconditions.checkNotNull(getLoginUser());++ if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ editor.error(new Path(new PathNode.Named("name")),+ "Tag '" + tagName + "' already exists, please choose a different name.");target.add(form);- } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {- form.error("Tag '" + tagName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);+ } else if (getProject().getTagProtection(tagName, user).isPreventCreation()) {+ editor.error(new Path(new PathNode.Named("name")), "Unable to create protected tag");target.add(form);} else {- Project project = getProject();- TagProtection protection = project.getTagProtection(tagName, getLoginUser());- if (protection.isPreventCreation()) {- form.error("Unable to create protected tag");- target.focusComponent(nameInput);- target.add(form);- } else {- getProject().createTag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);- modal.close();- target.add(tagsTable);-- getSession().success("Tag '" + tagName + "' created");- }+ getProject().createTag(tagName, helperBean.getRevision(), user.asPerson(), helperBean.getMessage());+ modal.close();+ target.add(tagsTable);++ getSession().success("Tag '" + tagName + "' created");}}+ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }+});form.add(new AjaxLink<Void>("cancel") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.javanew file mode 100644index 0000000000..91f2464d11--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java@@ -0,0 +1,29 @@+package io.onedev.server.web.page.project.tags;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.component.createtag.TagBean;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.RevisionPick;++@Editable+public class TagBeanWithRevision extends TagBean {++ private static final long serialVersionUID = 1L;++ private String revision;++ @Editable(order=1000, name="Revision")+ @RevisionPick+ @NotEmpty(message = "Please select revision to create tag from")+ @OmitName+ public String getRevision() {+ return revision;+ }++ public void setRevision(String revision) {+ this.revision = revision;+ }++}