From 99e031c52977434d9c18dda2cef49913b0f950e1 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Sat, 12 Aug 2023 14:57:55 +0200
Subject: [PATCH] (control) Remove broken pagination from events and message
 queue; new "light" events table for some views

---
 .../control/svc/EventLogService.java          |  3 --
 .../control/svc/MessageQueueService.java      |  3 --
 .../resources/templates/control/index.hdb     |  4 +--
 .../control/partials/events-table-summary.hdb | 23 ++++++++++++++
 .../control/partials/events-table.hdb         | 30 +++++++++++--------
 .../control/partials/message-queue-table.hdb  |  1 -
 .../templates/control/service-by-id.hdb       |  2 +-
 7 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb

diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/EventLogService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/EventLogService.java
index 1b4729ee..ddbc1974 100644
--- a/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/EventLogService.java
+++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/EventLogService.java
@@ -79,14 +79,11 @@ public class EventLogService {
         else
             next = "";
 
-        Object prev = afterParam == null ? "" : afterParam;
-
         return Map.of(
                 "events", entries,
                 "types", typeFilterList,
                 "services", serviceFilterList,
                 "next", next,
-                "prev", prev,
                 "elFilter", elFilter);
 
     }
diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/MessageQueueService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/MessageQueueService.java
index 1d74a5bf..b045cd48 100644
--- a/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/MessageQueueService.java
+++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/svc/MessageQueueService.java
@@ -64,11 +64,8 @@ public class MessageQueueService {
         else
             next = "";
 
-        Object prev = afterParam == null ? "" : afterParam;
-
         return Map.of("messages", entries,
                 "next", next,
-                "prev", prev,
                 "mqFilter", mqFilter);
     }
 
diff --git a/code/services-core/control-service/src/main/resources/templates/control/index.hdb b/code/services-core/control-service/src/main/resources/templates/control/index.hdb
index 43c189fd..46f39140 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/index.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/index.hdb
@@ -10,8 +10,8 @@
   <section>
       {{> control/partials/services-table }}
       {{> control/partials/processes-table}}
-      {{> control/partials/actors-table}}
-      {{> control/partials/events-table }}
+      {{> control/partials/actors-table }}
+      {{> control/partials/events-table-summary }}
   </section>
 </body>
 <script src="/refresh.js"></script>
diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb b/code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb
new file mode 100644
index 00000000..68d66568
--- /dev/null
+++ b/code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb
@@ -0,0 +1,23 @@
+<h1>Event Summary</h1>
+
+<table id="events">
+    <tr>
+        <th>Service Name</th>
+        <th>Instance</th>
+        <th>Event Time</th>
+        <th>Type</th>
+        <th>Message</th>
+    </tr>
+    {{#each events}}
+    <tr>
+        <td>{{serviceName}}</td>
+        <td title="{{instanceFull}}">
+            <span style="background-color: {{instanceColor}}" class="uuidPip">&nbsp;</span><span style="background-color: {{instanceColor2}}" class="uuidPip">&nbsp;</span>
+            {{instance}}
+        </td>
+        <td title="{{eventDateTime}}">{{eventTime}}</td>
+        <td>{{eventType}}</td>
+        <td>{{eventMessage}}</td>
+    </tr>
+    {{/each}}
+</table>
\ No newline at end of file
diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb b/code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb
index d5b7604a..82a62de6 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb
@@ -9,17 +9,24 @@
         <th>Message</th>
     </tr>
     <tr>
-        <td colspan="6" style="padding: 0.5ch">
-            <form method="GET" action="/events">
-                <select name="service" id="service">
-                    {{#each services}}<option value="{{value}}" {{#if current}}selected{{/if}} >{{name}}</option>{{/each}}
-                </select>
-                <select name="type" id="type">
-                    {{#each types}}<option value="{{value}}" {{#if current}}selected{{/if}} >{{name}}</option>{{/each}}
-                </select>
-                <input type="submit" value="Filter Results">
-            </form>
-        </td>
+
+        <form method="GET" action="/events">
+            <td>
+            <select name="service" id="service">
+                {{#each services}}<option value="{{value}}" {{#if current}}selected{{/if}} >{{name}}</option>{{/each}}
+            </select>
+            </td>
+            <td colspan="2"></td>
+            <td>
+            <select name="type" id="type">
+                {{#each types}}<option value="{{value}}" {{#if current}}selected{{/if}} >{{name}}</option>{{/each}}
+            </select>
+            </td>
+            <td>
+            <input type="submit" value="Filter Results">
+            </td>
+        </form>
+
     </tr>
     {{#each events}}
     <tr>
@@ -36,7 +43,6 @@
     <tfoot>
     <tr>
         <td colspan="6" style="padding: 0.5ch">
-            {{#if prev}}<a href="/events?after={{prev}}&{{elFilter}}">Prev</a>{{/if}}
             {{#if next}}<a href="/events?after={{next}}&{{elFilter}}" style="float:right">Next</a>{{/if}}
         </td>
     </tr>
diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb b/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
index d71d0941..926d1670 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
@@ -45,7 +45,6 @@
     <tfoot>
     <tr>
         <td colspan="6" style="padding: 0.5ch">
-            {{#if prev}}<a href="?after={{prev}}&{{mqFilter}}">Prev</a>{{/if}}
             {{#if next}}<a href="?after={{next}}&{{mqFilter}}" style="float:right">Next</a>{{/if}}
         </td>
     </tr>
diff --git a/code/services-core/control-service/src/main/resources/templates/control/service-by-id.hdb b/code/services-core/control-service/src/main/resources/templates/control/service-by-id.hdb
index f350ac5a..73cbb6d9 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/service-by-id.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/service-by-id.hdb
@@ -9,7 +9,7 @@
   {{> control/partials/nav}}
   <section>
   <h1>Services/{{id}}</h1>
-  {{> control/partials/events-table }}
+  {{> control/partials/events-table-summary }}
   {{> control/partials/message-queue-table }}
   </section>
 </body>