Convert more datatables

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/cluster/ClusterController.java

@@ -98,6 +98,7 @@ public String datatable(
             .withRequestParams(allParams)
             .withUrl("/cluster")
             .withLabel("Kafka Clusters")
+            // Name Column
             .withColumn(DatatableColumn.newBuilder(Cluster.class)
                 .withFieldName("name")
                 .withLabel("Cluster")
@@ -107,6 +108,7 @@ public String datatable(
                 ))
                 .withIsSortable(true)
                 .build())
+            // Views Column
             .withColumn(DatatableColumn.newBuilder(Cluster.class)
                 .withFieldName("id")
                 .withLabel("Views")
@@ -116,12 +118,20 @@ public String datatable(
                 ))
                 .withIsSortable(false)
                 .build())
+            // SSL Column
             .withColumn(DatatableColumn.newBuilder(Cluster.class)
                 .withFieldName("isSslEnabled")
-                .withLabel("SSL")
+                .withLabel("SSL Enabled")
                 .withRenderTemplate(new YesNoBadgeTemplate<>(Cluster::isSslEnabled))
                 .withIsSortable(true)
                 .build())
+            // SASL Column
+            .withColumn(DatatableColumn.newBuilder(Cluster.class)
+                .withFieldName("isSaslEnabled")
+                .withLabel("SASL Enabled")
+                .withRenderTemplate(new YesNoBadgeTemplate<>(Cluster::isSaslEnabled))
+                .withIsSortable(true)
+                .build())
             .withSearch("name");
 
         // Add datatable attribute

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/user/UserController.java

@@ -29,23 +29,30 @@
 import org.sourcelab.kafka.webview.ui.controller.configuration.user.forms.UserForm;
 import org.sourcelab.kafka.webview.ui.manager.ui.BreadCrumbManager;
 import org.sourcelab.kafka.webview.ui.manager.ui.FlashMessage;
+import org.sourcelab.kafka.webview.ui.manager.ui.datatable.ActionTemplate;
+import org.sourcelab.kafka.webview.ui.manager.ui.datatable.ConstraintOperator;
+import org.sourcelab.kafka.webview.ui.manager.ui.datatable.Datatable;
+import org.sourcelab.kafka.webview.ui.manager.ui.datatable.DatatableColumn;
 import org.sourcelab.kafka.webview.ui.manager.user.UserManager;
 import org.sourcelab.kafka.webview.ui.model.User;
 import org.sourcelab.kafka.webview.ui.model.UserRole;
 import org.sourcelab.kafka.webview.ui.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -68,7 +75,12 @@ public class UserController extends BaseController {
      * GET Displays main user index.
      */
     @RequestMapping(path = "", method = RequestMethod.GET)
-    public String index(final UserForm userForm, final Model model, final RedirectAttributes redirectAttributes) {
+    public String index(
+        final Model model,
+        final Pageable pageable,
+        @RequestParam Map<String,String> allParams,
+        final RedirectAttributes redirectAttributes
+    ) {
         // Setup breadcrumbs
         setupBreadCrumbs(model, null, null);
 
@@ -77,10 +89,71 @@ public String index(final UserForm userForm, final Model model, final RedirectAt
             return "redirect:/";
         }
 
-        // Retrieve all users
-        final Iterable<User> usersList = userRepository.findAllByIsActiveOrderByEmailAsc(true);
-        model.addAttribute("users", usersList);
-
+        final Datatable.Builder<User> builder = Datatable.newBuilder(User.class)
+            .withRepository(userRepository)
+            .withPageable(pageable)
+            .withRequestParams(allParams)
+            .withUrl("/configuration/user")
+            .withLabel("Users")
+            // Only show active users.
+            .withConstraint("isActive", true, ConstraintOperator.EQUALS)
+            // With Create Link
+            .withCreateLink("/configuration/user/create")
+            // Email Column
+            .withColumn(DatatableColumn.newBuilder(User.class)
+                .withFieldName("email")
+                .withLabel("Email")
+                .withRenderFunction(User::getEmail)
+                .withIsSortable(true)
+                .build())
+            // Name Column
+            .withColumn(DatatableColumn.newBuilder(User.class)
+                .withFieldName("displayName")
+                .withLabel("Name")
+                .withRenderFunction(User::getDisplayName)
+                .withIsSortable(true)
+                .build())
+            // Role Column
+            .withColumn(DatatableColumn.newBuilder(User.class)
+                .withFieldName("role")
+                .withLabel("Role")
+                .withRenderFunction((user) -> {
+                    switch (user.getRole()) {
+                        case ROLE_ADMIN:
+                            return "Admin";
+                        case ROLE_USER:
+                            return "User";
+                        default:
+                            return "Unknown";
+                    }
+                })
+                .withIsSortable(true)
+                .build())
+            // Action Column
+            .withColumn(DatatableColumn.newBuilder(User.class)
+                .withLabel("Action")
+                .withFieldName("id")
+                .withIsSortable(false)
+                .withHeaderAlignRight()
+                .withRenderTemplate(ActionTemplate.newBuilder(User.class)
+                    // Edit Link
+                    .withEditLink(User.class, (record) -> "/configuration/user/edit/" + record.getId())
+                    // Delete Link
+                    .withDeleteLink(User.class, (record) -> "/configuration/user/delete/" + record.getId())
+                    .build())
+                .build())
+            .withSearch("email", "displayName");
+            // TODO fix filters with enums
+//            .withFilter(DatatableFilter.newBuilder()
+//                .withField("role")
+//                .withLabel("Role")
+//                .withOption(UserRole.ROLE_ADMIN.name(), "Admin")
+//                .withOption(UserRole.ROLE_USER.name(), "User")
+//                .build()
+//            );
+
+        // Add datatable attribute
+        model.addAttribute("datatable", builder.build());
         return "configuration/user/index";
     }