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]
This commit is contained in:
 Ján Mikláš
2024-08-09 21:54:43 +02:00
committed by Jan Jakeš
parent 8ea0482ed8
commit 9feb0433e6
3 changed files with 7 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ import { FilterType, List, Logs } from './list';
interface LogsWindow extends Window { interface LogsWindow extends Window {
mailpoet_logs: Logs; mailpoet_logs: Logs;
mailpoet_logs_default_from: string;
} }
declare let window: LogsWindow; declare let window: LogsWindow;
@@ -19,7 +20,9 @@ if (container) {
<ErrorBoundary> <ErrorBoundary>
<List <List
logs={window.mailpoet_logs} logs={window.mailpoet_logs}
originalFrom={url.searchParams.get('from')} originalFrom={
url.searchParams.get('from') || window.mailpoet_logs_default_from
}
originalTo={url.searchParams.get('to')} originalTo={url.searchParams.get('to')}
originalSearch={url.searchParams.get('search')} originalSearch={url.searchParams.get('search')}
originalOffset={url.searchParams.get('offset')} originalOffset={url.searchParams.get('offset')}

View File

@@ -28,6 +28,7 @@ class Logs {
$offset = isset($_GET['offset']) ? sanitize_text_field(wp_unslash($_GET['offset'])) : null; $offset = isset($_GET['offset']) ? sanitize_text_field(wp_unslash($_GET['offset'])) : null;
$limit = isset($_GET['limit']) ? sanitize_text_field(wp_unslash($_GET['limit'])) : null; $limit = isset($_GET['limit']) ? sanitize_text_field(wp_unslash($_GET['limit'])) : null;
$dateFrom = (new Carbon())->subDays(7); $dateFrom = (new Carbon())->subDays(7);
$defaultFrom = $dateFrom->format('Y-m-d');
if (isset($from)) { if (isset($from)) {
$dateFrom = new Carbon($from); $dateFrom = new Carbon($from);
} }
@@ -38,6 +39,7 @@ class Logs {
$logs = $this->logRepository->getLogs($dateFrom, $dateTo, $search, $offset, $limit); $logs = $this->logRepository->getLogs($dateFrom, $dateTo, $search, $offset, $limit);
$data = [ $data = [
'logs' => [], 'logs' => [],
'logs_default_from' => $defaultFrom,
]; ];
foreach ($logs as $log) { foreach ($logs as $log) {
$data['logs'][] = [ $data['logs'][] = [

View File

@@ -10,6 +10,7 @@
<script type="text/javascript"> <script type="text/javascript">
<% autoescape 'js' %> <% autoescape 'js' %>
var mailpoet_logs = <%= json_encode(logs) %>; var mailpoet_logs = <%= json_encode(logs) %>;
var mailpoet_logs_default_from = '<%= logs_default_from %>';
<% endautoescape %> <% endautoescape %>
</script> </script>
</div> </div>