Monitor History UI: decoupled full-year graphs, tabbed/paginated recent checks, and detail-page enhancements

app/Http/Controllers/MonitorsController.php

@@ -99,93 +99,62 @@ public function store(MonitorRequest $request)
      */
     public function show(Request $request, Monitor $monitor)
     {
-        $history = null;
+        $graph = null;
+        $filters = null;
+        $summary = null;
+        $recentChecks = null;
 
         if (config('monitor-history.enabled')) {
-            $range = $this->resolveHistoryRange($request, $monitor);
+            // The monitor's earliest check feeds the 'all' preset range, the
+            // available-years list and the summary's first_checked_at. Resolve it
+            // once here and thread it through, rather than re-running the same
+            // MIN(checked_at) lookup inside each consumer.
+            $firstCheckedAt = $monitor->checkLogs()->orderBy('checked_at')->value('checked_at');
+
+            $range = $this->resolveHistoryRange($request, $firstCheckedAt);
             $fromUtc = $range['from']->copy()->startOfDay()->utc();
             $toUtc = $range['to']->copy()->endOfDay()->utc();
             $timezone = $range['timezone'];
 
+            $availableYears = $this->availableYears($timezone, $firstCheckedAt);
+            $graphYear = $this->resolveGraphYear($request, $availableYears);
+            $graph = $this->buildGraphPayload($monitor, $graphYear, $timezone, $availableYears);
+
             $selectedRangeQuery = $monitor->checkLogs()
                 ->whereBetween('checked_at', [$fromUtc, $toUtc]);
 
             $allTimeSummary = $this->buildSummary($monitor->checkLogs());
             $selectedRangeSummary = $this->buildSummary($selectedRangeQuery);
 
-            $dailyMetrics = $monitor->dailyCheckMetrics()
-                ->forTimezone($timezone)
-                ->betweenDates($range['from']->toDateString(), $range['to']->toDateString())
-                ->orderBy('date')
-                ->get()
-                ->groupBy('check_type')
-                ->map(function ($rows) {
-                    return $rows->map(function ($row) {
-                        return [
-                            'date' => $row->date->toDateString(),
-                            'total_checks' => $row->total_checks,
-                            'successful_checks' => $row->successful_checks,
-                            'warning_checks' => $row->warning_checks,
-                            'failed_checks' => $row->failed_checks,
-                            'success_ratio' => (float) $row->success_ratio,
-                            'worst_status' => $row->worst_status,
-                            'avg_response_time_ms' => $row->avg_response_time_ms,
-                            'p95_response_time_ms' => $row->p95_response_time_ms,
-                        ];
-                    })->values();
-                });
-
-            $recentChecks = $monitor->checkLogs()
-                ->whereBetween('checked_at', [$fromUtc, $toUtc])
-                ->latest('checked_at')
-                ->limit((int) config('monitor-history.recent_checks_limit', 50))
-                ->get()
-                ->map(function (MonitorCheckLog $log) use ($timezone) {
-                    return [
-                        'id' => $log->id,
-                        'check_type' => $log->check_type,
-                        'status' => $log->status,
-                        'checked_at' => $log->checked_at->timezone($timezone)->toDateTimeString(),
-                        'message' => $log->message,
-                        'failure_reason' => $log->failure_reason,
-                        'response_time_ms' => $log->response_time_ms,
-                        'metadata' => $log->metadata,
-                    ];
-                });
-
-            $history = [
-                'range' => [
-                    'preset' => $range['preset'],
-                    'from' => $range['from']->toDateString(),
-                    'to' => $range['to']->toDateString(),
-                    'timezone' => $timezone,
-                ],
-                'check_types' => [
-                    [
-                        'type' => MonitorCheckLogService::CHECK_TYPE_UPTIME,
-                        'enabled' => (bool) $monitor->uptime_check_enabled,
-                    ],
-                    [
-                        'type' => MonitorCheckLogService::CHECK_TYPE_DOMAIN,
-                        'enabled' => (bool) $monitor->domain_check_enabled,
-                    ],
-                    [
-                        'type' => MonitorCheckLogService::CHECK_TYPE_CERTIFICATE,
-                        'enabled' => (bool) $monitor->certificate_check_enabled,
-                    ],
-                ],
-                'summary' => [
-                    'all_time' => $allTimeSummary,
-                    'selected_range' => $selectedRangeSummary,
-                ],
-                'daily_metrics' => $dailyMetrics,
-                'recent_checks' => $recentChecks,
+            $filters = [
+                'preset' => $range['preset'],
+                'from' => $range['from']->toDateString(),
+                'to' => $range['to']->toDateString(),
+                'timezone' => $timezone,
+            ];
+
+            $summary = [
+                'all_time' => $allTimeSummary,
+                'selected_range' => $selectedRangeSummary,
+                'first_checked_at' => $firstCheckedAt
+                    ? Carbon::parse($firstCheckedAt)->timezone($timezone)->toDateTimeString()
+                    : null,
             ];
+
+            $recentType = $request->string('recent_type')->toString() ?: MonitorCheckLogService::CHECK_TYPE_UPTIME;
+            if (! in_array($recentType, [MonitorCheckLogService::CHECK_TYPE_UPTIME, MonitorCheckLogService::CHECK_TYPE_DOMAIN], true)) {
+                $recentType = MonitorCheckLogService::CHECK_TYPE_UPTIME;
+            }
+
+            $recentChecks = $this->buildRecentChecks($monitor, $recentType, $fromUtc, $toUtc, $timezone);
         }
 
         return Inertia::render('Monitors/Show', [
             'monitor' => $monitor,
-            'history' => $history,
+            'graph' => $graph,
+            'filters' => $filters,
+            'summary' => $summary,
+            'recentChecks' => $recentChecks,
         ]);
     }
 
@@ -242,7 +211,7 @@ public function destroy(Monitor $monitor)
         return redirect()->route('monitors.index');
     }
 
