## Summary - add Intune RBAC Role Definition baseline scope support, capture references, compare classification, findings evidence, and landing/detail UI labels - keep Intune Role Assignments explicitly excluded from baseline compare scope, summaries, findings, and restore messaging - add focused Pest coverage for baseline scope selection, capture, compare behavior, recurrence, isolation, findings rendering, inventory anchoring, and RBAC summaries ## Verification - `vendor/bin/sail bin pint --dirty --format agent` - `vendor/bin/sail artisan test --compact tests/Unit/Inventory/InventoryPolicyTypeMetaBaselineSupportTest.php tests/Unit/Baselines/BaselinePolicyVersionResolverTest.php tests/Unit/Baselines/BaselineScopeTest.php tests/Unit/IntuneRoleDefinitionNormalizerTest.php tests/Feature/Baselines/BaselineCaptureRbacRoleDefinitionsTest.php tests/Feature/Baselines/BaselineCompareRbacRoleDefinitionsTest.php tests/Feature/Baselines/BaselineCompareDriftEvidenceContractRbacTest.php tests/Feature/Baselines/BaselineCompareCoverageGuardTest.php tests/Feature/Baselines/BaselineCompareCrossTenantMatchTest.php tests/Feature/Baselines/BaselineCompareFindingRecurrenceKeyTest.php tests/Feature/Baselines/BaselineCompareWhyNoFindingsReasonCodeTest.php tests/Feature/Filament/BaselineProfileFoundationScopeTest.php tests/Feature/Filament/BaselineSnapshotRbacRoleDefinitionsTest.php tests/Feature/Filament/BaselineCompareLandingRbacLabelsTest.php tests/Feature/Filament/FindingViewRbacEvidenceTest.php tests/Feature/Findings/FindingRecurrenceTest.php tests/Feature/Findings/DriftStaleAutoResolveTest.php tests/Feature/Inventory/InventorySyncButtonTest.php tests/Feature/Inventory/InventorySyncServiceTest.php tests/Feature/RunAuthorizationTenantIsolationTest.php` - result: `71 passed (467 assertions)` ## Filament / Platform Notes - Livewire compliance: unchanged and compatible with Livewire v4.0+ - Provider registration: no panel/provider changes; `bootstrap/providers.php` remains the registration location - Global search: no new globally searchable resource added; existing global search behavior is unchanged - Destructive actions: no new destructive actions introduced; existing confirmed actions remain unchanged - Assets: no new Filament assets introduced; deploy asset handling remains unchanged, including `php artisan filament:assets` - Testing plan covered: baseline profile scope, snapshot detail, compare job, findings recurrence, findings detail, compare landing labels, inventory sync anchoring, and tenant isolation Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #156
119 lines
5.0 KiB
PHP
119 lines
5.0 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Filament\Widgets\Dashboard;
|
|
|
|
use App\Filament\Resources\FindingResource;
|
|
use App\Models\Finding;
|
|
use App\Models\InventoryItem;
|
|
use App\Models\Tenant;
|
|
use App\Support\Badges\BadgeDomain;
|
|
use App\Support\Badges\BadgeRenderer;
|
|
use App\Support\OpsUx\ActiveRuns;
|
|
use Filament\Facades\Filament;
|
|
use Filament\Tables\Columns\TextColumn;
|
|
use Filament\Tables\Table;
|
|
use Filament\Widgets\TableWidget;
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
use Illuminate\Support\Arr;
|
|
|
|
class RecentDriftFindings extends TableWidget
|
|
{
|
|
public function table(Table $table): Table
|
|
{
|
|
$tenant = Filament::getTenant();
|
|
|
|
return $table
|
|
->heading('Recent Drift Findings')
|
|
->query($this->getQuery())
|
|
->poll(fn (): ?string => ($tenant instanceof Tenant) && ActiveRuns::existForTenant($tenant) ? '10s' : null)
|
|
->defaultSort('created_at', 'desc')
|
|
->paginated(\App\Support\Filament\TablePaginationProfiles::widget())
|
|
->columns([
|
|
TextColumn::make('short_id')
|
|
->label('ID')
|
|
->state(fn (Finding $record): string => '#'.$record->getKey())
|
|
->copyable()
|
|
->copyableState(fn (Finding $record): string => (string) $record->getKey()),
|
|
TextColumn::make('subject_display_name')
|
|
->label('Subject')
|
|
->placeholder('—')
|
|
->limit(40)
|
|
->formatStateUsing(function (?string $state, Finding $record): ?string {
|
|
if (is_string($state) && trim($state) !== '') {
|
|
return $state;
|
|
}
|
|
|
|
$fallback = Arr::get($record->evidence_jsonb ?? [], 'display_name');
|
|
$fallback = is_string($fallback) ? trim($fallback) : null;
|
|
|
|
return $fallback !== '' ? $fallback : null;
|
|
})
|
|
->description(function (Finding $record): ?string {
|
|
if (Arr::get($record->evidence_jsonb ?? [], 'summary.kind') !== 'rbac_role_definition') {
|
|
return null;
|
|
}
|
|
|
|
return __('findings.drift.rbac_role_definition');
|
|
})
|
|
->tooltip(function (Finding $record): ?string {
|
|
$displayName = $record->subject_display_name;
|
|
|
|
if (is_string($displayName) && trim($displayName) !== '') {
|
|
return $displayName;
|
|
}
|
|
|
|
$fallback = Arr::get($record->evidence_jsonb ?? [], 'display_name');
|
|
|
|
return is_string($fallback) && trim($fallback) !== '' ? trim($fallback) : null;
|
|
}),
|
|
TextColumn::make('severity')
|
|
->badge()
|
|
->sortable()
|
|
->formatStateUsing(BadgeRenderer::label(BadgeDomain::FindingSeverity))
|
|
->color(BadgeRenderer::color(BadgeDomain::FindingSeverity))
|
|
->icon(BadgeRenderer::icon(BadgeDomain::FindingSeverity))
|
|
->iconColor(BadgeRenderer::iconColor(BadgeDomain::FindingSeverity)),
|
|
TextColumn::make('status')
|
|
->badge()
|
|
->sortable()
|
|
->toggleable(isToggledHiddenByDefault: true)
|
|
->formatStateUsing(BadgeRenderer::label(BadgeDomain::FindingStatus))
|
|
->color(BadgeRenderer::color(BadgeDomain::FindingStatus))
|
|
->icon(BadgeRenderer::icon(BadgeDomain::FindingStatus))
|
|
->iconColor(BadgeRenderer::iconColor(BadgeDomain::FindingStatus)),
|
|
TextColumn::make('created_at')
|
|
->label('Created')
|
|
->sortable()
|
|
->since(),
|
|
])
|
|
->recordUrl(fn (Finding $record): ?string => $tenant instanceof Tenant
|
|
? FindingResource::getUrl('view', ['record' => $record], tenant: $tenant)
|
|
: null)
|
|
->emptyStateHeading('No drift findings')
|
|
->emptyStateDescription('You\'re looking good — no drift findings to review yet.');
|
|
}
|
|
|
|
/**
|
|
* @return Builder<Finding>
|
|
*/
|
|
private function getQuery(): Builder
|
|
{
|
|
$tenant = Filament::getTenant();
|
|
$tenantId = $tenant instanceof Tenant ? $tenant->getKey() : null;
|
|
|
|
return Finding::query()
|
|
->addSelect([
|
|
'subject_display_name' => InventoryItem::query()
|
|
->select('display_name')
|
|
->whereColumn('inventory_items.tenant_id', 'findings.tenant_id')
|
|
->whereColumn('inventory_items.external_id', 'findings.subject_external_id')
|
|
->limit(1),
|
|
])
|
|
->when($tenantId, fn (Builder $query) => $query->where('tenant_id', $tenantId))
|
|
->where('finding_type', Finding::FINDING_TYPE_DRIFT)
|
|
->latest('created_at');
|
|
}
|
|
}
|