## Summary - introduce a canonical admin tenant filter-state helper and route all in-scope workspace-admin tenant resolution through `OperateHubShell::activeEntitledTenant()` - align operations monitoring, operation-run deep links, Entra group admin list/view/search behavior, and shared context-bar rendering with the documented scope contract - add the Spec 135 design artifacts, architecture note, focused guardrail coverage, and non-regression tests for filter persistence, direct-record access, and global search safety ## Validation - `vendor/bin/sail bin pint --dirty --format agent` - `vendor/bin/sail artisan test --compact tests/Feature/Monitoring/OperationsKpiHeaderTenantContextTest.php tests/Feature/Monitoring/OperationsTenantScopeTest.php tests/Feature/Monitoring/OperationsCanonicalUrlsTest.php tests/Feature/Spec085/OperationsIndexHeaderTest.php tests/Feature/Spec085/RunDetailBackAffordanceTest.php tests/Feature/Filament/OperationRunListFiltersTest.php tests/Feature/Filament/EntraGroupAdminScopeTest.php tests/Feature/Filament/EntraGroupGlobalSearchScopeTest.php tests/Feature/DirectoryGroups/BrowseGroupsTest.php tests/Feature/Filament/EntraGroupEnterpriseDetailPageTest.php tests/Feature/Filament/PolicyVersionResolvedReferenceLinksTest.php tests/Feature/Filament/EntraGroupResolvedReferencePresentationTest.php tests/Feature/Guards/AdminTenantResolverGuardTest.php tests/Feature/OpsUx/OperateHubShellTest.php tests/Feature/Filament/Alerts/AlertsKpiHeaderTest.php tests/Feature/Alerts/AlertDeliveryDeepLinkFiltersTest.php` - `vendor/bin/sail artisan test --compact tests/Feature/Filament/TableStatePersistenceTest.php tests/Feature/Filament/TenantScopingTest.php tests/Feature/Filament/Alerts/AlertDeliveryViewerTest.php tests/Unit/Support/References/CapabilityAwareReferenceResolverTest.php` ## Notes - Filament v5 remains on Livewire v4.0+ compliant surfaces only. - No provider registration changes were needed; Laravel 12 provider registration remains in `bootstrap/providers.php`. - Entra group global search remains enabled and is now scoped to the canonical admin tenant contract. Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #164
138 lines
4.5 KiB
PHP
138 lines
4.5 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\EntraGroupResource;
|
|
use App\Filament\Resources\EntraGroupResource\Pages\ListEntraGroups;
|
|
use App\Models\EntraGroup;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Collection;
|
|
use Livewire\Livewire;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('cached groups can be listed, searched, and filtered (DB-only)', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$otherTenant = Tenant::factory()->create();
|
|
|
|
$stalenessDays = (int) config('directory_groups.staleness_days', 30);
|
|
|
|
EntraGroup::query()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'entra_id' => '00000000-0000-0000-0000-000000000001',
|
|
'display_name' => 'Alpha Team',
|
|
'group_types' => null,
|
|
'security_enabled' => true,
|
|
'mail_enabled' => false,
|
|
'last_seen_at' => now(),
|
|
]);
|
|
|
|
EntraGroup::query()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'entra_id' => '00000000-0000-0000-0000-000000000002',
|
|
'display_name' => 'Beta Unified',
|
|
'group_types' => ['Unified'],
|
|
'security_enabled' => false,
|
|
'mail_enabled' => true,
|
|
'last_seen_at' => now()->subDays(max(1, $stalenessDays) + 1),
|
|
]);
|
|
|
|
EntraGroup::query()->create([
|
|
'tenant_id' => $otherTenant->getKey(),
|
|
'entra_id' => '00000000-0000-0000-0000-000000000003',
|
|
'display_name' => 'Other Tenant Group',
|
|
'group_types' => null,
|
|
'security_enabled' => true,
|
|
'mail_enabled' => false,
|
|
'last_seen_at' => now(),
|
|
]);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$extractNames = function ($livewire): Collection {
|
|
$records = $livewire->instance()->getTableRecords();
|
|
|
|
$items = method_exists($records, 'items') ? collect($records->items()) : collect($records);
|
|
|
|
return $items->pluck('display_name');
|
|
};
|
|
|
|
$forgetPersistedFilters = function (): void {
|
|
$component = Livewire::test(ListEntraGroups::class)->instance();
|
|
|
|
session()->forget($component->getTableFiltersSessionKey());
|
|
session()->forget($component->getTableSearchSessionKey());
|
|
session()->forget($component->getTableSortSessionKey());
|
|
};
|
|
|
|
$names = $extractNames(Livewire::test(ListEntraGroups::class));
|
|
expect($names)->toContain('Alpha Team');
|
|
expect($names)->toContain('Beta Unified');
|
|
expect($names)->not->toContain('Other Tenant Group');
|
|
|
|
$names = $extractNames(
|
|
Livewire::test(ListEntraGroups::class)
|
|
->set('tableSearch', 'Beta')
|
|
);
|
|
expect($names)->toContain('Beta Unified');
|
|
expect($names)->not->toContain('Alpha Team');
|
|
|
|
$forgetPersistedFilters();
|
|
|
|
$names = $extractNames(
|
|
Livewire::test(ListEntraGroups::class)
|
|
->set('tableFilters.stale.value', 1)
|
|
);
|
|
expect($names)->toContain('Beta Unified');
|
|
expect($names)->not->toContain('Alpha Team');
|
|
|
|
$forgetPersistedFilters();
|
|
|
|
$names = $extractNames(
|
|
Livewire::test(ListEntraGroups::class)
|
|
->set('tableFilters.group_type.value', 'security')
|
|
);
|
|
expect($names)->toContain('Alpha Team');
|
|
expect($names)->not->toContain('Beta Unified');
|
|
});
|
|
|
|
test('group detail is tenant-scoped and cross-tenant access is not found (404)', function () {
|
|
$tenantA = Tenant::factory()->create();
|
|
$tenantB = Tenant::factory()->create([
|
|
'workspace_id' => $tenantA->workspace_id,
|
|
]);
|
|
|
|
$groupB = EntraGroup::query()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'entra_id' => '00000000-0000-0000-0000-000000000099',
|
|
'display_name' => 'Tenant B Group',
|
|
'group_types' => null,
|
|
'security_enabled' => true,
|
|
'mail_enabled' => false,
|
|
'last_seen_at' => now(),
|
|
]);
|
|
|
|
$user = User::factory()->create();
|
|
[$user, $tenantA] = createUserWithTenant(tenant: $tenantA, user: $user, role: 'owner');
|
|
|
|
$this->actingAs($user)
|
|
->get(EntraGroupResource::getUrl('view', ['record' => $groupB], tenant: $tenantA))
|
|
->assertNotFound();
|
|
});
|
|
|
|
test('keeps Entra groups out of admin sidebar navigation while preserving tenant-panel navigation', function () {
|
|
Filament::setCurrentPanel(Filament::getPanel('admin'));
|
|
|
|
expect(EntraGroupResource::shouldRegisterNavigation())->toBeFalse();
|
|
|
|
Filament::setCurrentPanel(Filament::getPanel('tenant'));
|
|
|
|
expect(EntraGroupResource::shouldRegisterNavigation())->toBeTrue();
|
|
|
|
Filament::setCurrentPanel(null);
|
|
});
|