The Unified and Autonomous Development Platform
Property group support for bean viewer and bean editor
Robin Shenfb6d54f6d29c
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex c82d86bd3a..7f047e7e32 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -1,491 +1,493 @@-package io.onedev.server.model;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.UUID;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;-import javax.persistence.Version;--import org.apache.commons.lang.SerializationUtils;-import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;--import com.fasterxml.jackson.annotation.JsonView;-import com.google.common.collect.Lists;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.OneDev;-import io.onedev.server.cache.CommitInfoManager;-import io.onedev.server.cache.UserInfoManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.IssueField;-import io.onedev.server.util.Referenceable;-import io.onedev.server.util.facade.IssueFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.jackson.DefaultView;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.Editable;--/**- * @author robin- *- */-@Entity-@Table(- indexes={- @Index(columnList="o_project_id"), @Index(columnList="state"),- @Index(columnList="title"), @Index(columnList="noSpaceTitle"),- @Index(columnList="number"), @Index(columnList="numberStr"),- @Index(columnList="submitDate"), @Index(columnList="o_submitter_id"),- @Index(columnList="voteCount"), @Index(columnList="commentCount"),- @Index(columnList="o_milestone_id"), @Index(columnList="updateDate")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})-@Editable-public class Issue extends AbstractEntity implements Referenceable {-- private static final long serialVersionUID = 1L;-- @Version- private long version;-- @Column(nullable=false)- private String state;-- @Column(nullable=false)- private String title;-- @Lob- @Column(length=65535)- private String description;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Project project;-- @ManyToOne(fetch=FetchType.LAZY)- private Milestone milestone;-- @ManyToOne(fetch=FetchType.LAZY)- private User submitter;-- private String submitterName;-- @Column(nullable=false)- private Date submitDate;-- private int voteCount;-- private int commentCount;-- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- private long number;-- // used for number search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String numberStr;-- // used for title search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String noSpaceTitle;-- @Column(nullable=false)- private Date updateDate = new Date();-- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueFieldEntity> fieldEntities = new ArrayList<>();-- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueComment> comments = new ArrayList<>();-- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueChange> changes = new ArrayList<>();-- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueVote> votes = new ArrayList<>();-- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueWatch> watches = new ArrayList<>();-- private transient List<RevCommit> commits;-- public long getVersion() {- return version;- }-- public String getState() {- return state;- }-- public void setState(String state) {- this.state = state;- }-- public String getTitle() {- return title;- }-- public void setTitle(String title) {- this.title = title;- noSpaceTitle = StringUtils.deleteWhitespace(title);- }-- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-- @Override- public long getNumber() {- return number;- }-- public void setNumber(long number) {- this.number = number;- numberStr = String.valueOf(number);- }-- public User getSubmitter() {- return submitter;- }-- public void setSubmitter(User submitter) {- this.submitter = submitter;- }-- @Nullable- public String getSubmitterName() {- return submitterName;- }-- public Date getSubmitDate() {- return submitDate;- }-- public void setSubmitDate(Date submitDate) {- this.submitDate = submitDate;- }-- public Milestone getMilestone() {- return milestone;- }-- public void setMilestone(Milestone milestone) {- this.milestone = milestone;- }-- public Collection<IssueComment> getComments() {- return comments;- }-- public void setComments(Collection<IssueComment> comments) {- this.comments = comments;- }-- public Collection<IssueChange> getChanges() {- return changes;- }-- public void setChanges(Collection<IssueChange> changes) {- this.changes = changes;- }-- public Collection<IssueVote> getVotes() {- return votes;- }-- public void setVotes(Collection<IssueVote> votes) {- this.votes = votes;- }-- @Override- public Collection<IssueWatch> getWatches() {- return watches;- }-- public void setWatches(Collection<IssueWatch> watches) {- this.watches = watches;- }-- @Override- public EntityWatch getWatch(User user, boolean createIfNotExist) {- if (createIfNotExist) {- IssueWatch watch = (IssueWatch) super.getWatch(user, false);- if (watch == null) {- watch = new IssueWatch();- watch.setIssue(this);- watch.setUser(user);- getWatches().add(watch);- }- return watch;- } else {- return super.getWatch(user, false);- }- }-- public int getVoteCount() {- return voteCount;- }-- public void setVoteCount(int voteCount) {- this.voteCount = voteCount;- }-- public int getCommentCount() {- return commentCount;- }-- public void setCommentCount(int commentCount) {- this.commentCount = commentCount;- }-- public Collection<IssueFieldEntity> getFieldEntities() {- return fieldEntities;- }-- public void setFieldEntities(Collection<IssueFieldEntity> fieldEntities) {- this.fieldEntities = fieldEntities;- }-- public Date getUpdateDate() {- return updateDate;- }-- public void setUpdateDate(Date updateDate) {- this.updateDate = updateDate;- }-- public boolean isVisitedAfter(Date date) {- User user = SecurityUtils.getUser();- if (user != null) {- Date visitDate = OneDev.getInstance(UserInfoManager.class).getIssueVisitDate(user, this);- return visitDate != null && visitDate.getTime()>date.getTime();- } else {- return true;- }- }-- public Collection<String> getFieldNames() {- return getFieldEntities().stream().map(it->it.getName()).collect(Collectors.toSet());- }-- public Map<String, IssueField> getFields() {- Map<String, IssueField> fields = new LinkedHashMap<>();-- Map<String, List<IssueFieldEntity>> entityMap = new HashMap<>();- for (IssueFieldEntity entity: getFieldEntities()) {- List<IssueFieldEntity> fieldsOfName = entityMap.get(entity.getName());- if (fieldsOfName == null) {- fieldsOfName = new ArrayList<>();- entityMap.put(entity.getName(), fieldsOfName);- }- fieldsOfName.add(entity);- }- for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {- String fieldName = fieldSpec.getName();- List<IssueFieldEntity> unaries = entityMap.get(fieldName);- if (unaries != null) {- String type = unaries.iterator().next().getType();- List<String> values = new ArrayList<>();- for (IssueFieldEntity entity: unaries) {- if (entity.getValue() != null)- values.add(entity.getValue());- }- Collections.sort(values);- if (!fieldSpec.isAllowMultiple() && values.size() > 1)- values = Lists.newArrayList(values.iterator().next());- fields.put(fieldName, new IssueField(fieldName, type, values));- }- }- return fields;- }-- public static String getWebSocketObservable(Long issueId) {- return Issue.class.getName() + ":" + issueId;- }-- @Nullable- public String getMilestoneName() {- return getMilestone()!=null? getMilestone().getName():null;- }-- @Nullable- public Object getFieldValue(String fieldName) {- IssueField field = getFields().get(fieldName);-- if (field != null)- return field.getValue(getProject());- else- return null;- }-- private GlobalIssueSetting getIssueSetting() {- return OneDev.getInstance(SettingManager.class).getIssueSetting();- }-- public long getFieldOrdinal(String fieldName, Object fieldValue) {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);- if (fieldSpec != null)- return fieldSpec.getOrdinal(fieldValue);- else- return -1;- }-- public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);- Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();-- for (PropertyDescriptor property: beanDescriptor.getPropertyDescriptors()) {- IssueField field = getFields().get(property.getDisplayName());- if (field != null)- property.setPropertyValue(fieldBean, field.getValue(getProject()));- else if (!withDefaultValue)- property.setPropertyValue(fieldBean, null);- }- return fieldBean;- }-- public void removeFields(Collection<String> fieldNames) {- for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {- if (fieldNames.contains(it.next().getName()))- it.remove();- }- }-- public void setFieldValues(Map<String, Object> fieldValues) {- for (Map.Entry<String, Object> entry: fieldValues.entrySet())- setFieldValue(entry.getKey(), entry.getValue());- }-- public void setFieldValue(String fieldName, @Nullable Object fieldValue) {- for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {- if (fieldName.equals(it.next().getName()))- it.remove();- }-- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);- if (fieldSpec != null) {- long ordinal = getFieldOrdinal(fieldName, fieldValue);-- IssueFieldEntity field = new IssueFieldEntity();- field.setIssue(this);- field.setName(fieldName);- field.setOrdinal(ordinal);- field.setType(fieldSpec.getType());-- if (fieldValue != null) {- List<String> strings = fieldSpec.convertToStrings(fieldValue);- if (!strings.isEmpty()) {- for (String string: strings) {- IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);- cloned.setIssue(this);- cloned.setValue(string);- getFieldEntities().add(cloned);- }- } else {- getFieldEntities().add(field);- }- } else {- getFieldEntities().add(field);- }- }- }-- public boolean isFieldVisible(String fieldName) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);- if (fieldSpec != null) {- if (fieldSpec.getShowCondition() != null) {- IssueField dependentField = getFields().get(fieldSpec.getShowCondition().getInputName());- if (dependentField != null) {- String value;- if (!dependentField.getValues().isEmpty())- value = dependentField.getValues().iterator().next();- else- value = null;- return fieldSpec.getShowCondition().getValueMatcher().matches(value);- } else {- return false;- }- } else {- return true;- }- } else {- return false;- }- }-- public IssueFacade getFacade() {- return new IssueFacade(getId(), getProject().getId(), getNumber());- }-- public List<RevCommit> getCommits() {- if (commits == null) {- commits = new ArrayList<>();- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- for (ObjectId commitId: commitInfoManager.getFixCommits(getProject(), getNumber())) {- RevCommit commit = getProject().getRevCommit(commitId, false);- if (commit != null)- commits.add(commit);- }- Collections.sort(commits, new Comparator<RevCommit>() {-- @Override- public int compare(RevCommit o1, RevCommit o2) {- return o2.getCommitTime() - o1.getCommitTime();- }-- });- }- return commits;- }--}+package io.onedev.server.model;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.UUID;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import javax.persistence.Version;++import org.apache.commons.lang.SerializationUtils;+import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import com.fasterxml.jackson.annotation.JsonView;+import com.google.common.collect.Lists;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.EntityWatch;+import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.IssueField;+import io.onedev.server.util.Referenceable;+import io.onedev.server.util.facade.IssueFacade;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.jackson.DefaultView;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.annotation.Editable;++/**+ * @author robin+ *+ */+@Entity+@Table(+ indexes={+ @Index(columnList="o_project_id"), @Index(columnList="state"),+ @Index(columnList="title"), @Index(columnList="noSpaceTitle"),+ @Index(columnList="number"), @Index(columnList="numberStr"),+ @Index(columnList="submitDate"), @Index(columnList="o_submitter_id"),+ @Index(columnList="voteCount"), @Index(columnList="commentCount"),+ @Index(columnList="o_milestone_id"), @Index(columnList="updateDate")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})+@Editable+public class Issue extends AbstractEntity implements Referenceable {++ private static final long serialVersionUID = 1L;++ @Version+ private long version;++ @Column(nullable=false)+ private String state;++ @Column(nullable=false)+ private String title;++ @Lob+ @Column(length=65535)+ private String description;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ private Milestone milestone;++ @ManyToOne(fetch=FetchType.LAZY)+ private User submitter;++ private String submitterName;++ @Column(nullable=false)+ private Date submitDate;++ private int voteCount;++ private int commentCount;++ @Column(nullable=false)+ private String uuid = UUID.randomUUID().toString();++ private long number;++ // used for number search in markdown editor+ @Column(nullable=false)+ @JsonView(DefaultView.class)+ private String numberStr;++ // used for title search in markdown editor+ @Column(nullable=false)+ @JsonView(DefaultView.class)+ private String noSpaceTitle;++ @Column(nullable=false)+ private Date updateDate = new Date();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueFieldEntity> fieldEntities = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueComment> comments = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueChange> changes = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueVote> votes = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueWatch> watches = new ArrayList<>();++ private transient List<RevCommit> commits;++ public long getVersion() {+ return version;+ }++ public String getState() {+ return state;+ }++ public void setState(String state) {+ this.state = state;+ }++ public String getTitle() {+ return title;+ }++ public void setTitle(String title) {+ this.title = title;+ noSpaceTitle = StringUtils.deleteWhitespace(title);+ }++ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public String getUUID() {+ return uuid;+ }++ public void setUUID(String uuid) {+ this.uuid = uuid;+ }++ @Override+ public long getNumber() {+ return number;+ }++ public void setNumber(long number) {+ this.number = number;+ numberStr = String.valueOf(number);+ }++ public User getSubmitter() {+ return submitter;+ }++ public void setSubmitter(User submitter) {+ this.submitter = submitter;+ }++ @Nullable+ public String getSubmitterName() {+ return submitterName;+ }++ public Date getSubmitDate() {+ return submitDate;+ }++ public void setSubmitDate(Date submitDate) {+ this.submitDate = submitDate;+ }++ public Milestone getMilestone() {+ return milestone;+ }++ public void setMilestone(Milestone milestone) {+ this.milestone = milestone;+ }++ public Collection<IssueComment> getComments() {+ return comments;+ }++ public void setComments(Collection<IssueComment> comments) {+ this.comments = comments;+ }++ public Collection<IssueChange> getChanges() {+ return changes;+ }++ public void setChanges(Collection<IssueChange> changes) {+ this.changes = changes;+ }++ public Collection<IssueVote> getVotes() {+ return votes;+ }++ public void setVotes(Collection<IssueVote> votes) {+ this.votes = votes;+ }++ @Override+ public Collection<IssueWatch> getWatches() {+ return watches;+ }++ public void setWatches(Collection<IssueWatch> watches) {+ this.watches = watches;+ }++ @Override+ public EntityWatch getWatch(User user, boolean createIfNotExist) {+ if (createIfNotExist) {+ IssueWatch watch = (IssueWatch) super.getWatch(user, false);+ if (watch == null) {+ watch = new IssueWatch();+ watch.setIssue(this);+ watch.setUser(user);+ getWatches().add(watch);+ }+ return watch;+ } else {+ return super.getWatch(user, false);+ }+ }++ public int getVoteCount() {+ return voteCount;+ }++ public void setVoteCount(int voteCount) {+ this.voteCount = voteCount;+ }++ public int getCommentCount() {+ return commentCount;+ }++ public void setCommentCount(int commentCount) {+ this.commentCount = commentCount;+ }++ public Collection<IssueFieldEntity> getFieldEntities() {+ return fieldEntities;+ }++ public void setFieldEntities(Collection<IssueFieldEntity> fieldEntities) {+ this.fieldEntities = fieldEntities;+ }++ public Date getUpdateDate() {+ return updateDate;+ }++ public void setUpdateDate(Date updateDate) {+ this.updateDate = updateDate;+ }++ public boolean isVisitedAfter(Date date) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getIssueVisitDate(user, this);+ return visitDate != null && visitDate.getTime()>date.getTime();+ } else {+ return true;+ }+ }++ public Collection<String> getFieldNames() {+ return getFieldEntities().stream().map(it->it.getName()).collect(Collectors.toSet());+ }++ public Map<String, IssueField> getFields() {+ Map<String, IssueField> fields = new LinkedHashMap<>();++ Map<String, List<IssueFieldEntity>> entityMap = new HashMap<>();+ for (IssueFieldEntity entity: getFieldEntities()) {+ List<IssueFieldEntity> fieldsOfName = entityMap.get(entity.getName());+ if (fieldsOfName == null) {+ fieldsOfName = new ArrayList<>();+ entityMap.put(entity.getName(), fieldsOfName);+ }+ fieldsOfName.add(entity);+ }+ for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {+ String fieldName = fieldSpec.getName();+ List<IssueFieldEntity> unaries = entityMap.get(fieldName);+ if (unaries != null) {+ String type = unaries.iterator().next().getType();+ List<String> values = new ArrayList<>();+ for (IssueFieldEntity entity: unaries) {+ if (entity.getValue() != null)+ values.add(entity.getValue());+ }+ Collections.sort(values);+ if (!fieldSpec.isAllowMultiple() && values.size() > 1)+ values = Lists.newArrayList(values.iterator().next());+ fields.put(fieldName, new IssueField(fieldName, type, values));+ }+ }+ return fields;+ }++ public static String getWebSocketObservable(Long issueId) {+ return Issue.class.getName() + ":" + issueId;+ }++ @Nullable+ public String getMilestoneName() {+ return getMilestone()!=null? getMilestone().getName():null;+ }++ @Nullable+ public Object getFieldValue(String fieldName) {+ IssueField field = getFields().get(fieldName);++ if (field != null)+ return field.getValue(getProject());+ else+ return null;+ }++ private GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ public long getFieldOrdinal(String fieldName, Object fieldValue) {+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);+ if (fieldSpec != null)+ return fieldSpec.getOrdinal(fieldValue);+ else+ return -1;+ }++ public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);+ Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();++ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties) {+ IssueField field = getFields().get(property.getDisplayName());+ if (field != null)+ property.setPropertyValue(fieldBean, field.getValue(getProject()));+ else if (!withDefaultValue)+ property.setPropertyValue(fieldBean, null);+ }+ }+ return fieldBean;+ }++ public void removeFields(Collection<String> fieldNames) {+ for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {+ if (fieldNames.contains(it.next().getName()))+ it.remove();+ }+ }++ public void setFieldValues(Map<String, Object> fieldValues) {+ for (Map.Entry<String, Object> entry: fieldValues.entrySet())+ setFieldValue(entry.getKey(), entry.getValue());+ }++ public void setFieldValue(String fieldName, @Nullable Object fieldValue) {+ for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {+ if (fieldName.equals(it.next().getName()))+ it.remove();+ }++ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ if (fieldSpec != null) {+ long ordinal = getFieldOrdinal(fieldName, fieldValue);++ IssueFieldEntity field = new IssueFieldEntity();+ field.setIssue(this);+ field.setName(fieldName);+ field.setOrdinal(ordinal);+ field.setType(fieldSpec.getType());++ if (fieldValue != null) {+ List<String> strings = fieldSpec.convertToStrings(fieldValue);+ if (!strings.isEmpty()) {+ for (String string: strings) {+ IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);+ cloned.setIssue(this);+ cloned.setValue(string);+ getFieldEntities().add(cloned);+ }+ } else {+ getFieldEntities().add(field);+ }+ } else {+ getFieldEntities().add(field);+ }+ }+ }++ public boolean isFieldVisible(String fieldName) {+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ if (fieldSpec != null) {+ if (fieldSpec.getShowCondition() != null) {+ IssueField dependentField = getFields().get(fieldSpec.getShowCondition().getInputName());+ if (dependentField != null) {+ String value;+ if (!dependentField.getValues().isEmpty())+ value = dependentField.getValues().iterator().next();+ else+ value = null;+ return fieldSpec.getShowCondition().getValueMatcher().matches(value);+ } else {+ return false;+ }+ } else {+ return true;+ }+ } else {+ return false;+ }+ }++ public IssueFacade getFacade() {+ return new IssueFacade(getId(), getProject().getId(), getNumber());+ }++ public List<RevCommit> getCommits() {+ if (commits == null) {+ commits = new ArrayList<>();+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ for (ObjectId commitId: commitInfoManager.getFixCommits(getProject(), getNumber())) {+ RevCommit commit = getProject().getRevCommit(commitId, false);+ if (commit != null)+ commits.add(commit);+ }+ Collections.sort(commits, new Comparator<RevCommit>() {++ @Override+ public int compare(RevCommit o1, RevCommit o2) {+ return o2.getCommitTime() - o1.getCommitTime();+ }++ });+ }+ return commits;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.javaindex ba7718ce10..a136108a16 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java@@ -70,7 +70,7 @@ public abstract class JobExecutor implements Serializable {this.name = name;}- @Editable(order=100, name="Applicable Projects",+ @Editable(order=10000, name="Applicable Projects", group="Job Match Settings",description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "+ "Leave empty to match all projects")@ProjectPatterns@@ -83,7 +83,7 @@ public abstract class JobExecutor implements Serializable {this.projects = projects;}- @Editable(order=200, name="Applicable Branches",+ @Editable(order=10100, name="Applicable Branches", group="Job Match Settings",description="Optionally specify space-separated branches applicable for this executor. When run a job "+ "against a particular commit, all branches able to reaching the commit will be checked. "+ "Use * or ? for wildcard match. Leave empty to match all branches.")@@ -97,7 +97,7 @@ public abstract class JobExecutor implements Serializable {this.branches = branches;}- @Editable(order=300, name="Applicable Jobs",+ @Editable(order=10200, name="Applicable Jobs", group="Job Match Settings",description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match. "+ "Leave empty to match all jobs")@Patterns@@ -110,7 +110,7 @@ public abstract class JobExecutor implements Serializable {this.jobs = jobs;}- @Editable(order=400, name="Applicable Environments",+ @Editable(order=10300, name="Applicable Environments", group="Job Match Settings",description="Optionally specify space-separated environments applicable for this executor. Use * or ? for wildcard match. "+ "Leave empty to match all images")@Patterns@@ -123,7 +123,7 @@ public abstract class JobExecutor implements Serializable {this.environments = environments;}- @Editable(order=10000, description="Specify job cache TTL (time to live) by days. OneDev may create "+ @Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. OneDev may create "+ "multiple job caches even for same cache key to avoid cache conflicts when running jobs "+ "concurrently. This setting tells OneDev to remove caches inactive for specified "+ "time period to save disk space")diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.javaindex 32afc6fff4..7acb1359f6 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java@@ -120,7 +120,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDathis.password = password;}- @Editable(order=1400, description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "+ @Editable(order=20000, group="More Settings", description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "+ "to limit memory of created container to be 2 giga bytes")public String getRunOptions() {return runOptions;@@ -134,7 +134,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDareturn (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");}- @Editable(order=1400, description="Specify max number of concurrent jobs being executed. Each job execution "+ @Editable(order=21000, group="More Settings", description="Specify max number of concurrent jobs being executed. Each job execution "+ "will launch a separate docker container. Defaults to number of processors in the system")public int getCapacity() {return capacity;diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.javaindex c010843f5e..951a991a97 100644--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Map;import java.util.Set;import java.util.StringTokenizer;@@ -37,8 +38,10 @@ public class IssueUtils {private static final String BEAN_PREFIX = "IssueFieldBean";public static void clearFields(Serializable fieldBean) {- for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors())- property.setPropertyValue(fieldBean, null);+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties)+ property.setPropertyValue(fieldBean, null);+ }}@SuppressWarnings("unchecked")@@ -63,11 +66,13 @@ public class IssueUtils {Collection<String> propertyNames = new HashSet<>();SettingManager settingManager = OneDev.getInstance(SettingManager.class);User user = SecurityUtils.getUser();- for (PropertyDescriptor property: new BeanDescriptor(fieldBeanClass).getPropertyDescriptors()) {- if (fieldNames.contains(property.getDisplayName())) {- InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());- if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))- propertyNames.add(property.getPropertyName());+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (fieldNames.contains(property.getDisplayName())) {+ InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());+ if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))+ propertyNames.add(property.getPropertyName());+ }}}return propertyNames;@@ -78,9 +83,11 @@ public class IssueUtils {try {Map<String, Object> fieldValues = new HashMap<>();BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- if (fieldNames.contains(propertyDescriptor.getDisplayName()))- fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));+ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (fieldNames.contains(property.getDisplayName()))+ fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));+ }}return fieldValues;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 852b90772e..38a70aa2a9 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -76,10 +76,14 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- for (PropertyDescriptor propertyDescriptor: builtInFieldsEditor.getBeanDescriptor().getPropertyDescriptors())- propertyDescriptor.setPropertyExcluded(!selectedFields.contains(propertyDescriptor.getDisplayName()));- for (PropertyDescriptor propertyDescriptor: customFieldsEditor.getBeanDescriptor().getPropertyDescriptors())- propertyDescriptor.setPropertyExcluded(!selectedFields.contains(propertyDescriptor.getDisplayName()));+ for (List<PropertyDescriptor> values: builtInFieldsEditor.getBeanDescriptor().getPropertyDescriptors().values()) {+ for (PropertyDescriptor value: values)+ value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));+ }+ for (List<PropertyDescriptor> values: customFieldsEditor.getBeanDescriptor().getPropertyDescriptors().values()) {+ for (PropertyDescriptor value: values)+ value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));+ }target.add(form);}@@ -201,9 +205,11 @@ abstract class BatchEditPanel extends Panel implements InputContext {form.add(builtInFieldsEditor);excludedProperties = new HashSet<>();- for (PropertyDescriptor property: new BeanDescriptor(customFieldsBean.getClass()).getPropertyDescriptors()) {- if (!selectedFields.contains(property.getDisplayName()))- excludedProperties.add(property.getPropertyName());+ for (List<PropertyDescriptor> values: new BeanDescriptor(customFieldsBean.getClass()).getPropertyDescriptors().values()) {+ for (PropertyDescriptor value: values) {+ if (!selectedFields.contains(value.getDisplayName()))+ excludedProperties.add(value.getPropertyName());+ }}customFieldsEditor = BeanContext.editBean("customFieldsEditor", customFieldsBean, excludedProperties, true);diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 1eb0666d06..eea6b0021b 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -1,103 +1,119 @@-package io.onedev.server.web.editable;--import java.io.Serializable;-import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import com.google.common.collect.Sets;--import io.onedev.commons.utils.BeanUtils;-import io.onedev.server.exception.OneException;-import io.onedev.server.web.editable.annotation.Editable;--@SuppressWarnings("serial")-public class BeanDescriptor implements Serializable {-- private final Class<?> beanClass;-- protected final List<PropertyDescriptor> propertyDescriptors;-- public BeanDescriptor(Class<?> beanClass) {- this(beanClass, Sets.newHashSet(), true);- }-- public BeanDescriptor(Class<?> beanClass, Collection<String> properties, boolean excluded) {- this.beanClass = beanClass;-- propertyDescriptors = new ArrayList<>();-- List<Method> propertyGetters = BeanUtils.findGetters(getBeanClass());- EditableUtils.sortAnnotatedElements(propertyGetters);-- for (Method propertyGetter: propertyGetters) {- if (propertyGetter.getAnnotation(Editable.class) != null) {- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyGetter);- propertyDescriptors.add(propertyDescriptor);- String propertyName = BeanUtils.getPropertyName(propertyGetter);- propertyDescriptor.setPropertyExcluded(BeanUtils.findSetter(propertyGetter) == null- || properties.contains(propertyName) && excluded- || !properties.contains(propertyName) && !excluded);- }- }- }-- public BeanDescriptor(BeanDescriptor beanDescriptor) {- this.beanClass = beanDescriptor.getBeanClass();- this.propertyDescriptors = beanDescriptor.getPropertyDescriptors();- }-- public Class<?> getBeanClass() {- return beanClass;- }-- public List<PropertyDescriptor> getPropertyDescriptors() {- return propertyDescriptors;- }-- public Map<String, PropertyDescriptor> getMapOfDisplayNameToPropertyDescriptor() {- Map<String, PropertyDescriptor> propertyDescriptors = new HashMap<>();- for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors())- propertyDescriptors.put(EditableUtils.getDisplayName(propertyDescriptor.getPropertyGetter()), propertyDescriptor);- return propertyDescriptors;- }-- public void copyProperties(Object from, Object to) {- for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors()) {- if (!propertyDescriptor.isPropertyExcluded())- propertyDescriptor.copyProperty(from, to);- }- }-- @Nullable- public PropertyDescriptor getPropertyDescriptor(String propertyName) {- for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors()) {- if (propertyDescriptor.getPropertyName().equals(propertyName))- return propertyDescriptor;- }- return null;- }-- public Object newBeanInstance() {- try {- return getBeanClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }-- public String getPropertyName(String propertyNameOrDisplayName) {- for (PropertyDescriptor propertyDescriptor: propertyDescriptors) {- String displayName = propertyDescriptor.getDisplayName();- if (propertyDescriptor.getPropertyName().equals(propertyNameOrDisplayName) || displayName.equals(propertyNameOrDisplayName))- return propertyDescriptor.getPropertyName();- }- throw new OneException("No property found with name: " + propertyNameOrDisplayName);- }--}+package io.onedev.server.web.editable;++import java.io.Serializable;+import java.lang.reflect.Method;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import com.google.common.collect.Sets;++import io.onedev.commons.utils.BeanUtils;+import io.onedev.server.exception.OneException;+import io.onedev.server.web.editable.annotation.Editable;++@SuppressWarnings("serial")+public class BeanDescriptor implements Serializable {++ private final Class<?> beanClass;++ protected final Map<String, List<PropertyDescriptor>> propertyDescriptors;++ public BeanDescriptor(Class<?> beanClass) {+ this(beanClass, Sets.newHashSet(), true);+ }++ public BeanDescriptor(Class<?> beanClass, Collection<String> properties, boolean excluded) {+ this.beanClass = beanClass;++ propertyDescriptors = new LinkedHashMap<>();++ List<Method> propertyGetters = BeanUtils.findGetters(getBeanClass());+ EditableUtils.sortAnnotatedElements(propertyGetters);++ for (Method propertyGetter: propertyGetters) {+ Editable editable = propertyGetter.getAnnotation(Editable.class);+ if (editable != null) {+ String group = editable.group();+ List<PropertyDescriptor> groupPropertyDescriptors = propertyDescriptors.get(group);+ if (groupPropertyDescriptors == null) {+ groupPropertyDescriptors = new ArrayList<>();+ propertyDescriptors.put(group, groupPropertyDescriptors);+ }+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyGetter);+ groupPropertyDescriptors.add(propertyDescriptor);+ String propertyName = BeanUtils.getPropertyName(propertyGetter);+ propertyDescriptor.setPropertyExcluded(BeanUtils.findSetter(propertyGetter) == null+ || properties.contains(propertyName) && excluded+ || !properties.contains(propertyName) && !excluded);+ }+ }+ }++ public BeanDescriptor(BeanDescriptor beanDescriptor) {+ this.beanClass = beanDescriptor.getBeanClass();+ this.propertyDescriptors = beanDescriptor.getPropertyDescriptors();+ }++ public Class<?> getBeanClass() {+ return beanClass;+ }++ public Map<String, List<PropertyDescriptor>> getPropertyDescriptors() {+ return propertyDescriptors;+ }++ public Map<String, PropertyDescriptor> getMapOfDisplayNameToPropertyDescriptor() {+ Map<String, PropertyDescriptor> propertyDescriptors = new HashMap<>();+ for (List<PropertyDescriptor> groupProperties: getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties)+ propertyDescriptors.put(EditableUtils.getDisplayName(property.getPropertyGetter()), property);+ }+ return propertyDescriptors;+ }++ public void copyProperties(Object from, Object to) {+ for (List<PropertyDescriptor> groupProperties: getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (!property.isPropertyExcluded())+ property.copyProperty(from, to);+ }+ }+ }++ @Nullable+ public PropertyDescriptor getPropertyDescriptor(String propertyName) {+ for (List<PropertyDescriptor> groupProperties: getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (property.getPropertyName().equals(propertyName))+ return property;+ }+ }+ return null;+ }++ public Object newBeanInstance() {+ try {+ return getBeanClass().newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }++ public String getPropertyName(String propertyNameOrDisplayName) {+ for (List<PropertyDescriptor> groupProperties: propertyDescriptors.values()) {+ for (PropertyDescriptor property: groupProperties) {+ String displayName = property.getDisplayName();+ if (property.getPropertyName().equals(propertyNameOrDisplayName) || displayName.equals(propertyNameOrDisplayName))+ return property.getPropertyName();+ }+ }+ throw new OneException("No property found with name: " + propertyNameOrDisplayName);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.htmlindex 53739fd6c0..933b4dad09 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.html@@ -1,33 +1,38 @@-<wicket:panel>- <div wicket:id="content" class="bean-properties"></div>-- <wicket:fragment wicket:id="verticalFrag">- <div wicket:id="properties" class="form-group">- <wicket:enclosure child="name">- <label class="name control-label">- <span wicket:id="name"></span>- <span wicket:id="required" class="required"></span>- </label>- </wicket:enclosure>- <div wicket:id="value" class="value"></div>- <div wicket:id="feedback"></div>- <div wicket:id="description" class="help-block"></div>- </div>- </wicket:fragment>-- <wicket:fragment wicket:id="horizontalFrag">- <table>- <tr wicket:id="properties">- <td wicket:id="name" class="name control-label">- <span wicket:id="name"></span>- <span wicket:id="required" class="required"></span>- </td>- <td wicket:id="value" class="value">- <div wicket:id="value"></div>- <div wicket:id="feedback"></div>- <div wicket:id="description" class="help-block"></div>- </td>- </tr>- </table>- </wicket:fragment>+<wicket:panel>+ <div wicket:id="groups" class="group bean-properties">+ <a wicket:id="toggle" class="toggle"><span wicket:id="groupName"></span></a>+ <wicket:container wicket:id="content"></wicket:container>+ </div>++ <wicket:fragment wicket:id="verticalPropertiesFrag">+ <div>+ <div wicket:id="properties" class="form-group">+ <wicket:enclosure child="name">+ <label class="name control-label">+ <span wicket:id="name"></span>+ <span wicket:id="required" class="required"></span>+ </label>+ </wicket:enclosure>+ <div wicket:id="value" class="value"></div>+ <div wicket:id="feedback"></div>+ <div wicket:id="description" class="help-block"></div>+ </div>+ </div>+ </wicket:fragment>++ <wicket:fragment wicket:id="horizontalPropertiesFrag">+ <table>+ <tr wicket:id="properties">+ <td wicket:id="name" class="name control-label">+ <span wicket:id="name"></span>+ <span wicket:id="required" class="required"></span>+ </td>+ <td wicket:id="value" class="value">+ <div wicket:id="value"></div>+ <div wicket:id="feedback"></div>+ <div wicket:id="description" class="help-block"></div>+ </td>+ </tr>+ </table>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 5c09d7e101..621ff608e5 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -1,369 +1,396 @@-package io.onedev.server.web.editable;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Optional;-import java.util.Set;--import javax.validation.ConstraintViolation;-import javax.validation.Validator;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import org.apache.wicket.validation.IValidatable;-import org.apache.wicket.validation.IValidator;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.web.editable.PathElement.Named;-import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Vertical;--@SuppressWarnings("serial")-public class BeanEditor extends ValueEditor<Serializable> {-- public static final String SCRIPT_CONTEXT_BEAN = "beanEditor";-- private final BeanDescriptor beanDescriptor;-- private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();-- private final boolean vertical;-- private RepeatingView propertiesView;-- public BeanEditor(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {- super(id, model);-- this.beanDescriptor = beanDescriptor;-- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors())- propertyContexts.add(PropertyContext.of(propertyDescriptor));-- Class<?> beanClass = beanDescriptor.getBeanClass();- if (beanClass.getAnnotation(Vertical.class) != null)- vertical = true;- else if (beanClass.getAnnotation(Horizontal.class) != null)- vertical = false;- else- vertical = true;- }-- private boolean hasTransitiveDependency(String dependentPropertyName, String dependencyPropertyName,- Set<String> checkedPropertyNames) {- if (checkedPropertyNames.contains(dependentPropertyName))- return false;- checkedPropertyNames.add(dependentPropertyName);- Set<String> directDependencies = getPropertyContext(dependentPropertyName).getDescriptor().getDependencyPropertyNames();- if (directDependencies.contains(dependencyPropertyName))- return true;- for (String directDependency: directDependencies) {- if (hasTransitiveDependency(directDependency, dependencyPropertyName, new HashSet<>(checkedPropertyNames)))- return true;- }- return false;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();- List<PropertyContainer> propertyContainers = new ArrayList<>();- for (Component item: propertiesView)- propertyContainers.add((PropertyContainer) item);- for (PropertyContainer propertyContainer: propertyContainers) {- int propertyIndex = (int) propertyContainer.getDefaultModelObject();- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);- Set<String> checkedPropertyNames = new HashSet<>();- if (hasTransitiveDependency(propertyContext.getPropertyName(),- propertyUpdating.getPropertyName(), checkedPropertyNames)) {- propertyUpdating.getHandler().add(propertyContainer);- String script = String.format("$('#%s').addClass('no-autofocus');", propertyContainer.getMarkupId());- propertyUpdating.getHandler().appendJavaScript(script);- }- }- validate();- if (!hasErrors(true))- send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler()));- else- clearErrors(true);- }- }-- private WebMarkupContainer newItem(String id, int propertyIndex) {- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);-- WebMarkupContainer item = new PropertyContainer(id, propertyIndex) {-- private Label descriptionLabel;-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupPlaceholderTag(true);-- WebMarkupContainer nameContainer;- WebMarkupContainer valueContainer;- if (!vertical) {- add(nameContainer = new WebMarkupContainer("name"));- add(valueContainer = new WebMarkupContainer("value"));- } else {- nameContainer = this;- valueContainer = this;- }- Label nameLabel = new Label("name", propertyContext.getDescriptor().getDisplayName(this));- nameContainer.add(nameLabel);-- OmitName omitName = propertyContext.getPropertyGetter().getAnnotation(OmitName.class);- if (omitName != null && omitName.value() != OmitName.Place.VIEWER) {- if (!vertical) {- nameContainer.setVisible(false);- valueContainer.add(AttributeAppender.replace("colspan", "2"));- } else {- nameLabel.setVisible(false);- }- }-- String required;- if (propertyContext.getDescriptor().isPropertyRequired()- && propertyContext.getPropertyClass() != boolean.class- && propertyContext.getPropertyClass() != Boolean.class) {- required = "*";- } else {- required = " ";- }-- nameContainer.add(new Label("required", required).setEscapeModelStrings(false));-- Serializable propertyValue;-- OneContext context = new OneContext(this);-- OneContext.push(context);- try {- propertyValue = (Serializable) propertyContext.getDescriptor().getPropertyValue(getModelObject());- } finally {- OneContext.pop();- }- PropertyEditor<Serializable> propertyEditor = propertyContext.renderForEdit("value", Model.of(propertyValue));- valueContainer.add(propertyEditor);-- descriptionLabel = new Label("description", propertyContext.getDescriptor().getDescription(this)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(StringUtils.isNotBlank(getModelValue()));- }-- };- descriptionLabel.setEscapeModelStrings(false);- descriptionLabel.setOutputMarkupPlaceholderTag(true);- valueContainer.add(descriptionLabel);-- valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));-- valueContainer.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof PropertyUpdating)- ((PropertyUpdating)event.getPayload()).getHandler().add(descriptionLabel);- }-- @Override- public Object getInputValue(String name) {- /*- * Field will be display name of the property when the bean class being edited is- * generated via groovy script- */- String propertyName = beanDescriptor.getPropertyName(name);- propertyContext.getDescriptor().getDependencyPropertyNames().add(propertyName);-- Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {-- @Override- public void component(PropertyEditor<?> object, IVisit<Optional<Object>> visit) {- if (object.getDescriptor().getPropertyName().equals(propertyName))- visit.stop(Optional.ofNullable(object.getConvertedInput()));- else- visit.dontGoDeeper();- }-- });- if (result == null)- return getPropertyContext(propertyName).getDescriptor().getPropertyValue(getModelObject());- else- return result.orElse(null);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!propertyContext.getDescriptor().isPropertyExcluded()- && propertyContext.getDescriptor().isPropertyVisible(new OneContext(this), beanDescriptor));- }-- };-- return item;- }-- public PropertyContext<Serializable> getPropertyContext(String propertyName) {- for (PropertyContext<Serializable> propertyContext: propertyContexts) {- if (propertyContext.getPropertyName().equals(propertyName))- return propertyContext;- }- throw new RuntimeException("Property not found: " + propertyName);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Fragment fragment;- if (vertical) {- fragment = new Fragment("content", "verticalFrag", this);- fragment.add(AttributeAppender.append("class", " vertical"));- } else {- fragment = new Fragment("content", "horizontalFrag", this);- fragment.add(AttributeAppender.append("class", " horizontal"));- }-- add(fragment);-- propertiesView = new RepeatingView("properties");- fragment.add(propertiesView);-- for (int i=0; i<propertyContexts.size(); i++) {- propertiesView.add(newItem(propertiesView.newChildId(), i));- }-- add(new IValidator<Serializable>() {-- @Override- public void validate(IValidatable<Serializable> validatable) {- OneContext.push(getOneContext());- try {- Validator validator = AppLoader.getInstance(Validator.class);- for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {- ErrorContext errorContext = getErrorContext(new ValuePath(violation.getPropertyPath()));- if (errorContext != null)- errorContext.addError(violation.getMessage());- }- } finally {- OneContext.pop();- }- }-- });-- add(AttributeAppender.append("class", "bean-editor editable"));-- setOutputMarkupId(true);- }-- public BeanDescriptor getBeanDescriptor() {- return beanDescriptor;- }-- public List<PropertyContext<Serializable>> getPropertyContexts() {- return propertyContexts;- }-- @Override- public ErrorContext getErrorContext(PathElement element) {- PathElement.Named namedElement = (Named) element;- return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {-- @Override- public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (object.getDescriptor().getPropertyName().equals(namedElement.getName()) && object.isVisibleInHierarchy())- visit.stop(object);- else- visit.dontGoDeeper();- }-- });- }-- @Override- protected Serializable convertInputToValue() throws ConversionException {- final Serializable bean = (Serializable) getBeanDescriptor().newBeanInstance();-- visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {-- @Override- public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (!object.getDescriptor().isPropertyExcluded())- object.getDescriptor().setPropertyValue(bean, object.getConvertedInput());- visit.dontGoDeeper();- }-- });-- return bean;- }-- public OneContext getOneContext() {- return new OneContext(this) {-- @Override- public OneContext getPropertyContext(String propertyName) {- for (Component item: propertiesView) {- int propertyIndex = (int) item.getDefaultModelObject();- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);- if (propertyContext.getPropertyName().equals(propertyName))- return new OneContext(item);- }- return null;- }-- };- }-- private abstract class PropertyContainer extends WebMarkupContainer implements EditContext {-- public PropertyContainer(String id, int propertyIndex) {- super(id, Model.of(propertyIndex));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new PropertyContainerResourceReference()));-- String script = String.format("onedev.server.propertyContainer.onDomReady('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- }--}+package io.onedev.server.web.editable;++import java.io.Serializable;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.stream.Collectors;++import javax.validation.ConstraintViolation;+import javax.validation.Validator;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.validation.IValidator;++import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.PathElement.Named;+import io.onedev.server.web.editable.annotation.Horizontal;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.Vertical;++@SuppressWarnings("serial")+public class BeanEditor extends ValueEditor<Serializable> {++ public static final String SCRIPT_CONTEXT_BEAN = "beanEditor";++ private final BeanDescriptor beanDescriptor;++ private final Map<String, List<PropertyContext<Serializable>>> propertyContexts = new LinkedHashMap<>();++ private final boolean vertical;++ private RepeatingView groupsView;++ public BeanEditor(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {+ super(id, model);++ this.beanDescriptor = beanDescriptor;++ for (Map.Entry<String, List<PropertyDescriptor>> entry: beanDescriptor.getPropertyDescriptors().entrySet()) {+ propertyContexts.put(entry.getKey(),+ entry.getValue().stream().map(it->PropertyContext.of(it)).collect(Collectors.toList()));+ }++ Class<?> beanClass = beanDescriptor.getBeanClass();+ if (beanClass.getAnnotation(Vertical.class) != null)+ vertical = true;+ else if (beanClass.getAnnotation(Horizontal.class) != null)+ vertical = false;+ else+ vertical = true;+ }++ private boolean hasTransitiveDependency(String dependentPropertyName, String dependencyPropertyName,+ Set<String> checkedPropertyNames) {+ if (checkedPropertyNames.contains(dependentPropertyName))+ return false;+ checkedPropertyNames.add(dependentPropertyName);+ Set<String> directDependencies = getPropertyContext(dependentPropertyName).getDescriptor().getDependencyPropertyNames();+ if (directDependencies.contains(dependencyPropertyName))+ return true;+ for (String directDependency: directDependencies) {+ if (hasTransitiveDependency(directDependency, dependencyPropertyName, new HashSet<>(checkedPropertyNames)))+ return true;+ }+ return false;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();+ for (Component groupContainer: groupsView) {+ RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");+ for (Component item: propertiesView) {+ @SuppressWarnings("unchecked")+ PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();+ Set<String> checkedPropertyNames = new HashSet<>();+ if (hasTransitiveDependency(propertyContext.getPropertyName(),+ propertyUpdating.getPropertyName(), checkedPropertyNames)) {+ propertyUpdating.getHandler().add(item);+ String script = String.format("$('#%s').addClass('no-autofocus');", item.getMarkupId());+ propertyUpdating.getHandler().appendJavaScript(script);+ }+ }+ }+ validate();+ if (!hasErrors(true))+ send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler()));+ else+ clearErrors(true);+ }+ }++ private WebMarkupContainer newItem(String id, PropertyContext<Serializable> property) {+ WebMarkupContainer item = new PropertyContainer(id, property) {++ private Label descriptionLabel;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setOutputMarkupPlaceholderTag(true);++ WebMarkupContainer nameContainer;+ WebMarkupContainer valueContainer;+ if (!vertical) {+ add(nameContainer = new WebMarkupContainer("name"));+ add(valueContainer = new WebMarkupContainer("value"));+ } else {+ nameContainer = this;+ valueContainer = this;+ }+ Label nameLabel = new Label("name", property.getDescriptor().getDisplayName(this));+ nameContainer.add(nameLabel);++ OmitName omitName = property.getPropertyGetter().getAnnotation(OmitName.class);+ if (omitName != null && omitName.value() != OmitName.Place.VIEWER) {+ if (!vertical) {+ nameContainer.setVisible(false);+ valueContainer.add(AttributeAppender.replace("colspan", "2"));+ } else {+ nameLabel.setVisible(false);+ }+ }++ String required;+ if (property.getDescriptor().isPropertyRequired()+ && property.getPropertyClass() != boolean.class+ && property.getPropertyClass() != Boolean.class) {+ required = "*";+ } else {+ required = " ";+ }++ nameContainer.add(new Label("required", required).setEscapeModelStrings(false));++ Serializable propertyValue;++ OneContext context = new OneContext(this);++ OneContext.push(context);+ try {+ propertyValue = (Serializable) property.getDescriptor().getPropertyValue(getModelObject());+ } finally {+ OneContext.pop();+ }+ PropertyEditor<Serializable> propertyEditor = property.renderForEdit("value", Model.of(propertyValue));+ valueContainer.add(propertyEditor);++ descriptionLabel = new Label("description", property.getDescriptor().getDescription(this)) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(StringUtils.isNotBlank(getModelValue()));+ }++ };+ descriptionLabel.setEscapeModelStrings(false);+ descriptionLabel.setOutputMarkupPlaceholderTag(true);+ valueContainer.add(descriptionLabel);++ valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));++ valueContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof PropertyUpdating)+ ((PropertyUpdating)event.getPayload()).getHandler().add(descriptionLabel);+ }++ @Override+ public Object getInputValue(String name) {+ /*+ * Field will be display name of the property when the bean class being edited is+ * generated via groovy script+ */+ String propertyName = beanDescriptor.getPropertyName(name);+ property.getDescriptor().getDependencyPropertyNames().add(propertyName);++ Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {++ @Override+ public void component(PropertyEditor<?> object, IVisit<Optional<Object>> visit) {+ if (object.getDescriptor().getPropertyName().equals(propertyName))+ visit.stop(Optional.ofNullable(object.getConvertedInput()));+ else+ visit.dontGoDeeper();+ }++ });+ if (result == null)+ return getPropertyContext(propertyName).getDescriptor().getPropertyValue(getModelObject());+ else+ return result.orElse(null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!property.getDescriptor().isPropertyExcluded()+ && property.getDescriptor().isPropertyVisible(new OneContext(this), beanDescriptor));+ }++ };++ return item;+ }++ public PropertyContext<Serializable> getPropertyContext(String propertyName) {+ for (List<PropertyContext<Serializable>> groupProperties: propertyContexts.values()) {+ for (PropertyContext<Serializable> property: groupProperties) {+ if (property.getPropertyName().equals(propertyName))+ return property;+ }+ }+ throw new RuntimeException("Property not found: " + propertyName);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ groupsView = new RepeatingView("groups");+ add(groupsView);++ for (Map.Entry<String, List<PropertyContext<Serializable>>> entry: propertyContexts.entrySet()) {+ WebMarkupContainer groupContainer = new WebMarkupContainer(groupsView.newChildId());++ WebMarkupContainer toggleLink = new WebMarkupContainer("toggle");+ toggleLink.add(new Label("groupName", entry.getKey()));+ groupContainer.add(toggleLink);++ Fragment contentFrag;+ if (vertical) {+ contentFrag = new Fragment("content", "verticalPropertiesFrag", this);+ contentFrag.add(AttributeAppender.append("class", " vertical"));+ } else {+ contentFrag = new Fragment("content", "horizontalPropertiesFrag", this);+ contentFrag.add(AttributeAppender.append("class", " horizontal"));+ }+ RepeatingView propertiesView = new RepeatingView("properties");+ contentFrag.add(propertiesView);++ for (PropertyContext<Serializable> property: entry.getValue())+ propertiesView.add(newItem(propertiesView.newChildId(), property));++ groupContainer.add(contentFrag);++ if (entry.getKey().length() == 0) {+ toggleLink.setVisible(false);+ groupContainer.add(AttributeAppender.append("class", "expanded"));+ }+ groupsView.add(groupContainer);+ }++ add(new IValidator<Serializable>() {++ @Override+ public void validate(IValidatable<Serializable> validatable) {+ OneContext.push(getOneContext());+ try {+ Validator validator = AppLoader.getInstance(Validator.class);+ for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {+ ErrorContext errorContext = getErrorContext(new ValuePath(violation.getPropertyPath()));+ if (errorContext != null)+ errorContext.addError(violation.getMessage());+ }+ } finally {+ OneContext.pop();+ }+ }++ });++ add(AttributeAppender.append("class", "bean-editor editable"));++ if (vertical)+ add(AttributeAppender.append("class", "vertical"));+ else+ add(AttributeAppender.append("class", "horizontal"));++ setOutputMarkupId(true);+ }++ public BeanDescriptor getBeanDescriptor() {+ return beanDescriptor;+ }++ @Override+ public ErrorContext getErrorContext(PathElement element) {+ PathElement.Named namedElement = (Named) element;+ return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {++ @Override+ public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {+ if (object.getDescriptor().getPropertyName().equals(namedElement.getName()) && object.isVisibleInHierarchy())+ visit.stop(object);+ else+ visit.dontGoDeeper();+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("onedev.server.editable.onBeanEditorDomReady('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ protected Serializable convertInputToValue() throws ConversionException {+ final Serializable bean = (Serializable) getBeanDescriptor().newBeanInstance();++ visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {++ @Override+ public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {+ if (!object.getDescriptor().isPropertyExcluded())+ object.getDescriptor().setPropertyValue(bean, object.getConvertedInput());+ visit.dontGoDeeper();+ }++ });++ return bean;+ }++ public OneContext getOneContext() {+ return new OneContext(this) {++ @Override+ public OneContext getPropertyContext(String propertyName) {+ for (Component groupContainer: groupsView) {+ RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");+ for (Component item: propertiesView) {+ @SuppressWarnings("unchecked")+ PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();+ if (propertyContext.getPropertyName().equals(propertyName))+ return new OneContext(item);+ }+ }+ return null;+ }++ };+ }++ private abstract class PropertyContainer extends WebMarkupContainer implements EditContext {++ public PropertyContainer(String id, PropertyContext<Serializable> property) {+ super(id, Model.of(property));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ String script = String.format("onedev.server.editable.onBeanEditorPropertyContainerDomReady('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.htmlindex 780e591dcf..4d9621bf2f 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.html@@ -1,10 +1,11 @@-<wicket:panel>- <div class="bean-properties">- <table>- <tr wicket:id="properties">- <td wicket:id="name" class="name"><span wicket:id="content"></span></td>- <td wicket:id="value" class="value"><div wicket:id="content"></div></td>- </tr>- </table>- </div>+<wicket:panel>+ <div wicket:id="groups" class="group bean-properties">+ <a wicket:id="toggle"><span wicket:id="groupName"></span></a>+ <table>+ <tr wicket:id="properties">+ <td wicket:id="name" class="name"><span wicket:id="content"></span></td>+ <td wicket:id="value" class="value"><div wicket:id="content"></div></td>+ </tr>+ </table>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 2eb9fb515c..1fea51a07f 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -1,91 +1,137 @@-package io.onedev.server.web.editable;--import java.io.Serializable;-import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.web.editable.annotation.OmitName;--@SuppressWarnings("serial")-public class BeanViewer extends Panel implements EditContext {-- private final BeanDescriptor beanDescriptor;-- private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();-- public BeanViewer(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {- super(id, model);-- this.beanDescriptor = beanDescriptor;-- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- propertyContexts.add(PropertyContext.of(propertyDescriptor));- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<PropertyContext<Serializable>>("properties", propertyContexts) {-- @Override- protected void populateItem(ListItem<PropertyContext<Serializable>> item) {- PropertyContext<Serializable> propertyContext = item.getModelObject();- Method propertyGetter = propertyContext.getPropertyGetter();-- WebMarkupContainer nameTd = new WebMarkupContainer("name");- item.add(nameTd);- WebMarkupContainer valueTd = new WebMarkupContainer("value");- item.add(valueTd);-- String displayName = propertyContext.getDisplayName(this);- Component content = new Label("content", displayName);- nameTd.add(content);- OmitName omitName = propertyGetter.getAnnotation(OmitName.class);-- if (omitName != null && omitName.value() != OmitName.Place.EDITOR) {- nameTd.setVisible(false);- valueTd.add(AttributeAppender.replace("colspan", "2"));- item.add(AttributeAppender.append("class", "name-omitted"));- }-- Serializable bean = (Serializable) BeanViewer.this.getDefaultModelObject();- Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);- valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));-- item.setVisible(propertyContext.isPropertyVisible(new OneContext(BeanViewer.this), beanDescriptor)- && !propertyContext.isPropertyExcluded());-- item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));- }-- });-- add(AttributeAppender.append("class", "bean-viewer editable"));- }-- @Override- public Object getInputValue(String name) {- String propertyName = beanDescriptor.getPropertyName(name);- for (PropertyContext<?> propertyContext: propertyContexts) {- if (propertyContext.getPropertyName().equals(propertyName))- return propertyContext.getPropertyValue(getDefaultModelObject());- }- throw new RuntimeException("Property not found: " + propertyName);- }--}+package io.onedev.server.web.editable;++import java.io.Serializable;+import java.lang.reflect.Method;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Map.Entry;+import java.util.stream.Collectors;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.OmitName;++@SuppressWarnings("serial")+public class BeanViewer extends Panel implements EditContext {++ private final BeanDescriptor beanDescriptor;++ private final Map<String, List<PropertyContext<Serializable>>> propertyContexts = new LinkedHashMap<>();++ public BeanViewer(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {+ super(id, model);++ this.beanDescriptor = beanDescriptor;++ for (Map.Entry<String, List<PropertyDescriptor>> entry: beanDescriptor.getPropertyDescriptors().entrySet()) {+ propertyContexts.put(entry.getKey(),+ entry.getValue().stream().map(it->PropertyContext.of(it)).collect(Collectors.toList()));+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<Map.Entry<String, List<PropertyContext<Serializable>>>>("groups", new LoadableDetachableModel<List<Map.Entry<String, List<PropertyContext<Serializable>>>>>() {++ @Override+ protected List<Entry<String, List<PropertyContext<Serializable>>>> load() {+ return new ArrayList<>(propertyContexts.entrySet());+ }++ }) {++ @Override+ protected void populateItem(ListItem<Entry<String, List<PropertyContext<Serializable>>>> item) {+ Entry<String, List<PropertyContext<Serializable>>> entry = item.getModelObject();++ WebMarkupContainer toggleLink = new WebMarkupContainer("toggle");+ toggleLink.add(new Label("groupName", entry.getKey()));+ item.add(toggleLink);++ if (entry.getKey().length() == 0) {+ toggleLink.setVisible(false);+ item.add(AttributeAppender.append("class", "expanded"));+ }++ item.add(new ListView<PropertyContext<Serializable>>("properties", entry.getValue()) {++ @Override+ protected void populateItem(ListItem<PropertyContext<Serializable>> item) {+ PropertyContext<Serializable> propertyContext = item.getModelObject();+ Method propertyGetter = propertyContext.getPropertyGetter();++ WebMarkupContainer nameTd = new WebMarkupContainer("name");+ item.add(nameTd);+ WebMarkupContainer valueTd = new WebMarkupContainer("value");+ item.add(valueTd);++ String displayName = propertyContext.getDisplayName(this);+ Component content = new Label("content", displayName);+ nameTd.add(content);+ OmitName omitName = propertyGetter.getAnnotation(OmitName.class);++ if (omitName != null && omitName.value() != OmitName.Place.EDITOR) {+ nameTd.setVisible(false);+ valueTd.add(AttributeAppender.replace("colspan", "2"));+ item.add(AttributeAppender.append("class", "name-omitted"));+ }++ Serializable bean = (Serializable) BeanViewer.this.getDefaultModelObject();+ Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);+ valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));++ item.setVisible(propertyContext.isPropertyVisible(new OneContext(BeanViewer.this), beanDescriptor)+ && !propertyContext.isPropertyExcluded());++ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ }++ });+ }++ });++ add(AttributeAppender.append("class", "bean-viewer editable"));++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new EditableResourceReference()));+ String script = String.format("onedev.server.editable.onBeanViewerDomReady('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ public Object getInputValue(String name) {+ String propertyName = beanDescriptor.getPropertyName(name);+ for (List<PropertyContext<Serializable>> groupProperties: propertyContexts.values()) {+ for (PropertyContext<Serializable> property: groupProperties) {+ if (property.getPropertyName().equals(propertyName))+ return property.getPropertyValue(getDefaultModelObject());+ }+ }+ throw new RuntimeException("Property not found: " + propertyName);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/EditableResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/EditableResourceReference.javanew file mode 100644index 0000000000..a53cbdc5c0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/EditableResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.web.editable;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class EditableResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public EditableResourceReference() {+ super(EditableResourceReference.class, "editable.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ EditableResourceReference.class, "editable.css")));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex 4ce0989385..4a37216d44 100644--- a/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -1,137 +1,137 @@-package io.onedev.server.web.editable;--import java.io.Serializable;-import java.lang.reflect.AnnotatedElement;-import java.lang.reflect.Field;-import java.lang.reflect.Method;-import java.util.List;--import javax.annotation.Nullable;-import javax.validation.Validator;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.utils.BeanUtils;-import io.onedev.commons.utils.ClassUtils;-import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.WordUtils;-import io.onedev.server.web.editable.annotation.Editable;--public class EditableUtils {-- /**- * Get display name of specified element from name parameter of {@link Editable} annotation.- * If the annotation is not defined or name parameter is not available in the annotation, the- * element name itself will be transferred to non-camel case and returned.- *- * @param element- * annotated element to get name from- * @return- * display name of the element- */- public static String getDisplayName(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null && editable.name().trim().length() != 0)- return editable.name();- else if (element instanceof Class)- return WordUtils.uncamel(((Class<?>)element).getSimpleName());- else if (element instanceof Field)- return WordUtils.uncamel(WordUtils.capitalize(((Field)element).getName()));- else if (element instanceof Method)- return StringUtils.substringAfter(WordUtils.uncamel(((Method)element).getName()), " ");- else if (element instanceof Package)- return ((Package)element).getName();- else- throw new RuntimeException("Invalid element type: " + element.getClass().getName());- }-- /**- * Get category of specified element from category parameter of {@link Editable} annotation.- *- * @param element- * annotated element to get category from- * @return- * category name of specified element, or <tt>null</tt> if not defined- */- public static @Nullable String getCategory(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null && editable.category().trim().length() != 0)- return editable.category();- else- return null;- }-- /**- * Get icon of specified element from icon parameter of {@link Editable} annotation.- *- * @param element- * annotated element to get icon from- * @return- * icon name of specified element, or <tt>null</tt> if not defined- */- public static @Nullable String getIcon(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null && editable.icon().trim().length() != 0)- return editable.icon();- else- return null;- }-- /**- * Get description of specified element from description parameter of {@link Editable} annotation- *- * @param element- * annotated element to get description from- * @return- * defined description, or <tt>null</tt> if description can not be found- */- public static @Nullable String getDescription(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null) {- if (editable.description().length() != 0)- return editable.description();- }- return null;- }-- /**- * Get display order parameter defined in {@link Editable} annotation of specified element.- *- * @param element- * annotated element to get order from- * @return- * defined order, or {@link Integer#MAX_VALUE} if Editable annotation is not found- */- public static int getOrder(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null)- return editable.order();- else- return Integer.MAX_VALUE;- }-- /**- * Sort specified elements by order parameter defined in {@link Editable} annotation.- *- * @param annotatedElements- * annotated elements to be sorted- */- public static <T extends AnnotatedElement> void sortAnnotatedElements(List<T> annotatedElements) {- annotatedElements.sort((element1, element2) -> getOrder(element1) - getOrder(element2));- }-- public static boolean hasEditableProperties(Class<?> beanClass) {- for (Method getter: BeanUtils.findGetters(ClassUtils.unproxy(beanClass))) {- Method setter = BeanUtils.findSetter(getter);- if (setter != null && getter.getAnnotation(Editable.class) != null)- return true;- }- return false;- }-- public static boolean isDefaultInstanceValid(Class<? extends Serializable> beanClass) {- Serializable bean = ReflectionUtils.instantiateClass(beanClass);- return AppLoader.getInstance(Validator.class).validate(bean).isEmpty();- }--}+package io.onedev.server.web.editable;++import java.io.Serializable;+import java.lang.reflect.AnnotatedElement;+import java.lang.reflect.Field;+import java.lang.reflect.Method;+import java.util.List;++import javax.annotation.Nullable;+import javax.validation.Validator;++import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.utils.BeanUtils;+import io.onedev.commons.utils.ClassUtils;+import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.WordUtils;+import io.onedev.server.web.editable.annotation.Editable;++public class EditableUtils {++ /**+ * Get display name of specified element from name parameter of {@link Editable} annotation.+ * If the annotation is not defined or name parameter is not available in the annotation, the+ * element name itself will be transferred to non-camel case and returned.+ *+ * @param element+ * annotated element to get name from+ * @return+ * display name of the element+ */+ public static String getDisplayName(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ if (editable != null && editable.name().trim().length() != 0)+ return editable.name();+ else if (element instanceof Class)+ return WordUtils.uncamel(((Class<?>)element).getSimpleName());+ else if (element instanceof Field)+ return WordUtils.uncamel(WordUtils.capitalize(((Field)element).getName()));+ else if (element instanceof Method)+ return StringUtils.substringAfter(WordUtils.uncamel(((Method)element).getName()), " ");+ else if (element instanceof Package)+ return ((Package)element).getName();+ else+ throw new RuntimeException("Invalid element type: " + element.getClass().getName());+ }++ /**+ * Get category of specified element from category parameter of {@link Editable} annotation.+ *+ * @param element+ * annotated element to get category from+ * @return+ * category name of specified element, or <tt>null</tt> if not defined+ */+ public static @Nullable String getCategory(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ if (editable != null && editable.group().trim().length() != 0)+ return editable.group();+ else+ return null;+ }++ /**+ * Get icon of specified element from icon parameter of {@link Editable} annotation.+ *+ * @param element+ * annotated element to get icon from+ * @return+ * icon name of specified element, or <tt>null</tt> if not defined+ */+ public static @Nullable String getIcon(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ if (editable != null && editable.icon().trim().length() != 0)+ return editable.icon();+ else+ return null;+ }++ /**+ * Get description of specified element from description parameter of {@link Editable} annotation+ *+ * @param element+ * annotated element to get description from+ * @return+ * defined description, or <tt>null</tt> if description can not be found+ */+ public static @Nullable String getDescription(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ if (editable != null) {+ if (editable.description().length() != 0)+ return editable.description();+ }+ return null;+ }++ /**+ * Get display order parameter defined in {@link Editable} annotation of specified element.+ *+ * @param element+ * annotated element to get order from+ * @return+ * defined order, or {@link Integer#MAX_VALUE} if Editable annotation is not found+ */+ public static int getOrder(AnnotatedElement element) {+ Editable editable = element.getAnnotation(Editable.class);+ if (editable != null)+ return editable.order();+ else+ return Integer.MAX_VALUE;+ }++ /**+ * Sort specified elements by order parameter defined in {@link Editable} annotation.+ *+ * @param annotatedElements+ * annotated elements to be sorted+ */+ public static <T extends AnnotatedElement> void sortAnnotatedElements(List<T> annotatedElements) {+ annotatedElements.sort((element1, element2) -> getOrder(element1) - getOrder(element2));+ }++ public static boolean hasEditableProperties(Class<?> beanClass) {+ for (Method getter: BeanUtils.findGetters(ClassUtils.unproxy(beanClass))) {+ Method setter = BeanUtils.findSetter(getter);+ if (setter != null && getter.getAnnotation(Editable.class) != null)+ return true;+ }+ return false;+ }++ public static boolean isDefaultInstanceValid(Class<? extends Serializable> beanClass) {+ Serializable bean = ReflectionUtils.instantiateClass(beanClass);+ return AppLoader.getInstance(Validator.class).validate(bean).isEmpty();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.javadeleted file mode 100644index 8947b6be5c..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable;--import io.onedev.server.web.page.base.BaseDependentResourceReference;--public class PropertyContainerResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public PropertyContainerResourceReference() {- super(PropertyContainerResourceReference.class, "property-container.js");- }--}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.javaindex 425202d1c3..75d6552709 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyViewer.java@@ -1,27 +1,35 @@-package io.onedev.server.web.editable;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.panel.Panel;--@SuppressWarnings("serial")-public abstract class PropertyViewer extends Panel {-- private final PropertyDescriptor descriptor;-- public PropertyViewer(String id, PropertyDescriptor descriptor) {- super(id);-- this.descriptor = descriptor;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(newContent("content", descriptor));- add(AttributeAppender.append("class", "property-viewer editable"));- }-- protected abstract Component newContent(String id, PropertyDescriptor descriptor);-}+package io.onedev.server.web.editable;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.panel.Panel;++@SuppressWarnings("serial")+public abstract class PropertyViewer extends Panel {++ private final PropertyDescriptor descriptor;++ public PropertyViewer(String id, PropertyDescriptor descriptor) {+ super(id);++ this.descriptor = descriptor;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newContent("content", descriptor));+ add(AttributeAppender.append("class", "property-viewer editable"));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new EditableResourceReference()));+ }++ protected abstract Component newContent(String id, PropertyDescriptor descriptor);+}diff --git a/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java b/core/src/main/java/io/onedev/server/web/editable/ValueEditor.javaindex 3805db371b..509da5662c 100644--- a/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java@@ -1,87 +1,95 @@-package io.onedev.server.web.editable;--import javax.annotation.Nullable;--import org.apache.wicket.markup.html.form.FormComponent;-import org.apache.wicket.markup.html.form.FormComponentPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.util.convert.ConversionException;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;--@SuppressWarnings("serial")-public abstract class ValueEditor<T> extends FormComponentPanel<T> implements ErrorContext {-- public ValueEditor(String id, IModel<T> model) {- super(id, model);- setConvertedInput(model.getObject());- }-- /**- * Get error context of specified path- * @param path- * @return- * error context of specified path, <tt>null</tt> if error on the path should be ignored (for instance- * when visibility of the property depends on another property, or is excluded etc.)- */- public @Nullable ErrorContext getErrorContext(ValuePath path) {- ErrorContext context = this;- for (PathElement element: path.getElements()) {- ErrorContext elementContext = context.getErrorContext(element);- if (elementContext != null)- context = elementContext;- else- return null;- }- return context;- }-- public void clearErrors(boolean recursive) {- if (recursive) {- visitFormComponentsPostOrder(this, new IVisitor<FormComponent<?>, Void>() {-- @Override- public void component(FormComponent<?> formComponent, IVisit<Void> visit) {- formComponent.getFeedbackMessages().clear();- }-- });- } else {- getFeedbackMessages().clear();- }- }-- /**- * Get error context for specified path element.- *- * @return- * error context of specified path element, or <tt>null</tt> if error context- * for specified path segment can not be found- */- public abstract @Nullable ErrorContext getErrorContext(PathElement element);-- protected abstract T convertInputToValue() throws ConversionException;-- @Override- public void convertInput() {- try {- setConvertedInput(convertInputToValue());- } catch (ConversionException e) {- error(newValidationError(e));- }- }-- @Override- public void addError(String errorMessage) {- error(errorMessage);- }-- @Override- public boolean hasErrors(boolean recursive) {- if (recursive)- return !isValid();- else- return hasErrorMessage();- }--}+package io.onedev.server.web.editable;++import javax.annotation.Nullable;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.form.FormComponent;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;++@SuppressWarnings("serial")+public abstract class ValueEditor<T> extends FormComponentPanel<T> implements ErrorContext {++ public ValueEditor(String id, IModel<T> model) {+ super(id, model);+ setConvertedInput(model.getObject());+ }++ /**+ * Get error context of specified path+ * @param path+ * @return+ * error context of specified path, <tt>null</tt> if error on the path should be ignored (for instance+ * when visibility of the property depends on another property, or is excluded etc.)+ */+ public @Nullable ErrorContext getErrorContext(ValuePath path) {+ ErrorContext context = this;+ for (PathElement element: path.getElements()) {+ ErrorContext elementContext = context.getErrorContext(element);+ if (elementContext != null)+ context = elementContext;+ else+ return null;+ }+ return context;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new EditableResourceReference()));+ }++ public void clearErrors(boolean recursive) {+ if (recursive) {+ visitFormComponentsPostOrder(this, new IVisitor<FormComponent<?>, Void>() {++ @Override+ public void component(FormComponent<?> formComponent, IVisit<Void> visit) {+ formComponent.getFeedbackMessages().clear();+ }++ });+ } else {+ getFeedbackMessages().clear();+ }+ }++ /**+ * Get error context for specified path element.+ *+ * @return+ * error context of specified path element, or <tt>null</tt> if error context+ * for specified path segment can not be found+ */+ public abstract @Nullable ErrorContext getErrorContext(PathElement element);++ protected abstract T convertInputToValue() throws ConversionException;++ @Override+ public void convertInput() {+ try {+ setConvertedInput(convertInputToValue());+ } catch (ConversionException e) {+ error(newValidationError(e));+ }+ }++ @Override+ public void addError(String errorMessage) {+ error(errorMessage);+ }++ @Override+ public boolean hasErrors(boolean recursive) {+ if (recursive)+ return !isValid();+ else+ return hasErrorMessage();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java b/core/src/main/java/io/onedev/server/web/editable/annotation/Editable.javaindex bac50873ea..9100ff15d4 100644--- a/core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java@@ -1,20 +1,20 @@-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;--@Retention(RetentionPolicy.RUNTIME)-@Target({ElementType.TYPE, ElementType.METHOD})-public @interface Editable {- String category() default "";-- String icon() default "";-- String name() default "";-- int order() default 0;-- String description() default "";-}+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;++@Retention(RetentionPolicy.RUNTIME)+@Target({ElementType.TYPE, ElementType.METHOD})+public @interface Editable {+ String group() default "";++ String icon() default "";++ String name() default "";++ int order() default 0;++ String description() default "";+}diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 1f36f30f75..d753488e5f 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -1,342 +1,343 @@-package io.onedev.server.web.editable.beanlist;--import static de.agilecoders.wicket.jquery.JQuery.$;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FeedbackMessage;-import org.apache.wicket.feedback.FencedFeedbackPanel;-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.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import io.onedev.commons.utils.ClassUtils;-import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.editable.PathElement.Named;-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.PropertyUpdating;--@SuppressWarnings("serial")-public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {-- private final List<PropertyContext<Serializable>> propertyContexts;-- private final Class<?> elementClass;-- private RepeatingView rows;-- private WebMarkupContainer noElements;-- public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- elementClass = ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());-- propertyContexts = new ArrayList<>();-- for (PropertyDescriptor each: new BeanDescriptor(elementClass).getPropertyDescriptors()) {- propertyContexts.add(PropertyContext.of(each));- }-- }-- @SuppressWarnings("unchecked")- private List<Serializable> newList() {- if (ClassUtils.isConcrete(getDescriptor().getPropertyClass())) {- try {- return (List<Serializable>) getDescriptor().getPropertyClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- } else {- return new ArrayList<Serializable>();- }- }-- private Serializable newElement() {- try {- return (Serializable) elementClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<Serializable> list = getModelObject();- if (list == null)- list = newList();-- add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {-- @Override- protected void populateItem(ListItem<PropertyContext<Serializable>> item) {- PropertyContext<Serializable> propertyContext = item.getModelObject();- item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));- item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));-- String required;- if (propertyContext.isPropertyRequired() && propertyContext.getPropertyClass() != boolean.class)- required = "*";- else- required = " ";-- item.add(new Label("required", required).setEscapeModelStrings(false));- String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());- if (description != null) {- WebMarkupContainer help = new WebMarkupContainer("help");- help.add(AttributeAppender.append("title", description));- item.add(help);- } else {- item.add(new WebMarkupContainer("help").setVisible(false));- }- }-- });-- rows = new RepeatingView("elements");- add(rows);-- for (Serializable element: list) {- addRow(element);- }-- add(new AjaxButton("addElement") {-- @SuppressWarnings("deprecation")- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Component lastRow;- if (rows.size() != 0)- lastRow = rows.get(rows.size() - 1);- else- lastRow = null;-- Component newRow = addRow(newElement());- String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());- if (lastRow != null)- script += ".insertAfter('#" + lastRow.getMarkupId() + "');";- else- script += ".appendTo('#" + BeanListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";-- target.prependJavaScript(script);- target.add(newRow);- target.add(noElements);-- onPropertyUpdating(target);- }-- }.setDefaultFormProcessing(false));-- add(noElements = new WebMarkupContainer("noElements") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new WebMarkupContainer("td").add(AttributeAppender.append("colspan", propertyContexts.size())));- setOutputMarkupPlaceholderTag(true);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(rows.size() == 0);- }-- });-- add(new SortBehavior() {-- @SuppressWarnings("deprecation")- @Override- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- /*- List<Component> children = new ArrayList<>();- for (Component child: rows)- children.add(child);-- Component fromChild = children.remove(from.getItemIndex());- children.add(to.getItemIndex(), fromChild);-- rows.removeAll();- for (Component child: children)- rows.add(child);- */-- // Do not use code above as removing components outside of a container and add again- // can cause the fenced feedback panel not functioning properly- int fromIndex = from.getItemIndex();- int toIndex = to.getItemIndex();- if (fromIndex < toIndex) {- for (int i=0; i<toIndex-fromIndex; i++)- rows.swap(fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- rows.swap(fromIndex-i, fromIndex-i-1);- }- onPropertyUpdating(target);- }-- }.sortable("tbody"));-- setOutputMarkupId(true);- }-- @Override- protected String getErrorClass() {- return null;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());- }- }-- private WebMarkupContainer addRow(Serializable element) {- WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());- row.setOutputMarkupId(true);- rows.add(row);-- RepeatingView columns = new RepeatingView("properties");- row.add(columns);-- for (PropertyContext<Serializable> propertyContext: propertyContexts) {- WebMarkupContainer column = new WebMarkupContainer(columns.newChildId());- column.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));- columns.add(column);-- Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(element);- PropertyEditor<?> propertyEditor = propertyContext.renderForEdit("propertyEditor", Model.of(propertyValue));- column.add(propertyEditor);- column.add(new FencedFeedbackPanel("feedback", propertyEditor));- }-- row.add(new AjaxButton("deleteElement") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- target.appendJavaScript($(row).chain("remove").get());- target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));- rows.remove(row);- target.add(noElements);- onPropertyUpdating(target);- }-- }.setDefaultFormProcessing(false));-- return row;- }-- @SuppressWarnings("unchecked")- private List<PropertyEditor<Serializable>> getPropertyEditorsAtRow(int index) {- int currentIndex = 0;- Iterator<Component> it = rows.iterator();- Component row = it.next();- while (currentIndex++ < index) {- row = it.next();- }-- List<PropertyEditor<Serializable>> propertyEditors = new ArrayList<>();- RepeatingView columns = (RepeatingView) row.get("properties");- for (Component column: columns) {- propertyEditors.add((PropertyEditor<Serializable>) column.get("propertyEditor"));- }-- return propertyEditors;- }-- @Override- public ErrorContext getErrorContext(PathElement element) {- final int index = ((PathElement.Indexed) element).getIndex();- final String messagePrefix = "Item " + (index+1) + ": ";-- return new ErrorContext() {-- @Override- public void addError(String errorMessage) {- error(messagePrefix + errorMessage);- }-- @Override- public boolean hasErrors(boolean recursive) {- for (FeedbackMessage message: getFeedbackMessages()) {- if (message.getMessage().toString().startsWith(messagePrefix)) {- return true;- }- }-- if (recursive) {- for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {- if (propertyEditor.hasErrors(true))- return true;- }- }- return false;- }-- @Override- public ErrorContext getErrorContext(PathElement element) {- PathElement.Named namedElement = (Named) element;-- for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {- if (propertyEditor.getDescriptor().getPropertyName().equals(namedElement.getName()))- return propertyEditor;- }- return null;- }-- };- }-- @Override- protected List<Serializable> convertInputToValue() throws ConversionException {- List<Serializable> newList = newList();-- for (Component row: rows) {- Serializable element = newElement();- newList.add(element);-- RepeatingView columns = (RepeatingView) row.get("properties");- for (Component column: columns) {- @SuppressWarnings("unchecked")- PropertyEditor<Serializable> propertyEditor = (PropertyEditor<Serializable>) column.get("propertyEditor");- propertyEditor.getDescriptor().setPropertyValue(element, propertyEditor.getConvertedInput());- }- }- return newList;- }--}+package io.onedev.server.web.editable.beanlist;++import static de.agilecoders.wicket.jquery.JQuery.$;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FeedbackMessage;+import org.apache.wicket.feedback.FencedFeedbackPanel;+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.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.commons.utils.ClassUtils;+import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathElement.Named;+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.PropertyUpdating;++@SuppressWarnings("serial")+public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {++ private final List<PropertyContext<Serializable>> propertyContexts;++ private final Class<?> elementClass;++ private RepeatingView rows;++ private WebMarkupContainer noElements;++ public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ elementClass = ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());++ propertyContexts = new ArrayList<>();++ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(elementClass).getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties)+ propertyContexts.add(PropertyContext.of(property));+ }++ }++ @SuppressWarnings("unchecked")+ private List<Serializable> newList() {+ if (ClassUtils.isConcrete(getDescriptor().getPropertyClass())) {+ try {+ return (List<Serializable>) getDescriptor().getPropertyClass().newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ } else {+ return new ArrayList<Serializable>();+ }+ }++ private Serializable newElement() {+ try {+ return (Serializable) elementClass.newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Serializable> list = getModelObject();+ if (list == null)+ list = newList();++ add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {++ @Override+ protected void populateItem(ListItem<PropertyContext<Serializable>> item) {+ PropertyContext<Serializable> propertyContext = item.getModelObject();+ item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));+ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));++ String required;+ if (propertyContext.isPropertyRequired() && propertyContext.getPropertyClass() != boolean.class)+ required = "*";+ else+ required = " ";++ item.add(new Label("required", required).setEscapeModelStrings(false));+ String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());+ if (description != null) {+ WebMarkupContainer help = new WebMarkupContainer("help");+ help.add(AttributeAppender.append("title", description));+ item.add(help);+ } else {+ item.add(new WebMarkupContainer("help").setVisible(false));+ }+ }++ });++ rows = new RepeatingView("elements");+ add(rows);++ for (Serializable element: list) {+ addRow(element);+ }++ add(new AjaxButton("addElement") {++ @SuppressWarnings("deprecation")+ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Component lastRow;+ if (rows.size() != 0)+ lastRow = rows.get(rows.size() - 1);+ else+ lastRow = null;++ Component newRow = addRow(newElement());+ String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());+ if (lastRow != null)+ script += ".insertAfter('#" + lastRow.getMarkupId() + "');";+ else+ script += ".appendTo('#" + BeanListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";++ target.prependJavaScript(script);+ target.add(newRow);+ target.add(noElements);++ onPropertyUpdating(target);+ }++ }.setDefaultFormProcessing(false));++ add(noElements = new WebMarkupContainer("noElements") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new WebMarkupContainer("td").add(AttributeAppender.append("colspan", propertyContexts.size())));+ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(rows.size() == 0);+ }++ });++ add(new SortBehavior() {++ @SuppressWarnings("deprecation")+ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ /*+ List<Component> children = new ArrayList<>();+ for (Component child: rows)+ children.add(child);++ Component fromChild = children.remove(from.getItemIndex());+ children.add(to.getItemIndex(), fromChild);++ rows.removeAll();+ for (Component child: children)+ rows.add(child);+ */++ // Do not use code above as removing components outside of a container and add again+ // can cause the fenced feedback panel not functioning properly+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ rows.swap(fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ rows.swap(fromIndex-i, fromIndex-i-1);+ }+ onPropertyUpdating(target);+ }++ }.sortable("tbody"));++ setOutputMarkupId(true);+ }++ @Override+ protected String getErrorClass() {+ return null;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ private WebMarkupContainer addRow(Serializable element) {+ WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());+ row.setOutputMarkupId(true);+ rows.add(row);++ RepeatingView columns = new RepeatingView("properties");+ row.add(columns);++ for (PropertyContext<Serializable> propertyContext: propertyContexts) {+ WebMarkupContainer column = new WebMarkupContainer(columns.newChildId());+ column.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ columns.add(column);++ Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(element);+ PropertyEditor<?> propertyEditor = propertyContext.renderForEdit("propertyEditor", Model.of(propertyValue));+ column.add(propertyEditor);+ column.add(new FencedFeedbackPanel("feedback", propertyEditor));+ }++ row.add(new AjaxButton("deleteElement") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ target.appendJavaScript($(row).chain("remove").get());+ target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));+ rows.remove(row);+ target.add(noElements);+ onPropertyUpdating(target);+ }++ }.setDefaultFormProcessing(false));++ return row;+ }++ @SuppressWarnings("unchecked")+ private List<PropertyEditor<Serializable>> getPropertyEditorsAtRow(int index) {+ int currentIndex = 0;+ Iterator<Component> it = rows.iterator();+ Component row = it.next();+ while (currentIndex++ < index) {+ row = it.next();+ }++ List<PropertyEditor<Serializable>> propertyEditors = new ArrayList<>();+ RepeatingView columns = (RepeatingView) row.get("properties");+ for (Component column: columns) {+ propertyEditors.add((PropertyEditor<Serializable>) column.get("propertyEditor"));+ }++ return propertyEditors;+ }++ @Override+ public ErrorContext getErrorContext(PathElement element) {+ final int index = ((PathElement.Indexed) element).getIndex();+ final String messagePrefix = "Item " + (index+1) + ": ";++ return new ErrorContext() {++ @Override+ public void addError(String errorMessage) {+ error(messagePrefix + errorMessage);+ }++ @Override+ public boolean hasErrors(boolean recursive) {+ for (FeedbackMessage message: getFeedbackMessages()) {+ if (message.getMessage().toString().startsWith(messagePrefix)) {+ return true;+ }+ }++ if (recursive) {+ for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {+ if (propertyEditor.hasErrors(true))+ return true;+ }+ }+ return false;+ }++ @Override+ public ErrorContext getErrorContext(PathElement element) {+ PathElement.Named namedElement = (Named) element;++ for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {+ if (propertyEditor.getDescriptor().getPropertyName().equals(namedElement.getName()))+ return propertyEditor;+ }+ return null;+ }++ };+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> newList = newList();++ for (Component row: rows) {+ Serializable element = newElement();+ newList.add(element);++ RepeatingView columns = (RepeatingView) row.get("properties");+ for (Component column: columns) {+ @SuppressWarnings("unchecked")+ PropertyEditor<Serializable> propertyEditor = (PropertyEditor<Serializable>) column.get("propertyEditor");+ propertyEditor.getDescriptor().setPropertyValue(element, propertyEditor.getConvertedInput());+ }+ }+ return newList;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.javaindex 55ea356a84..f721c721c9 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java@@ -1,77 +1,78 @@-package io.onedev.server.web.editable.beanlist;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.AttributeModifier;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.Model;--import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;--@SuppressWarnings("serial")-public class BeanListPropertyViewer extends Panel {-- private final List<PropertyContext<Serializable>> elementPropertyContexts;-- private final List<Serializable> elements;-- public BeanListPropertyViewer(String id, Class<?> elementClass, List<Serializable> elements) {- super(id);-- elementPropertyContexts = new ArrayList<>();- for (PropertyDescriptor propertyDescriptor: new BeanDescriptor(elementClass).getPropertyDescriptors()) {- elementPropertyContexts.add(PropertyContext.of(propertyDescriptor));- }-- this.elements = elements;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<PropertyContext<Serializable>>("headers", elementPropertyContexts) {-- @Override- protected void populateItem(ListItem<PropertyContext<Serializable>> item) {- PropertyContext<?> propertyContext = item.getModelObject();- item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));- item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));- }-- });- add(new ListView<Serializable>("rows", elements) {-- @Override- protected void populateItem(final ListItem<Serializable> rowItem) {- rowItem.add(new ListView<PropertyContext<Serializable>>("columns", elementPropertyContexts) {-- @Override- protected void populateItem(ListItem<PropertyContext<Serializable>> columnItem) {- PropertyContext<Serializable> propertyContext = columnItem.getModelObject();- Serializable elementPropertyValue = (Serializable) propertyContext.getPropertyValue(rowItem.getModelObject());- columnItem.add(propertyContext.renderForView("cell", Model.of(elementPropertyValue)));- columnItem.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));- }-- });- }-- });- WebMarkupContainer noElements = new WebMarkupContainer("noElements");- noElements.setVisible(elements.isEmpty());- noElements.add(AttributeModifier.append("colspan", elementPropertyContexts.size()));- add(noElements);- }--}+package io.onedev.server.web.editable.beanlist;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.Model;++import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;++@SuppressWarnings("serial")+public class BeanListPropertyViewer extends Panel {++ private final List<PropertyContext<Serializable>> elementPropertyContexts;++ private final List<Serializable> elements;++ public BeanListPropertyViewer(String id, Class<?> elementClass, List<Serializable> elements) {+ super(id);++ elementPropertyContexts = new ArrayList<>();+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(elementClass).getPropertyDescriptors().values()) {+ for (PropertyDescriptor property: groupProperties)+ elementPropertyContexts.add(PropertyContext.of(property));+ }++ this.elements = elements;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<PropertyContext<Serializable>>("headers", elementPropertyContexts) {++ @Override+ protected void populateItem(ListItem<PropertyContext<Serializable>> item) {+ PropertyContext<?> propertyContext = item.getModelObject();+ item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));+ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ }++ });+ add(new ListView<Serializable>("rows", elements) {++ @Override+ protected void populateItem(final ListItem<Serializable> rowItem) {+ rowItem.add(new ListView<PropertyContext<Serializable>>("columns", elementPropertyContexts) {++ @Override+ protected void populateItem(ListItem<PropertyContext<Serializable>> columnItem) {+ PropertyContext<Serializable> propertyContext = columnItem.getModelObject();+ Serializable elementPropertyValue = (Serializable) propertyContext.getPropertyValue(rowItem.getModelObject());+ columnItem.add(propertyContext.renderForView("cell", Model.of(elementPropertyValue)));+ columnItem.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ }++ });+ }++ });+ WebMarkupContainer noElements = new WebMarkupContainer("noElements");+ noElements.setVisible(elements.isEmpty());+ noElements.add(AttributeModifier.append("colspan", elementPropertyContexts.size()));+ add(noElements);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/editable.css b/core/src/main/java/io/onedev/server/web/editable/editable.cssnew file mode 100644index 0000000000..1b533f5d8f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/editable.css@@ -0,0 +1,118 @@+.editable>.bean-properties>table {+ width: 100%;+}+.editable>.group {+ margin-bottom: 12px;+}+.editable>.group>a {+ display: block;+ text-decoration: none;+ color: #444;+ background: #F5F5F5;+ border-right: 4px solid #DDD;+ padding: 4px 8px;+ margin-bottom: 12px;+ text-align: right;+ border-radius: 4px;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}+.editable>.group>a:AFTER {+ font-family: "FontAwesome";+ margin-left: 12px;+}+.editable>.group>a:AFTER {+ content: "\f103";+}+.editable>.group.expanded>a:AFTER {+ content: "\f102";+}+.editable>.group>div, .editable>.group>table {+ display: none;+}+.editable>.group.expanded>div {+ display: block;+}+.editable>.group.expanded>table {+ display: table;+}+.editable>.bean-properties>table>tbody>tr>td {+ vertical-align: top;+ padding: 0 8px 16px 0;+}+.editable td.value>div:last-child>div:last-child>table>tbody>tr:last-child>td.value,+.editable td.value>div:last-child>div:last-child>div:last-child>div:last-child>table>tbody>tr:last-child>td.value {+ padding-bottom: 0;+ margin-bottom: 0;+}++.editable>.bean-properties>table>tbody>tr>td.name {+ font-weight: bold;+ border-right: 1px solid #E0E0E0;+ text-align: right;+ white-space: nowrap;+ width: 20%;+ font-size: 12px;+ line-height: 20px;+}+.editable>.bean-properties>table>tbody>tr>td.value {+ padding-left: 8px;+}+.editable table {+ margin-bottom: 0;+}++.property-editor>.polymorphic-list>table>tbody>tr>td {+ border-top: 2px solid #BBB;+ padding-top: 20px;+}+.property-editor>.polymorphic-list>table>tbody>tr>td>.head {+ margin-bottom: 20px;+}+.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions {+ font-size: 18px;+ margin-left: 20px;+}+.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions a {+ color: #666;+}+.property-viewer>.polymorphic-list>tbody>tr>td {+ border-top: 2px solid #BBB;+ padding-top: 12px;+ padding-bottom: 12px;+}+.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {+ margin-bottom: 12px;+}++.editable>.polymorphic>.type-selector {+ margin-bottom: 15px;+}++.bean-editor>input.enable {+ margin-bottom: 12px;+}++.bean-editor .password-confirm {+ margin-top: 12px;+}++.property-editor>.bean-editor {+ border-top: 1px dotted #BBB;+ margin-top: 4px;+ padding-top: 12px;+ margin-bottom: 12px;+}+.bean-viewer .bean-properties>table>tbody>tr.name-omitted>td {+ padding-left: 0;+}+.bean-viewer .type-selector {+ font-style: italic;+}++.bean-editor .bean-list>table>tbody>tr>td {+ border-top: none;+}++.bean-editor .select2-container {+ width: 100%;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/editable.js b/core/src/main/java/io/onedev/server/web/editable/editable.jsnew file mode 100644index 0000000000..78809b6b08--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/editable.js@@ -0,0 +1,35 @@+onedev.server.editable = {+ onBeanEditorDomReady: function(containerId) {+ var $container = $("#" + containerId);+ var $group = $container.children(".group");+ $group.children("a").click(function() {+ $(this).parent().toggleClass("expanded");+ });+ $(".feedbackPanelERROR").closest(".group.bean-properties").addClass("expanded");+ },+ onBeanViewerDomReady: function(containerId) {+ var $container = $("#" + containerId);+ var $group = $container.children(".group");+ $group.children("a").click(function() {+ $(this).parent().toggleClass("expanded");+ });+ },+ onBeanEditorPropertyContainerDomReady: function(containerId) {+ var $container = $("#" + containerId);+ $container.find(".value>input[type=checkbox]").each(function() {+ var $input = $(this);+ $input.css("margin-right", "8px");+ $input.css("vertical-align", "text-top");+ var $label = $input.parent().prev("label.name");+ $label.attr("for", $input.attr("id")).insertAfter($input);+ });++ $container.find(".value>div>input[type=checkbox]").each(function() {+ var $input = $(this);+ $input.css("margin-right", "8px");+ $input.css("vertical-align", "text-top");+ $label = $input.parent().parent().prev("label.name");+ $label.attr("for", $input.attr("id")).insertAfter($input);+ });+ }+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/property-container.js b/core/src/main/java/io/onedev/server/web/editable/property-container.jsdeleted file mode 100644index 4eaa01e3e6..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/property-container.js+++ /dev/null@@ -1,20 +0,0 @@-onedev.server.propertyContainer = {- onDomReady: function(containerId) {- var $container = $("#" + containerId);- $container.find(".value>input[type=checkbox]").each(function() {- var $input = $(this);- $input.css("margin-right", "8px");- $input.css("vertical-align", "text-top");- var $label = $input.parent().prev("label.name");- $label.attr("for", $input.attr("id")).insertAfter($input);- });-- $container.find(".value>div>input[type=checkbox]").each(function() {- var $input = $(this);- $input.css("margin-right", "8px");- $input.css("vertical-align", "text-top");- $label = $input.parent().parent().prev("label.name");- $label.attr("for", $input.attr("id")).insertAfter($input);- });- }-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 1ef03fbd43..88553dbe0f 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -179,93 +179,6 @@ a.tree-junction {font-size: 13px;}-/* Editor and Viewer */--.editable>.bean-properties>table {- width: 100%;-}-.editable>.bean-properties>table>tbody>tr>td {- vertical-align: top;- padding: 0 8px 16px 0;-}-.editable td.value>div:last-child>div:last-child>table>tbody>tr:last-child>td.value,-.editable td.value>div:last-child>div:last-child>div:last-child>div:last-child>table>tbody>tr:last-child>td.value {- padding-bottom: 0;- margin-bottom: 0;-}--.editable>.bean-properties>table>tbody>tr>td.name {- font-weight: bold;- border-right: 1px solid #E0E0E0;- text-align: right;- white-space: nowrap;- width: 20%;- font-size: 12px;- line-height: 20px;-}-.editable>.bean-properties>table>tbody>tr>td.value {- padding-left: 8px;-}-.editable table {- margin-bottom: 0;-}--.property-editor>.polymorphic-list>table>tbody>tr>td {- border-top: 2px solid #BBB;- padding-top: 20px;-}-.property-editor>.polymorphic-list>table>tbody>tr>td>.head {- margin-bottom: 20px;-}-.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions {- font-size: 18px;- margin-left: 20px;-}-.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions a {- color: #666;-}-.property-viewer>.polymorphic-list>tbody>tr>td {- border-top: 2px solid #BBB;- padding-top: 12px;- padding-bottom: 12px;-}-.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {- margin-bottom: 12px;-}--.editable>.polymorphic>.type-selector {- margin-bottom: 15px;-}--.bean-editor>input.enable {- margin-bottom: 12px;-}--.bean-editor .password-confirm {- margin-top: 12px;-}--.property.editor>.bean-editor {- border-top: 1px dotted #BBB;- margin-top: 4px;- padding-top: 12px;- margin-bottom: 12px;-}-.bean-viewer .bean-properties>table>tbody>tr.name-omitted>td {- padding-left: 0;-}-.bean-viewer .type-selector {- font-style: italic;-}--.bean-editor .bean-list>table>tbody>tr>td {- border-top: none;-}--/* Select2 */-.bean-editor .select2-container {- width: 100%;-}.input-group .select2-container.form-control .select2-choice,.input-group .select2-container.form-control .select2-choices {border-radius: 0 4px 4px 0;diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 623b8841c4..e8a32b1e9a 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,2 @@-<wicket:extend>- <a wicket:id="test">test</a>+<wicket:extend></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex d5197a5b36..8c5e0b3ff5 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.page.base.BasePage;@@ -18,13 +17,6 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Link<Void>("test") {-- @Override- public void onClick() {- }-- });}@Override