From 9feb0433e63b14ab845a7555c2dfd1699116015c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A0Ja=CC=81n=20Mikla=CC=81s=CC=8C?= <neosinner@gmail.com>
Date: Fri, 9 Aug 2024 21:54:43 +0200
Subject: [PATCH] Show "from" value in logs when not explicitely set

It was empty before, and it looked like there are no logs. But they were just filtered for the last 7 days.

[MAILPOET-5670]
---
 mailpoet/assets/js/src/logs/logs.tsx   | 5 ++++-
 mailpoet/lib/AdminPages/Pages/Logs.php | 2 ++
 mailpoet/views/logs.html               | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mailpoet/assets/js/src/logs/logs.tsx b/mailpoet/assets/js/src/logs/logs.tsx
index a04b818411..1046fde7c9 100644
--- a/mailpoet/assets/js/src/logs/logs.tsx
+++ b/mailpoet/assets/js/src/logs/logs.tsx
@@ -5,6 +5,7 @@ import { FilterType, List, Logs } from './list';
 
 interface LogsWindow extends Window {
   mailpoet_logs: Logs;
+  mailpoet_logs_default_from: string;
 }
 
 declare let window: LogsWindow;
@@ -19,7 +20,9 @@ if (container) {
     <ErrorBoundary>
       <List
         logs={window.mailpoet_logs}
-        originalFrom={url.searchParams.get('from')}
+        originalFrom={
+          url.searchParams.get('from') || window.mailpoet_logs_default_from
+        }
         originalTo={url.searchParams.get('to')}
         originalSearch={url.searchParams.get('search')}
         originalOffset={url.searchParams.get('offset')}
diff --git a/mailpoet/lib/AdminPages/Pages/Logs.php b/mailpoet/lib/AdminPages/Pages/Logs.php
index a8b1be3126..8fb9439399 100644
--- a/mailpoet/lib/AdminPages/Pages/Logs.php
+++ b/mailpoet/lib/AdminPages/Pages/Logs.php
@@ -28,6 +28,7 @@ class Logs {
     $offset = isset($_GET['offset']) ? sanitize_text_field(wp_unslash($_GET['offset'])) : null;
     $limit = isset($_GET['limit']) ? sanitize_text_field(wp_unslash($_GET['limit'])) : null;
     $dateFrom = (new Carbon())->subDays(7);
+    $defaultFrom = $dateFrom->format('Y-m-d');
     if (isset($from)) {
       $dateFrom = new Carbon($from);
     }
@@ -38,6 +39,7 @@ class Logs {
     $logs = $this->logRepository->getLogs($dateFrom, $dateTo, $search, $offset, $limit);
     $data = [
       'logs' => [],
+      'logs_default_from' => $defaultFrom,
     ];
     foreach ($logs as $log) {
       $data['logs'][] = [
diff --git a/mailpoet/views/logs.html b/mailpoet/views/logs.html
index d949771dde..9679e6c05e 100644
--- a/mailpoet/views/logs.html
+++ b/mailpoet/views/logs.html
@@ -10,6 +10,7 @@
   <script type="text/javascript">
     <% autoescape 'js' %>
       var mailpoet_logs = <%= json_encode(logs) %>;
+      var mailpoet_logs_default_from = '<%= logs_default_from %>';
     <% endautoescape %>
   </script>
 </div>