Skip to content

Count every open incident in the dashboard's Incidents badge #499

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

Merged
jbrooksuk merged 1 commit into from
Nov 2, 2026
Merged

Count every open incident in the dashboard's Incidents badge #499

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
3 changes: 1 addition & 2 deletions src/Filament/Resources/Incidents/IncidentResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Cachet\Filament\Resources\Updates\RelationManagers\UpdatesRelationManager;
use Cachet\Models\Incident;
use Cachet\Settings\MailSettings;
use Cachet\Status;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteAction;
Expand Down Expand Up @@ -311,7 +310,7 @@ public static function getEloquentQuery(): Builder

public static function getNavigationBadge(): ?string
{
return (string) (int) app(Status::class)->incidents()->unresolved;
return (string) Incident::query()->unresolved()->count();
}

public static function getNavigationBadgeColor(): string
Expand Down
10 changes: 10 additions & 0 deletions tests/Feature/Filament/Resources/IncidentResourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Cachet\Enums\IncidentStatusEnum;
use Cachet\Enums\ResourceVisibilityEnum;
use Cachet\Filament\Components\ComponentOptions;
use Cachet\Filament\Resources\Incidents\IncidentResource;
use Cachet\Filament\Resources\Incidents\Pages\CreateIncident;
use Cachet\Filament\Resources\Incidents\Pages\EditIncident;
use Cachet\Filament\Resources\Incidents\Pages\ListIncidents;
Expand All @@ -29,6 +30,15 @@
actingAs(User::factory()->create(['is_admin' => true]));
});

it('counts every open incident in the navigation badge', function () {
Incident::factory()->create(['status' => IncidentStatusEnum::investigating, 'visible' => ResourceVisibilityEnum::authenticated]);
Incident::factory()->create(['status' => IncidentStatusEnum::identified, 'visible' => ResourceVisibilityEnum::hidden]);
Incident::factory()->create(['status' => IncidentStatusEnum::fixed, 'visible' => ResourceVisibilityEnum::guest]);

expect(IncidentResource::getNavigationBadge())->toBe('2')
->and(IncidentResource::getNavigationBadgeColor())->toBe('danger');
});

it('can create, reload, edit and clear a private note on a public incident', function () {
livewire(CreateIncident::class)
->fillForm([
Expand Down
Loading