The Unified and Autonomous Development Platform
Improve job secret and action authorization editing
Robin Shen164710da3274
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 7e30f02530..4bd1e0bdac 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -6,17 +6,13 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputCompletion;-import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.utils.LinearRange;import io.onedev.server.model.Project;import io.onedev.server.util.validation.annotation.SecretName;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.editable.annotation.Patterns;-import io.onedev.server.web.editable.annotation.SuggestionProvider;import io.onedev.server.web.util.SuggestionUtils;@Editable@@ -31,7 +27,6 @@ public class JobSecret implements Serializable {private String authorizedBranches;@Editable(order=100)- @SuggestionProvider("suggestNames")@NotEmpty@SecretNamepublic String getName() {@@ -42,27 +37,9 @@ public class JobSecret implements Serializable {this.name = name;}- @SuppressWarnings("unused")- private static List<InputCompletion> suggestNames(InputStatus inputStatus) {- Project project = Project.get();- List<InputCompletion> suggestions = new ArrayList<>();- if (project != null) {- for (JobSecret secret: project.getBuildSetting().getJobSecrets()) {- LinearRange match = LinearRange.match(secret.getName(), inputStatus.getContentBeforeCaret());- if (match != null) {- InputCompletion suggestion = new InputCompletion(secret.getName(),- secret.getName() + inputStatus.getContentAfterCaret(),- secret.getName().length(), "override inherited", match);- suggestions.add(suggestion);- }- }- }- return suggestions;- }-@Editable(order=200)- @Password@NotEmpty+ @Multilinepublic String getValue() {return value;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex e23ee8eb85..e35012c306 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -12,6 +12,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;+import io.onedev.server.model.support.build.actionauthorization.CreateTagAuthorization;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -31,6 +33,11 @@ public class ProjectBuildSetting implements Serializable {private transient GlobalBuildSetting globalSetting;+ public ProjectBuildSetting() {+ actionAuthorizations.add(new CloseMilestoneAuthorization());+ actionAuthorizations.add(new CreateTagAuthorization());+ }+public List<JobSecret> getJobSecrets() {return jobSecrets;}@@ -96,15 +103,11 @@ public class ProjectBuildSetting implements Serializable {public boolean isActionAuthorized(Build build, PostBuildAction action) {List<ActionAuthorization> authorizations = getActionAuthorizations();- if (!authorizations.isEmpty()) {- for (ActionAuthorization authorization: authorizations) {- if (authorization.isAuthorized(build, action))- return true;- }- return false;- } else {- return true;+ for (ActionAuthorization authorization: authorizations) {+ if (authorization.matches(action) && build.isOnBranches(authorization.getAuthorizedBranches()))+ return true;}+ return false;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.javaindex 5dcb398a42..73e4ad72b2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java@@ -6,7 +6,6 @@ import java.util.List;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.job.action.PostBuildAction;-import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -42,11 +41,7 @@ public abstract class ActionAuthorization implements Serializable {return new ArrayList<>();}- public boolean isAuthorized(Build build, PostBuildAction postBuildAction) {- return matches(postBuildAction) && build.isOnBranches(getAuthorizedBranches());- }-- protected abstract boolean matches(PostBuildAction postBuildAction);+ public abstract boolean matches(PostBuildAction postBuildAction);public abstract String getActionDescription();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.javadeleted file mode 100644index 69745e7def..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.build.actionauthorization;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class ActionAuthorizationCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public ActionAuthorizationCssResourceReference() {- super(ActionAuthorizationCssResourceReference.class, "action-authorization.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.htmldeleted file mode 100644index 37b5ede8da..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.html+++ /dev/null@@ -1,17 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="action-authorization-edit leave-confirm">- <div class="modal-header">- <button wicket:id="close" type="button" class="close">×</button>- <h4 id="modal-title" class="modal-title">- Action Authorization- </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="Save">- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.htmldeleted file mode 100644index ceaf5a5a6f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="action-authorization-list list">- <table wicket:id="authorizations" class="table table-condensed table-hover"></table>- <div class="foot">- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>- <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.javadeleted file mode 100644index a51d9b46e0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.java+++ /dev/null@@ -1,215 +0,0 @@-package io.onedev.server.web.editable.build.actionauthorization;--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.model.support.build.actionauthorization.ActionAuthorization;-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.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyUpdating;--@SuppressWarnings("serial")-class ActionAuthorizationListEditPanel extends PropertyEditor<List<Serializable>> {-- private final List<ActionAuthorization> authorizations;-- public ActionAuthorizationListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- authorizations = new ArrayList<>();- for (Serializable each: model.getObject()) {- authorizations.add((ActionAuthorization) each);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new ModalLink("addNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new ActionAuthorizationEditPanel(id, authorizations, -1) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(ActionAuthorizationListEditPanel.this);- }-- };- }-- });-- List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));- }-- @Override- public String getCssClass() {- return "minimum actions";- }-- });-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));- }- });-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- String authorizedBranches = rowModel.getObject().getAuthorizedBranches();- if (authorizedBranches != null)- cellItem.add(new Label(componentId, authorizedBranches));- else- cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));- }-- });-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", ActionAuthorizationListEditPanel.this);- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new ActionAuthorizationEditPanel(id, authorizations, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(ActionAuthorizationListEditPanel.this);- }-- };- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- markFormDirty(target);- authorizations.remove(rowModel.getObject());- onPropertyUpdating(target);- target.add(ActionAuthorizationListEditPanel.this);- }-- });- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions";- }-- });-- IDataProvider<ActionAuthorization> dataProvider = new ListDataProvider<ActionAuthorization>() {-- @Override- protected List<ActionAuthorization> getData() {- return authorizations;- }-- };-- DataTable<ActionAuthorization, Void> dataTable;- add(dataTable = new DataTable<ActionAuthorization, Void>("authorizations", 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(authorizations, fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- Collections.swap(authorizations, fromIndex-i, fromIndex-i-1);- }- onPropertyUpdating(target);- target.add(ActionAuthorizationListEditPanel.this);- }-- }.sortable("tbody"));- }-- @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 (ActionAuthorization each: authorizations)- value.add(each);- return value;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.javadeleted file mode 100644index bbe662ac16..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.java+++ /dev/null@@ -1,60 +0,0 @@-package io.onedev.server.web.editable.build.actionauthorization;--import java.io.Serializable;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;--import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.EmptyValueLabel;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyViewer;--@SuppressWarnings("serial")-public class ActionAuthorizationListEditSupport implements EditSupport {-- @Override- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {- Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == ActionAuthorization.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 ActionAuthorizationListViewPanel(id, model.getObject());- } else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());- }- }-- };- }-- @Override- public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new ActionAuthorizationListEditPanel(componentId, descriptor, model);- }-- };- }- }- return null;- }-- @Override- public int getPriority() {- return 0;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.htmldeleted file mode 100644index 6a46b8acb6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:panel>- <div class="def-list action-authorization-list">- <div class="body">- <table wicket:id="authorizations" 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 filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.javadeleted file mode 100644index 81a54a0c3f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.java+++ /dev/null@@ -1,92 +0,0 @@-package io.onedev.server.web.editable.build.actionauthorization;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--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.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-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.model.support.build.actionauthorization.ActionAuthorization;--@SuppressWarnings("serial")-class ActionAuthorizationListViewPanel extends Panel {-- private final List<ActionAuthorization> authorizations = new ArrayList<>();-- public ActionAuthorizationListViewPanel(String id, List<Serializable> elements) {- super(id);-- for (Serializable each: elements)- authorizations.add((ActionAuthorization) each);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));- }-- });-- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {-- @Override- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {- String authorizedBranches = rowModel.getObject().getAuthorizedBranches();- if (authorizedBranches != null)- cellItem.add(new Label(componentId, authorizedBranches));- else- cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));- }-- });-- IDataProvider<ActionAuthorization> dataProvider = new ListDataProvider<ActionAuthorization>() {-- @Override- protected List<ActionAuthorization> getData() {- return authorizations;- }-- };-- add(new DataTable<ActionAuthorization, Void>("authorizations", columns, dataProvider, Integer.MAX_VALUE) {-- @Override- protected void onInitialize() {- super.onInitialize();- addTopToolbar(new HeadersToolbar<Void>(this, null));- addBottomToolbar(new NoRecordsToolbar(this));- }-- });- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new ActionAuthorizationCssResourceReference()));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.css b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.cssdeleted file mode 100644index 2d1f6d0d80..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.css+++ /dev/null@@ -1,3 +0,0 @@-.def-list.action-authorization-list table>tbody>tr>td {- padding: 5px;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.javaindex b65aaeb965..a5ea242498 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.java@@ -1,27 +1,27 @@-package io.onedev.server.web.editable.build.actionauthorization;--import java.io.Serializable;--import javax.validation.constraints.NotNull;--import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class ActionAuthorizationBean implements Serializable {-- private static final long serialVersionUID = 1L;-- private ActionAuthorization authorization;-- @Editable(name="Type", order=100)- @NotNull(message="may not be empty")- public ActionAuthorization getAuthorization() {- return authorization;- }-- public void setAuthorization(ActionAuthorization authorization) {- this.authorization = authorization;- }--}+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ActionAuthorizationBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private ActionAuthorization authorization;++ @Editable(name="Action")+ @NotNull+ public ActionAuthorization getAuthorization() {+ return authorization;+ }++ public void setAuthorization(ActionAuthorization authorization) {+ this.authorization = authorization;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.htmlnew file mode 100644index 0000000000..57ca525b6a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <div class="action-authorization-edit">+ <form wicket:id="form" class="leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">Edit Action Authorization</h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.javasimilarity index 55%rename from server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.javaindex e111deec24..80dc7da106 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.java@@ -1,111 +1,103 @@-package io.onedev.server.web.editable.build.actionauthorization;--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.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;--@SuppressWarnings("serial")-abstract class ActionAuthorizationEditPanel extends Panel {-- private final List<ActionAuthorization> authorizations;-- private final int authorizationIndex;-- public ActionAuthorizationEditPanel(String id, List<ActionAuthorization> authorizations, int authorizationIndex) {- super(id);-- this.authorizations = authorizations;- this.authorizationIndex = authorizationIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- ActionAuthorizationBean bean = new ActionAuthorizationBean();- if (authorizationIndex != -1)- bean.setAuthorization(authorizations.get(authorizationIndex));-- 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(ActionAuthorizationEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", bean);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- ActionAuthorization trigger = bean.getAuthorization();- if (editor.isValid()) {- if (authorizationIndex != -1) {- authorizations.set(authorizationIndex, trigger);- } else {- authorizations.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(ActionAuthorizationEditPanel.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);--}+package io.onedev.server.web.page.project.setting.build;++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 io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+public abstract class ActionAuthorizationEditPanel extends Panel {++ private final int index;++ public ActionAuthorizationEditPanel(String id, int index) {+ super(id);+ this.index = index;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ ActionAuthorizationBean bean = new ActionAuthorizationBean();+ if (index != -1)+ bean.setAuthorization(getProject().getBuildSetting().getActionAuthorizations().get(index));++ BeanEditor editor = BeanContext.edit("editor", bean);+ form.add(editor);++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ });+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ List<ActionAuthorization> authorizations = getProject().getBuildSetting().getActionAuthorizations();+ if (index == -1)+ authorizations.add(bean.getAuthorization());+ else+ authorizations.set(index, bean.getAuthorization());++ OneDev.getInstance(ProjectManager.class).save(getProject());+ onSaved(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ });+ add(form);+ }++ protected abstract Project getProject();++ protected abstract void onCancelled(AjaxRequestTarget target);++ protected abstract void onSaved(AjaxRequestTarget target);+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.javadeleted file mode 100644index 53f53be9c0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class ActionAuthorizationsBean implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();-- @Editable- public List<ActionAuthorization> getActionAuthorizations() {- return actionAuthorizations;- }-- public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {- this.actionAuthorizations = actionAuthorizations;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.htmlindex 2ec20c32ec..e7852fb138 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html@@ -1,13 +1,18 @@<wicket:extend>- <div class="help-block">Define rules to authorize build actions. A build action will be allowed- as long as one rule allows it. All build actions will be allowed if no rules defined</div><div class="action-authorization-list list">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ <div class="help-block">Define rules to authorize build actions. A build action will be allowed+ as long as one rule allows it</div>+ <div class="head clearfix">+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div>- </form>+ </div>+ <div class="body">+ <table wicket:id="authorizations" class="authorizations table table-hover"></table>+ </div></div>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="edit" title="Edit this authorization"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete this authorization"><i class="fa fa-trash"></i></a>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.javaindex 79e6d6a327..976dc1d531 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java@@ -1,19 +1,39 @@package io.onedev.server.web.page.project.setting.build;-import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;-import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+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.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.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+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.model.IModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")public class ActionAuthorizationsPage extends BuildSettingPage {+ private DataTable<ActionAuthorization, Void> authorizationsTable;+public ActionAuthorizationsPage(PageParameters params) {super(params);}@@ -21,28 +41,159 @@ public class ActionAuthorizationsPage extends BuildSettingPage {@Overrideprotected void onInitialize() {super.onInitialize();++ add(new AjaxLink<Void>("addNew") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new ActionAuthorizationEditPanel(id, -1) {++ @Override+ protected Project getProject() {+ return ActionAuthorizationsPage.this.getProject();+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(authorizationsTable);+ close();+ }++ };+ }++ };+ }++ });- ActionAuthorizationsBean bean = new ActionAuthorizationsBean();- bean.setActionAuthorizations(getProject().getBuildSetting().getActionAuthorizations());+ List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();- PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "actionAuthorizations");+ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,+ IModel<ActionAuthorization> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));+ }++ });- Form<?> form = new Form<Void>("form") {+ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {@Override- protected void onSubmit() {- super.onSubmit();- getSession().success("Action authorization rules saved");- getProject().getBuildSetting().setActionAuthorizations(bean.getActionAuthorizations());- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ActionAuthorizationsPage.class,- ActionAuthorizationsPage.paramsOf(getProject()));+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,+ IModel<ActionAuthorization> rowModel) {+ if (rowModel.getObject().getAuthorizedBranches() != null)+ cellItem.add(new Label(componentId, rowModel.getObject().getAuthorizedBranches()));+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));}+ });++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,+ IModel<ActionAuthorization> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", ActionAuthorizationsPage.this);++ int index = cellItem.findParent(Item.class).getIndex();++ fragment.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new ActionAuthorizationEditPanel(id, index) {++ @Override+ protected Project getProject() {+ return ActionAuthorizationsPage.this.getProject();+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(authorizationsTable);+ close();+ }++ };+ }++ };+ }++ });++ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ String message = "Do you really want to delete this authorization?";+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getProject().getBuildSetting().getActionAuthorizations().remove(index);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ Session.get().success("Action authorization deleted");+ target.add(authorizationsTable);+ }++ });++ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ SortableDataProvider<ActionAuthorization, Void> dataProvider = new SortableDataProvider<ActionAuthorization, Void>() {++ @Override+ public Iterator<? extends ActionAuthorization> iterator(long first, long count) {+ return getProject().getBuildSetting().getActionAuthorizations().iterator();+ }++ @Override+ public long size() {+ return getProject().getBuildSetting().getActionAuthorizations().size();+ }++ @Override+ public IModel<ActionAuthorization> model(ActionAuthorization object) {+ return Model.of(object);+ }};- form.add(new NotificationPanel("feedback", form));- form.add(editor);- add(form);++ add(authorizationsTable = new DefaultDataTable<>("authorizations", columns, dataProvider,+ Integer.MAX_VALUE, null));+ authorizationsTable.setOutputMarkupId(true);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.htmlnew file mode 100644index 0000000000..faddc6ac4c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <div class="job-secret-edit">+ <form wicket:id="form" class="leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">Edit Job Secret</h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.javanew file mode 100644index 0000000000..a6857fcdb5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java@@ -0,0 +1,122 @@+package io.onedev.server.web.page.project.setting.build;++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 io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.build.JobSecret;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+public abstract class JobSecretEditPanel extends Panel {++ private final int index;++ public JobSecretEditPanel(String id, int index) {+ super(id);+ this.index = index;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ JobSecret editingSecret;+ if (index != -1) {+ editingSecret = getProject().getBuildSetting().getJobSecrets().get(index);+ editingSecret.setValue(null);+ } else {+ editingSecret = new JobSecret();+ }++ BeanEditor editor = BeanContext.edit("editor", editingSecret);+ form.add(editor);++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ });+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ boolean hasErrors = false;+ List<JobSecret> secrets = getProject().getBuildSetting().getJobSecrets();+ for (int i=0; i<secrets.size(); i++) {+ JobSecret secret = secrets.get(i);+ if (i != index && secret.getName().equals(editingSecret.getName())) {+ editor.error(new Path(new PathNode.Named("name")),+ "Name already been used by another secret");+ hasErrors = true;+ break;+ }+ }+ if (!hasErrors) {+ if (index == -1)+ secrets.add(editingSecret);+ else+ secrets.set(index, editingSecret);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ onSaved(target);+ } else {+ target.add(form);+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancelled(target);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ });+ add(form);+ }++ protected abstract Project getProject();++ protected abstract void onCancelled(AjaxRequestTarget target);++ protected abstract void onSaved(AjaxRequestTarget target);+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.javadeleted file mode 100644index 0f35bf2a2f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.support.build.JobSecret;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class JobSecretsBean implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<JobSecret> secrets = new ArrayList<>();-- @Editable- public List<JobSecret> getSecrets() {- return secrets;- }-- public void setSecrets(List<JobSecret> secrets) {- this.secrets = secrets;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.htmlindex 5be71c975e..8ac6a4e8e0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html@@ -1,12 +1,17 @@<wicket:extend>- <div wicket:id="note" class="help-block"></div><div class="job-secret-list list">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ <div wicket:id="secretsNote" class="help-block"></div>+ <div class="head clearfix">+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div>- </form>+ </div>+ <div class="body">+ <table wicket:id="secrets" class="secrets table table-hover"></table>+ </div></div>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="edit" title="Edit this secret"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete this secret"><i class="fa fa-trash"></i></a>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.javaindex cbe59bbaec..a0084aac96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java@@ -1,24 +1,40 @@package io.onedev.server.web.page.project.setting.build;-import java.io.Serializable;-import java.util.HashSet;-import java.util.Set;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+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.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.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.model.support.inputspec.SecretInput;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")public class JobSecretsPage extends BuildSettingPage {+ private DataTable<JobSecret, Void> secretsTable;+public JobSecretsPage(PageParameters params) {super(params);}@@ -29,39 +45,159 @@ public class JobSecretsPage extends BuildSettingPage {String note = String.format("Define job secrets to be used in build spec. Secret value less "+ "than %d characters will not be masked in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));+ add(new Label("secretsNote", note).setEscapeModelStrings(false));++ add(new AjaxLink<Void>("addNew") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new JobSecretEditPanel(id, -1) {++ @Override+ protected Project getProject() {+ return JobSecretsPage.this.getProject();+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(secretsTable);+ close();+ }++ };+ }++ };+ }++ });- JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getProject().getBuildSetting().getJobSecrets());+ List<IColumn<JobSecret, Void>> columns = new ArrayList<>();- PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "secrets");+ columns.add(new AbstractColumn<JobSecret, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobSecret>> cellItem, String componentId,+ IModel<JobSecret> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));+ }++ });++ columns.add(new AbstractColumn<JobSecret, Void>(Model.of("Authorized Branches")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobSecret>> cellItem, String componentId,+ IModel<JobSecret> rowModel) {+ if (rowModel.getObject().getAuthorizedBranches() != null)+ cellItem.add(new Label(componentId, rowModel.getObject().getAuthorizedBranches()));+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));+ }++ });- Form<?> form = new Form<Void>("form") {+ columns.add(new AbstractColumn<JobSecret, Void>(Model.of("")) {@Override- protected void onSubmit() {- super.onSubmit();+ public void populateItem(Item<ICellPopulator<JobSecret>> cellItem, String componentId,+ IModel<JobSecret> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", JobSecretsPage.this);+ int index = cellItem.findParent(Item.class).getIndex();++ fragment.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new JobSecretEditPanel(id, index) {++ @Override+ protected Project getProject() {+ return JobSecretsPage.this.getProject();+ }++ @Override+ protected void onCancelled(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(secretsTable);+ close();+ }++ };+ }++ };+ }++ });- Set<String> names = new HashSet<>();- for (JobSecret secret: bean.getSecrets()) {- if (names.contains(secret.getName())) {- error("Duplicate name found: " + secret.getName());- return;- } else {- names.add(secret.getName());+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ String message = "Do you really want to delete secret '" + rowModel.getObject().getName() + "'?";+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getProject().getBuildSetting().getJobSecrets().remove(index);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ Session.get().success("Secret '" + rowModel.getObject().getName() + "' deleted");+ target.add(secretsTable);}- }- getSession().success("Job secrets saved");- getProject().getBuildSetting().setJobSecrets(bean.getSecrets());- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(JobSecretsPage.class, JobSecretsPage.paramsOf(getProject()));++ });++ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";}+ });++ SortableDataProvider<JobSecret, Void> dataProvider = new SortableDataProvider<JobSecret, Void>() {++ @Override+ public Iterator<? extends JobSecret> iterator(long first, long count) {+ return getProject().getBuildSetting().getJobSecrets().iterator();+ }++ @Override+ public long size() {+ return getProject().getBuildSetting().getJobSecrets().size();+ }++ @Override+ public IModel<JobSecret> model(JobSecret object) {+ return Model.of(object);+ }};- form.add(new NotificationPanel("feedback", form));- form.add(editor);- add(form);+ add(secretsTable = new DefaultDataTable<>("secrets", columns, dataProvider,+ Integer.MAX_VALUE, null));+ secretsTable.setOutputMarkupId(true);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex abaedaa99d..86776d0e39 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -84,4 +84,9 @@ body.BranchProtectionsPage, body.TagProtectionsPage, body.WebHooksPage {body.SecretListPage .help-block {margin: 0 0 16px 0;+}++.job-secret-edit textarea {+ font-family: monospace;+ height: 200px !important;}\ No newline at end of file