-    protected function resolveHistoryRange(Request $request, Monitor $monitor): array
+    protected function resolveHistoryRange(Request $request, $firstCheckedAt = null): array
     {
         // The daily metrics are aggregated server-side under this single timezone,
         // so the detail page must read them back under the same one. We deliberately
@@ -256,8 +225,6 @@ protected function resolveHistoryRange(Request $request, Monitor $monitor): arra
         $preset = $request->string('preset')->toString() ?: '30d';
 
         if ($preset === 'all') {
-            $firstCheckedAt = $monitor->checkLogs()->orderBy('checked_at')->value('checked_at');
-
             $from = $firstCheckedAt
                 ? Carbon::parse($firstCheckedAt)->timezone($timezone)->startOfDay()
                 : Carbon::now($timezone)->subDays(30)->startOfDay();
@@ -376,4 +343,172 @@ protected function buildSummary($query): array
 
         return $summary;
     }
+
+    protected function graphCheckTypes(Monitor $monitor): array
+    {
+        return [
+            [
+                'type' => MonitorCheckLogService::CHECK_TYPE_UPTIME,
+                'enabled' => (bool) $monitor->uptime_check_enabled,
+            ],
+            [
+                'type' => MonitorCheckLogService::CHECK_TYPE_DOMAIN,
+                'enabled' => (bool) $monitor->domain_check_enabled,
+            ],
+        ];
+    }
+
+    protected function availableYears(string $timezone, $firstCheckedAt = null): array
+    {
+        $currentYear = (int) Carbon::now($timezone)->format('Y');
+
+        if (! $firstCheckedAt) {
+            return [$currentYear];
+        }
+
+        $minYear = (int) Carbon::parse($firstCheckedAt)->timezone($timezone)->format('Y');
+
+        if ($minYear > $currentYear) {
+            $minYear = $currentYear;
+        }
+
+        return range($minYear, $currentYear);
+    }
+
+    protected function resolveGraphYear(Request $request, array $availableYears): int
+    {
+        $default = end($availableYears) ?: (int) Carbon::now('UTC')->format('Y');
+
+        $requested = $request->integer('year') ?: $default;
+
+        if (! in_array((int) $requested, $availableYears, true)) {
+            return (int) $default;
+        }
+
+        return (int) $requested;
+    }
+
+    protected function buildGraphPayload(Monitor $monitor, int $year, string $timezone, array $availableYears): array
+    {
+        $checkTypes = $this->graphCheckTypes($monitor);
+        $recentChecksLimit = (int) config('monitor-history.recent_checks_limit', 150);
+
+        $yearStartUtc = Carbon::create($year, 1, 1, 0, 0, 0, $timezone)->startOfDay()->utc();
+        $yearEndUtc = Carbon::create($year, 12, 31, 0, 0, 0, $timezone)->endOfDay()->utc();
+        $yearStartDate = Carbon::create($year, 1, 1, 0, 0, 0, $timezone)->toDateString();
+        $yearEndDate = Carbon::create($year, 12, 31, 0, 0, 0, $timezone)->toDateString();
+
+        $dailyMetricsByType = $monitor->dailyCheckMetrics()
+            ->forTimezone($timezone)
+            ->betweenDates($yearStartDate, $yearEndDate)
+            ->orderBy('date')
+            ->get()
+            ->groupBy('check_type')
+            ->map(function ($rows) {
+                return $rows->map(function ($row) {
+                    return [
+                        'date' => $row->date->toDateString(),
+                        'total_checks' => $row->total_checks,
+                        'successful_checks' => $row->successful_checks,
+                        'warning_checks' => $row->warning_checks,
+                        'failed_checks' => $row->failed_checks,
+                        'success_ratio' => (float) $row->success_ratio,
+                        'worst_status' => $row->worst_status,
+                        'avg_response_time_ms' => $row->avg_response_time_ms,
+                        'p95_response_time_ms' => $row->p95_response_time_ms,
+                    ];
+                })->values();
+            });
+
+        $series = [];
+
+        foreach ($checkTypes as $checkType) {
+            $type = $checkType['type'];
+
+            $typeSummary = $this->buildSummary(
+                $monitor->checkLogs()
+                    ->where('check_type', $type)
+                    ->whereBetween('checked_at', [$yearStartUtc, $yearEndUtc])
+            );
+
+            $series[$type] = [
+                'summary' => [
+                    'total_checks' => $typeSummary['by_type'][$type]['total_checks'] ?? 0,
+                    'success_ratio' => (float) ($typeSummary['by_type'][$type]['success_ratio'] ?? 0),
+                    'status_totals' => $typeSummary['by_type'][$type]['status_totals'] ?? [
+                        MonitorCheckLogService::STATUS_SUCCESS => 0,
+                        MonitorCheckLogService::STATUS_WARNING => 0,
+                        MonitorCheckLogService::STATUS_FAILED => 0,
+                        MonitorCheckLogService::STATUS_UNKNOWN => 0,
+                    ],
+                ],
+                'daily_metrics' => $dailyMetricsByType->get($type, collect())->values()->all(),
+                'latest_checks' => $this->buildLatestChecks($monitor, $type, $timezone, $recentChecksLimit),
+            ];
+        }
+
+        return [
+            'year' => $year,
+            'available_years' => $availableYears,
+            'timezone' => $timezone,
+            'today_iso' => Carbon::now($timezone)->toDateString(),
+            'check_types' => $checkTypes,
+            'recent_checks_limit' => $recentChecksLimit,
+            'series' => $series,
+        ];
+    }
+
+    protected function buildRecentChecks(Monitor $monitor, string $type, Carbon $fromUtc, Carbon $toUtc, string $timezone): array
+    {
+        $paginator = $monitor->checkLogs()
+            ->where('check_type', $type)
+            ->whereBetween('checked_at', [$fromUtc, $toUtc])
+            ->latest('checked_at')
+            ->paginate(25, ['*'], 'recent_page');
+
+        $data = collect($paginator->items())
+            ->map(function (MonitorCheckLog $log) use ($timezone) {
+                return [
+                    'id' => $log->id,
+                    'check_type' => $log->check_type,
+                    'status' => $log->status,
+                    'checked_at' => $log->checked_at->timezone($timezone)->toDateTimeString(),
+                    'message' => $log->message,
+                    'failure_reason' => $log->failure_reason,
+                    'response_time_ms' => $log->response_time_ms,
+                ];
+            })
+            ->all();
+
+        return [
+            'type' => $type,
+            'data' => $data,
+            'pagination' => [
+                'current_page' => $paginator->currentPage(),
+                'last_page' => $paginator->lastPage(),
+                'per_page' => $paginator->perPage(),
+                'total' => $paginator->total(),
+            ],
+        ];
+    }
+
+    protected function buildLatestChecks(Monitor $monitor, string $checkType, string $timezone, int $limit): array
+    {
+        return $monitor->checkLogs()
+            ->where('check_type', $checkType)
+            ->latest('checked_at')
+            ->limit($limit)
+            ->get()
+            ->map(function (MonitorCheckLog $log) use ($timezone) {
+                return [
+                    'id' => $log->id,
+                    'checked_at' => $log->checked_at->timezone($timezone)->toDateTimeString(),
+                    'status' => $log->status,
+                    'message' => $log->message,
+                    'failure_reason' => $log->failure_reason,
+                    'response_time_ms' => $log->response_time_ms,
+                ];
+            })
+            ->all();
+    }
 }

config/monitor-history.php

@@ -23,9 +23,13 @@
     ],
 
     /*
-     * Maximum recent check rows to return on monitor detail page.
+     * Maximum recent checks surfaced on the monitor detail page's recent strip.
+     * Single source of truth: the controller caps `latest_checks` to this value
+     * AND ships it in the graph payload, and the frontend strip uses the same
+     * number as its slot cap (MonitorRecentStrip maxSlots) — so the backend and
+     * frontend caps cannot drift apart.
      */
-    'recent_checks_limit' => 50,
+    'recent_checks_limit' => 150,
 
     /*
      * How many days of raw logs to keep before pruning.