Skip to content

The Unified and Autonomous Development Platform

Added ui components for keys

Andrea Del Beneb1bbd396cc95
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java
index 2696e12ac3..c9598a93d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.my.sshkeys;
+import java.util.Collection;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -15,7 +16,7 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
-public class InsertSshKeyPanel extends Panel {
+public abstract class InsertSshKeyPanel extends Panel {
private ModalPanel modal;
private User user;
@@ -30,7 +31,7 @@ public class InsertSshKeyPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
-
+ Collection<SshKey> sshKeys = user.getSshKeys();
add(new AjaxLink<Void>("close") {
@Override
@@ -63,9 +64,9 @@ public class InsertSshKeyPanel extends Panel {
dao.persist(sshKey);
- System.out.println("Number of keys: " + dao.count(SshKey.class));
-
modal.close();
+
+ onSave(target);
}
});
@@ -76,4 +77,6 @@ public class InsertSshKeyPanel extends Panel {
add(form);
}
+
+ protected abstract void onSave(AjaxRequestTarget target);
}
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.html
index e3568b69f6..e637c0cb74 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
@@ -1,4 +1,17 @@
<wicket:extend>
<div class="page-title">Ssh Keys</div>
- <div wicket:id="content">ciao</div>
+ <div class="body">
+ <div wicket:id="keyList">
+ <table class="table">
+ <tr><th>Name</th><th>Owner</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><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
+ class="fa fa-plus"></i> New Ssh Key</a>
</wicket:extend>
\ No newline at end of file
diff --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.java
index 72a234975e..5f02ccb92e 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
@@ -1,7 +1,20 @@
package io.onedev.server.web.page.my.sshkeys;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.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.UserManager;
+import io.onedev.server.model.SshKey;
+import io.onedev.server.model.User;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.my.MyPage;
@@ -17,13 +30,52 @@ public class MySshKeysPage extends MyPage {
protected void onInitialize() {
super.onInitialize();
+ User user = getLoginUser();
+ WebMarkupContainer keyList = new WebMarkupContainer("keyList");
+
add(new ModalLink("content") {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new InsertSshKeyPanel(id, modal, getLoginUser());
+ return new InsertSshKeyPanel(id, modal, user) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(keyList);
+ }};
}
});
+
+
+
+ LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {
+
+ @Override
+ protected List<SshKey> load() {
+ return new ArrayList<>(user.getSshKeys());
+ }
+
+ };
+
+ 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 AjaxLink<Void>("delete") {
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ user.getSshKeys().remove(sshKey);
+ OneDev.getInstance(UserManager.class).save(user);
+ target.add(keyList);
+ }
+ });
+ }
+ }).setOutputMarkupId(true);
+
+ add(keyList);
}
}