Skip to content

The Unified and Autonomous Development Platform

Add job trigger editing support

robin shen2d08d273e85a
diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.java
index 014ce3dfd3..4c1053ba04 100644
--- a/core/src/main/java/io/onedev/server/ci/CISpec.java
+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java
@@ -13,14 +13,14 @@ public class CISpec implements Serializable {
public static final String BLOB_PATH = "onedev-ci.xml";
- private List<JobSpec> jobs = new ArrayList<>();
+ private List<Job> jobs = new ArrayList<>();
@Editable
- public List<JobSpec> getJobs() {
+ public List<Job> getJobs() {
return jobs;
}
- public void setJobs(List<JobSpec> jobs) {
+ public void setJobs(List<Job> jobs) {
this.jobs = jobs;
}
diff --git a/core/src/main/java/io/onedev/server/ci/DependencySpec.java b/core/src/main/java/io/onedev/server/ci/Dependency.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/ci/DependencySpec.java
rename to core/src/main/java/io/onedev/server/ci/Dependency.java
index e6f0ecbd1b..0e5337a1f9 100644
--- a/core/src/main/java/io/onedev/server/ci/DependencySpec.java
+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies.DependencyEditPanel;
@Editable
-public class DependencySpec implements Serializable {
+public class Dependency implements Serializable {
private static final long serialVersionUID = 1L;
@@ -56,8 +56,8 @@ public class DependencySpec implements Serializable {
private static List<String> getJobChoices() {
DependencyEditPanel editor = OneContext.get().getComponent().findParent(DependencyEditPanel.class);
List<String> choices = new ArrayList<>();
- JobSpec belongingJob = editor.getBelongingJob();
- for (JobSpec job: editor.getEditingCISpec().getJobs()) {
+ Job belongingJob = editor.getBelongingJob();
+ for (Job job: editor.getCISpec().getJobs()) {
choices.add(job.getName());
}
choices.remove(belongingJob.getName());
diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.java
new file mode 100644
index 0000000000..474836f4f0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/Job.java
@@ -0,0 +1,98 @@
+package io.onedev.server.ci;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
+
+@Editable
+@Horizontal
+public class Job implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private List<Dependency> dependencies = new ArrayList<>();
+
+ private List<InputSpec> params = new ArrayList<>();
+
+ private List<Step> steps = new ArrayList<>();
+
+ private List<JobTrigger> triggers = new ArrayList<>();
+
+ private String artifacts;
+
+ private long timeout = 3600;
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200)
+ public List<InputSpec> getParams() {
+ return params;
+ }
+
+ public void setParams(List<InputSpec> params) {
+ this.params = params;
+ }
+
+ @Editable(order=300)
+ public List<Step> getSteps() {
+ return steps;
+ }
+
+ public void setSteps(List<Step> steps) {
+ this.steps = steps;
+ }
+
+ @Editable(order=400)
+ public List<Dependency> getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(List<Dependency> dependencies) {
+ this.dependencies = dependencies;
+ }
+
+ @Editable(order=500)
+ public List<JobTrigger> getTriggers() {
+ return triggers;
+ }
+
+ public void setTriggers(List<JobTrigger> triggers) {
+ this.triggers = triggers;
+ }
+
+ @Editable(order=500)
+ public String getArtifacts() {
+ return artifacts;
+ }
+
+ public void setArtifacts(String artifacts) {
+ this.artifacts = artifacts;
+ }
+
+ @Editable(order=600, description="Timeout in seconds")
+ public long getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(long timeout) {
+ this.timeout = timeout;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/JobSpec.java b/core/src/main/java/io/onedev/server/ci/JobSpec.java
deleted file mode 100644
index b173d78397..0000000000
--- a/core/src/main/java/io/onedev/server/ci/JobSpec.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.onedev.server.ci;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Horizontal;
-
-@Editable
-@Horizontal
-public class JobSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private List<DependencySpec> dependencies = new ArrayList<>();
-
- private List<InputSpec> params = new ArrayList<>();
-
- private List<StepSpec> steps = new ArrayList<>();
-
- @Editable(order=100)
- @NotEmpty
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Editable(order=200)
- public List<InputSpec> getParams() {
- return params;
- }
-
- public void setParams(List<InputSpec> params) {
- this.params = params;
- }
-
- @Editable(order=300)
- public List<StepSpec> getSteps() {
- return steps;
- }
-
- public void setSteps(List<StepSpec> steps) {
- this.steps = steps;
- }
-
- @Editable(order=400)
- public List<DependencySpec> getDependencies() {
- return dependencies;
- }
-
- public void setDependencies(List<DependencySpec> dependencies) {
- this.dependencies = dependencies;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/ci/StepSpec.java b/core/src/main/java/io/onedev/server/ci/Step.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/ci/StepSpec.java
rename to core/src/main/java/io/onedev/server/ci/Step.java
index 730b5d506e..b48e7fec85 100644
--- a/core/src/main/java/io/onedev/server/ci/StepSpec.java
+++ b/core/src/main/java/io/onedev/server/ci/Step.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public class StepSpec implements Serializable {
+public class Step implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
new file mode 100644
index 0000000000..4705121f9f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
@@ -0,0 +1,83 @@
+package io.onedev.server.ci.jobtrigger;
+
+import java.util.Collection;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Job;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.web.editable.annotation.BranchPattern;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.PathPattern;
+import io.onedev.utils.PathUtils;
+
+@Editable(order=100, name="When pushes to branches")
+public class BranchPushedTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String branches;
+
+ private String path;
+
+ @Editable(order=100)
+ @BranchPattern
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @Editable(order=200)
+ @PathPattern
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ @Override
+ protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
+ if (event instanceof RefUpdated) {
+ RefUpdated refUpdated = (RefUpdated) event;
+ String branch = GitUtils.ref2branch(refUpdated.getRefName());
+ if (branch != null && PathUtils.matchChildAware(getBranches(), branch)) {
+ if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
+ return true;
+ } else if (!refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
+ if (getPath() != null) {
+ Collection<String> changedFiles = GitUtils.getChangedFiles(event.getProject().getRepository(),
+ refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
+ for (String changedFile: changedFiles) {
+ if (PathUtils.matchChildAware(getPath(), changedFile))
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getDescription() {
+ if (getBranches() != null && getPath() != null)
+ return "When push to branches '" + getBranches() + "' on path '" + getPath() + "'";
+ else if (getBranches() != null)
+ return "When push to branches '" + getBranches() + "'";
+ else if (getPath() != null)
+ return "When push to branches '" + getPath() + "'";
+ else
+ return "When push to branches";
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java
new file mode 100644
index 0000000000..ccaabbb054
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java
@@ -0,0 +1,41 @@
+package io.onedev.server.ci.jobtrigger;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.Job;
+import io.onedev.server.ci.jobparam.JobParam;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.build2.BuildFinished;
+import io.onedev.server.model.Build2;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=500, name="When dependency jobs finished running")
+public class DependencyBuiltTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
+ if (event instanceof BuildFinished) {
+ BuildFinished buildFinished = (BuildFinished) event;
+ Build2 build = buildFinished.getBuild();
+ for (Dependency dependency: job.getDependencies()) {
+ if (dependency.getJob().equals(build.getJob())) {
+ for (JobParam param: dependency.getParams()) {
+ String paramValue = build.getParamMap().get(param.getName());
+ if (!param.getValueProvider().getValues().contains(paramValue))
+ return false;
+ }
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getDescription() {
+ return "When dependency job finished running";
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
new file mode 100644
index 0000000000..7ddc3d5a35
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
@@ -0,0 +1,33 @@
+package io.onedev.server.ci.jobtrigger;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Job;
+import io.onedev.server.ci.jobparam.JobParam;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public abstract class JobTrigger implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<JobParam> params = new ArrayList<>();
+
+ @Editable(order=1000)
+ public List<JobParam> getParams() {
+ return params;
+ }
+
+ public void setParams(List<JobParam> params) {
+ this.params = params;
+ }
+
+ protected abstract boolean matches(ProjectEvent event, CISpec ciSpec, Job job);
+
+ public abstract String getDescription();
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
new file mode 100644
index 0000000000..a44049341b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
@@ -0,0 +1,52 @@
+package io.onedev.server.ci.jobtrigger;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Job;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.pullrequest.PullRequestOpened;
+import io.onedev.server.event.pullrequest.PullRequestUpdated;
+import io.onedev.server.web.editable.annotation.BranchPattern;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.utils.PathUtils;
+
+@Editable(order=300, name="When pull requests are created/updated")
+public class PullRequestTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String targetBranches;
+
+ @Editable(order=100)
+ @BranchPattern
+ public String getTargetBranches() {
+ return targetBranches;
+ }
+
+ public void setTargetBranches(String targetBranches) {
+ this.targetBranches = targetBranches;
+ }
+
+ @Override
+ protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
+ if (event instanceof PullRequestOpened) {
+ PullRequestOpened pullRequestOpened = (PullRequestOpened) event;
+ if (PathUtils.matchChildAware(getTargetBranches(), pullRequestOpened.getRequest().getTargetBranch()))
+ return true;
+ }
+ if (event instanceof PullRequestUpdated) {
+ PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;
+ if (PathUtils.matchChildAware(getTargetBranches(), pullRequestUpdated.getRequest().getTargetBranch()))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public String getDescription() {
+ if (getTargetBranches() != null)
+ return "When pull requests targeting branch '" + getTargetBranches() + "'are created/updated";
+ else
+ return "When pull requests are created/updated";
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
new file mode 100644
index 0000000000..8defdbe89d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
@@ -0,0 +1,52 @@
+package io.onedev.server.ci.jobtrigger;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Job;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.TagPattern;
+import io.onedev.utils.PathUtils;
+
+@Editable(order=200, name="When tags are created")
+public class TagCreatedTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String tags;
+
+ @Editable(order=100)
+ @TagPattern
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ @Override
+ protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
+ if (event instanceof RefUpdated) {
+ RefUpdated refUpdated = (RefUpdated) event;
+ String tag = GitUtils.ref2tag(refUpdated.getRefName());
+ if (tag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
+ && PathUtils.matchChildAware(getTags(), tag)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getDescription() {
+ if (getTags() != null)
+ return "When tags '" + getTags() + "' are created ";
+ else
+ return "When tags are created";
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java
new file mode 100644
index 0000000000..c264878bfd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java
@@ -0,0 +1,26 @@
+package io.onedev.server.event.build2;
+
+import java.util.Date;
+
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.model.Build2;
+import io.onedev.server.model.User;
+
+public class BuildEvent extends ProjectEvent {
+
+ private Build2 build;
+
+ public BuildEvent(User user, Date date, Build2 build) {
+ super(user, date, build.getProject());
+ this.build = build;
+ }
+
+ public Build2 getBuild() {
+ return build;
+ }
+
+ public void setBuild(Build2 build) {
+ this.build = build;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java
new file mode 100644
index 0000000000..7dbf6fb87d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java
@@ -0,0 +1,14 @@
+package io.onedev.server.event.build2;
+
+import java.util.Date;
+
+import io.onedev.server.model.Build2;
+import io.onedev.server.model.User;
+
+public class BuildFinished extends BuildEvent {
+
+ public BuildFinished(User user, Date date, Build2 build) {
+ super(user, date, build);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildStarted.java b/core/src/main/java/io/onedev/server/event/build2/BuildStarted.java
new file mode 100644
index 0000000000..a781c36003
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/build2/BuildStarted.java
@@ -0,0 +1,14 @@
+package io.onedev.server.event.build2;
+
+import java.util.Date;
+
+import io.onedev.server.model.Build2;
+import io.onedev.server.model.User;
+
+public class BuildStarted extends BuildEvent {
+
+ public BuildStarted(User user, Date date, Build2 build) {
+ super(user, date, build);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.java
new file mode 100644
index 0000000000..a2ff2d224a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/Build2.java
@@ -0,0 +1,164 @@
+package io.onedev.server.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+import io.onedev.server.util.jackson.DefaultView;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),
+ @Index(columnList="number"), @Index(columnList="job"), @Index(columnList="numberStr"),
+ @Index(columnList="status"), @Index(columnList="beginDate"), @Index(columnList="duration")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})}
+)
+public class Build2 extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String STATUS = "status";
+
+ public enum Status {
+ RUNNING, SUCCESSFUL, FAILED, CANCELLED, TIMEDOUT;
+ };
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Project project;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private User user;
+
+ private String job;
+
+ private long number;
+
+ // used for number search in markdown editor
+ @Column(nullable=false)
+ @JsonView(DefaultView.class)
+ private String numberStr;
+
+ @Column(nullable=false)
+ private String commitHash;
+
+ @Column(nullable=false)
+ private Status status;
+
+ @Column(nullable=false)
+ private Date beginDate;
+
+ private long duration;
+
+ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)
+ private Collection<BuildParam> params = new ArrayList<>();
+
+ private transient Map<String, String> paramMap;
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ @Nullable
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public String getJob() {
+ return job;
+ }
+
+ public void setJob(String job) {
+ this.job = job;
+ }
+
+ public long getNumber() {
+ return number;
+ }
+
+ public void setNumber(long number) {
+ this.number = number;
+ }
+
+ public String getNumberStr() {
+ return numberStr;
+ }
+
+ public void setNumberStr(String numberStr) {
+ this.numberStr = numberStr;
+ }
+
+ public String getCommitHash() {
+ return commitHash;
+ }
+
+ public void setCommitHash(String commitHash) {
+ this.commitHash = commitHash;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Status status) {
+ this.status = status;
+ }
+
+ public Date getBeginDate() {
+ return beginDate;
+ }
+
+ public void setBeginDate(Date beginDate) {
+ this.beginDate = beginDate;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public void setDuration(long duration) {
+ this.duration = duration;
+ }
+
+ public Collection<BuildParam> getParams() {
+ return params;
+ }
+
+ public void setParams(Collection<BuildParam> params) {
+ this.params = params;
+ }
+
+ public Map<String, String> getParamMap() {
+ if (paramMap == null) {
+ paramMap = new HashMap<>();
+ for (BuildParam param: getParams())
+ paramMap.put(param.getName(), param.getValue());
+ }
+ return paramMap;
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/model/BuildParam.java b/core/src/main/java/io/onedev/server/model/BuildParam.java
new file mode 100644
index 0000000000..b5b2cfaccf
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -0,0 +1,54 @@
+package io.onedev.server.model;
+
+import javax.persistence.Column;
+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;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_build_id"), @Index(columnList="name"), @Index(columnList="value")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", "name", "value"})})
+public class BuildParam extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Build2 build;
+
+ @Column(nullable=false)
+ private String name;
+
+ @Column(nullable=false)
+ private String value;
+
+ public Build2 getBuild() {
+ return build;
+ }
+
+ public void setBuild(Build2 build) {
+ this.build = build;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 048ea20d9f..3d168b160e 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -165,6 +165,9 @@ form>.test-feedback {
.editable>.bean-properties>table>tbody>tr>td.value {
padding-left: 8px;
}
+.editable table {
+ margin-bottom: 0;
+}
.property-editor>.polymorphic-list>table>tbody>tr>td {
border-top: 2px solid #BBB;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
index aafd2c2dcc..097da0bd6e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import com.google.common.base.Throwables;
import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Job;
import io.onedev.server.git.Blob;
import io.onedev.server.migration.VersionedDocument;
import io.onedev.server.web.component.MultilineLabel;
@@ -35,7 +35,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel {
CISpec ciSpec = (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();
Fragment fragment = new Fragment("content", "validFrag", this);
RepeatingView jobsView = new RepeatingView("jobs");
- for (JobSpec job: ciSpec.getJobs()) {
+ for (Job job: ciSpec.getJobs()) {
jobsView.add(BeanContext.viewBean(jobsView.newChildId(), job));
}
fragment.add(jobsView);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
index d5360bafd6..c2bac29156 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
@@ -20,7 +20,7 @@ import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Job;
import io.onedev.server.migration.VersionedDocument;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.web.component.MultilineLabel;
@@ -53,7 +53,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {
}
}
- private WebMarkupContainer newJobContainer(String componentId, JobSpec job) {
+ private WebMarkupContainer newJobContainer(String componentId, Job job) {
WebMarkupContainer container = new WebMarkupContainer(jobsView.newChildId());
container.add(BeanContext.editBean("editor", job));
container.add(new AjaxLink<Void>("delete") {
@@ -80,14 +80,14 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {
jobsView = new RepeatingView("jobs");
fragment.add(jobsView);
- for (JobSpec job: ciSpec.getJobs()) {
+ for (Job job: ciSpec.getJobs()) {
jobsView.add(newJobContainer(jobsView.newChildId(), job));
}
fragment.add(new AjaxLink<Void>("addJob") {
@Override
public void onClick(AjaxRequestTarget target) {
- JobSpec job = new JobSpec();
+ Job job = new Job();
WebMarkupContainer jobContainer = newJobContainer(jobsView.newChildId(), job);
jobsView.add(jobContainer);
String script = String.format("$(\"#%s\").before(\"<div id='%s'></div>\");",
@@ -107,7 +107,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {
@Override
public void convertInput() {
- CISpec editingCISpec = getEditingCISpec();
+ CISpec editingCISpec = getCISpec();
if (editingCISpec != null) {
setConvertedInput(VersionedDocument.fromBean(editingCISpec).toXML().getBytes(Charsets.UTF_8));
} else {
@@ -116,12 +116,12 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {
}
@Nullable
- public CISpec getEditingCISpec() {
+ public CISpec getCISpec() {
if (parseResult instanceof CISpec) {
CISpec ciSpec = new CISpec();
for (Component child: jobsView) {
BeanEditor jobEditor = (BeanEditor) child.get("editor");
- ciSpec.getJobs().add((JobSpec) jobEditor.getConvertedInput());
+ ciSpec.getJobs().add((Job) jobEditor.getConvertedInput());
}
return ciSpec;
} else {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
index 741f528683..bc8c8bd26a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
@@ -43,3 +43,7 @@
.floating.job-param>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
min-width: 150px;
}
+
+.trigger-list>.body>table>thead, .trigger-list>table>thead {
+ display: none;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java
index 75fc76a491..f9c0ad1d92 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java
@@ -11,8 +11,8 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.DependencySpec;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.Job;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
@@ -21,11 +21,11 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
public abstract class DependencyEditPanel extends Panel {
- private final List<DependencySpec> dependencies;
+ private final List<Dependency> dependencies;
private final int dependencyIndex;
- public DependencyEditPanel(String id, List<DependencySpec> dependencies, int dependencyIndex) {
+ public DependencyEditPanel(String id, List<Dependency> dependencies, int dependencyIndex) {
super(id);
this.dependencies = dependencies;
@@ -36,11 +36,11 @@ public abstract class DependencyEditPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- DependencySpec dependency;
+ Dependency dependency;
if (dependencyIndex != -1)
dependency = dependencies.get(dependencyIndex);
else
- dependency = new DependencySpec();
+ dependency = new Dependency();
Form<?> form = new Form<Void>("form") {
@@ -76,7 +76,7 @@ public abstract class DependencyEditPanel extends Panel {
super.onSubmit(target, form);
if (dependencyIndex != -1) {
- DependencySpec oldDependency = dependencies.get(dependencyIndex);
+ Dependency oldDependency = dependencies.get(dependencyIndex);
if (!dependency.getJob().equals(oldDependency.getJob()) && getDependency(dependency.getJob()) != null) {
editor.getErrorContext(new PathSegment.Property("job"))
.addError("Dependency to this job is already defined");
@@ -119,8 +119,8 @@ public abstract class DependencyEditPanel extends Panel {
add(form);
}
- private DependencySpec getDependency(String job) {
- for (DependencySpec dependency: dependencies) {
+ private Dependency getDependency(String job) {
+ for (Dependency dependency: dependencies) {
if (job.equals(dependency.getJob()))
return dependency;
}
@@ -131,8 +131,8 @@ public abstract class DependencyEditPanel extends Panel {
protected abstract void onCancel(AjaxRequestTarget target);
- public abstract CISpec getEditingCISpec();
+ public abstract CISpec getCISpec();
- public abstract JobSpec getBelongingJob();
+ public abstract Job getBelongingJob();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
index 26a3f6aa87..4743cb06be 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
@@ -26,8 +26,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.DependencySpec;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.Job;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -43,25 +43,17 @@ import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecEdit
@SuppressWarnings("serial")
public class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
- private final List<DependencySpec> dependencies;
+ private final List<Dependency> dependencies;
public DependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
dependencies = new ArrayList<>();
for (Serializable each: model.getObject()) {
- dependencies.add((DependencySpec) each);
+ dependencies.add((Dependency) each);
}
}
- private int getDependencyIndex(String jobSpec) {
- for (int i=0; i<dependencies.size(); i++) {
- if (dependencies.get(i).getJob().equals(jobSpec))
- return i;
- }
- return -1;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -83,13 +75,13 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
}
@Override
- public CISpec getEditingCISpec() {
- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();
+ public CISpec getCISpec() {
+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();
}
@Override
- public JobSpec getBelongingJob() {
- return (JobSpec) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();
+ public Job getBelongingJob() {
+ return (Job) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();
}
};
@@ -97,18 +89,18 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
});
- List<IColumn<DependencySpec, Void>> columns = new ArrayList<>();
+ List<IColumn<Dependency, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Job")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("Job")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
Fragment fragment = new Fragment(componentId, "jobColumnFrag", DependencyListEditPanel.this);
ModalLink link = new ModalLink("link") {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new DependencyEditPanel(id, dependencies, getDependencyIndex(rowModel.getObject().getJob())) {
+ return new DependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -122,13 +114,13 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
}
@Override
- public CISpec getEditingCISpec() {
- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();
+ public CISpec getCISpec() {
+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();
}
@Override
- public JobSpec getBelongingJob() {
- return (JobSpec) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();
+ public Job getBelongingJob() {
+ return (Job) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();
}
};
@@ -142,10 +134,10 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
}
});
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Artifacts")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("Artifacts")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
if (StringUtils.isNotBlank(rowModel.getObject().getArtifacts()))
cellItem.add(new Label(componentId, rowModel.getObject().getArtifacts()));
else
@@ -154,10 +146,10 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
});
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);
fragment.add(new AjaxLink<Void>("delete") {
@@ -178,17 +170,17 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
});
- IDataProvider<DependencySpec> dataProvider = new ListDataProvider<DependencySpec>() {
+ IDataProvider<Dependency> dataProvider = new ListDataProvider<Dependency>() {
@Override
- protected List<DependencySpec> getData() {
+ protected List<Dependency> getData() {
return dependencies;
}
};
- DataTable<DependencySpec, Void> dataTable;
- add(dataTable = new DataTable<DependencySpec, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
+ DataTable<Dependency, Void> dataTable;
+ add(dataTable = new DataTable<Dependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
@@ -231,7 +223,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
protected List<Serializable> convertInputToValue() throws ConversionException {
List<Serializable> value = new ArrayList<>();
- for (DependencySpec each: dependencies)
+ for (Dependency each: dependencies)
value.add(each);
return value;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
index da3b60003b..b3412cd118 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import io.onedev.server.ci.DependencySpec;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.Job;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
@@ -21,9 +21,9 @@ public class DependencyListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- if (descriptor.getBeanClass() == JobSpec.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
- if (elementClass == DependencySpec.class) {
+ if (elementClass == Dependency.class) {
return new PropertyContext<List<Serializable>>(descriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
index ae5f848db2..0b6c39188e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
@@ -24,9 +24,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.google.common.base.Preconditions;
-
-import io.onedev.server.ci.DependencySpec;
+import io.onedev.server.ci.Dependency;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
import jersey.repackaged.com.google.common.collect.Sets;
@@ -34,26 +32,26 @@ import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
public class DependencyListViewPanel extends Panel {
- private final List<DependencySpec> dependencies = new ArrayList<>();
+ private final List<Dependency> dependencies = new ArrayList<>();
public DependencyListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
- dependencies.add((DependencySpec) each);
+ dependencies.add((Dependency) each);
}
@Override
protected void onInitialize() {
super.onInitialize();
- List<IColumn<DependencySpec, Void>> columns = new ArrayList<>();
+ List<IColumn<Dependency, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Job")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("Job")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -64,11 +62,11 @@ public class DependencyListViewPanel extends Panel {
}
});
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Artifacts")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("Artifacts")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -83,11 +81,11 @@ public class DependencyListViewPanel extends Panel {
}
});
- columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {
@Override
- public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -104,16 +102,16 @@ public class DependencyListViewPanel extends Panel {
});
- IDataProvider<DependencySpec> dataProvider = new ListDataProvider<DependencySpec>() {
+ IDataProvider<Dependency> dataProvider = new ListDataProvider<Dependency>() {
@Override
- protected List<DependencySpec> getData() {
+ protected List<Dependency> getData() {
return dependencies;
}
};
- add(new DataTable<DependencySpec, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
+ add(new DataTable<Dependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
@Override
protected void onInitialize() {
@@ -125,28 +123,15 @@ public class DependencyListViewPanel extends Panel {
});
}
- private int getDependencyIndex(String job) {
- for (int i=0; i<dependencies.size(); i++) {
- if (dependencies.get(i).getJob().equals(job))
- return i;
- }
- return -1;
- }
-
private abstract class ColumnFragment extends Fragment {
private final int index;
- public ColumnFragment(String id, IModel<DependencySpec> model) {
- super(id, "columnFrag", DependencyListViewPanel.this, model);
- this.index = getDependencyIndex(getDependency().getJob());
- Preconditions.checkState(this.index != -1);
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", DependencyListViewPanel.this);
+ this.index = index;
}
- private DependencySpec getDependency() {
- return (DependencySpec) getDefaultModelObject();
- }
-
protected abstract Component newLabel(String componentId);
@Override
@@ -160,7 +145,7 @@ public class DependencyListViewPanel extends Panel {
@Override
protected String getTitle() {
- return getDependency().getJob();
+ return dependencies.get(index).getJob();
}
@Override
@@ -171,7 +156,7 @@ public class DependencyListViewPanel extends Panel {
@Override
protected Component newBody(String id) {
- return BeanContext.viewBean(id, getDependency(), Sets.newHashSet("job"), true);
+ return BeanContext.viewBean(id, dependencies.get(index), Sets.newHashSet("job"), true);
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamBean.java
similarity index 91%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamBean.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamBean.java
index 9718a28d1c..eb3fc0c10e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamBean.java
@@ -8,7 +8,7 @@ import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public class JobParamBean implements Serializable {
+public class ParamBean implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.html
new file mode 100644
index 0000000000..0c5495cd20
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.html
@@ -0,0 +1,17 @@
+<wicket:panel>
+ <form wicket:id="form" class="param-edit leave-confirm">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 id="modal-title" class="modal-title">
+ Job Parameter
+ </h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Update">
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java
index 2ee5c3ebb3..feb6223300 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java
@@ -19,13 +19,13 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
-abstract class JobParamEditPanel extends Panel implements InputContext {
+abstract class ParamEditPanel extends Panel implements InputContext {
private final List<InputSpec> params;
private final int paramIndex;
- public JobParamEditPanel(String id, List<InputSpec> params, int paramIndex) {
+ public ParamEditPanel(String id, List<InputSpec> params, int paramIndex) {
super(id);
this.params = params;
@@ -36,7 +36,7 @@ abstract class JobParamEditPanel extends Panel implements InputContext {
protected void onInitialize() {
super.onInitialize();
- JobParamBean bean = new JobParamBean();
+ ParamBean bean = new ParamBean();
if (paramIndex != -1)
bean.setParam(params.get(paramIndex));
@@ -55,7 +55,7 @@ abstract class JobParamEditPanel extends Panel implements InputContext {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobParamEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamEditPanel.this));
}
@Override
@@ -106,7 +106,7 @@ abstract class JobParamEditPanel extends Panel implements InputContext {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobParamEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamEditPanel.this));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.properties b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.properties
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.properties
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.properties
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.html
similarity index 91%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.html
index 7cb5a99023..e255222250 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="job-param-list list">
+ <div class="param-list list">
<div class="head">
<a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
index 2ce668687c..6ef89f1c13 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
@@ -38,11 +38,11 @@ import io.onedev.server.web.editable.PropertyUpdating;
import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
-public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
+public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
private final List<InputSpec> params;
- public JobParamListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ public ParamListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
params = new ArrayList<>();
@@ -51,14 +51,6 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
}
}
- private int getParamIndex(String paramName) {
- for (int i=0; i<params.size(); i++) {
- if (params.get(i).getName().equals(paramName))
- return i;
- }
- return -1;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -66,7 +58,7 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new JobParamEditPanel(id, params, -1) {
+ return new ParamEditPanel(id, params, -1) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -76,7 +68,7 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
- target.add(JobParamListEditPanel.this);
+ target.add(ParamListEditPanel.this);
}
};
@@ -90,12 +82,12 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "nameColumnFrag", JobParamListEditPanel.this);
+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", ParamListEditPanel.this);
ModalLink link = new ModalLink("link") {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new JobParamEditPanel(id, params, getParamIndex(rowModel.getObject().getName())) {
+ return new ParamEditPanel(id, params, cellItem.findParent(Item.class).getIndex()) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -105,7 +97,7 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
modal.close();
- target.add(JobParamListEditPanel.this);
+ target.add(ParamListEditPanel.this);
}
};
@@ -140,13 +132,13 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobParamListEditPanel.this);
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", ParamListEditPanel.this);
fragment.add(new AjaxLink<Void>("delete") {
@Override
public void onClick(AjaxRequestTarget target) {
params.remove(rowModel.getObject());
- target.add(JobParamListEditPanel.this);
+ target.add(ParamListEditPanel.this);
}
});
@@ -187,7 +179,7 @@ public class JobParamListEditPanel extends PropertyEditor<List<Serializable>> {
for (int i=0; i<fromIndex-toIndex; i++)
Collections.swap(params, fromIndex-i, fromIndex-i-1);
}
- target.add(JobParamListEditPanel.this);
+ target.add(ParamListEditPanel.this);
}
}.sortable("tbody"));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditSupport.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
index 8f7edc52c5..f9c9e3f3b0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
@@ -6,7 +6,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import io.onedev.server.ci.JobSpec;
+import io.onedev.server.ci.Job;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditableUtils;
@@ -17,11 +17,11 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
-public class JobParamListEditSupport implements EditSupport {
+public class ParamListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- if (descriptor.getBeanClass() == JobSpec.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass == InputSpec.class) {
return new PropertyContext<List<Serializable>>(descriptor) {
@@ -33,7 +33,7 @@ public class JobParamListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new JobParamListViewPanel(id, elementClass, model.getObject());
+ return new ParamListViewPanel(id, elementClass, model.getObject());
} else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
@@ -44,7 +44,7 @@ public class JobParamListEditSupport implements EditSupport {
@Override
public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
- return new JobParamListEditPanel(componentId, descriptor, model);
+ return new ParamListEditPanel(componentId, descriptor, model);
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.html
similarity index 83%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.html
index 0f8b5c5b9b..46289b9352 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="def-list job-param-list">
+ <div class="def-list param-list">
<div class="body">
<table wicket:id="params" class="table table-condensed table-hover"></table>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
index 7a20227596..067b7f178d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
@@ -23,8 +23,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.google.common.base.Preconditions;
-
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
@@ -33,11 +31,11 @@ import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
-public class JobParamListViewPanel extends Panel {
+public class ParamListViewPanel extends Panel {
private final List<InputSpec> params = new ArrayList<>();
- public JobParamListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ public ParamListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
@@ -54,7 +52,7 @@ public class JobParamListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -70,7 +68,7 @@ public class JobParamListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
InputSpec param = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -85,7 +83,7 @@ public class JobParamListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -100,7 +98,7 @@ public class JobParamListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
@Override
protected Component newLabel(String componentId) {
@@ -139,28 +137,15 @@ public class JobParamListViewPanel extends Panel {
});
}
- private int getParamIndex(String paramName) {
- for (int i=0; i<params.size(); i++) {
- if (params.get(i).getName().equals(paramName))
- return i;
- }
- return -1;
- }
-
private abstract class ColumnFragment extends Fragment {
private final int index;
- public ColumnFragment(String id, IModel<InputSpec> model) {
- super(id, "columnFrag", JobParamListViewPanel.this, model);
- this.index = getParamIndex(getParam().getName());
- Preconditions.checkState(this.index != -1);
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", ParamListViewPanel.this);
+ this.index = index;
}
- private InputSpec getParam() {
- return (InputSpec) getDefaultModelObject();
- }
-
protected abstract Component newLabel(String componentId);
@Override
@@ -174,7 +159,8 @@ public class JobParamListViewPanel extends Panel {
@Override
protected String getTitle() {
- return getParam().getName() + " (type: " + EditableUtils.getDisplayName(getParam().getClass()) + ")";
+ InputSpec param = params.get(index);
+ return param.getName() + " (type: " + EditableUtils.getDisplayName(param.getClass()) + ")";
}
@Override
@@ -185,7 +171,7 @@ public class JobParamListViewPanel extends Panel {
@Override
protected Component newBody(String id) {
- return BeanContext.viewBean(id, getParam(), Sets.newHashSet("name"), true);
+ return BeanContext.viewBean(id, params.get(index), Sets.newHashSet("name"), true);
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java
new file mode 100644
index 0000000000..f2251e9108
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java
@@ -0,0 +1,27 @@
+package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtriggers;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class TriggerBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private JobTrigger trigger;
+
+ @Editable(name="Type", order=100)
+ @NotNull(message="may not be empty")
+ public JobTrigger getTrigger() {
+ return trigger;
+ }
+
+ public void setTrigger(JobTrigger trigger) {
+ this.trigger = trigger;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java
new file mode 100644
index 0000000000..368d582b37
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java
@@ -0,0 +1,111 @@
+package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtriggers;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
+
+@SuppressWarnings("serial")
+abstract class TriggerEditPanel extends Panel {
+
+ private final List<JobTrigger> triggers;
+
+ private final int triggerIndex;
+
+ public TriggerEditPanel(String id, List<JobTrigger> triggers, int triggerIndex) {
+ super(id);
+
+ this.triggers = triggers;
+ this.triggerIndex = triggerIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ TriggerBean bean = new TriggerBean();
+ if (triggerIndex != -1)
+ bean.setTrigger(triggers.get(triggerIndex));
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(TriggerEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.editBean("editor", bean);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ JobTrigger trigger = bean.getTrigger();
+ if (!editor.hasErrors(true)) {
+ if (triggerIndex != -1) {
+ triggers.set(triggerIndex, trigger);
+ } else {
+ triggers.add(trigger);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(TriggerEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.html
new file mode 100644
index 0000000000..7a21755d1b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <div class="trigger-list list">
+ <div class="head">
+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>
+ </div>
+ <table wicket:id="triggers" class="table table-condensed table-hover"></table>
+ </div>
+ <wicket:fragment wicket:id="descriptionColumnFrag">
+ <span class="drag-indicator fa fa-reorder"></span>
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java
new file mode 100644
index 0000000000..4c35f51b0a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java
@@ -0,0 +1,199 @@
+package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtriggers;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<JobTrigger> triggers;
+
+ public TriggerListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ triggers = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ triggers.add((JobTrigger) each);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TriggerEditPanel(id, triggers, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ modal.close();
+ target.add(TriggerListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<JobTrigger, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("Description")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ Fragment fragment = new Fragment(componentId, "descriptionColumnFrag", TriggerListEditPanel.this);
+ ModalLink link = new ModalLink("link") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TriggerEditPanel(id, triggers, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ modal.close();
+ target.add(TriggerListEditPanel.this);
+ }
+
+ };
+ }
+
+ };
+ link.add(new Label("label", rowModel.getObject().getDescription()));
+ fragment.add(link);
+
+ cellItem.add(fragment);
+ }
+ });
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", TriggerListEditPanel.this);
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ triggers.remove(rowModel.getObject());
+ target.add(TriggerListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions";
+ }
+
+ });
+
+ IDataProvider<JobTrigger> dataProvider = new ListDataProvider<JobTrigger>() {
+
+ @Override
+ protected List<JobTrigger> getData() {
+ return triggers;
+ }
+
+ };
+
+ DataTable<JobTrigger, Void> dataTable;
+ add(dataTable = new DataTable<JobTrigger, Void>("triggers", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(triggers, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(triggers, fromIndex-i, fromIndex-i-1);
+ }
+ target.add(TriggerListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ protected String getErrorClass() {
+ return null;
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (JobTrigger each: triggers)
+ value.add(each);
+ return value;
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java
new file mode 100644
index 0000000000..d22eaaab35
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java
@@ -0,0 +1,61 @@
+package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtriggers;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.ci.Job;
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class TriggerListEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == JobTrigger.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null) {
+ return new TriggerListViewPanel(id, elementClass, model.getObject());
+ } else {
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new TriggerListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.html
new file mode 100644
index 0000000000..f57215e062
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.html
@@ -0,0 +1,10 @@
+<wicket:panel>
+ <div class="def-list trigger-list">
+ <div class="body">
+ <table wicket:id="triggers" class="table table-condensed table-hover"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="columnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java
new file mode 100644
index 0000000000..63447ca360
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java
@@ -0,0 +1,152 @@
+package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobtriggers;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.ci.jobtrigger.JobTrigger;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.page.layout.SideFloating;
+
+@SuppressWarnings("serial")
+public class TriggerListViewPanel extends Panel {
+
+ private final List<JobTrigger> triggers = new ArrayList<>();
+
+ public TriggerListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ triggers.add((JobTrigger) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<JobTrigger, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("Description")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getDescription());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);
+ }
+
+ });
+
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis";
+ }
+
+ });
+
+ IDataProvider<JobTrigger> dataProvider = new ListDataProvider<JobTrigger>() {
+
+ @Override
+ protected List<JobTrigger> getData() {
+ return triggers;
+ }
+
+ };
+
+ add(new DataTable<JobTrigger, Void>("triggers", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this));
+ }
+
+ });
+ }
+
+ private abstract class ColumnFragment extends Fragment {
+
+ private final int index;
+
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", TriggerListViewPanel.this);
+ this.index = index;
+ }
+
+ protected abstract Component newLabel(String componentId);
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new SideFloating(target, SideFloating.Placement.RIGHT) {
+
+ @Override
+ protected String getTitle() {
+ return EditableUtils.getDisplayName(triggers.get(index).getClass());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "job-trigger def-detail"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.viewBean(id, triggers.get(index));
+ }
+
+ };
+ }
+
+ };
+ link.add(newLabel("label"));
+ add(link);
+ }
+
+ }
+}