wip

Author: jbrooksuk

resources/lang/en.json

@@ -1,5 +1,5 @@
 {
-    ":incidents Incidents": ":incidents Incident|:incidents Incidents",
+    ":count Incident": ":count Incident|:count Incidents",
     "Admin": "Admin",
     "Always Hidden": "Always Hidden",
     "Always collapsed": "Always collapsed",

resources/views/components/component-group.blade.php

@@ -14,10 +14,10 @@
             <x-heroicon-o-chevron-up ::class="!$disclosure.isOpen && 'rotate-180'" class="size-4 transition" />
         </button>
 
-        @if(($incidentCount = $componentGroup->components()->sum('incidents_count')) > 0)
-        <a href="#" class="rounded border border-zinc-800 px-2 py-1 text-xs font-semibold text-zinc-800 dark:border-zinc-600 dark:text-zinc-400">
-            {{ trans_choice(':incidents Incidents', $incidentCount, ['incidents' => $incidentCount]) }}
-        </a>
+        @if(($incidentCount = $componentGroup->components->sum('incidents_count')) > 0)
+        <span class="rounded border border-zinc-800 px-2 py-1 text-xs font-semibold text-zinc-800 dark:border-zinc-600 dark:text-zinc-400">
+            {{ trans_choice(':count Incident', $incidentCount) }}
+        </span>
         @endif
     </div>
 

resources/views/components/component.blade.php

@@ -22,6 +22,10 @@
             @endif
         </div>
 
+        @if ($component->incidents_count > 0)
+        <a href="{{ route('cachet.status-page.incident', [$component->incidents->first()]) }}"><x-cachet::component-badge :type="$component->status" /></a>
+        @else
         <x-cachet::component-badge :type="$component->status" />
+        @endif
     </div>
 </li>

src/Http/Controllers/StatusPage/StatusPageController.php

@@ -8,6 +8,8 @@
 use Cachet\Models\ComponentGroup;
 use Cachet\Models\Incident;
 use Cachet\Models\Schedule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\View\View;
 
 class StatusPageController
@@ -19,9 +21,9 @@ public function index(): View
     {
         return view('cachet::status-page.index', [
             'componentGroups' => ComponentGroup::query()
-                ->with(['components' => fn ($query) => $query->enabled()->orderBy('order')->withCount('incidents')])
+                ->with(['components' => fn (HasMany $query) => $query->enabled()->orderBy('order')->withCount('incidents')])
                 ->visible(auth()->check())
-                ->when(auth()->check(), fn ($query) => $query->users(), fn ($query) => $query->guests())
+                ->when(auth()->check(), fn (Builder $query) => $query->users(), fn ($query) => $query->guests())
                 ->get(),
             'ungroupedComponents' => (new ComponentGroup([
                 'name' => __('Other Components'),

src/Models/Component.php

@@ -53,9 +53,9 @@ public function group(): BelongsTo
     /**
      * Get the incidents for the component.
      */
-    public function incidents(): HasMany
+    public function incidents(): BelongsToMany
     {
-        return $this->hasMany(Incident::class);
+        return $this->belongsToMany(Incident::class, 'incident_components')->withPivot('status');
     }
 
     /**