Skip to content

Commit bf09fcd

Browse files
authored
Separate ungrouped components on the status page (#102)
1 parent 936e483 commit bf09fcd

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@props(['component' => null])
2+
3+
<div class="overflow-hidden rounded-lg border shadow dark:border-zinc-700">
4+
<div class="flex flex-col divide-y bg-white dark:bg-zinc-800">
5+
<ul class="divide-y dark:divide-zinc-700">
6+
<x-cachet::component :component="$component" />
7+
</ul>
8+
</div>
9+
</div>

resources/views/status-page/index.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<x-cachet::component-group :component-group="$componentGroup"/>
1111
@endforeach
1212

13-
@if($ungroupedComponents->components->isNotEmpty())
14-
<x-cachet::component-group :component-group="$ungroupedComponents"/>
15-
@endif
13+
@foreach($ungroupedComponents as $component)
14+
<x-cachet::component-ungrouped :component="$component" />
15+
@endforeach
1616

1717
@if($schedules->isNotEmpty())
1818
<x-cachet::schedules :schedules="$schedules" />

src/Http/Controllers/StatusPage/StatusPageController.php

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,12 @@ public function index(): View
2525
->visible(auth()->check())
2626
->when(auth()->check(), fn (Builder $query) => $query->users(), fn ($query) => $query->guests())
2727
->get(),
28-
'ungroupedComponents' => (new ComponentGroup([
29-
'name' => __('Other Components'),
30-
'collapsed' => ComponentGroupVisibilityEnum::expanded,
31-
'visible' => ResourceVisibilityEnum::guest,
32-
]))
33-
->setRelation(
34-
'components',
35-
Component::query()
36-
->enabled()
37-
->whereNull('component_group_id')
38-
->orderBy('order')
39-
->withCount('incidents')
40-
->get()
41-
),
28+
'ungroupedComponents' => Component::query()
29+
->enabled()
30+
->whereNull('component_group_id')
31+
->orderBy('order')
32+
->withCount('incidents')
33+
->get(),
4234

4335
'schedules' => Schedule::query()->inTheFuture()->orderBy('scheduled_at')->get(),
4436
]);

0 commit comments

Comments
 (0)