fix: update x scales time unit

Author: Sean Connole

public/build/assets/cachet-BXLEFZKk.css

@@ -1,6 +1,6 @@
 {
   "resources/css/cachet.css": {
-    "file": "assets/cachet-Df9g2n5M.css",
+    "file": "assets/cachet-BXLEFZKk.css",
     "src": "resources/css/cachet.css",
     "isEntry": true
   },
@@ -10,7 +10,7 @@
     "isEntry": true
   },
   "resources/js/cachet.js": {
-    "file": "assets/cachet-DCZQ8JcZ.js",
+    "file": "assets/cachet-D0qURpuI.js",
     "name": "cachet",
     "src": "resources/js/cachet.js",
     "isEntry": true

public/build/assets/cachet-D0qURpuI.js

@@ -5,6 +5,15 @@
     const previous7Days = new Date(now - 7 * 24 * 60 * 60 * 1000)
     const previous30Days = new Date(now - 30 * 24 * 60 * 60 * 1000)
 
+    const MetricView = {{
+        Js::from([
+            'last_hour' => \Cachet\Enums\MetricViewEnum::last_hour->value,
+            'today' => \Cachet\Enums\MetricViewEnum::today->value,
+            'week' => \Cachet\Enums\MetricViewEnum::week->value,
+            'month' => \Cachet\Enums\MetricViewEnum::month->value,
+        ])
+    }}
+
     function init() {
         // Parse metric points
         const metricPoints = this.metric.metric_points.map((point) => {
@@ -45,8 +54,18 @@ function init() {
 
         this.$watch('period', () => {
             chart.data.datasets[0].data = this.points[this.period]
+            chart.options.scales.x.time.unit = getTimeUnit(this.period)
+
             chart.update()
         })
+
+        function getTimeUnit(period) {
+            if (period == MetricView.last_hour) return 'minute'
+            if (period == MetricView.today) return 'hour'
+            if (period == MetricView.week) return 'week'
+            if (period == MetricView.month) return 'month'
+            return 'day'
+        }
     }
 </script>
 

public/build/assets/cachet-DCZQ8JcZ.js

@@ -26,7 +26,7 @@ public function render(): View
         // Convert each metric point to Chart.js format (x, y)
         $metrics->each(function ($metric) {
             $metric->metricPoints->transform(fn ($point) => [
-                'x' => $point->created_at->toIso8601String(),
+                'x' => $point->created_at->utc(),
                 'y' => $point->value,
             ]);
         });
@@ -45,6 +45,8 @@ private function metrics(Carbon $startDate): Collection
             ->with([
                 'metricPoints' => fn ($query) => $query->orderBy('created_at'),
             ])
+            ->where('display_chart', '=', 1)
+            ->where('visible', '=', 1)
             ->where('visible', '>=', !auth()->check())
             ->whereHas('metricPoints', fn (Builder $query) => $query->where('created_at', '>=', $startDate))
             ->orderBy('places', 'asc')