This is an automated email from the ASF dual-hosted git repository.

ddanielr pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new 5fccb5bda5 Adds  "All" entries option to the monitor (#6038)
5fccb5bda5 is described below

commit 5fccb5bda55985bf42adfd5e3338c35c44c14e28
Author: Daniel Roberts <[email protected]>
AuthorDate: Wed Jan 7 12:39:39 2026 -0500

    Adds  "All" entries option to the monitor (#6038)
    
    * Fix missing semi-colon in html
    
    * Adds a "All" option to the table entries selector
    
    Adds a "All" option with a value of '-1' that will allow all entries to
    show on the monitor when selected.
    
    * Move dataTable changes to functions.js
    
    Move the lengthMenu changes from extenal to `functions.js` so it
    persists across external dep upgrades
    
    * fix missing comma
---
 .../org/apache/accumulo/monitor/resources/js/functions.js      | 10 ++++++++++
 .../resources/org/apache/accumulo/monitor/templates/navbar.ftl |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
index 30705be653..418b0d5e3f 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
@@ -28,6 +28,16 @@ var QUANTITY_SUFFIX = ['', 'K', 'M', 'B', 'T', 'e15', 'e18', 
'e21'];
 // Suffixes for size
 var SIZE_SUFFIX = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z'];
 
+// Override Length Menu options for dataTables
+if ($.fn && $.fn.dataTable) {
+  $.extend(true, $.fn.dataTable.defaults, {
+  "lengthMenu" : [
+    [ 10, 25, 50, 100, -1 ],
+    [ 10, 25, 50, 100, "All" ]
+  ]
+  });
+}
+
 /**
  * Initializes Auto Refresh to false if it is not set,
  * and creates listeners for auto refresh
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 7e77c4c3fe..dcdadda83e 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -36,7 +36,7 @@
             </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" 
role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                <span id="statusNotification" class="icon-dot 
normal"></span>&nbspServers
+                <span id="statusNotification" class="icon-dot 
normal"></span>&nbsp;Servers
               </a>
               <ul class="dropdown-menu">
                 <li><a class="dropdown-item" href="manager"><span 
id="managerStatusNotification" class="icon-dot 
normal"></span>&nbsp;Manager&nbsp;Server&nbsp;</a></li>

Reply via email to