From 45bed8bf32ce49453930c8cba0b9dc2ff7a97ee8 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Thu, 26 Oct 2023 12:48:48 +0200
Subject: [PATCH] - Move the cache detail links to the individual database
 pages. - Fix the auto refresh functionality on the Reference Count page.

---
 CHANGES.rst                   |  6 +++++-
 src/App/ApplicationManager.py |  3 +++
 src/App/dtml/dbMain.dtml      | 13 ++++++++++++-
 src/App/dtml/debug.dtml       | 33 +++++++++++++--------------------
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6749b10b72..0a3cd08e0d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,11 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.8.7 (unreleased)
 ------------------
 
-- Separate ZODB connection information into new ZODB Connections view
+- Separate ZODB connection information into new ZODB Connections view.
+
+- Move the cache detail links to the individual database pages.
+
+- Fix the auto refresh functionality on the Reference Count page
 
 - Update the Ace editor in the ZMI.
 
diff --git a/src/App/ApplicationManager.py b/src/App/ApplicationManager.py
index 4dd73001e5..5ac45a5d52 100644
--- a/src/App/ApplicationManager.py
+++ b/src/App/ApplicationManager.py
@@ -338,6 +338,9 @@ def _getDB(self):
     def cache_length(self):
         return self._getDB().cacheSize()
 
+    def cache_active_and_inactive_count(self):
+        return sum([x['size'] for x in self._getDB().cacheDetailSize()])
+
     def cache_length_bytes(self):
         return self._getDB().getCacheSizeBytes()
 
diff --git a/src/App/dtml/dbMain.dtml b/src/App/dtml/dbMain.dtml
index 8b480209e7..2fbf311b9b 100644
--- a/src/App/dtml/dbMain.dtml
+++ b/src/App/dtml/dbMain.dtml
@@ -91,11 +91,22 @@
       <tr>
           <th>Total</th>
           <th>&dtml-cache_length;</th>
-          <th>&nbsp;</th>
+          <th>&dtml-cache_active_and_inactive_count;</th>
       </tr>
     </tbody>
   </table>
 
+  <p class="form-help">
+    <a href="cache_detail" class="mr-3" target="blank">
+      <i class="fas fa-microchip" title="Cache detail"></i>
+      Cache detail
+    </a>
+    <a href="cache_extreme_detail" target="blank">
+      <i class="fas fa-microchip" title="Cache extreme detail"></i>
+      Cache extreme detail
+    </a>
+  </p>
+
   <div class="zmi-controls mb-5">
     <form action="&dtml-URL1;/manage_minimize" method="post">
       <input class="btn btn-primary" id="minimize" type="submit"
diff --git a/src/App/dtml/debug.dtml b/src/App/dtml/debug.dtml
index 324a33ab11..edd772772a 100644
--- a/src/App/dtml/debug.dtml
+++ b/src/App/dtml/debug.dtml
@@ -49,33 +49,26 @@
     </dtml-if>
   </dtml-let>
   
-  <p class="form-help">
-    <a href="../Database/cache_detail" class="mr-3" target="blank">
-      <i class="fas fa-microchip" title="Cache detail"></i> 
-      Cache detail
-    </a>
-    <a href="../Database/cache_extreme_detail" target="blank">
-      <i class="fas fa-microchip" title="Cache extreme detail"></i> 
-      Cache extreme detail
-    </a>
-  </p>
-
   <div class="zmi-controls row border-top border-bottom p-3 bg-light">
     <form action="&dtml-URL;" method="GET" class="form-group form-inline p-0 m-0">
       <button class="btn btn-primary mr-3" 
         onclick="window.location.href='&dtml-URL;?update_snapshot=1';"
       >Update Snapshot</button>
       <dtml-if debug_auto_reload>
-        <button class="btn btn-primary mr-3"
-          onclick="window.location.href='&dtml-URL;';"
-        >Stop auto refresh</button>
+          <button class="btn btn-primary mr-3"
+            onclick="window.location.href='&dtml-URL;';"
+          >Stop auto refresh</button>
+        </form>
       <dtml-else>
-        <button class="btn btn-primary mr-3"
-          onclick="window.location.href='&dtml-URL;';"
-        >Refresh</button>
-        <label for="debug_auto_reload" class="mx-3">Auto refresh interval (seconds):</label>
-        <input class="form-control mr-3" type="text" id="debug_auto_reload" name="debug_auto_reload" size="3" value="10" />
-        <input class="btn btn-primary" type="submit" value="Start auto refresh" />
+          <button class="btn btn-primary mr-3"
+            onclick="window.location.href='&dtml-URL;';"
+          >Refresh</button>
+        </form>
+        <form action="&dtml-URL;" method="GET" class="form-group form-inline p-0 m-0">
+          <label for="debug_auto_reload" class="mx-3">Auto refresh interval (seconds):</label>
+          <input class="form-control mr-3" type="text" id="debug_auto_reload" name="debug_auto_reload" size="3" value="10" />
+          <input class="btn btn-primary" type="submit" value="Start auto refresh" />
+        </form>
       </dtml-if>
     </form>
   </div>