The Unified and Autonomous Development Platform
Introduced panel SshKeysListPanel to show ssh keys list
Andrea Del Beneedb1147c0011
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.htmlindex f7a711798f..0a95c62926 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html@@ -2,18 +2,8 @@<div class="page-title">Ssh Keys</div><div class="body"><div wicket:id="keyList">- <table class="table">- <tr><th>Name</th><th>Owner</th><th>Digest</th><th>Creation time</th><th></th></tr>- <tr wicket:id="keys" class="even">- <td><span wicket:id="name">Test ID</span></td>- <td><span wicket:id="owner">Test ID</span></td>- <td><span wicket:id="digest">Test ID</span></td>- <td><span wicket:id="timestamp">Test ID</span></td>- <td><a class="btn btn-danger" wicket:id="delete">Delete</a></td>- </tr>- </table></div></div>- <a class="add-new btn btn-success" wicket:id="content"><i+ <a class="add-new btn btn-success" wicket:id="newKey"><iclass="fa fa-plus"></i> New Ssh Key</a></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex 9dacd4eb89..89e6b161f8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -4,20 +4,12 @@ import java.time.format.DateTimeFormatter;import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxCallListener;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.my.MyPage;@@ -36,9 +28,19 @@ public class MySshKeysPage extends MyPage {super.onInitialize();User user = getLoginUser();- WebMarkupContainer keyList = new WebMarkupContainer("keyList");- add(new ModalLink("content") {+ LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {+ @Override+ protected List<SshKey> load() {+ SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);+ return sshKeyManager.loadUserKeys(user);+ }++ };++ SshKeysListPanel keyList = new SshKeysListPanel("keyList", detachableModel);++ add(new ModalLink("newKey") {@Overrideprotected Component newContent(String id, ModalPanel modal) {@@ -51,50 +53,7 @@ public class MySshKeysPage extends MyPage {}});- LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {- @Override- protected List<SshKey> load() {- SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);- return sshKeyManager.loadUserKeys(user);- }-- };-- keyList.add(new ListView<SshKey>("keys", detachableModel)- {- public void populateItem(final ListItem<SshKey> item)- {- final SshKey sshKey = item.getModelObject();- item.add(new Label("name", sshKey.getName()));- item.add(new Label("owner", sshKey.getOwner().getName()));- item.add(new Label("digest", sshKey.getDigest()));- item.add(new Label("timestamp", sshKey.getTimestamp().format(formatter)));- item.add(new AjaxLink<Void>("delete") {- @Override- public void onClick(AjaxRequestTarget target) {- Dao dao = OneDev.getInstance(Dao.class);- dao.remove(sshKey);- target.add(keyList);- }-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- AjaxCallListener myAjaxCallListener = new AjaxCallListener() {-- @Override- public CharSequence getPrecondition(Component component) {- return "return confirm(\"Are you sure you want to delete key \'"- + sshKey.getName() + "\'?\")";- }- };- attributes.getAjaxCallListeners().add(myAjaxCallListener);- }- });- }- }).setOutputMarkupId(true);-- add(keyList);+ add(keyList.setOutputMarkupId(true));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.htmlnew file mode 100644index 0000000000..c455044bf2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html@@ -0,0 +1,23 @@+<!DOCTYPE html>+<html>+<head>+<meta charset="UTF-8">+<title>Insert title here</title>+</head>+<body>+ <wicket:panel>+ <div wicket:id="keyList">+ <table class="table">+ <tr><th>Name</th><th>Owner</th><th>Digest</th><th>Creation time</th><th></th></tr>+ <tr wicket:id="keys" class="even">+ <td><span wicket:id="name">Test ID</span></td>+ <td><span wicket:id="owner">Test ID</span></td>+ <td><span wicket:id="digest">Test ID</span></td>+ <td><span wicket:id="timestamp">Test ID</span></td>+ <td><a class="btn btn-danger" wicket:id="delete">Delete</a></td>+ </tr>+ </table>+ </div>+ </wicket:panel>+</body>+</html>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.javanew file mode 100644index 0000000000..bf3b06b756--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java@@ -0,0 +1,83 @@+package io.onedev.server.web.page.my.sshkeys;++import java.time.format.DateTimeFormatter;+import java.util.List;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxCallListener;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import io.onedev.server.OneDev;+import io.onedev.server.model.SshKey;+import io.onedev.server.persistence.dao.Dao;++public class SshKeysListPanel extends Panel {++ /**+ *+ */+ private static final long serialVersionUID = 1L;+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");++ public SshKeysListPanel(String id, IModel<List<SshKey>> model) {+ super(id);+ WebMarkupContainer keyList = new WebMarkupContainer("keyList");++ keyList.add(new ListView<SshKey>("keys", model)+ {+ /**+ *+ */+ private static final long serialVersionUID = 1L;++ public void populateItem(final ListItem<SshKey> item)+ {+ final SshKey sshKey = item.getModelObject();+ item.add(new Label("name", sshKey.getName()));+ item.add(new Label("owner", sshKey.getOwner().getName()));+ item.add(new Label("digest", sshKey.getDigest()));+ item.add(new Label("timestamp", sshKey.getTimestamp().format(formatter)));+ item.add(new AjaxLink<Void>("delete") {+ /**+ *+ */+ private static final long serialVersionUID = 1L;++ @Override+ public void onClick(AjaxRequestTarget target) {+ Dao dao = OneDev.getInstance(Dao.class);+ dao.remove(sshKey);+ target.add(keyList);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ AjaxCallListener myAjaxCallListener = new AjaxCallListener() {++ /**+ *+ */+ private static final long serialVersionUID = 1L;++ @Override+ public CharSequence getPrecondition(Component component) {+ return "return confirm(\"Are you sure you want to delete key \'"+ + sshKey.getName() + "\'?\")";+ }+ };+ attributes.getAjaxCallListeners().add(myAjaxCallListener);+ }+ });+ }+ });++ add(keyList);+ }+}