wrap up configuration/user datatable

Author: Crim

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

@@ -75,27 +75,7 @@ public class UserController extends BaseController {
      * GET Displays main user index.
      */
     @RequestMapping(path = "", method = RequestMethod.GET)
-    public String index(final Model model, final RedirectAttributes redirectAttributes) {
-        // Setup breadcrumbs
-        setupBreadCrumbs(model, null, null);
-
-        // Check for LDAP auth method and restrict access.
-        if (redirectIfUsingLdapAuthentication(redirectAttributes)) {
-            return "redirect:/";
-        }
-
-        // Retrieve all users
-        final Iterable<User> usersList = userRepository.findAllByIsActiveOrderByEmailAsc(true);
-        model.addAttribute("users", usersList);
-
-        return "configuration/user/index";
-    }
-
-    /**
-     * GET Displays main user index.
-     */
-    @RequestMapping(path = "/datatable", method = RequestMethod.GET)
-    public String datatable(
+    public String index(
         final Model model,
         final Pageable pageable,
         @RequestParam Map<String,String> allParams,
@@ -109,12 +89,11 @@ public String datatable(
             return "redirect:/";
         }
 
-        // TODO fix enum filter for role
         final Datatable.Builder<User> builder = Datatable.newBuilder(User.class)
             .withRepository(userRepository)
             .withPageable(pageable)
             .withRequestParams(allParams)
-            .withUrl("/configuration/user/datatable")
+            .withUrl("/configuration/user")
             .withLabel("Users")
             // Only show active users.
             .withConstraint("isActive", true, ConstraintOperator.EQUALS)
@@ -163,7 +142,8 @@ public String datatable(
                     .withDeleteLink(User.class, (record) -> "/configuration/user/delete/" + record.getId())
                     .build())
                 .build())
-            .withSearch("email");
+            .withSearch("email", "displayName");
+            // TODO fix filters with enums
 //            .withFilter(DatatableFilter.newBuilder()
 //                .withField("role")
 //                .withLabel("Role")
@@ -174,12 +154,7 @@ public String datatable(
 
         // Add datatable attribute
         model.addAttribute("datatable", builder.build());
-
-        // Retrieve all users
-        final Iterable<User> usersList = userRepository.findAllByIsActiveOrderByEmailAsc(true);
-        model.addAttribute("users", usersList);
-
-        return "configuration/user/datatable";
+        return "configuration/user/index";
     }
 
     /**

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/ui/datatable/Datatable.java

@@ -31,10 +31,12 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -330,18 +332,19 @@ private Page<T> getPage() {
                 searchValue = null;
             }
         }
-        Specification<T> specification;
-        if (searchValue == null) {
-            specification = Specification.where(null);
-        } else {
-            specification = Specification.where((root, query, builder) ->
-                builder.like(
-                    builder.lower(root.get(getSearch().getField())), "%" + getSearch().getCurrentSearchTerm().toLowerCase() + "%"
-                )
-            );
+        Specification<T> specification = Specification.where(null);
+        if (searchValue != null) {
+            // OR all of the search fields
+            for (final String field : getSearch().getFields()) {
+                specification = specification.or((root, query, builder) ->
+                    builder.like(
+                        builder.lower(root.get(field)), "%" + getSearch().getCurrentSearchTerm().toLowerCase() + "%"
+                    )
+                );
+            }
         }
 
-        // Add filter criterias
+        // Add filter criteria
         for (final DatatableFilter filter : getFilters()) {
             // Skip non-provided filters.
             if (getCurrentFilterValueFor(filter).isEmpty()) {
@@ -528,16 +531,16 @@ public Builder<T> withSearch(DatatableSearch datatableSearch) {
             return this;
         }
 
-        public Builder<T> withSearch(final String name) {
-            return withSearch("Search...", name, null);
+        public Builder<T> withSearch(final String ... fields) {
+            return withSearch("Search...", Arrays.asList(fields));
         }
 
-        public Builder<T> withSearch(final String search, final String name) {
-            return withSearch(search, name, null);
+        public Builder<T> withSearch(final String label, final List<String> fields) {
+            return withSearch(label, fields, null);
         }
 
-        public Builder<T> withSearch(final String search, final String name, final String currentSearchTerm) {
-            return withSearch(new DatatableSearch(search, name, currentSearchTerm));
+        public Builder<T> withSearch(final String search, final List<String> fields, final String currentSearchTerm) {
+            return withSearch(new DatatableSearch(search, fields, currentSearchTerm));
         }
 
         public Builder<T> withCreateLink(final String url) {
@@ -573,11 +576,11 @@ public Builder<T> withConstraint(final DatatableConstraint constraint) {
          */
         public Datatable<T> build() {
             // Inject current search term from request parameters if available and not already set.
-            if (datatableSearch != null && datatableSearch.getField() != null && datatableSearch.getCurrentSearchTerm() == null) {
+            if (datatableSearch != null && datatableSearch.getCurrentSearchTerm() == null) {
                 if (requestParams.containsKey("search")) {
                     datatableSearch = new DatatableSearch(
                         datatableSearch.getLabel(),
-                        datatableSearch.getField(),
+                        datatableSearch.getFields(),
                         requestParams.get("search")
                     );
                 }

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/ui/datatable/DatatableSearch.java

@@ -24,12 +24,17 @@
 
 package org.sourcelab.kafka.webview.ui.manager.ui.datatable;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Represents a searchable field on a datatable.
  */
 public class DatatableSearch {
     private final String label;
-    private final String field;
+    private final List<String> fields;
     private final String currentSearchTerm;
 
     /**
@@ -39,17 +44,23 @@ public class DatatableSearch {
      * @param currentSearchTerm The current search term if defined in a request.
      */
     public DatatableSearch(final String label, final String field, final String currentSearchTerm) {
-        this.label = label;
-        this.field = field;
+        this(label, Collections.singletonList(field), currentSearchTerm);
+    }
+
+    public DatatableSearch(final String label, final List<String> fields, final String currentSearchTerm) {
+        Objects.requireNonNull(fields);
+
+        this.label = Objects.requireNonNull(label);
+        this.fields = Collections.unmodifiableList(new ArrayList<>(fields));
         this.currentSearchTerm = currentSearchTerm;
     }
 
     public String getLabel() {
         return label;
     }
 
-    public String getField() {
-        return field;
+    public List<String> getFields() {
+        return fields;
     }
 
     public String getCurrentSearchTerm() {
@@ -60,7 +71,8 @@ public String getCurrentSearchTerm() {
     public String toString() {
         return "DatatableSearch{"
             + "label='" + label + '\''
-            + ", field='" + field + '\''
+            + ", fields=" + fields
+            + ", currentSearchTerm='" + currentSearchTerm + '\''
             + '}';
     }
 }

kafka-webview-ui/src/main/resources/templates/configuration/user/datatable.html

@@ -11,61 +11,8 @@
 <body>
 <section layout:fragment="content">
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="card">
-                    <div class="card-header">
-                        <i class="fa fa-align-justify"></i>
-                        Users
-                        <div class="btn-group float-right" role="group" aria-label="Button group">
-                            <a class="btn" th:href="@{/configuration/user/create}" style="padding-bottom: 0;">
-                                <i class="icon-settings"></i>
-                                &nbsp;Create new
-                            </a>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <table class="table table-bordered table-striped table-sm">
-                            <thead>
-                            <tr>
-                                <th>Email</th>
-                                <th>Name</th>
-                                <th>Role</th>
-                                <th class="text-right">Action</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <tr th:each="user : ${users}">
-                                <td th:text="${user.email}"></td>
-                                <td th:text="${user.displayName}"></td>
-                                <td th:text="${user.role}"></td>
-                                <td class="text-right">
-                                    <div class="dropdown">
-                                        <button class="btn btn-secondary btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            Actions
-                                        </button>
-                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                            <a class="dropdown-item" th:href="@{/configuration/user/edit/{id}(id=${user.id})}">
-                                                <i class="fa fa-edit"></i>
-                                                Edit
-                                            </a>
-                                            <form th:action="@{/configuration/user/delete/{id}(id=${user.id})}" method="post">
-                                                <button class="dropdown-item" onclick="return confirm('Are you sure?');" type="submit">
-                                                    <i class="fa fa-remove"></i>
-                                                    Delete
-                                                </button>
-                                            </form>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <!--/.col-->
-        </div>
+        <!-- Render datatable -->
+        <div th:replace="fragments/datatable/Datatable :: display(${datatable})"></div>
     </div>
 </section>