The Unified and Autonomous Development Platform
Fix issue #929 - Able to label projects, builds and pull requests
Robin Shend365cf6fa761
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 8770379be4..e4619f3d55 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -91,6 +91,7 @@ import io.onedev.server.entitymanager.AgentAttributeManager;import io.onedev.server.entitymanager.AgentManager;import io.onedev.server.entitymanager.AgentTokenManager;import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildLabelManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.BuildParamManager;@@ -119,15 +120,18 @@ import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;import io.onedev.server.entitymanager.IssueScheduleManager;import io.onedev.server.entitymanager.IssueVoteManager;import io.onedev.server.entitymanager.IssueWatchManager;+import io.onedev.server.entitymanager.LabelManager;import io.onedev.server.entitymanager.LinkAuthorizationManager;import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.PendingSuggestionApplyManager;+import io.onedev.server.entitymanager.ProjectLabelManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestAssignmentManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestLabelManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;import io.onedev.server.entitymanager.PullRequestReviewManager;@@ -144,6 +148,7 @@ import io.onedev.server.entitymanager.impl.DefaultAgentAttributeManager;import io.onedev.server.entitymanager.impl.DefaultAgentManager;import io.onedev.server.entitymanager.impl.DefaultAgentTokenManager;import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;+import io.onedev.server.entitymanager.impl.DefaultBuildLabelManager;import io.onedev.server.entitymanager.impl.DefaultBuildManager;import io.onedev.server.entitymanager.impl.DefaultBuildMetricManager;import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;@@ -172,15 +177,18 @@ import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManagimport io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;+import io.onedev.server.entitymanager.impl.DefaultLabelManager;import io.onedev.server.entitymanager.impl.DefaultLinkAuthorizationManager;import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;import io.onedev.server.entitymanager.impl.DefaultMembershipManager;import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;import io.onedev.server.entitymanager.impl.DefaultPendingSuggestionApplyManager;+import io.onedev.server.entitymanager.impl.DefaultProjectLabelManager;import io.onedev.server.entitymanager.impl.DefaultProjectManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestLabelManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestQueryPersonalizationManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;@@ -473,6 +481,10 @@ public class CoreModule extends AbstractPluginModule {bind(DashboardUserShareManager.class).to(DefaultDashboardUserShareManager.class);bind(DashboardGroupShareManager.class).to(DefaultDashboardGroupShareManager.class);bind(DashboardVisitManager.class).to(DefaultDashboardVisitManager.class);+ bind(LabelManager.class).to(DefaultLabelManager.class);+ bind(ProjectLabelManager.class).to(DefaultProjectLabelManager.class);+ bind(BuildLabelManager.class).to(DefaultBuildLabelManager.class);+ bind(PullRequestLabelManager.class).to(DefaultPullRequestLabelManager.class);bind(WebHookManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.javanew file mode 100644index 0000000000..2bba358d1a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java@@ -0,0 +1,7 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.BuildLabel;++public interface BuildLabelManager extends EntityLabelManager<BuildLabel> {++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/EntityLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/EntityLabelManager.javanew file mode 100644index 0000000000..7896d117d2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/EntityLabelManager.java@@ -0,0 +1,13 @@+package io.onedev.server.entitymanager;++import java.util.Collection;++import io.onedev.server.model.support.EntityLabel;+import io.onedev.server.model.support.LabelSupport;+import io.onedev.server.persistence.dao.EntityManager;++public interface EntityLabelManager<T extends EntityLabel> extends EntityManager<T> {++ void sync(LabelSupport<T> entity, Collection<String> labelNames);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.javanew file mode 100644index 0000000000..50d2219d6a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.java@@ -0,0 +1,21 @@+package io.onedev.server.entitymanager;++import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.LabelSpec;+import io.onedev.server.persistence.dao.EntityManager;++public interface LabelManager extends EntityManager<LabelSpec> {++ @Nullable+ LabelSpec find(String name);++ int count(@Nullable String term);++ List<LabelSpec> query(@Nullable String term, int firstResult, int maxResults);++ void sync(List<LabelSpec> labels);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.javanew file mode 100644index 0000000000..6fb60ba615--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java@@ -0,0 +1,7 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.ProjectLabel;++public interface ProjectLabelManager extends EntityLabelManager<ProjectLabel> {++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.javanew file mode 100644index 0000000000..d253dfde2d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java@@ -0,0 +1,7 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.PullRequestLabel;++public interface PullRequestLabelManager extends EntityLabelManager<PullRequestLabel> {++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.javanew file mode 100644index 0000000000..2354d473da--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java@@ -0,0 +1,48 @@+package io.onedev.server.entitymanager.impl;++import java.util.Collection;+import java.util.HashSet;+import java.util.stream.Collectors;++import javax.inject.Inject;++import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.support.EntityLabel;+import io.onedev.server.model.support.LabelSupport;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++public abstract class BaseEntityLabelManager<T extends EntityLabel> extends BaseEntityManager<T> {++ private final LabelManager labelManager;++ @Inject+ public BaseEntityLabelManager(Dao dao, LabelManager labelManager) {+ super(dao);+ this.labelManager = labelManager;+ }++ @Transactional+ public void sync(LabelSupport<T> entity, Collection<String> labelNames) {+ var labelsToRemove = new HashSet<>();+ entity.getLabels().stream()+ .filter(it->!labelNames.contains(it.getSpec().getName()))+ .forEach(it-> {delete(it); labelsToRemove.add(it);});+ entity.getLabels().removeAll(labelsToRemove);++ Collection<String> existingLabelNames = entity.getLabels().stream()+ .map(it->it.getSpec().getName())+ .collect(Collectors.toSet());+ labelNames.stream().filter(it->!existingLabelNames.contains(it)).forEach(it-> {+ var label = newEntityLabel((AbstractEntity) entity, labelManager.find(it));+ save(label);+ entity.getLabels().add(label);+ });+ }++ protected abstract T newEntityLabel(AbstractEntity entity, LabelSpec spec);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.javanew file mode 100644index 0000000000..1e35427385--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java@@ -0,0 +1,30 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.BuildLabelManager;+import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Build;+import io.onedev.server.model.BuildLabel;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultBuildLabelManager extends BaseEntityLabelManager<BuildLabel> implements BuildLabelManager {++ @Inject+ public DefaultBuildLabelManager(Dao dao, LabelManager labelManager) {+ super(dao, labelManager);+ }++ @Override+ protected BuildLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {+ var label = new BuildLabel();+ label.setBuild((Build) entity);+ label.setSpec(spec);+ return label;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.javanew file mode 100644index 0000000000..633d231186--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java@@ -0,0 +1,71 @@+package io.onedev.server.entitymanager.impl;++import java.util.List;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;++@Singleton+public class DefaultLabelManager extends BaseEntityManager<LabelSpec> implements LabelManager {++ @Inject+ public DefaultLabelManager(Dao dao) {+ super(dao);+ }++ @Override+ public LabelSpec find(String name) {+ EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);+ criteria.add(Restrictions.eq(LabelSpec.PROP_NAME, name));+ return find(criteria);+ }++ private EntityCriteria<LabelSpec> getCriteria(@Nullable String term) {+ EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);+ if (term != null)+ criteria.add(Restrictions.ilike(LabelSpec.PROP_NAME, term, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);+ return criteria;+ }++ @Sessional+ @Override+ public List<LabelSpec> query(String term, int firstResult, int maxResults) {+ EntityCriteria<LabelSpec> criteria = getCriteria(term);+ criteria.addOrder(Order.asc(LabelSpec.PROP_NAME));+ return query(criteria, firstResult, maxResults);+ }++ @Sessional+ @Override+ public int count(String term) {+ return count(getCriteria(term));+ }++ @Transactional+ @Override+ public void sync(List<LabelSpec> labels) {+ for (var label: labels) {+ save(label);+ }+ for (var existingLabel: query()) {+ if (!labels.contains(existingLabel))+ delete(existingLabel);+ }+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.javanew file mode 100644index 0000000000..24ea711124--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java@@ -0,0 +1,30 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.entitymanager.ProjectLabelManager;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.Project;+import io.onedev.server.model.ProjectLabel;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultProjectLabelManager extends BaseEntityLabelManager<ProjectLabel> implements ProjectLabelManager {++ @Inject+ public DefaultProjectLabelManager(Dao dao, LabelManager labelManager) {+ super(dao, labelManager);+ }++ @Override+ protected ProjectLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {+ var label = new ProjectLabel();+ label.setProject((Project) entity);+ label.setSpec(spec);+ return label;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.javanew file mode 100644index 0000000000..81b5bd794c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java@@ -0,0 +1,31 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.entitymanager.PullRequestLabelManager;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestLabel;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultPullRequestLabelManager extends BaseEntityLabelManager<PullRequestLabel>+ implements PullRequestLabelManager {++ @Inject+ public DefaultPullRequestLabelManager(Dao dao, LabelManager labelManager) {+ super(dao, labelManager);+ }++ @Override+ protected PullRequestLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {+ var label = new PullRequestLabel();+ label.setRequest((PullRequest) entity);+ label.setSpec(spec);+ return label;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 9c3964229d..e8a23d184e 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -76,6 +76,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.support.BuildMetric;+import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;@@ -116,7 +117,8 @@ import io.onedev.server.web.util.WicketUtils;@Index(columnList="o_numberScope_id"), @Index(columnList="o_project_id, " + PROP_COMMIT)},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})-public class Build extends AbstractEntity implements Referenceable, AttachmentStorageSupport {+public class Build extends AbstractEntity+ implements Referenceable, AttachmentStorageSupport, LabelSupport<BuildLabel> {private static final long serialVersionUID = 1L;@@ -134,6 +136,8 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentStpublic static final String NAME_JOB = "Job";+ public static final String NAME_LABEL = "Label";+public static final String PROP_JOB = "jobName";public static final String NAME_STATUS = "Status";@@ -197,15 +201,15 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentStpublic static final String PROP_TRIGGER_ID = "triggerId";public static final Set<String> ALL_FIELDS = Sets.newHashSet(- NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,- NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,- NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION,- NAME_LOG, BuildMetric.NAME_REPORT);+ NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_LABEL, NAME_STATUS, NAME_SUBMITTER,+ NAME_CANCELLER, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE,+ NAME_FINISH_DATE, NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT,+ NAME_VERSION, NAME_LOG, BuildMetric.NAME_REPORT);public static final List<String> QUERY_FIELDS = Lists.newArrayList(NAME_PROJECT, NAME_JOB, NAME_STATUS, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION,- NAME_PULL_REQUEST, NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE,- NAME_FINISH_DATE);+ NAME_LABEL, NAME_PULL_REQUEST, NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE,+ NAME_RUNNING_DATE, NAME_FINISH_DATE);public static final List<String> METRIC_QUERY_FIELDS = Lists.newArrayList(NAME_JOB, NAME_BRANCH, NAME_PULL_REQUEST, BuildMetric.NAME_REPORT);@@ -333,6 +337,9 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentSt@Column(nullable=false, length=1000)private String submitReason;+ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)+ private Collection<BuildLabel> labels = new ArrayList<>();+@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)private Collection<BuildParam> params = new ArrayList<>();@@ -603,6 +610,14 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentStthis.params = params;}+ public Collection<BuildLabel> getLabels() {+ return labels;+ }++ public void setLabels(Collection<BuildLabel> labels) {+ this.labels = labels;+ }+public Collection<BuildDependence> getDependencies() {return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/model/BuildLabel.java b/server-core/src/main/java/io/onedev/server/model/BuildLabel.javanew file mode 100644index 0000000000..fe34a96850--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/BuildLabel.java@@ -0,0 +1,55 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import io.onedev.server.model.support.EntityLabel;++@Entity+@Table(+ indexes={@Index(columnList="o_build_id"), @Index(columnList="o_spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", "o_spec_id"})}+)+public class BuildLabel extends EntityLabel {++ private static final long serialVersionUID = 1L;++ public static String PROP_BUILD = "build";++ public static String PROP_SPEC = "spec";++ @ManyToOne+ @JoinColumn(nullable=false)+ private Build build;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private LabelSpec spec;++ public Build getBuild() {+ return build;+ }++ public void setBuild(Build build) {+ this.build = build;+ }++ public LabelSpec getSpec() {+ return spec;+ }++ public void setSpec(LabelSpec spec) {+ this.spec = spec;+ }++ @Override+ public AbstractEntity getEntity() {+ return getBuild();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/LabelSpec.java b/server-core/src/main/java/io/onedev/server/model/LabelSpec.javanew file mode 100644index 0000000000..bc921c7871--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/LabelSpec.java@@ -0,0 +1,103 @@+package io.onedev.server.model;++import static io.onedev.server.model.LabelSpec.PROP_NAME;++import java.util.ArrayList;+import java.util.Collection;++import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.validation.constraints.NotEmpty;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++import io.onedev.server.web.editable.annotation.Color;+import io.onedev.server.web.editable.annotation.Editable;++@Entity+@Table(indexes={@Index(columnList=PROP_NAME)})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class LabelSpec extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String PROP_NAME = "name";++ @Column(nullable=false)+ private String name;++ @Column(nullable=false)+ private String color = "#0d87e9";++ @OneToMany(mappedBy="spec", cascade=CascadeType.REMOVE)+ private Collection<ProjectLabel> projectLabels = new ArrayList<>();++ @OneToMany(mappedBy="spec", cascade=CascadeType.REMOVE)+ private Collection<BuildLabel> buildLabels = new ArrayList<>();++ @OneToMany(mappedBy="spec", cascade=CascadeType.REMOVE)+ private Collection<PullRequestLabel> pullRequestLabels = new ArrayList<>();++ @Editable+ @Override+ public Long getId() {+ return super.getId();+ }++ @Override+ public void setId(Long id) {+ super.setId(id);+ }++ @Editable(order=100)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ @NotEmpty+ @Color+ public String getColor() {+ return color;+ }++ public void setColor(String color) {+ this.color = color;+ }++ public Collection<ProjectLabel> getProjectLabels() {+ return projectLabels;+ }++ public void setProjectLabels(Collection<ProjectLabel> projectLabels) {+ this.projectLabels = projectLabels;+ }++ public Collection<BuildLabel> getBuildLabels() {+ return buildLabels;+ }++ public void setBuildLabels(Collection<BuildLabel> buildLabels) {+ this.buildLabels = buildLabels;+ }++ public Collection<PullRequestLabel> getPullRequestLabels() {+ return pullRequestLabels;+ }++ public void setPullRequestLabels(Collection<PullRequestLabel> pullRequestLabels) {+ this.pullRequestLabels = pullRequestLabels;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex a7a93826a9..14781fe860 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -45,6 +45,7 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;import javax.validation.Validator;+import javax.validation.constraints.NotEmpty;import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;import org.apache.commons.collections4.map.ReferenceMap;@@ -76,7 +77,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;-import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -126,6 +126,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;+import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.TagProtection;@@ -178,7 +179,7 @@ import io.onedev.server.web.util.WicketUtils;//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@Editable-public class Project extends AbstractEntity {+public class Project extends AbstractEntity implements LabelSupport<ProjectLabel> {private static final long serialVersionUID = 1L;@@ -206,6 +207,8 @@ public class Project extends AbstractEntity {public static final String PROP_FORKED_FROM = "forkedFrom";+ public static final String NAME_LABEL = "Label";+public static final String PROP_PARENT = "parent";public static final String PROP_USER_AUTHORIZATIONS = "userAuthorizations";@@ -222,8 +225,8 @@ public class Project extends AbstractEntity {public static final String NULL_SERVICE_DESK_PREFIX = "<$NullServiceDesk$>";- public static final List<String> QUERY_FIELDS =- Lists.newArrayList(NAME_NAME, NAME_PATH, NAME_SERVICE_DESK_NAME, NAME_DESCRIPTION, NAME_UPDATE_DATE);+ public static final List<String> QUERY_FIELDS = Lists.newArrayList(+ NAME_NAME, NAME_PATH, NAME_LABEL, NAME_SERVICE_DESK_NAME, NAME_DESCRIPTION, NAME_UPDATE_DATE);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_PATH, PROP_PATH,@@ -309,6 +312,10 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Issue> issues = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<ProjectLabel> labels = new ArrayList<>();+@OneToMany(mappedBy="parent")@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Project> children = new ArrayList<>();@@ -546,6 +553,14 @@ public class Project extends AbstractEntity {this.forkedFrom = forkedFrom;}+ public Collection<ProjectLabel> getLabels() {+ return labels;+ }++ public void setLabels(Collection<ProjectLabel> labels) {+ this.labels = labels;+ }+@Nullablepublic Project getParent() {return parent;diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.javanew file mode 100644index 0000000000..e1479cc24b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java@@ -0,0 +1,55 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import io.onedev.server.model.support.EntityLabel;++@Entity+@Table(+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_spec_id"})}+)+public class ProjectLabel extends EntityLabel {++ private static final long serialVersionUID = 1L;++ public static String PROP_PROJECT = "project";++ public static String PROP_SPEC = "spec";++ @ManyToOne+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private LabelSpec spec;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public LabelSpec getSpec() {+ return spec;+ }++ public void setSpec(LabelSpec spec) {+ this.spec = spec;+ }++ @Override+ public AbstractEntity getEntity() {+ return getProject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 9c8ce4aeda..648b0afe37 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -61,6 +61,7 @@ import io.onedev.server.infomanager.PullRequestInfoManager;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.EntityWatch;+import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;@@ -86,7 +87,8 @@ import io.onedev.server.web.util.WicketUtils;uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate-public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {+public class PullRequest extends AbstractEntity+ implements Referenceable, AttachmentStorageSupport, LabelSupport<PullRequestLabel> {private static final long serialVersionUID = 1L;@@ -116,6 +118,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_TITLE = "title";+ public static final String NAME_LABEL = "Label";+public static final String NAME_DESCRIPTION = "Description";public static final String PROP_DESCRIPTION = "description";@@ -170,9 +174,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final List<String> QUERY_FIELDS = Lists.newArrayList(NAME_NUMBER, NAME_STATUS, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,- NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_DESCRIPTION,- NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE,- NAME_CLOSE_DATE, NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT);+ NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_LABEL, NAME_DESCRIPTION,+ NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE, NAME_CLOSE_DATE,+ NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_SUBMIT_DATE, PROP_SUBMIT_DATE,@@ -284,6 +288,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@JsonIgnoreprivate int revision;+ @OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)+ private Collection<PullRequestLabel> labels = new ArrayList<>();+@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestUpdate> updates = new ArrayList<>();@@ -449,6 +456,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()), true);}+ @Override+ public Collection<PullRequestLabel> getLabels() {+ return labels;+ }++ public void setLabels(Collection<PullRequestLabel> labels) {+ this.labels = labels;+ }+public Collection<PullRequestUpdate> getUpdates() {return updates;}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.javanew file mode 100644index 0000000000..05b7a1bdc1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java@@ -0,0 +1,55 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import io.onedev.server.model.support.EntityLabel;++@Entity+@Table(+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_spec_id"})}+)+public class PullRequestLabel extends EntityLabel {++ private static final long serialVersionUID = 1L;++ public static String PROP_REQUEST = "request";++ public static String PROP_SPEC = "spec";++ @ManyToOne+ @JoinColumn(nullable=false)+ private PullRequest request;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private LabelSpec spec;++ public PullRequest getRequest() {+ return request;+ }++ public void setRequest(PullRequest request) {+ this.request = request;+ }++ public LabelSpec getSpec() {+ return spec;+ }++ public void setSpec(LabelSpec spec) {+ this.spec = spec;+ }++ @Override+ public AbstractEntity getEntity() {+ return getRequest();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.java b/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.javanew file mode 100644index 0000000000..2059e71518--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.java@@ -0,0 +1,17 @@+package io.onedev.server.model.support;++import javax.persistence.MappedSuperclass;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.LabelSpec;++@MappedSuperclass+public abstract class EntityLabel extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public abstract AbstractEntity getEntity();++ public abstract LabelSpec getSpec();++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/LabelSupport.java b/server-core/src/main/java/io/onedev/server/model/support/LabelSupport.javanew file mode 100644index 0000000000..68bbf29c0b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/LabelSupport.java@@ -0,0 +1,9 @@+package io.onedev.server.model.support;++import java.util.Collection;++public interface LabelSupport<T extends EntityLabel> {++ Collection<T> getLabels();++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex ba2362db14..929bf69d06 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -17,6 +17,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.LabelManager;import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;@@ -25,6 +26,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;+import io.onedev.server.model.LabelSpec;import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;@@ -58,6 +60,14 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa}}+ public static LabelSpec getLabelSpec(String labelName) {+ var labelSpec = OneDev.getInstance(LabelManager.class).find(labelName);+ if (labelSpec != null)+ return labelSpec;+ else+ throw new ExplicitException("Undefined label: " + labelName);+ }+public static long getLongValue(String value) {try {return Long.parseLong(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 0a56e58047..c1c7dffba6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;import static io.onedev.server.model.Build.NAME_BRANCH;+import static io.onedev.server.model.Build.NAME_LABEL;import static io.onedev.server.model.Build.NAME_COMMIT;import static io.onedev.server.model.Build.NAME_FINISH_DATE;import static io.onedev.server.model.Build.NAME_JOB;@@ -228,6 +229,8 @@ public class BuildQuery extends EntityQuery<Build> {return new BranchCriteria(value);case NAME_TAG:return new TagCriteria(value);+ case NAME_LABEL:+ return new LabelCriteria(getLabelSpec(value));case NAME_PULL_REQUEST:return new PullRequestCriteria(project, value);default:@@ -306,7 +309,8 @@ public class BuildQuery extends EntityQuery<Build> {&& !fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_NUMBER)&& !fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)&& !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_TAG)- && !fieldName.equals(NAME_STATUS) && !paramNames.contains(fieldName)) {+ && !fieldName.equals(NAME_LABEL) && !fieldName.equals(NAME_STATUS)+ && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.javanew file mode 100644index 0000000000..2e2a7dca5e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java@@ -0,0 +1,47 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.BuildLabel;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.Project;+import io.onedev.server.util.criteria.Criteria;++public class LabelCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final LabelSpec labelSpec;++ public LabelCriteria(LabelSpec labelSpec) {+ this.labelSpec = labelSpec;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ var labelQuery = query.subquery(BuildLabel.class);+ var labelRoot = labelQuery.from(BuildLabel.class);+ labelQuery.select(labelRoot);++ return builder.exists(labelQuery.where(+ builder.equal(labelRoot.get(BuildLabel.PROP_BUILD), from),+ builder.equal(labelRoot.get(BuildLabel.PROP_SPEC), labelSpec)));+ }++ @Override+ public boolean matches(Build build) {+ return build.getLabels().stream().anyMatch(it->it.getSpec().equals(labelSpec));+ }++ @Override+ public String toStringWithoutParens() {+ return Criteria.quote(Project.NAME_LABEL) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + Criteria.quote(labelSpec.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.javanew file mode 100644index 0000000000..a21087689b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.search.entity.project;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.Project;+import io.onedev.server.model.ProjectLabel;+import io.onedev.server.util.criteria.Criteria;++public class LabelCriteria extends Criteria<Project> {++ private static final long serialVersionUID = 1L;++ private final LabelSpec labelSpec;++ public LabelCriteria(LabelSpec labelSpec) {+ this.labelSpec = labelSpec;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {+ var labelQuery = query.subquery(ProjectLabel.class);+ var labelRoot = labelQuery.from(ProjectLabel.class);+ labelQuery.select(labelRoot);++ return builder.exists(labelQuery.where(+ builder.equal(labelRoot.get(ProjectLabel.PROP_PROJECT), from),+ builder.equal(labelRoot.get(ProjectLabel.PROP_SPEC), labelSpec)));+ }++ @Override+ public boolean matches(Project project) {+ return project.getLabels().stream().anyMatch(it->it.getSpec().equals(labelSpec));+ }++ @Override+ public String toStringWithoutParens() {+ return Criteria.quote(Project.NAME_LABEL) + " "+ + ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "+ + Criteria.quote(labelSpec.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 610accb542..a754349e2c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -128,8 +128,10 @@ public class ProjectQuery extends EntityQuery<Project> {return new NameCriteria(value);else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME))return new ServiceDeskNameCriteria(value);- else+ else if (fieldName.equals(Project.NAME_PATH))return new PathCriteria(value);+ else+ return new LabelCriteria(getLabelSpec(value));case ProjectQueryLexer.Contains:return new DescriptionCriteria(value);case ProjectQueryLexer.IsUntil:@@ -201,6 +203,7 @@ public class ProjectQuery extends EntityQuery<Project> {break;case ProjectQueryLexer.Is:if (!fieldName.equals(Project.NAME_NAME)+ && !fieldName.equals(Project.NAME_LABEL)&& !fieldName.equals(Project.NAME_SERVICE_DESK_NAME)&& !fieldName.equals(Project.NAME_PATH)) {throw newOperatorException(fieldName, operator);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.javanew file mode 100644index 0000000000..8415f9a07b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.search.entity.pullrequest;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.LabelSpec;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestLabel;+import io.onedev.server.util.criteria.Criteria;++public class LabelCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final LabelSpec labelSpec;++ public LabelCriteria(LabelSpec labelSpec) {+ this.labelSpec = labelSpec;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ var labelQuery = query.subquery(PullRequestLabel.class);+ var labelRoot = labelQuery.from(PullRequestLabel.class);+ labelQuery.select(labelRoot);++ return builder.exists(labelQuery.where(+ builder.equal(labelRoot.get(PullRequestLabel.PROP_REQUEST), from),+ builder.equal(labelRoot.get(PullRequestLabel.PROP_SPEC), labelSpec)));+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getLabels().stream().anyMatch(it->it.getSpec().equals(labelSpec));+ }++ @Override+ public String toStringWithoutParens() {+ return Criteria.quote(PullRequest.NAME_LABEL) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + Criteria.quote(labelSpec.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 11a11f52b8..bc53b6e19b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -202,6 +202,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {return new TargetBranchCriteria(value);case PullRequest.NAME_TARGET_PROJECT:return new TargetProjectCriteria(value);+ case PullRequest.NAME_LABEL:+ return new LabelCriteria(getLabelSpec(value));case PullRequest.NAME_COMMENT_COUNT:return new CommentCountCriteria(getIntValue(value), operator);default:@@ -296,6 +298,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {&& !fieldName.equals(PullRequest.NAME_TARGET_BRANCH)&& !fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)&& !fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)+ && !fieldName.equals(PullRequest.NAME_LABEL)&& !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {throw newOperatorException(fieldName, operator);}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.jsindex 711d686877..d30b8124e1 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js@@ -51,8 +51,8 @@var borderLeft = jQuery(window).scrollLeft() + pageMargin;var borderRight = borderLeft + jQuery(window).width() - 2*pageMargin;- var thisWidth = $this.outerWidth();- var thisHeight = $this.outerHeight();+ var thisWidth = $this.outerWidth() + $autosuit[0].scrollWidth - $autosuit.width();+ var thisHeight = $this.outerHeight() + $autosuit[0].scrollHeight - $autosuit.height();// Do not reduce original dimension as otherwise the popup may flip while filtering its content// and this will make the typing experience baddiff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 36cec81f75..ce7ca7227b 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -148,6 +148,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestTags(project, matchWith);elsereturn null;+ } else if (fieldName.equals(Build.NAME_LABEL)) {+ return SuggestionUtils.suggestLabels(matchWith);} else if (fieldName.equals(Build.NAME_PULL_REQUEST)) {return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 696e911723..37c1e268fd 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -95,6 +95,8 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestProjectPaths(matchWith);elsereturn null;+ } else if (fieldName.equals(Project.NAME_LABEL)) {+ return SuggestionUtils.suggestLabels(matchWith);} else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME)) {if (!matchWith.contains("*")) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex e2a269fe51..e1efe1b071 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -124,6 +124,8 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {for (MergeStrategy strategy: MergeStrategy.values())candidates.add(strategy.toString());return SuggestionUtils.suggest(candidates, matchWith);+ } else if (fieldName.equals(PullRequest.NAME_LABEL)) {+ return SuggestionUtils.suggestLabels(matchWith);} else if (fieldName.equals(PullRequest.NAME_TITLE)|| fieldName.equals(PullRequest.NAME_DESCRIPTION)|| fieldName.equals(PullRequest.NAME_COMMENT_COUNT)diff --git a/server-core/src/main/java/io/onedev/server/web/component/LabelBadge.java b/server-core/src/main/java/io/onedev/server/web/component/LabelBadge.javanew file mode 100644index 0000000000..cffb1a4495--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/LabelBadge.java@@ -0,0 +1,43 @@+package io.onedev.server.web.component;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.MarkupStream;+import org.apache.wicket.markup.html.WebComponent;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.LabelSpec;+import io.onedev.server.util.ColorUtils;++@SuppressWarnings("serial")+public class LabelBadge extends WebComponent {++ public LabelBadge(String id, IModel<LabelSpec> model) {+ super(id, model);+ }++ @Override+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {+ replaceComponentTagBody(markupStream, openTag, getLabel().getName());+ }++ private LabelSpec getLabel() {+ return (LabelSpec) getDefaultModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String backgroundColor = getLabel().getColor();+ if (backgroundColor == null)+ backgroundColor = "#E4E6EF";+ String fontColor = ColorUtils.isLight(backgroundColor)?"#3F4254":"white";+ String style = String.format(+ "background-color: %s; color: %s;",+ backgroundColor, fontColor);+ add(AttributeAppender.append("style", style));+ add(AttributeAppender.append("class", "badge badge-sm"));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 5424ef8f63..dfd34a91c5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -35,10 +35,13 @@</div></div><wicket:fragment wicket:id="buildFrag">- <a wicket:id="link" class="flex-nowrap">- <svg wicket:id="icon" class="icon mr-1"></svg>- <span wicket:id="label"></span>- </a>+ <div class="d-flex flex-wrap row-gap-2">+ <a wicket:id="link" class="text-nowrap mr-3">+ <svg wicket:id="icon" class="icon mr-1"></svg>+ <span wicket:id="text"></span>+ </a>+ <span wicket:id="labels"></span>+ </div></wicket:fragment><wicket:fragment wicket:id="linkFrag"><a wicket:id="link">diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 3349a63bf1..ad9e7a75f0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -57,6 +57,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.model.BuildLabel;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.search.entity.EntityQuery;@@ -79,6 +80,7 @@ import io.onedev.server.web.component.build.ParamValuesLabel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ActionablePageLink;@@ -979,7 +981,7 @@ public abstract class BuildListPanel extends Panel {}}));- link.add(new Label("label", new AbstractReadOnlyModel<String>() {+ link.add(new Label("text", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -999,6 +1001,9 @@ public abstract class BuildListPanel extends Panel {}));fragment.add(link);++ fragment.add(new EntityLabelsPanel<BuildLabel>("labels", rowModel));+fragment.add(newBuildObserver(buildId));fragment.setOutputMarkupId(true);cellItem.add(fragment);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlindex fd3c6a7d2d..a91652f2ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -81,6 +81,13 @@</div></wicket:enclosure></div>+ <div wicket:id="labels" class="labels">+ <div wicket:id="head" class="d-flex align-items-center justify-content-between mb-3">+ <span class="font-weight-bolder">Labels</span>+ <wicket:svg href="gear" class="icon icon-sm"></wicket:svg>+ </div>+ <div wicket:id="body" class="body d-flex align-items-center"></div>+ </div><div wicket:id="pullRequest" class="pull-request"><div class="font-weight-bolder mb-3">Pull Request</div><div class="body d-flex align-items-center">diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex bf7e3e8937..b5bfd30831 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.build.side;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -26,12 +27,15 @@ import org.eclipse.jgit.lib.FileMode;import com.google.common.collect.Sets;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;+import io.onedev.server.entitymanager.BuildLabelManager;import io.onedev.server.entityreference.Referenceable;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;+import io.onedev.server.model.BuildLabel;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;@@ -41,12 +45,14 @@ import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.ParamValuesLabel;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.pullrequest.RequestStatusBadge;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.editable.InplacePropertyEditLink;import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -54,6 +60,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.util.editablebean.LabelsBean;@SuppressWarnings("serial")public abstract class BuildSidePanel extends Panel {@@ -304,7 +311,7 @@ public abstract class BuildSidePanel extends Panel {}});-+general.add(new WebSocketObserver() {@Override@@ -319,6 +326,62 @@ public abstract class BuildSidePanel extends Panel {});+ WebMarkupContainer labelsContainer = new WebMarkupContainer("labels") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getBuild().getLabels().isEmpty() || SecurityUtils.canManage(getBuild()));+ }++ };+ labelsContainer.setOutputMarkupId(true);++ if (SecurityUtils.canManage(getBuild())) {+ labelsContainer.add(new InplacePropertyEditLink("head") {++ @Override+ protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName) {+ LabelsBean labelsBean = (LabelsBean) bean;+ OneDev.getInstance(BuildLabelManager.class).sync(getBuild(), labelsBean.getLabels());+ handler.add(labelsContainer);+ }++ @Override+ protected String getPropertyName() {+ return "labels";+ }++ @Override+ protected Project getProject() {+ return getBuild().getProject();+ }++ @Override+ protected Serializable getBean() {+ return LabelsBean.of(getBuild());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("a");+ }++ });+ } else {+ labelsContainer.add(new WebMarkupContainer("head"));+ }+ labelsContainer.add(new EntityLabelsPanel<BuildLabel>("body", new AbstractReadOnlyModel<Build>() {++ @Override+ public Build getObject() {+ return getBuild();+ }++ }));+ add(labelsContainer);+add(new ListView<Input>("params", new LoadableDetachableModel<List<Input>>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.cssindex 307b419359..0f0704a438 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css@@ -35,8 +35,11 @@.build-side>.properties>div:last-child>div {padding-bottom: 0;}+.build-side>.labels>div>.icon {+ display: none;+}.build-side>div>.head {font-weight: 600;margin-bottom: 1rem;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.htmlnew file mode 100644index 0000000000..301ccd56a3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <wicket:container wicket:id="labels"><span wicket:id="label" class="mr-2"></span></wicket:container>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.javanew file mode 100644index 0000000000..75ce3c752b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java@@ -0,0 +1,66 @@+package io.onedev.server.web.component.entity.labels;++import java.util.Comparator;+import java.util.List;+import java.util.stream.Collectors;++import org.apache.wicket.behavior.AttributeAppender;+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 io.onedev.server.model.LabelSpec;+import io.onedev.server.model.support.EntityLabel;+import io.onedev.server.model.support.LabelSupport;+import io.onedev.server.web.component.LabelBadge;++@SuppressWarnings("serial")+public class EntityLabelsPanel<T extends EntityLabel> extends Panel {++ private final IModel<? extends LabelSupport<T>> model;++ public EntityLabelsPanel(String id, IModel<? extends LabelSupport<T>> model) {+ super(id);+ this.model = model;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<LabelSpec>("labels", new LoadableDetachableModel<List<LabelSpec>>() {++ @Override+ protected List<LabelSpec> load() {+ return model.getObject().getLabels().stream()+ .map(it->it.getSpec())+ .sorted(Comparator.comparing(LabelSpec::getName))+ .collect(Collectors.toList());+ }++ }) {++ @Override+ protected void populateItem(ListItem<LabelSpec> item) {+ item.add(new LabelBadge("label", item.getModel()));+ }++ });+ add(AttributeAppender.append("class", "d-inline-flex align-items-center flex-wrap row-gap-1"));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!model.getObject().getLabels().isEmpty());+ }++ @Override+ protected void onDetach() {+ model.detach();+ super.onDetach();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.htmlindex 569dc4c7e4..0ec1002d54 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.html@@ -7,6 +7,7 @@<div class="modal-body"><div wicket:id="editor"></div><div wicket:id="defaultRoleEditor"></div>+ <div wicket:id="labelsEditor"></div><div wicket:id="parentEditor"></div></div><div class="modal-footer">diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex 678bb81c6f..ad75ef4ef5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -18,8 +18,10 @@ import org.apache.wicket.model.IModel;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectLabelManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -28,6 +30,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;import io.onedev.server.web.page.project.setting.general.ParentBean;+import io.onedev.server.web.util.editablebean.LabelsBean;@SuppressWarnings("serial")public abstract class ForkOptionPanel extends Panel {@@ -65,10 +68,13 @@ public abstract class ForkOptionPanel extends Panel {DefaultRoleBean defaultRoleBean = new DefaultRoleBean();defaultRoleBean.setRole(getProject().getDefaultRole());+ LabelsBean labelsBean = LabelsBean.of(getProject());+Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION, PROP_ISSUE_MANAGEMENT);BeanEditor editor = BeanContext.edit("editor", editProject, properties, false);BeanEditor defaultRoleEditor = BeanContext.edit("defaultRoleEditor", defaultRoleBean);+ BeanEditor labelsEditor = BeanContext.edit("labelsEditor", labelsBean);BeanEditor parentEditor = BeanContext.edit("parentEditor", parentBean);Form<?> form = new Form<Void>("form");@@ -76,6 +82,7 @@ public abstract class ForkOptionPanel extends Panel {form.add(editor);form.add(defaultRoleEditor);+ form.add(labelsEditor);form.add(parentEditor);form.add(new AjaxButton("save") {@@ -98,7 +105,16 @@ public abstract class ForkOptionPanel extends Panel {newProject.setDescription(editProject.getDescription());newProject.setIssueManagement(editProject.isIssueManagement());newProject.setDefaultRole(defaultRoleBean.getRole());- getProjectManager().fork(getProject(), newProject);++ OneDev.getInstance(TransactionManager.class).run(new Runnable() {++ @Override+ public void run() {+ getProjectManager().fork(getProject(), newProject);+ OneDev.getInstance(ProjectLabelManager.class).sync(newProject, labelsBean.getLabels());+ }++ });Session.get().success("Project forked");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(newProject));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.htmlindex 3c0d0fb83d..83d4bffb05 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html@@ -1,6 +1,6 @@<wicket:panel><div class="project-info p-4">- <div class="d-flex align-items-center justify-content-between">+ <div class="d-flex justify-content-between"><div class="mr-4"><a wicket:id="path" class="mb-0 h5"></a><wicket:enclosure child="forkedFrom">@@ -8,11 +8,16 @@Forked from <a wicket:id="forkedFrom"></a></div></wicket:enclosure>+ <div wicket:id="labels" class="mt-2"></div></div>- <div wicket:id="forkInfo" class="btn-group">- <a wicket:id="forks" class="btn btn-sm btn-light btn-hover-primary"><span wicket:id="label"></span></a>- <a wicket:id="forkNow" class="btn btn-sm btn-light btn-hover-primary btn-icon" title="Fork now"><wicket:svg href="fork" class="icon"/></a>- </div>+ <wicket:enclosure child="forkInfo">+ <div>+ <span wicket:id="forkInfo" class="btn-group">+ <a wicket:id="forks" class="btn btn-sm btn-light btn-hover-primary"><span wicket:id="label"></span></a>+ <a wicket:id="forkNow" class="btn btn-sm btn-light btn-hover-primary btn-icon" title="Fork now"><wicket:svg href="fork" class="icon"/></a>+ </span>+ </div>+ </wicket:enclosure></div><wicket:enclosure child="serviceDesk"><div class="mt-2">diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.javaindex e3bc3f10b8..24f31b0a47 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java@@ -17,11 +17,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;+import io.onedev.server.model.ProjectLabel;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ParsedEmailAddress;import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -53,6 +55,8 @@ public abstract class ProjectInfoPanel extends Panel {});+ add(new EntityLabelsPanel<ProjectLabel>("labels", projectModel));+WebMarkupContainer forkInfo = new WebMarkupContainer("forkInfo");forkInfo.setVisible(getProject().isCodeManagement());add(forkInfo);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex 457a8694ca..733194024f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -36,9 +36,13 @@</div></div><wicket:fragment wicket:id="projectFrag">- <div class="d-flex flex-wrap font-size-h5">- <a wicket:id="path" class="mr-auto text-nowrap"><img wicket:id="avatar"> <span wicket:id="label" class="mr-3"></span></a>- <span wicket:id="lastUpdate" class="text-muted font-size-sm"></span>+ <div class="d-flex align-items-center flex-wrap row-gap-2 font-size-h5">+ <a wicket:id="path" class="text-nowrap mr-3">+ <img wicket:id="avatar">+ <span wicket:id="text"></span>+ </a>+ <span wicket:id="labels" class="mr-2"></span>+ <span wicket:id="lastUpdate" class="text-muted font-size-sm ml-auto"></span></div><div class="d-flex flex-wrap project-summary"><div wicket:id="codeStats" class="code-stats mt-2 d-flex align-items-center flex-wrap mr-3"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex bb8a0a57b3..6747e7f34b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -57,6 +57,7 @@ import io.onedev.server.imports.ProjectImporter;import io.onedev.server.imports.ProjectImporterContribution;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.model.ProjectLabel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.EntitySort;@@ -77,6 +78,7 @@ import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ProjectQueryBehavior;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;@@ -1043,10 +1045,12 @@ public class ProjectListPanel extends Panel {projectLink.add(new ProjectAvatar("avatar", projectId));if (getParentProject() != null)- projectLink.add(new Label("label", project.getPath().substring(getParentProject().getPath().length()+1)));+ projectLink.add(new Label("text", project.getPath().substring(getParentProject().getPath().length()+1)));else- projectLink.add(new Label("label", project.getPath()));+ projectLink.add(new Label("text", project.getPath()));fragment.add(projectLink);++ fragment.add(new EntityLabelsPanel<ProjectLabel>("labels", rowModel));fragment.add(new Label("lastUpdate", "Updated " + DateUtils.formatAge(project.getUpdateDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex f38e664078..6a0104c1be 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -33,10 +33,13 @@</div></div><wicket:fragment wicket:id="contentFrag">- <div class="primary d-flex mb-3">- <div class="flex-grow-1 mr-4">- <a wicket:id="number" class="number h6 mr-2"></a>- <span wicket:id="title" class="title h6"></span>+ <div class="primary d-flex mb-2">+ <div class="flex-grow-1 d-flex flex-wrap row-gap-2">+ <span class="text-nowrap mr-3">+ <a wicket:id="number" class="number h6 mr-1 mb-0"></a>+ <span wicket:id="title" class="title h6 mb-0"></span>+ </span>+ <span wicket:id="labels" class="mr-3"></span></div><div class="flex-shrink-0 comments d-none d-lg-block text-muted" title="Comments"><wicket:svg href="comments" class="icon"></wicket:svg> <span wicket:id="comments"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex a0dfa06cd0..a40af846df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -52,6 +52,7 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestLabel;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.support.LastUpdate;@@ -67,6 +68,7 @@ import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.PullRequestQueryBehavior;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;@@ -740,6 +742,8 @@ public abstract class PullRequestListPanel extends Panel {}}.setEscapeModelStrings(false).setOutputMarkupId(true));++ fragment.add(new EntityLabelsPanel<PullRequestLabel>("labels", rowModel));RepeatingView reviewsView = new RepeatingView("reviews");for (PullRequestReview review: request.getSortedReviews()) {diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex ad263157da..363499a7d4 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -30,6 +30,7 @@ import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateLimport io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;+import io.onedev.server.web.page.admin.labelmanagement.LabelManagementPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;@@ -267,6 +268,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {IssueNotificationTemplatePage.class));add(new BasePageMapper("administration/settings/pull-request-notification-template",PullRequestNotificationTemplatePage.class));+ add(new BasePageMapper("administration/labels", LabelManagementPage.class));add(new BasePageMapper("administration/settings/performance", PerformanceSettingPage.class));add(new BasePageMapper("administration/settings/backup", DatabaseBackupPage.class));add(new BasePageMapper("administration/settings/authenticator", AuthenticatorPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.cssindex d92a461738..8b5b81825e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css@@ -21,4 +21,10 @@}.dark-mode .logo-preview svg {color: var(--light);+}++.label-management .drag-indicator,+.label-management th.property-id,+.label-management td.property-id {+ display: none;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.javanew file mode 100644index 0000000000..4a64086c61--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.java@@ -0,0 +1,48 @@+package io.onedev.server.web.page.admin.labelmanagement;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashSet;+import java.util.List;++import javax.validation.ConstraintValidatorContext;++import io.onedev.server.model.LabelSpec;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable+@ClassValidating+public class LabelManagementBean implements Serializable, Validatable {++ private static final long serialVersionUID = 1L;++ private List<LabelSpec> labels = new ArrayList<>();++ @Editable+ @OmitName+ public List<LabelSpec> getLabels() {+ return labels;+ }++ public void setLabels(List<LabelSpec> labels) {+ this.labels = labels;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ var labelNames = new HashSet<>();+ for (var label: labels) {+ if (!labelNames.add(label.getName())) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Duplicate label: " + label.getName())+ .addPropertyNode("labels").addConstraintViolation();+ return false;+ }+ }+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.htmlnew file mode 100644index 0000000000..e8293449c9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div class="card label-management">+ <div class="card-body">+ <div class="alert alert-notice alert-light">Define labels to be assigned to project, build or pull request. For issues,+ custom fields can be used which is much more powerful than labels</div>+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <input type="submit" class="btn btn-primary dirty-aware" value="Update">+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.javanew file mode 100644index 0000000000..57fafa1f9b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java@@ -0,0 +1,57 @@+package io.onedev.server.web.page.admin.labelmanagement;++import java.util.Comparator;++import org.apache.wicket.Component;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.model.LabelSpec;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.admin.AdministrationPage;++@SuppressWarnings("serial")+public class LabelManagementPage extends AdministrationPage {++ public LabelManagementPage(PageParameters params) {+ super(params);+ }++ private LabelManager getLabelManager() {+ return OneDev.getInstance(LabelManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ LabelManagementBean bean = new LabelManagementBean();++ var labels = getLabelManager().query();+ labels.sort(Comparator.comparing(LabelSpec::getName));+ bean.getLabels().addAll(labels);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getLabelManager().sync(bean.getLabels());+ }++ };+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(BeanContext.edit("editor", bean));++ add(form);+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new org.apache.wicket.markup.html.basic.Label(componentId, "Labels");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex a537f314c9..f815af4535 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -768,3 +768,18 @@ span.keycap {background: var(--dark-mode-dark);}+.row-gap-1 {+ row-gap: 0.25rem;+}+.row-gap-2 {+ row-gap: 0.5rem;+}+.row-gap-3 {+ row-gap: 1rem;+}+.row-gap-4 {+ row-gap: 1.5rem;+}+.row-gap-5 {+ row-gap: 2rem;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 3d19415a59..84d3c46558 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -69,6 +69,7 @@ import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateLimport io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;+import io.onedev.server.web.page.admin.labelmanagement.LabelManagementPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;@@ -222,6 +223,9 @@ public abstract class LayoutPage extends BasePage {administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",notificationTemplateSettingMenuItems));+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Label Management",+ LabelManagementPage.class, new PageParameters()));+administrationMenuItems.add(new SidebarMenuItem.Page(null, "Performance Setting",PerformanceSettingPage.class, new PageParameters()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.htmlindex e90664b504..36e4515f91 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html@@ -4,6 +4,7 @@<form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div wicket:id="defaultRoleEditor"></div>+ <div wicket:id="labelsEditor"></div><div wicket:id="parentEditor"></div><input class="btn btn-primary dirty-aware" value="Create" type="submit"></form>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 97fafa05df..ca6583b619 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -17,8 +17,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectLabelManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -30,6 +32,7 @@ import io.onedev.server.web.page.project.children.ProjectChildrenPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;import io.onedev.server.web.page.project.setting.general.ParentBean;+import io.onedev.server.web.util.editablebean.LabelsBean;@SuppressWarnings("serial")public class NewProjectPage extends LayoutPage {@@ -53,11 +56,13 @@ public class NewProjectPage extends LayoutPage {PROP_CODE_MANAGEMENT, PROP_ISSUE_MANAGEMENT);DefaultRoleBean defaultRoleBean = new DefaultRoleBean();+ LabelsBean labelsBean = new LabelsBean();ParentBean parentBean = new ParentBean();if (parentId != null)parentBean.setParentPath(getProjectManager().load(parentId).getPath());BeanEditor editor = BeanContext.edit("editor", editProject, properties, false);+ BeanEditor labelsEditor = BeanContext.edit("labelsEditor", labelsBean);BeanEditor parentEditor = BeanContext.edit("parentEditor", parentBean);if (parentId != null)parentEditor.setVisible(false);@@ -82,7 +87,15 @@ public class NewProjectPage extends LayoutPage {newProject.setIssueManagement(editProject.isIssueManagement());newProject.setDefaultRole(defaultRoleBean.getRole());- getProjectManager().create(newProject);+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {++ @Override+ public void run() {+ getProjectManager().create(newProject);+ OneDev.getInstance(ProjectLabelManager.class).sync(newProject, labelsBean.getLabels());+ }++ });Session.get().success("New project created");if (newProject.isCodeManagement())@@ -102,6 +115,7 @@ public class NewProjectPage extends LayoutPage {};form.add(editor);+ form.add(labelsEditor);form.add(BeanContext.edit("defaultRoleEditor", defaultRoleBean));form.add(parentEditor);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 777181c04d..76bb4df3fe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -159,6 +159,13 @@<div wicket:id="help" class="font-size-sm text-muted form-text"></div></div></div>+ <div wicket:id="labels" class="labels">+ <div wicket:id="head" class="d-flex align-items-center justify-content-between mb-3">+ <span class="font-weight-bolder">Labels</span>+ <wicket:svg href="gear" class="icon icon-sm"></wicket:svg>+ </div>+ <div wicket:id="body" class="body d-flex align-items-center"></div>+ </div><div wicket:id="watches" class="watches"></div><div wicket:id="reference"></div><div wicket:id="actions" class="d-flex align-items-center justify-content-between">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex c44d110080..6e4458d5a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -5,6 +5,7 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MEimport static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import java.io.Serializable;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;@@ -59,6 +60,7 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestLabelManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestWatchManager;@@ -70,6 +72,7 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestLabel;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.PullRequestWatch;@@ -90,6 +93,7 @@ import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.BranchLink;+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;@@ -112,6 +116,7 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.editable.InplacePropertyEditLink;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;@@ -127,6 +132,7 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;import io.onedev.server.web.util.PullRequestAware;import io.onedev.server.web.util.ReferenceTransformer;+import io.onedev.server.web.util.editablebean.LabelsBean;@SuppressWarnings("serial")public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {@@ -863,6 +869,55 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});+ WebMarkupContainer labelsContainer = new WebMarkupContainer("labels") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().getLabels().isEmpty() || SecurityUtils.canModify(getPullRequest()));+ }++ };+ labelsContainer.setOutputMarkupId(true);++ if (SecurityUtils.canModify(getPullRequest())) {+ labelsContainer.add(new InplacePropertyEditLink("head") {++ @Override+ protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName) {+ LabelsBean labelsBean = (LabelsBean) bean;+ OneDev.getInstance(PullRequestLabelManager.class).sync(getPullRequest(), labelsBean.getLabels());+ handler.add(labelsContainer);+ }++ @Override+ protected String getPropertyName() {+ return "labels";+ }++ @Override+ protected Project getProject() {+ return getProject();+ }++ @Override+ protected Serializable getBean() {+ return LabelsBean.of(getPullRequest());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("a");+ }++ });+ } else {+ labelsContainer.add(new WebMarkupContainer("head"));+ }+ labelsContainer.add(new EntityLabelsPanel<PullRequestLabel>("body", requestModel));+ fragment.add(labelsContainer);+fragment.add(new ReferencePanel("reference") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 710558febe..8174d2ba23 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -91,6 +91,9 @@ ul>li>a.code-comments.new .icon {.pull-request-detail .more-info .assignments .right {margin-left: auto;}+.pull-request-detail .more-info .labels>div .icon {+ display: none;+}.pull-request-detail .more-info .submission td.name {padding-left: 0;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.htmlindex 55b62fa768..14fae685cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html@@ -4,6 +4,7 @@<form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div wicket:id="defaultRoleEditor" class="mb-4"></div>+ <div wicket:id="labelsEditor" class="mb-4"></div><div wicket:id="parentEditor" class="mb-4"></div><div class="d-flex"><input class="btn btn-primary dirty-aware mr-1" value="Update" type="submit">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.javaindex 863c312253..ee449a7226 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java@@ -23,8 +23,10 @@ import com.google.common.base.Objects;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectLabelManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -34,6 +36,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.editablebean.LabelsBean;@SuppressWarnings("serial")public class GeneralProjectSettingPage extends ProjectSettingPage {@@ -54,6 +57,8 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {DefaultRoleBean defaultRoleBean = new DefaultRoleBean();defaultRoleBean.setRole(getProject().getDefaultRole());+ LabelsBean labelsBean = LabelsBean.of(getProject());+ParentBean parentBean = new ParentBean();if (getProject().getParent() != null)parentBean.setParentPath(getProject().getParent().getPath());@@ -77,6 +82,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {}, properties, false);BeanEditor defaultRoleEditor = BeanContext.edit("defaultRoleEditor", defaultRoleBean);+ BeanEditor labelsEditor = BeanContext.edit("labelsEditor", labelsBean);BeanEditor parentEditor = BeanContext.edit("parentEditor", parentBean);Form<?> form = new Form<Void>("form") {@@ -125,7 +131,15 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {"This name has already been used by another project");} else {project.setDefaultRole(defaultRoleBean.getRole());- getProjectManager().save(project);+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {++ @Override+ public void run() {+ getProjectManager().save(project);+ OneDev.getInstance(ProjectLabelManager.class).sync(getProject(), labelsBean.getLabels());+ }++ });Session.get().success("General setting has been updated");setResponsePage(GeneralProjectSettingPage.class, paramsOf(project));}@@ -136,6 +150,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {};form.add(editor);form.add(defaultRoleEditor);+ form.add(labelsEditor);form.add(parentEditor);form.add(new AjaxLink<Void>("delete") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 795b443f3a..5649206554 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,8 @@<wicket:extend><a wicket:id="test">test</a>+ <div class="mr-1">1</div>+ <div class="mr-2">2</div>+ <div class="mr-3">3</div>+ <div class="mr-4">4</div>+ <div class="mr-5">5</div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex c172cf9273..397503db8a 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -31,6 +31,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.LabelManager;import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -64,8 +65,8 @@ public class SuggestionUtils {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- for (String candidate: candidates) {- LinearRange match = LinearRange.match(candidate, matchWith);+ for (var candidate: candidates) {+ var match = LinearRange.match(candidate, matchWith);if (match != null)suggestions.add(new InputSuggestion(candidate, null, match));}@@ -73,6 +74,14 @@ public class SuggestionUtils {return sortAndTruncate(suggestions, matchWith);}+ public static List<InputSuggestion> suggestLabels(String matchWith) {+ var labelNames = OneDev.getInstance(LabelManager.class).query().stream()+ .map(it->it.getName())+ .sorted()+ .collect(Collectors.toList());+ return suggest(labelNames, matchWith);+ }+private static List<InputSuggestion> sortAndTruncate(List<InputSuggestion> suggestions, String matchWith) {if (matchWith.length() != 0) {suggestions.sort(new Comparator<InputSuggestion>() {diff --git a/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.javanew file mode 100644index 0000000000..8959102c64--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java@@ -0,0 +1,46 @@+package io.onedev.server.web.util.editablebean;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.LabelManager;+import io.onedev.server.model.support.LabelSupport;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class LabelsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<String> labels = new ArrayList<>();++ @Editable+ @ChoiceProvider("getLabelChoices")+ public List<String> getLabels() {+ return labels;+ }++ public void setLabels(List<String> labels) {+ this.labels = labels;+ }++ @SuppressWarnings("unused")+ private static List<String> getLabelChoices() {+ var labels = OneDev.getInstance(LabelManager.class).query();+ return labels.stream().map(it->it.getName()).sorted().collect(Collectors.toList());+ }++ public static LabelsBean of(LabelSupport<?> labelSupport) {+ LabelsBean bean = new LabelsBean();+ labelSupport.getLabels().stream()+ .map(it->it.getSpec().getName())+ .sorted()+ .forEach(it->bean.getLabels().add(it));+ return bean;+ }++}