The Unified and Autonomous Development Platform
Minor UI improvements
Robin Shen8d97a174dc2b
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.javaindex 26bb919be5..ad46359f07 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java@@ -20,11 +20,16 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;@Editablepublic class ServiceDeskSetting implements Serializable {private static final long serialVersionUID = 1L;++ public static final String PROP_SENDER_AUTHORIZATIONS = "senderAuthorizations";++ public static final String PROP_DEFAULT_PROJECT_DESIGNATIONS = "defaultProjectDesignations";private List<SenderAuthorization> senderAuthorizations = new ArrayList<>();@@ -32,6 +37,8 @@ public class ServiceDeskSetting implements Serializable {private List<IssueCreationSetting> issueCreationSettings = new ArrayList<>();+ @Editable+ @OmitNamepublic List<SenderAuthorization> getSenderAuthorizations() {return senderAuthorizations;}@@ -40,6 +47,8 @@ public class ServiceDeskSetting implements Serializable {this.senderAuthorizations = senderAuthorizations;}+ @Editable+ @OmitNamepublic List<DefaultProjectDesignation> getDefaultProjectDesignations() {return defaultProjectDesignations;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.htmldeleted file mode 100644index cb67389d0c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.html+++ /dev/null@@ -1,15 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="default-project-designation-edit leave-confirm">- <div class="modal-header">- <h5 id="modal-title" class="modal-title">Default Project</h5>- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>- </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-secondary">Cancel</a>- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.javadeleted file mode 100644index 430ffa6c96..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationEditPanel.java+++ /dev/null@@ -1,111 +0,0 @@-package io.onedev.server.web.page.admin.servicedesk;--import java.util.List;--import org.apache.commons.lang3.SerializationUtils;-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.administration.DefaultProjectDesignation;-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 DefaultProjectDesignationEditPanel extends Panel {-- private final int designationIndex;-- public DefaultProjectDesignationEditPanel(String id, int designationIndex) {- super(id);-- this.designationIndex = designationIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- DefaultProjectDesignation designation;- if (designationIndex != -1)- designation = SerializationUtils.clone(getSettings().get(designationIndex));- else- designation = new DefaultProjectDesignation();-- 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(DefaultProjectDesignationEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", designation);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (editor.isValid()) {- if (designationIndex != -1)- getSettings().set(designationIndex, designation);- else- getSettings().add(designation);- 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(DefaultProjectDesignationEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- protected abstract List<DefaultProjectDesignation> getSettings();-- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.htmlindex 4a0500c08d..d7685fa22f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html@@ -3,13 +3,12 @@<div class="card-body"><div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues viaemail directly. If such email is sent to system email address directly without specifying project, OneDev- will use default projects defined here to decide where to create issues</div>- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="designations" class="table table-hover"></table>+ will use default projects defined here to decide where to create issues. For a particular sender, the first+ matching entry will take effect</div>+ <form wicket:id="form" class="default-project-designations leave-confirm">+ <div wicket:id="editor"></div>+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">+ </form></div></div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.javaindex 8415d07fb8..99d0833858 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java@@ -1,238 +1,44 @@package io.onedev.server.web.page.admin.servicedesk;-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.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.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.ComponentTag;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.LoopItem;-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.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.DefaultProjectDesignation;import io.onedev.server.model.support.administration.ServiceDeskSetting;-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.behavior.NoRecordsBehavior;-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.component.svg.SpriteImage;+import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class DefaultProjectDesignationListPage extends AdministrationPage {- private final List<DefaultProjectDesignation> designations;-public DefaultProjectDesignationListPage(PageParameters params) {super(params);- designations = getSettingManager().getServiceDeskSetting().getDefaultProjectDesignations();}- private DataTable<DefaultProjectDesignation, Void> designationsTable;-@Overrideprotected void onInitialize() {super.onInitialize();- add(new ModalLink("addNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new DefaultProjectDesignationEditPanel(id, -1) {-- @Override- protected void onSave(AjaxRequestTarget target) {- saveSettings();- target.add(designationsTable);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }+ ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();- @Override- protected List<DefaultProjectDesignation> getSettings() {- return designations;- }-- };- }+ Form<?> form = new Form<Void>("form") {@Override- protected String getModalCssClass() {- return "modal-lg";+ protected void onSubmit() {+ super.onSubmit();+ getSettingManager().saveServiceDeskSetting(setting);}- });-- List<IColumn<DefaultProjectDesignation, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<DefaultProjectDesignation>> cellItem, String componentId, IModel<DefaultProjectDesignation> rowModel) {- cellItem.add(new SpriteImage(componentId, "grip") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon drag-indicator");- }-- });- }-- @Override- public String getCssClass() {- return "minimum actions";- }-- });-- columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("Applicable Senders")) {-- @Override- public void populateItem(Item<ICellPopulator<DefaultProjectDesignation>> cellItem, String componentId, IModel<DefaultProjectDesignation> rowModel) {- DefaultProjectDesignation designation = rowModel.getObject();- if (designation.getSenderEmails() != null)- cellItem.add(new Label(componentId, designation.getSenderEmails()));- else- cellItem.add(new Label(componentId, "<i>Any sender</i>").setEscapeModelStrings(false));- }-- });-- columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("Default Project")) {-- @Override- public void populateItem(Item<ICellPopulator<DefaultProjectDesignation>> cellItem, String componentId, IModel<DefaultProjectDesignation> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getDefaultProject()));- }-- });-- columns.add(new AbstractColumn<DefaultProjectDesignation, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<DefaultProjectDesignation>> cellItem, String componentId, IModel<DefaultProjectDesignation> rowModel) {- int designationIndex = cellItem.findParent(LoopItem.class).getIndex();-- Fragment fragment = new Fragment(componentId, "actionColumnFrag", DefaultProjectDesignationListPage.this);- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new DefaultProjectDesignationEditPanel(id, designationIndex) {-- @Override- protected void onSave(AjaxRequestTarget target) {- saveSettings();- target.add(designationsTable);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected List<DefaultProjectDesignation> getSettings() {- return designations;- }-- };- }-- @Override- protected String getModalCssClass() {- return "modal-lg";- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this entry?"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- designations.remove(designationIndex);- saveSettings();- target.add(designationsTable);- }-- });-- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions";- }-- });-- IDataProvider<DefaultProjectDesignation> dataProvider = new ListDataProvider<DefaultProjectDesignation>() {-- @Override- protected List<DefaultProjectDesignation> getData() {- return designations;- }-};- add(designationsTable = new DataTable<DefaultProjectDesignation, Void>("designations", columns, dataProvider, Integer.MAX_VALUE));- designationsTable.addTopToolbar(new HeadersToolbar<Void>(designationsTable, null));- designationsTable.addBottomToolbar(new NoRecordsToolbar(designationsTable));- designationsTable.add(new NoRecordsBehavior());- designationsTable.setOutputMarkupId(true);-- designationsTable.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(designations, fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- Collections.swap(designations, fromIndex-i, fromIndex-i-1);- }- saveSettings();- target.add(designationsTable);- }-- }.sortable("tbody"));+ form.add(BeanContext.edit("editor", setting,+ Lists.newArrayList(ServiceDeskSetting.PROP_DEFAULT_PROJECT_DESIGNATIONS), false));+ add(form);}@Override@@ -244,10 +50,4 @@ public class DefaultProjectDesignationListPage extends AdministrationPage {return OneDev.getInstance(SettingManager.class);}- private void saveSettings() {- ServiceDeskSetting designation = getSettingManager().getServiceDeskSetting();- designation.setDefaultProjectDesignations(designations);- getSettingManager().saveServiceDeskSetting(designation);- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.htmlindex 0a987c36f5..c35ec960fe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html@@ -3,7 +3,7 @@<div class="card-body"><div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues viaemail directly. Upon receiving such email, OneDev will use issue creation settings defined here to decide- how to create the issue. Default issue settings will be used if no entry matches</div>+ how to create the issue. For a particular sender and project, the first matching entry will take effect</div><a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue creation setting"><wicket:svg href="plus" class="icon"></wicket:svg></a><table wicket:id="issueCreationSettings" class="table table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.htmldeleted file mode 100644index a5bdbc3649..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.html+++ /dev/null@@ -1,15 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="sender-authorization-edit leave-confirm">- <div class="modal-header">- <h5 id="modal-title" class="modal-title">Sender Authorization</h5>- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>- </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-secondary">Cancel</a>- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.javadeleted file mode 100644index e7e75f18d1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationEditPanel.java+++ /dev/null@@ -1,111 +0,0 @@-package io.onedev.server.web.page.admin.servicedesk;--import java.util.List;--import org.apache.commons.lang3.SerializationUtils;-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.administration.SenderAuthorization;-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 SenderAuthorizationEditPanel extends Panel {-- private final int authorizationIndex;-- public SenderAuthorizationEditPanel(String id, int authorizationIndex) {- super(id);-- this.authorizationIndex = authorizationIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- SenderAuthorization authorization;- if (authorizationIndex != -1)- authorization = SerializationUtils.clone(getAuthorizations().get(authorizationIndex));- else- authorization = new SenderAuthorization();-- 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(SenderAuthorizationEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", authorization);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (editor.isValid()) {- if (authorizationIndex != -1)- getAuthorizations().set(authorizationIndex, authorization);- else- getAuthorizations().add(authorization);- 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(SenderAuthorizationEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- protected abstract List<SenderAuthorization> getAuthorizations();-- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.htmlindex 001af08b23..a82fd1ccf3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html@@ -4,13 +4,12 @@<div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues, postissue or pull request comments via email directly. When sender email address can not be mapped to an existinguser, OneDev will use sender authorizations defined here to determine if the sender has permission to execute- relevant actions</div>- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add sender authorization"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <table wicket:id="authorizations" class="table table-hover"></table>+ relevant actions. For a particular sender, the first matching entry will take effect</div>++ <form wicket:id="form" class="sender-authorizations leave-confirm">+ <div wicket:id="editor"></div>+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">+ </form></div></div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.javaindex 2da52a6291..c7f9173bff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java@@ -1,267 +1,53 @@package io.onedev.server.web.page.admin.servicedesk;-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.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.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.ComponentTag;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.LoopItem;-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.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.SenderAuthorization;import io.onedev.server.model.support.administration.ServiceDeskSetting;-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.behavior.NoRecordsBehavior;-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.component.svg.SpriteImage;+import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class SenderAuthorizationListPage extends AdministrationPage {- private final List<SenderAuthorization> authorizations;-public SenderAuthorizationListPage(PageParameters params) {super(params);- authorizations = getSettingManager().getServiceDeskSetting().getSenderAuthorizations();}- private DataTable<SenderAuthorization, Void> authorizationsTable;-@Overrideprotected void onInitialize() {super.onInitialize();- add(new ModalLink("addNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new SenderAuthorizationEditPanel(id, -1) {-- @Override- protected void onSave(AjaxRequestTarget target) {- saveAuthorizations();- target.add(authorizationsTable);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected List<SenderAuthorization> getAuthorizations() {- return authorizations;- }-- };- }-- @Override- protected String getModalCssClass() {- return "modal-lg";- }-- });-- List<IColumn<SenderAuthorization, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {- cellItem.add(new SpriteImage(componentId, "grip") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon drag-indicator");- }-- });- }-- @Override- public String getCssClass() {- return "minimum actions";- }-- });-- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Applicable Senders")) {-- @Override- public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {- SenderAuthorization authorization = rowModel.getObject();- if (authorization.getSenderEmails() != null)- cellItem.add(new Label(componentId, authorization.getSenderEmails()));- else- cellItem.add(new Label(componentId, "<i>Any sender</i>").setEscapeModelStrings(false));- }-- });-- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Authorized Projects")) {+ ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();- @Override- public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {- SenderAuthorization authorization = rowModel.getObject();- if (authorization.getAuthorizedProjects() != null)- cellItem.add(new Label(componentId, authorization.getAuthorizedProjects()));- else- cellItem.add(new Label(componentId, "<i>Any project</i>").setEscapeModelStrings(false));- }-- });-- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Authorized Role")) {+ Form<?> form = new Form<Void>("form") {@Override- public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {- SenderAuthorization authorization = rowModel.getObject();- cellItem.add(new Label(componentId, authorization.getAuthorizedRoleName()));+ protected void onSubmit() {+ super.onSubmit();+ getSettingManager().saveServiceDeskSetting(setting);}- });-- columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId, IModel<SenderAuthorization> rowModel) {- int authorizationIndex = cellItem.findParent(LoopItem.class).getIndex();-- Fragment fragment = new Fragment(componentId, "actionColumnFrag", SenderAuthorizationListPage.this);- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new SenderAuthorizationEditPanel(id, authorizationIndex) {-- @Override- protected void onSave(AjaxRequestTarget target) {- saveAuthorizations();- target.add(authorizationsTable);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected List<SenderAuthorization> getAuthorizations() {- return authorizations;- }-- };- }-- @Override- protected String getModalCssClass() {- return "modal-lg";- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this entry?"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- authorizations.remove(authorizationIndex);- saveAuthorizations();- target.add(authorizationsTable);- }-- });-- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions";- }-- });-- IDataProvider<SenderAuthorization> dataProvider = new ListDataProvider<SenderAuthorization>() {-- @Override- protected List<SenderAuthorization> getData() {- return authorizations;- }-};- add(authorizationsTable = new DataTable<SenderAuthorization, Void>("authorizations", columns, dataProvider, Integer.MAX_VALUE));- authorizationsTable.addTopToolbar(new HeadersToolbar<Void>(authorizationsTable, null));- authorizationsTable.addBottomToolbar(new NoRecordsToolbar(authorizationsTable));- authorizationsTable.add(new NoRecordsBehavior());- authorizationsTable.setOutputMarkupId(true);-- authorizationsTable.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);- }- saveAuthorizations();- target.add(authorizationsTable);- }-- }.sortable("tbody"));+ form.add(BeanContext.edit("editor", setting,+ Lists.newArrayList(ServiceDeskSetting.PROP_SENDER_AUTHORIZATIONS), false));+ add(form);}@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Service Authorizations");+ return new Label(componentId, "Sender Authorizations");}private SettingManager getSettingManager() {return OneDev.getInstance(SettingManager.class);}- private void saveAuthorizations() {- ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();- setting.setSenderAuthorizations(authorizations);- getSettingManager().saveServiceDeskSetting(setting);- }-}