Skip to content

Show the component group status in the system status view #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jayhemnani9910 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show the component group status in the system status view #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions resources/views/components/system-status.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ \Cachet\Facades\CachetView::renderHook(\Cachet\View\RenderHook::STATUS_PAGE_SYSTEM_STATUS_BEFORE) }}
@php($showComponentGroupStatus = app(\Cachet\Settings\AppSettings::class)->show_component_group_status)
<section data-component="system-status" class="status-overview">
<header class="status-overview__masthead">
<h2 data-slot="title" class="font-semibold tracking-tight text-zinc-900 dark:text-zinc-100">{{ __('cachet::system_status.title') }}</h2>
Expand All @@ -16,9 +17,15 @@
<button data-slot="trigger" x-disclosure:button class="w-full px-5 py-4 text-left transition hover:bg-zinc-50/60 dark:hover:bg-white/[0.02] sm:px-6">
<div class="flex items-center justify-between gap-4">
<span class="flex min-w-0 items-center gap-2">
<span x-show="! $disclosure.isOpen" class="flex shrink-0">
<x-heroicon-s-check-circle class="size-4 text-emerald-500" />
</span>
@if ($showComponentGroupStatus)
@php($groupStatus = $group['model']->worstComponentStatus())
<span x-show="! $disclosure.isOpen" class="flex shrink-0">
@svg($groupStatus->getIcon(), 'size-4 shrink-0 '.$groupStatus->getTextColorClasses(), [
'data-slot' => 'status-icon',
'aria-label' => $groupStatus->getLabel(),
])
</span>
@endif
<span class="truncate font-semibold text-zinc-900 dark:text-zinc-100">{{ $group['model']->name }}</span>
<x-heroicon-m-chevron-down ::class="$disclosure.isOpen && 'rotate-180'" class="size-3.5 shrink-0 text-zinc-400 transition" />
<span class="hidden shrink-0 text-sm text-zinc-500 dark:text-zinc-400 lg:inline">{{ trans_choice('cachet::system_status.component_count', $group['components']->count(), ['count' => $group['components']->count()]) }}</span>
Expand Down
24 changes: 24 additions & 0 deletions tests/Feature/StatusPage/StatusPageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,30 @@
'signed in' => [true],
]);

it('shows the worst component status of a system status group', function (bool $showGroupStatus) {
$settings = app(AppSettings::class);
$settings->display_system_status = true;
$settings->show_component_group_status = $showGroupStatus;
$settings->save();

$group = ComponentGroup::factory()->create(['name' => 'Core services']);
Component::factory()->create(['component_group_id' => $group->id, 'status' => ComponentStatusEnum::major_outage]);
Component::factory()->create(['component_group_id' => $group->id]);

$page = $this->get(route('cachet.status-page'))->assertOk()->getContent();
$header = str($page)->after('data-component-group-id="'.$group->id.'"')->before('Core services')->toString();

expect($header)->not->toContain('text-emerald-500');
if ($showGroupStatus) {
expect($header)->toContain('aria-label="Major outage"');
} else {
expect($header)->not->toContain('data-slot="status-icon"');
}
})->with([
'group status shown' => [true],
'group status hidden' => [false],
]);

function systemStatusGroupPattern(ComponentGroup $group, bool $open): string
{
$tag = '<div data-component="system-status-group" data-component-group-id="'.$group->id.'" x-data x-disclosure';
Expand Down
Loading