The Unified and Autonomous Development Platform
Add support for properties in build spec
robin shen774ced95ade2
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex c20f420d91..517766e9fb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -1,199 +1,227 @@-package io.onedev.server.buildspec;--import java.io.Serializable;-import java.nio.charset.StandardCharsets;-import java.util.ArrayList;-import java.util.HashSet;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.ValidationException;--import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.collect.Lists;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobDependency;-import io.onedev.server.buildspec.job.action.PostBuildAction;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.buildspec.job.retrycondition.RetryCondition;-import io.onedev.server.buildspec.job.trigger.JobTrigger;-import io.onedev.server.migration.VersionedDocument;-import io.onedev.server.util.validation.Validatable;-import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-@ClassValidating-public class BuildSpec implements Serializable, Validatable {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(BuildSpec.class);-- public static final String BLOB_PATH = ".onedev-buildspec";-- private List<Job> jobs = new ArrayList<>();-- private transient Map<String, Job> jobMap;-- @Editable- @Valid- public List<Job> getJobs() {- return jobs;- }-- public void setJobs(List<Job> jobs) {- this.jobs = jobs;- }-- public Map<String, Job> getJobMap() {- if (jobMap == null) {- jobMap = new LinkedHashMap<>();- for (Job job: jobs)- jobMap.put(job.getName(), job);- }- return jobMap;- }-- @Override- public boolean isValid(ConstraintValidatorContext context) {- boolean valid = true;-- Set<String> jobNames = new HashSet<>();- for (Job job: jobs) {- if (!jobNames.add(job.getName())) {- context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())- .addPropertyNode("jobs").addConstraintViolation();- valid = false;- }- }-- for (int i=0; i<jobs.size(); i++) {- Job job = jobs.get(i);-- int j=1;- for (JobDependency dependency: job.getJobDependencies()) {- Job dependencyJob = getJobMap().get(dependency.getJobName());- if (dependencyJob != null) {- try {- ParamSupply.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());- } catch (ValidationException e) {- String message = "Item #" + j + ": Error validating parameters of dependency job '"- + dependencyJob.getName() + "': " + e.getMessage();- context.buildConstraintViolationWithTemplate(message)- .addPropertyNode("jobs").addPropertyNode("dependencies")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- } else {- context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName())- .addPropertyNode("jobs").addPropertyNode("dependencies")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- List<String> dependencyChain = Lists.newArrayList(job.getName());- if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {- context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)- .addPropertyNode("jobs").addPropertyNode("dependencies")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- j++;- }-- j=1;- for (JobTrigger trigger: job.getTriggers()) {- try {- ParamSupply.validateParams(job.getParamSpecs(), trigger.getParams());- } catch (Exception e) {- String message = "Item #" + j + ": Error validating job parameters: " + e.getMessage();- context.buildConstraintViolationWithTemplate(message)- .addPropertyNode("jobs").addPropertyNode("triggers")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- j++;- }-- if (job.getRetryCondition() != null) {- try {- RetryCondition.parse(job, job.getRetryCondition());- } catch (Exception e) {- context.buildConstraintViolationWithTemplate(e.getMessage())- .addPropertyNode("jobs").addPropertyNode("retryCondition")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- }-- j=1;- for (PostBuildAction action: job.getPostBuildActions()) {- try {- action.validateWithContext(this, job);- } catch (Exception e) {- if (e.getMessage() == null)- logger.error("Error validating post build action", e);- context.buildConstraintViolationWithTemplate("Item #" + j + ": " + e.getMessage())- .addPropertyNode("jobs").addPropertyNode("postBuildActions")- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- j++;- }- }-- if (!valid)- context.disableDefaultConstraintViolation();- return valid;- }-- private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {- if (dependencyChain.iterator().next().equals(jobName)) {- dependencyChain.add(jobName);- return true;- } else if (dependencyChain.contains(jobName)) {- // loop not at start of chain will be detected as a separate violation- return false;- } else {- dependencyChain.add(jobName);- Job job = getJobMap().get(jobName);- if (job != null) {- for (JobDependency dependency: job.getJobDependencies()) {- if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))- return true;- }- }- return false;- }- }-- @Nullable- public static BuildSpec parse(byte[] bytes) {- String buildSpecString = new String(bytes, StandardCharsets.UTF_8);- if (StringUtils.isNotBlank(buildSpecString)) {- try {- return (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();- } catch (Exception e) {- throw new InvalidBuildSpecException("Invalid build spec", e);- }- } else {- return null;- }- }--}+package io.onedev.server.buildspec;++import java.io.Serializable;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.Stack;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;+import javax.validation.ValidationException;++import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.Lists;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.job.JobDependency;+import io.onedev.server.buildspec.job.action.PostBuildAction;+import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.job.retrycondition.RetryCondition;+import io.onedev.server.buildspec.job.trigger.JobTrigger;+import io.onedev.server.migration.VersionedDocument;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+@ClassValidating+public class BuildSpec implements Serializable, Validatable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(BuildSpec.class);++ public static final String BLOB_PATH = ".onedev-buildspec";++ private List<Job> jobs = new ArrayList<>();++ private List<Property> properties = new ArrayList<>();++ private transient Map<String, Job> jobMap;++ private transient Map<String, String> propertyMap;++ @Editable+ @Valid+ public List<Job> getJobs() {+ return jobs;+ }++ public void setJobs(List<Job> jobs) {+ this.jobs = jobs;+ }++ @Editable+ public List<Property> getProperties() {+ return properties;+ }++ public void setProperties(List<Property> properties) {+ this.properties = properties;+ }++ public Map<String, Job> getJobMap() {+ if (jobMap == null) {+ jobMap = new LinkedHashMap<>();+ for (Job job: jobs)+ jobMap.put(job.getName(), job);+ }+ return jobMap;+ }++ public Map<String, String> getPropertyMap() {+ if (propertyMap == null) {+ propertyMap = new LinkedHashMap<>();+ for (Property property: properties)+ propertyMap.put(property.getName(), property.getValue());+ }+ return propertyMap;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ boolean valid = true;++ Set<String> jobNames = new HashSet<>();+ for (Job job: jobs) {+ if (!jobNames.add(job.getName())) {+ context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())+ .addPropertyNode("jobs").addConstraintViolation();+ valid = false;+ }+ }++ for (int i=0; i<jobs.size(); i++) {+ Job job = jobs.get(i);++ int j=1;+ for (JobDependency dependency: job.getJobDependencies()) {+ Job dependencyJob = getJobMap().get(dependency.getJobName());+ if (dependencyJob != null) {+ try {+ ParamSupply.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());+ } catch (ValidationException e) {+ String message = "Item #" + j + ": Error validating parameters of dependency job '"+ + dependencyJob.getName() + "': " + e.getMessage();+ context.buildConstraintViolationWithTemplate(message)+ .addPropertyNode("jobs").addPropertyNode("dependencies")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ } else {+ context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName())+ .addPropertyNode("jobs").addPropertyNode("dependencies")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ List<String> dependencyChain = Lists.newArrayList(job.getName());+ if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {+ context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)+ .addPropertyNode("jobs").addPropertyNode("dependencies")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ j++;+ }++ j=1;+ for (JobTrigger trigger: job.getTriggers()) {+ try {+ ParamSupply.validateParams(job.getParamSpecs(), trigger.getParams());+ } catch (Exception e) {+ String message = "Item #" + j + ": Error validating job parameters: " + e.getMessage();+ context.buildConstraintViolationWithTemplate(message)+ .addPropertyNode("jobs").addPropertyNode("triggers")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ j++;+ }++ if (job.getRetryCondition() != null) {+ try {+ RetryCondition.parse(job, job.getRetryCondition());+ } catch (Exception e) {+ context.buildConstraintViolationWithTemplate(e.getMessage())+ .addPropertyNode("jobs").addPropertyNode("retryCondition")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ }++ j=1;+ for (PostBuildAction action: job.getPostBuildActions()) {+ try {+ action.validateWithContext(this, job);+ } catch (Exception e) {+ if (e.getMessage() == null)+ logger.error("Error validating post build action", e);+ context.buildConstraintViolationWithTemplate("Item #" + j + ": " + e.getMessage())+ .addPropertyNode("jobs").addPropertyNode("postBuildActions")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ j++;+ }+ }++ if (!valid)+ context.disableDefaultConstraintViolation();+ return valid;+ }++ private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {+ if (dependencyChain.iterator().next().equals(jobName)) {+ dependencyChain.add(jobName);+ return true;+ } else if (dependencyChain.contains(jobName)) {+ // loop not at start of chain will be detected as a separate violation+ return false;+ } else {+ dependencyChain.add(jobName);+ Job job = getJobMap().get(jobName);+ if (job != null) {+ for (JobDependency dependency: job.getJobDependencies()) {+ if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))+ return true;+ }+ }+ return false;+ }+ }++ @Nullable+ public static BuildSpec parse(byte[] bytes) {+ String buildSpecString = new String(bytes, StandardCharsets.UTF_8);+ if (StringUtils.isNotBlank(buildSpecString)) {+ try {+ return (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();+ } catch (Exception e) {+ throw new InvalidBuildSpecException("Invalid build spec", e);+ }+ } else {+ return null;+ }+ }++ @SuppressWarnings("unused")+ private void migrate1(VersionedDocument dom, Stack<Integer> versions) {+ dom.getRootElement().addElement("properties");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Property.java b/server-core/src/main/java/io/onedev/server/buildspec/Property.javanew file mode 100644index 0000000000..6a3f094707--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/Property.java@@ -0,0 +1,38 @@+package io.onedev.server.buildspec;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class Property implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private String value;++ @Editable(order=100)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ @NotEmpty+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex d05a696a14..4fb0a50b02 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -127,17 +127,23 @@ public class Job implements Serializable, Validatable {Component component = ComponentContext.get().getComponent();List<InputSuggestion> suggestions = new ArrayList<>();ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);- if (jobAware != null) {- Job job = jobAware.getJob();- if (job != null) {- RevCommit commit;- if (page.getBlobIdent().revision != null)- commit = page.getCommit();- else- commit = null;- suggestions.addAll(SuggestionUtils.suggestVariables(page.getProject(), commit, job, matchWith));-+ BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);+ if (buildSpecAware != null) {+ BuildSpec buildSpec = buildSpecAware.getBuildSpec();+ if (buildSpec != null) {+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);+ if (jobAware != null) {+ Job job = jobAware.getJob();+ if (job != null) {+ RevCommit commit;+ if (page.getBlobIdent().revision != null)+ commit = page.getCommit();+ else+ commit = null;+ suggestions.addAll(SuggestionUtils.suggestVariables(+ page.getProject(), commit, buildSpec, job, matchWith));+ }+ }}}return suggestions;@@ -164,8 +170,9 @@ public class Job implements Serializable, Validatable {ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();Project project = page.getProject();ObjectId commitId = page.getCommit();+ BuildSpec buildSpec = ComponentContext.get().getComponent().findParent(BuildSpecAware.class).getBuildSpec();Job job = ComponentContext.get().getComponent().findParent(JobAware.class).getJob();- for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, job, ""))+ for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, buildSpec, job, ""))variables.add(suggestion.getContent());return variables;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.javaindex f2c21c567f..b9d0a31caa 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java@@ -18,6 +18,8 @@ public class VariableInterpolator implements Function<String, String> {public static final String PARAMS_PREFIX = "params:";+ public static final String PROPERTIES_PREFIX = "properties:";+public static final String SECRETS_PREFIX = "secrets:";public static final String SCRIPTS_PREFIX = "scripts:";@@ -53,6 +55,13 @@ public class VariableInterpolator implements Function<String, String> {}}throw new OneException("Undefined param: " + paramName);+ } else if (t.startsWith(PROPERTIES_PREFIX)) {+ String propertyName = t.substring(PROPERTIES_PREFIX.length());+ String propertyValue = build.getSpec().getPropertyMap().get(propertyName);+ if (propertyValue != null)+ return propertyValue;+ else+ throw new OneException("Undefined property: " + propertyName);} else if (t.startsWith(SECRETS_PREFIX)) {String secretName = t.substring(SECRETS_PREFIX.length());return build.getSecretValue(secretName);diff --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 b251f14c90..7736283b48 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@@ -188,7 +188,7 @@ public class Build extends AbstractEntity implements Referenceable {private transient Map<Build.Status, Collection<RevCommit>> commitsCache;- private transient BuildSpec buildSpec;+ private transient BuildSpec spec;private transient Job job;@@ -539,15 +539,15 @@ public class Build extends AbstractEntity implements Referenceable {return project.getBuildSetting().getSecretValue(project, secretName, ObjectId.fromString(getCommitHash()));}- public BuildSpec getBuildSpec() {- if (buildSpec == null)- buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(getCommitId()));- return buildSpec;+ public BuildSpec getSpec() {+ if (spec == null)+ spec = Preconditions.checkNotNull(getProject().getBuildSpec(getCommitId()));+ return spec;}public Job getJob() {if (job == null)- job = Preconditions.checkNotNull(getBuildSpec().getJobMap().get(getJobName()));+ job = Preconditions.checkNotNull(getSpec().getJobMap().get(getJobName()));return job;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 667ef8e850..171ff00bb1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -1034,6 +1034,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SpushState(target);}+ @Override+ public void pushState(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position) {+ state.blobIdent = blobIdent;+ state.position = position;+ pushState(target);+ }+@Overridepublic void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {newSearchResult(target, hits);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex f0600b60ea..a31ce8c238 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -71,6 +71,8 @@ public interface BlobRenderContext extends Serializable {boolean isOnBranch();+ void pushState(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);+void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.jsindex 077b4fceee..790505287f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js@@ -18,7 +18,7 @@ onedev.server.blobEdit = {$head.find(".save>a").click(function() {onedev.server.viewState.getFromViewAndSetToHistory();var $content = $body.find(">.content");- var $positionAware = $content.find(".position-aware");+ var $positionAware = $content.find(".position-aware:visible");if ($positionAware.length != 0) {var position = $positionAware.data("getPosition")();$content.children(".position").val(position);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlindex f604809c21..fc6871a413 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html@@ -2,11 +2,13 @@<div wicket:id="content" class="build-spec build-spec-view"></div><wicket:fragment wicket:id="validFrag"><div class="valid">- <div class="jobs">- <div class="head">- Jobs- </div>- <div wicket:id="body" class="body"></div>+ <div class="head">+ <a class="jobs">Jobs</a>+ <a class="properties">Properties</a>+ </div>+ <div class="body">+ <div wicket:id="jobs" class="jobs"></div>+ <div wicket:id="properties" class="properties"></div></div></div></wicket:fragment>@@ -17,10 +19,13 @@</div></wicket:fragment><wicket:fragment wicket:id="hasJobsFrag">- <div class="side"><div class="navs"><div wicket:id="navs" class="nav">- <a class="select"><span wicket:id="jobName"></span></a>- <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a>- </div></div></div>+ <div class="side">+ <div class="navs">+ <div wicket:id="navs" class="nav">+ <a class="select"><span wicket:id="jobName"></span></a>+ <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a>+ </div>+ </div></div><div class="contents"><div wicket:id="contents" class="content"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 7670707661..003d68b884 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -24,6 +24,7 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.job.RunJobLink;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@@ -46,7 +47,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {if (buildSpec != null) {Fragment validFrag = new Fragment("content", "validFrag", this);if (!buildSpec.getJobs().isEmpty()) {- Fragment hasJobsFrag = new Fragment("body", "hasJobsFrag", this);+ Fragment hasJobsFrag = new Fragment("jobs", "hasJobsFrag", this);RepeatingView navsView = new RepeatingView("navs");RepeatingView jobsView = new RepeatingView("contents");@@ -70,8 +71,14 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {validFrag.add(hasJobsFrag);} else {- validFrag.add(new Label("body", "No jobs defined").add(AttributeAppender.append("class", "not-defined")));+ validFrag.add(new Label("jobs", "No jobs defined").add(AttributeAppender.append("class", "not-defined")));}++ if (!buildSpec.getProperties().isEmpty())+ validFrag.add(PropertyContext.view("properties", buildSpec, "properties"));+ else+ validFrag.add(new Label("properties", "No properties defined").add(AttributeAppender.append("class", "not-defined")));+add(validFrag);} else {add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined")));@@ -89,7 +96,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();String selection = params.getParameterValue("selection").toString();String position = BuildSpecRendererProvider.getPosition(selection);- context.onSelect(target, context.getBlobIdent(), position);+ context.pushState(target, context.getBlobIdent(), position);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlindex 562b2e2c7a..865f4a9b97 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html@@ -2,15 +2,16 @@<div wicket:id="content" class="build-spec build-spec-edit"></div><wicket:fragment wicket:id="validFrag"><div class="valid">- <div class="jobs">- <div class="head">- Jobs- </div>- <div class="body">+ <div class="head">+ <a class="jobs">Jobs</a>+ <a class="properties">Properties</a>+ </div>+ <div class="body position-aware">+ <div class="jobs"><div class="side"><!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)in css -->- <div class="navs position-aware"><div wicket:id="navs" class="nav">+ <div class="navs"><div wicket:id="navs" class="nav"><a class="select"><span class="drag-indicator"><i class="fa fa-reorder"></i></span><span class="name"></span>@@ -28,6 +29,7 @@<div wicket:id="contents" class="content"></div></div></div>+ <div wicket:id="properties" class="properties"></div></div></div></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex ed4fdd5bfa..06acafe074 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -33,6 +33,7 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;+import io.onedev.server.buildspec.Property;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.JobSuggestion;@@ -48,6 +49,8 @@ import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PathNode.Indexed;import io.onedev.server.web.editable.PathNode.Named;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -64,6 +67,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprivate RepeatingView jobContents;+ private PropertyEditor<Serializable> properties;+private AbstractPostAjaxBehavior deleteBehavior;public BuildSpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {@@ -109,13 +114,13 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprivate void addJob(AjaxRequestTarget target, Job job) {Component nav = newJobNav(job);- String script = String.format("$('.build-spec>.valid>.jobs>.body>.side>.navs').append(\"<div id='%s'></div>\");",+ String script = String.format("$('.build-spec>.valid>.body>.jobs>.side>.navs').append(\"<div id='%s'></div>\");",nav.getMarkupId());target.prependJavaScript(script);target.add(nav);Component content = newJobContent(job);- script = String.format("$('.build-spec>.valid>.jobs>.body>.contents').append(\"<div id='%s'></div>\");",+ script = String.format("$('.build-spec>.valid>.body>.jobs>.contents').append(\"<div id='%s'></div>\");",content.getMarkupId());target.prependJavaScript(script);target.add(content);@@ -225,7 +230,9 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Butarget.appendJavaScript(String.format("onedev.server.buildSpec.swapJobs(%d, %d)", fromIndex, toIndex));}- }.sortable(".jobs>.body>.side>.navs"));+ }.sortable(".body>.jobs>.side>.navs"));++ content.add(properties = PropertyContext.edit("properties", buildSpec, "properties"));add(new IValidator<byte[]>() {@@ -308,6 +315,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buresponse.render(OnDomReadyHeaderItem.forScript(script));}+ @SuppressWarnings("unchecked")@Overridepublic BuildSpec getBuildSpec() {if (parseResult instanceof BuildSpec) {@@ -316,6 +324,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements BuBeanEditor jobContent = (BeanEditor) child;buildSpec.getJobs().add((Job) jobContent.getConvertedInput());}+ buildSpec.setProperties((List<Property>) properties.getConvertedInput());return buildSpec;} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.cssindex 17da1caf5b..54c3c4a0c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css@@ -17,61 +17,67 @@font-size: 13px;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}-.build-spec>.valid>div {- border-radius: 4px;+.build-spec>.valid>.head {+ margin-bottom: 20px;+ padding-bottom: 8px;+ border-bottom: 1px solid #E8E8E8;}-.build-spec>.valid>div>.head {+.build-spec>.valid>.head>a {font-weight: bold;font-size: 16px;margin-bottom: 16px;+ margin-right: 8px;}-.build-spec>.valid>div>.body {- position: relative;+.build-spec>.valid>.head>a.active {+ font-size: 20px;}-.build-spec>.valid>div>.not-defined {+.build-spec>.valid>.body>.not-defined {font-size: 16px;font-style: italic;}-.build-spec>.valid>div>.body>:first-child {+.build-spec>.valid>.body>.jobs {+ position: relative;+}+.build-spec>.valid>.body>.jobs>.side {position: absolute;left: 0;top: 0;width: 220px;}-.build-spec>.valid>div>.body>:last-child {+.build-spec>.valid>.body>.jobs>.contents {margin-left: 240px;}-.build-spec>.valid>div>.body>.side>.navs:not(:empty) {+.build-spec>.valid>.body>.jobs>.side>.navs:not(:empty) {margin-bottom: 20px;}-.build-spec>.valid>div>.body>.side>.navs>.nav {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav {position: relative;background: #444;border-radius: 4px;margin-bottom: 8px;}-.build-spec>.valid>div>.body>.side>.navs>.nav a {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav a {color: #BBB;}-.build-spec>.valid>div>.body>.side>.navs>.nav .drag-indicator {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav .drag-indicator {color: inherit;margin-right: 4px;}-.build-spec>.valid>div>.body>.side>.navs>.nav:hover a,-.build-spec>.valid>div>.body>.side>.navs>.nav.active a {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav:hover a,+.build-spec>.valid>.body>.jobs>.side>.navs>.nav.active a {color: white;font-weight: bold;}-.build-spec>.valid>div>.body>.side>.navs>.nav.active {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav.active {background: #080808;}-.build-spec>.valid>div>.body>.side>.navs>.nav:first-child:last-child {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav:first-child:last-child {border-radius: 4px;}-.build-spec>.valid>div>.body>.side>.navs>.nav>.select {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.select {padding: 8px 28px 8px 8px;text-decoration: none;display: block;@@ -79,8 +85,8 @@text-overflow: ellipsis;white-space: nowrap;}-.build-spec>.valid>div>.body>.side>.navs>.nav>.delete,-.build-spec>.valid>div>.body>.side>.navs>.nav>.run {+.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.delete,+.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.run {right: 0;top: 0;position: absolute;@@ -88,43 +94,41 @@padding: 8px 8px;display: block;}-.build-spec>.valid>div>.body>.side .add {+.build-spec>.valid>.body>.jobs>.side .add {position: relative;}-.build-spec>.valid>div>.body>.side .create {+.build-spec>.valid>.body>.jobs>.side .create {display: block;margin-right: 38px;border-radius: 4px 0 0 4px;}-.build-spec>.valid>div>.body>.side .create.no-suggestions {+.build-spec>.valid>.body>.jobs>.side .create.no-suggestions {margin-right: 0;border-radius: 4px;}-.build-spec>.valid>div>.body>.side .suggestions {+.build-spec>.valid>.body>.jobs>.side .suggestions {position: absolute;right: 0;top: 0;border-radius: 0 4px 4px 0;border-left: none;}-.build-spec>.valid>div>.body>.contents>.content {+.build-spec>.valid>.body>.jobs>.contents>.content {border-radius: 4px;border: 2px solid #DDD;padding: 20px;}-.build-spec>.valid .bean-properties>table>tbody>tr>td.name {+.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr>td.name {width: 200px;}-.build-spec>.valid .bean-properties>table>tbody>tr.property-retry td.name {+.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr.property-retry td.name {width: 100px;}-.build-spec>.valid .bean-properties>table>tbody>tr>td.value .form-control {+.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr>td.value .form-control {height: 32px;font-size: 13px;}-.build-spec>.valid .def-list table>tbody>tr>td:first-child>div>a {+.build-spec>.valid>.body>.jobs>.content .def-list table>tbody>tr>td:first-child>div>a {margin-left: 0;}--diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.jsindex 4e8c530519..09f1002971 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js@@ -1,66 +1,141 @@onedev.server.buildSpec = {onDomReady: function(selection, selectCallback, deleteCallback) {- var activeJobIndex = -1;- var $body = $(".build-spec>.valid>.jobs>.body");- $body.data("selectCallback", selectCallback);- $body.data("deleteCallback", deleteCallback);+ var $valid = $(".build-spec>.valid");++ $valid.data("selectCallback", selectCallback);+ $valid.data("deleteCallback", deleteCallback);- $body.find(">.contents>.content").each(function() {- var $this = $(this);- if ($this.find(".feedbackPanelERROR").length != 0) {- activeJobIndex = $this.index();- return false;- }- });- if (activeJobIndex == -1) {- if (selection && selection.startsWith("jobs/")) {- var activeJobName = selection.substring("jobs/".length);- activeJobIndex = $body.find(">.side>.navs>.nav[data-name='" + activeJobName.escape() + "']").index();- }+ var $body = $valid.children(".body");+ var $jobs = $body.children(".jobs");+ var $properties = $body.children(".properties");+ if ($jobs.find(".feedbackPanelERROR").length != 0) {+ onedev.server.buildSpec.showJobs();+ $jobs.find(">.contents>.content").each(function() {+ var $this = $(this);+ if ($this.find(".feedbackPanelERROR").length != 0) {+ onedev.server.buildSpec.showJob($this.index());+ return false;+ }+ });+ } else if ($properties.find(".feedbackPanelERROR").length != 0) {+ onedev.server.buildSpec.showProperties();+ } else if (selection) {+ onedev.server.buildSpec.showSelection(selection);+ } else {+ onedev.server.buildSpec.showJobs();+ onedev.server.buildSpec.showJob(0);}- if (activeJobIndex == -1)- activeJobIndex = 0;-- onedev.server.buildSpec.showJob(activeJobIndex);- var $navs = $body.find(".side>.navs");- $navs.data("getPosition", function() {- return "buildspec-jobs/" + $navs.children(".active").data("name");+ $body.data("getPosition", function() {+ if ($jobs.is(":visible")) {+ var $navs = $jobs.find(">.side>.navs");+ return "buildspec-jobs/" + $navs.children(".active").data("name");+ } else if ($properties.is(":visible")) {+ return "buildspec-properties";+ } else {+ return "buildspec-";+ }});++ var $head = $valid.children(".head");+ $head.children(".jobs").click(onedev.server.buildSpec.selectJobs);+ $head.children(".properties").click(onedev.server.buildSpec.selectProperties);+// use mouseup together with ui-sortable-helper (see selectJob method) class check// to avoid the issue that sortable will fire onclick event in firefox (hence cause// the job being selected while sorting- $body.find(".side>.navs>.nav>.select").mouseup(onedev.server.buildSpec.selectJob);- $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.buildSpec.deleteJob);+ $jobs.find(">.side>.navs>.nav>.select").mouseup(onedev.server.buildSpec.selectJob);+ $jobs.find(">.side>.navs>.nav>.delete").mouseup(onedev.server.buildSpec.deleteJob);},- selectJob: function() {- var $nav = $(this).parent();- if (!$nav.hasClass("ui-sortable-helper")) {- onedev.server.buildSpec.showJob($nav.index());- var $body = $(".build-spec>.valid>.jobs>.body");- if ($body.data("selectCallback"))- $body.data("selectCallback")("jobs/" + $nav.data("name"));- }+ showJobs: function() {+ var $valid = $(".build-spec>.valid");+ var $head = $valid.children(".head");+ $head.children().removeClass("active");+ $head.children(".jobs").addClass("active");+ var $body = $valid.children(".body");+ $body.children().hide();+ var $jobs = $body.children(".jobs");+ $jobs.show();+ $(window).resize();+ onedev.server.focus.doFocus($jobs);},showJob: function(index) {- var $body = $(".build-spec>.valid>.jobs>.body");- var $navs = $body.find(">.side>.navs");+ var $jobs = $(".build-spec>.valid>.body>.jobs");+ var $navs = $jobs.find(">.side>.navs");$navs.children().removeClass("active");var $nav = $navs.children().eq(index);$nav.addClass("active");- var $contents = $body.children(".contents");+ var $contents = $jobs.children(".contents");$contents.children().hide();var $content = $contents.children().eq(index);$content.show();$(window).resize();onedev.server.focus.doFocus($content);},+ showProperties: function() {+ var $valid = $(".build-spec>.valid");+ var $head = $valid.children(".head");+ $head.children().removeClass("active");+ $head.children(".properties").addClass("active");++ var $body = $valid.children(".body");+ $body.children().hide();+ var $properties = $body.children(".properties");+ $properties.show();+ $(window).resize();+ onedev.server.focus.doFocus($properties);+ },+ showSelection: function(selection) {+ if (selection == "jobs") {+ onedev.server.buildSpec.showJobs();+ onedev.server.buildSpec.showJob(0);+ } else if (selection.startsWith("jobs/")) {+ onedev.server.buildSpec.showJobs();+ var jobName = selection.substring("jobs/".length);+ var index = $(".build-spec>.valid>.body>.jobs>.side>.navs>.nav[data-name='" + jobName.escape() + "']").index();+ if (index != -1)+ onedev.server.buildSpec.showJob(index);+ else+ onedev.server.buildSpec.showJob(0);+ } else if (selection == "properties" || selection.startsWith("properties/")) {+ onedev.server.buildSpec.showProperties();+ } else {+ onedev.server.buildSpec.showJobs();+ onedev.server.buildSpec.showJob(0);+ }+ },+ selectJobs: function() {+ onedev.server.buildSpec.showJobs();+ var $valid = $(".build-spec>.valid");+ var $nav = $valid.find(">.body>.jobs>.side>.navs>.active");+ var selection = "jobs";+ if ($nav.length != 0)+ selection += "/" + $nav.data("name");+ if ($valid.data("selectCallback"))+ $valid.data("selectCallback")(selection);+ },+ selectJob: function() {+ var $nav = $(this).parent();+ if (!$nav.hasClass("ui-sortable-helper")) {+ onedev.server.buildSpec.showJob($nav.index());+ var $valid = $(".build-spec>.valid");+ if ($valid.data("selectCallback"))+ $valid.data("selectCallback")("jobs/" + $nav.data("name"));+ }+ },+ selectProperties: function() {+ onedev.server.buildSpec.showProperties();+ var $valid = $(".build-spec>.valid");+ if ($valid.data("selectCallback"))+ $valid.data("selectCallback")("properties");+ },deleteJob: function() {var $nav = $(this).parent();if (!$nav.hasClass("ui-sortable-helper")) {- var $body = $(".build-spec-edit .jobs>.body");- var $navs = $body.find(">.side>.navs");- var $contents = $body.children(".contents");+ var $valid = $(".build-spec>.valid");+ var $jobs = $valid.find(">.body>.jobs");+ var $navs = $jobs.find(">.side>.navs");+ var $contents = $jobs.children(".contents");var index = $nav.index();var $nav = $navs.children().eq(index);$nav.remove();@@ -69,11 +144,11 @@ onedev.server.buildSpec = {if ($nav.hasClass("active"))onedev.server.buildSpec.showJob(0);- $body.data("deleteCallback")(index);+ $valid.data("deleteCallback")(index);}},swapJobs: function(index1, index2) {- var $contents = $(".build-spec-edit .jobs>.body>.contents");+ var $contents = $(".build-spec>.valid>.body>.jobs>.contents");if (index1 < index2) {for (var i = 0; i < index2-index1; i++)@@ -84,10 +159,10 @@ onedev.server.buildSpec = {}},trackJobNameChange: function(index) {- var $body = $(".build-spec-edit .jobs>.body");- var $navs = $body.find(">.side>.navs");+ var $jobs = $(".build-spec>.valid>.body>.jobs");+ var $navs = $jobs.find(">.side>.navs");var $nav = $navs.children().eq(index);- var $contents = $body.children(".contents");+ var $contents = $jobs.children(".contents");var $content = $contents.children().eq(index);var $input = $content.find(">div>table>tbody>tr.property-name>td input");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 8c039df1e4..f06ebbe531 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -693,7 +693,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overridepublic void onClick(AjaxRequestTarget target) {- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));+ context.onSelect(target, context.getBlobIdent(),+ SourceRendererProvider.getPosition(symbol.getPosition()));}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.htmlindex 93ff7a2b3a..eea5b7d344 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html@@ -1,14 +1,6 @@<wicket:extend><div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.All builds will be preserved if no rules are defined</div>- <wicket:enclosure child="inheritedBuildPreservations">- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from Owner</b></div>- <div class="panel-body">- <div wicket:id="inheritedBuildPreservations"></div>- </div>- </div>- </wicket:enclosure><div class="panel panel-default"><div class="panel-heading"><b>Project Specific</b></div><div class="panel-body">@@ -20,4 +12,13 @@</div></form></div>- </div></wicket:extend>\ No newline at end of file+ </div>+ <wicket:enclosure child="inheritedBuildPreservations">+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from Owner</b></div>+ <div class="panel-body">+ <div wicket:id="inheritedBuildPreservations"></div>+ </div>+ </div>+ </wicket:enclosure>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.htmlindex c1ab80d060..cf9f089c6d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html@@ -1,13 +1,5 @@<wicket:extend><div wicket:id="note" class="help-block"></div>- <wicket:enclosure child="inheritedSecrets">- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from Owner</b></div>- <div class="panel-body">- <div wicket:id="inheritedSecrets"></div>- </div>- </div>- </wicket:enclosure><div class="panel panel-default"><div class="panel-heading"><b>Project Specific</b></div><div class="panel-body">@@ -20,4 +12,12 @@</form></div></div>+ <wicket:enclosure child="inheritedSecrets">+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from Owner</b></div>+ <div class="panel-body">+ <div wicket:id="inheritedSecrets"></div>+ </div>+ </div>+ </wicket:enclosure></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 310cf2b34b..58531e2522 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@@ -26,6 +26,8 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.Property;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobVariable;import io.onedev.server.buildspec.job.VariableInterpolator;@@ -135,7 +137,7 @@ public class SuggestionUtils {}public static List<InputSuggestion> suggestVariables(Project project, @Nullable ObjectId commitId,- Job job, String matchWith) {+ BuildSpec buildSpec, Job job, String matchWith) {matchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();@@ -145,6 +147,8 @@ public class SuggestionUtils {variables.put(var.name().toLowerCase(), null);for (ParamSpec paramSpec: job.getParamSpecs())variables.put(VariableInterpolator.PARAMS_PREFIX + paramSpec.getName(), paramSpec.getDescription());+ for (Property property: buildSpec.getProperties())+ variables.put(VariableInterpolator.PROPERTIES_PREFIX + property.getName(), null);for (JobSecret secret: project.getBuildSetting().getHierarchySecrets(project)) {String varName = VariableInterpolator.SECRETS_PREFIX + secret.getName();if (commitId != null && secret.isAuthorized(project, commitId)