From 74367ae40e35f1e2ad8f91f53e0fedaf14e8c2ee Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel.dohnal@automattic.com>
Date: Tue, 2 Mar 2021 14:25:35 +0100
Subject: [PATCH] Display data in table

[MAILPOET-3135]
---
 lib/AdminPages/Pages/Logs.php |  2 +-
 lib/Logging/LogRepository.php |  2 ++
 views/logs.html               | 21 +++++++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/AdminPages/Pages/Logs.php b/lib/AdminPages/Pages/Logs.php
index 30b78465f9..f25c39cf2e 100644
--- a/lib/AdminPages/Pages/Logs.php
+++ b/lib/AdminPages/Pages/Logs.php
@@ -30,7 +30,7 @@ class Logs {
       $data['logs'][] = [
         'name' => $log->getName(),
         'message' => $log->getMessage(),
-        'created_at' => $log->getCreatedAt(),
+        'created_at' => $log->getCreatedAt()->format('Y-m-d H:i:s'),
       ];
     }
     $this->pageRenderer->displayPage('logs.html', $data);
diff --git a/lib/Logging/LogRepository.php b/lib/Logging/LogRepository.php
index a86c5bc552..f6d42571ef 100644
--- a/lib/Logging/LogRepository.php
+++ b/lib/Logging/LogRepository.php
@@ -33,6 +33,8 @@ class LogRepository extends Repository {
         ->setParameter('dateTo', $dateTo->format('Y-m-d H:i:s'));
     }
 
+    $query->orderBy('l.createdAt', 'desc');
+
     return $query->getQuery()->getResult();
   }
 }
diff --git a/views/logs.html b/views/logs.html
index bf3e29309f..8aa894fda5 100644
--- a/views/logs.html
+++ b/views/logs.html
@@ -5,12 +5,21 @@
 <div class="wrap">
   <h1 class="mailpoet-h1">Logs</h1>
 
-  <table class="mailpoet-listing-table widefat fixed">
-    <tr>
-      <th>Name</th>
-      <th>Message</th>
-      <th>Created On</th>
-    </tr>
+  <table class="mailpoet-listing-table widefat striped">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Message</th>
+        <th>Created On</th>
+      </tr>
+    </thead>
+    <% for log in logs %>
+      <tr>
+        <td><%= log.name %></td>
+        <td><%= log.message %></td>
+        <td><%= log.created_at %></td>
+      </tr>
+    <% endfor %>
   </table>
 </div>