Changeset 5844

Timestamp:

11/24/14 08:35:50 (10 years ago)

Author:

Twan Goosen

Message:

Drop downs for groups and users in Groups management (admin pages)

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• frontend/Groups.html (modified) (2 diffs)
• frontend/Groups.java (modified) (8 diffs)
• model/RegistryUser.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/Groups.html

@@ -24 +24 @@
 
         <h2>Groups</h2>
-        <ul>
-            <li wicket:id="groups">
-                <span wicket:id="name">[name]</span>
-                <a wicket:id="select">[Select]</a>
-            </li>
-        </ul>
+        <form wicket:id="groups">
+            <select wicket:id="group">
+                <option>Group 1</option>
+            </select>
+            <input type="submit" value="Select" />
+        </form>
+
 
         <div wicket:id="group" style="border: 1px dashed; padding-left: 2em;">
@@ -37 +38 @@
             <form wicket:id="newMember">
                 <div wicket:id="feedback"></div>            
-                Principal name: <input type="text" wicket:id="principal" /> <br />
+                Principal name: 
+                <select wicket:id="principal">
+                    <option>user</option>
+                </select>
                 <input type="submit" value="Add member" />
             </form>

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/Groups.java

@@ -6 +6 @@
 import clarin.cmdi.componentregistry.impl.database.ValidationException;
 import clarin.cmdi.componentregistry.model.RegistryUser;
+import clarin.cmdi.componentregistry.persistence.jpa.UserDao;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
 import java.util.Collections;
 import java.util.List;
@@ -14 +16 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -25 +27 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -32 +36 @@
 public class Groups extends SecureAdminWebPage {
 
+    private final static Logger logger = LoggerFactory.getLogger(Groups.class);
+
     @SpringBean
     private GroupService groupService;
+    @SpringBean
+    private UserDao userDao;
     private final IModel<Long> selectedGroup = new Model<Long>(null);
 
@@ -69 +77 @@
 
     private Component createGroupList(String id) {
-        final IModel<List> groupsModel = new AbstractReadOnlyModel<List>() {
-
-            @Override
-            public List getObject() {
+        final IModel<String> groupModel = new Model<String>(null);
+        final Form form = new Form(id) {
+
+            @Override
+            protected void onSubmit() {
+                final String groupName = groupModel.getObject();
+                if (groupName != null) {
+                    try {
+                        final Long groupId = (Long) groupService.getGroupIdByName(groupName);
+                        selectedGroup.setObject(groupId);
+                    } catch (ItemNotFoundException ex) {
+                        logger.warn("Could", ex);
+                        selectedGroup.setObject(null);
+                    }
+                }
+            }
+
+        };
+
+        // model for group options
+        final IModel<List<String>> groupsModel = new AbstractReadOnlyModel<List<String>>() {
+
+            @Override
+            public List<String> getObject() {
                 return groupService.listGroupNames();
             }
         };
 
-        return new ListView(id, groupsModel) {
-
-            @Override
-            protected void populateItem(final ListItem li) {
-                li.add(new Label("name", li.getModel()));
-                li.add(new Link("select") {
-
-                    @Override
-                    public void onClick() {
-                        final String groupName = (String) li.getModelObject();
-                        try {
-                            final Long groupId = (Long) groupService.getGroupIdByName(groupName);
-                            selectedGroup.setObject(groupId);
-                        } catch (ItemNotFoundException ex) {
-                            selectedGroup.setObject(null);
-                        }
-                    }
-                });
-            }
-        };
-
+        // group selector
+        final DropDownChoice<String> groupChoice = new DropDownChoice<String>("group", groupModel, groupsModel);
+        groupChoice.setRequired(true);
+        form.add(groupChoice);
+
+        return form;
     }
 
@@ -129 +142 @@
 
     private Form createNewMemberForm(String id) {
-        final IModel<String> principalModel = new Model<String>("");
+        final IModel<RegistryUser> principalModel = new Model<RegistryUser>(null);
         final Form memberForm = new Form(id) {
 
@@ -136 +149 @@
                 try {
                     final String groupName = groupService.getGroupNameById(selectedGroup.getObject());
-                    groupService.makeMember(principalModel.getObject(), groupName);
+                    groupService.makeMember(principalModel.getObject().getPrincipalName(), groupName);
                     info("User " + principalModel.getObject() + " added to group");
                 } catch (ItemNotFoundException ex) {
@@ -145 +158 @@
         };
         memberForm.add(new FeedbackPanel("feedback"));
-        memberForm.add(new TextField("principal", principalModel).setRequired(true));
+
+        final IModel<List<RegistryUser>> usersModel = new AbstractReadOnlyModel<List<RegistryUser>>() {
+
+            @Override
+            public List<RegistryUser> getObject() {
+                // return all users sorted by their tostring value (ignoring case)
+                return new Ordering<Object>() {
+
+                    @Override
+                    public int compare(Object t, Object t1) {
+                        return t.toString().compareToIgnoreCase(t1.toString());
+                    }
+
+                }.sortedCopy(userDao.getAllUsers());
+            }
+        };
+
+        final DropDownChoice<RegistryUser> usersChoice = new DropDownChoice<RegistryUser>("principal", principalModel, usersModel);
+        usersChoice.setRequired(true);
+        memberForm.add(usersChoice);
         return memberForm;
     }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/RegistryUser.java

@@ -24 +24 @@
     @Column(name = "name")
     private String name;
-    
-    @Column(name = "principal_name", unique=true)
+
+    @Column(name = "principal_name", unique = true)
     private String principalName;
-    
+
     @Id
-    @SequenceGenerator( name = "registry_user_id_seq", sequenceName = "registry_user_id_seq", allocationSize = 1, initialValue = 1 )
-    @GeneratedValue( strategy = GenerationType.SEQUENCE, generator = "registry_user_id_seq" )
+    @SequenceGenerator(name = "registry_user_id_seq", sequenceName = "registry_user_id_seq", allocationSize = 1, initialValue = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "registry_user_id_seq")
     @Column(name = "id")
     private Long id;
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name;
     }
 
     public String getName() {
-        return name;
+        return name;
     }
 
     public void setPrincipalName(String principalName) {
-        this.principalName = principalName;
+        this.principalName = principalName;
     }
 
     public String getPrincipalName() {
-        return principalName;
+        return principalName;
     }
 
     public Long getId() {
-        return id;
+        return id;
     }
 
     public void setId(Long id) {
-        this.id = id;
+        this.id = id;
     }
+
+    @Override
+    public String toString() {
+        if (getName() == null) {
+            return getPrincipalName();
+        } else {
+            return String.format("%s [%s]", getName(), getPrincipalName());
+        }
+    }
+
 }