From 4e19a1c571e75f412d820c73fec3c6e986940a4a Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Wed, 2 Oct 2024 22:33:09 +0300
Subject: [PATCH] Enhances agent data display

---
 app/templates/agent-list.php      |  5 +++--
 app/templates/page-header.php     |  1 +
 public_html/static/agents.js      | 12 +++++++++++-
 public_html/static/css/agents.css | 11 +++++++++++
 public_html/static/loadcache.php  |  4 +++-
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 public_html/static/css/agents.css

diff --git a/app/templates/agent-list.php b/app/templates/agent-list.php
index 75c5748..ff4b83c 100644
--- a/app/templates/agent-list.php
+++ b/app/templates/agent-list.php
@@ -19,15 +19,16 @@
         'agent_id' => $agent['id']
     ];
     $jwt = $agentObject->generateAgentToken($payload, $agent['secret_key']);
+//    print_r($_SESSION);
 ?>
 <?php if (isset($_SESSION["agent{$agent['id']}_cache"])) { ?>
                             <button class="btn btn-primary" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="load recently cached data" onclick="loadCache('<?= htmlspecialchars($agent['id']) ?>')">load cache</button>
                             <button class="btn btn-primary" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="get fresh data from agent" onclick="fetchData('<?= htmlspecialchars($agent['id']) ?>', '<?= htmlspecialchars($agent['url']) ?>', '<?= htmlspecialchars($agent['agent_endpoint']) ?>', '<?= htmlspecialchars($jwt) ?>', true)">force refresh</button>
-                            <span id="cacheInfo<?= htmlspecialchars($agent['id']) ?>" style="margin: 5px 0;"></span>
 <?php } else { ?>
                             <button class="btn btn-primary" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="get data from the agent" onclick="fetchData('<?= htmlspecialchars($agent['id']) ?>', '<?= htmlspecialchars($agent['url']) ?>', '<?= htmlspecialchars($agent['agent_endpoint']) ?>', '<?= htmlspecialchars($jwt) ?>')">fetch data</button>
                             <button class="btn btn-light" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="no cache to refresh">force refresh</button>
 <?php } ?>
+                            <span id="cacheInfo<?= htmlspecialchars($agent['id']) ?>" style="margin: 5px 0;"></span>
                     </p>
-                        <pre id="result<?= htmlspecialchars($agent['id']) ?>">click a button to fetch data from the agent.</pre>
+                        <pre class="agent_result" id="result<?= htmlspecialchars($agent['id']) ?>">click a button to fetch data from the agent.</pre>
 <?php } ?>
diff --git a/app/templates/page-header.php b/app/templates/page-header.php
index 028210a..ac3a95e 100644
--- a/app/templates/page-header.php
+++ b/app/templates/page-header.php
@@ -25,6 +25,7 @@
     </script>
 <?php if ($page === 'agents') { ?>
     <script src="<?= $app_root ?>static/agents.js"></script>
+    <link rel="stylesheet" type="text/css" href="<?= $app_root ?>static/css/agents.css">
 <?php } ?>
     <title>Jilo Web</title>
     <link rel="icon" type="image/x-icon" href="<?= $app_root ?>static/favicon.ico">
diff --git a/public_html/static/agents.js b/public_html/static/agents.js
index 5b69e94..f05856e 100644
--- a/public_html/static/agents.js
+++ b/public_html/static/agents.js
@@ -55,13 +55,22 @@ function fetchData(agent_id, url, endpoint, jwtToken, force = false) {
                     } else {
                         // show the result in the html
                         resultElement.innerHTML = JSON.stringify(result, null, 2);
-                        cacheInfoElement.innerHTML = "";
+
+                        // Show the cache timestamp from the session
+                        const cacheTimestamp = new Date(result.cache_time);
+
+                        // Display the cache retrieval date and time
+                        const formattedDate = cacheTimestamp.toLocaleDateString();
+                        const formattedTime = cacheTimestamp.toLocaleTimeString();
+                        cacheInfoElement.innerHTML = `cache refreshed on ${formattedDate} at ${formattedTime}`;
+
                         // send the result to PHP to store in session
                         saveResultToSession(result, agent_id);
                     }
                 } catch (e) {
                     // Display the error
                     resultElement.innerHTML = "Error: Response is not a valid JSON.<br />Response: " + xhr.responseText;
+                    console.error("error:", e);
                 }
             } else {
                 resultElement.innerHTML = `Error: Unable to fetch data from ${agentUrl}<br />Status Code: ${xhr.status}<br />Status Text: ${xhr.statusText}<br />Response: ${xhr.responseText}`;
@@ -139,6 +148,7 @@ function loadCache(agent_id) {
                     }
                 } catch (e) {
                     resultElement.innerHTML = "Error loading cached data.";
+                    console.error("error:", e);
                 }
             } else {
                 resultElement.innerHTML = `Error: Unable to load cache. Status code: ${xhr.status}`;
diff --git a/public_html/static/css/agents.css b/public_html/static/css/agents.css
new file mode 100644
index 0000000..7583683
--- /dev/null
+++ b/public_html/static/css/agents.css
@@ -0,0 +1,11 @@
+
+.agent_result {
+    text-align: left;
+    font-family: monospace;
+    white-space: pre-wrap;
+    background-color: #f4f4f4;
+    padding: 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    overflow-x: auto;
+}
diff --git a/public_html/static/loadcache.php b/public_html/static/loadcache.php
index e513951..d5047a0 100644
--- a/public_html/static/loadcache.php
+++ b/public_html/static/loadcache.php
@@ -12,7 +12,9 @@ if (isset($_SESSION["agent{$agent}_cache"])) {
     echo json_encode([
         'status' => 'success',
         'data' => $_SESSION["agent{$agent}_cache"],
-        'cache_time' => $_SESSION["agent{$agent}_cache_time"] ?? time()  // we store cache time in the session
+        // we store cache time in the session
+        // FIXME may need to move to file cache
+        'cache_time' => $_SESSION["agent{$agent}_cache_time"] ?? time()
     ]);
 } else {
     // If no cached data exists