ahmido
cc93329672
## 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
60 lines
1.6 KiB
PHP
60 lines
1.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Filament\Concerns;
|
|
|
|
use App\Models\Tenant;
|
|
use App\Support\OperateHub\OperateHubShell;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
|
|
trait ScopesGlobalSearchToTenant
|
|
{
|
|
/**
|
|
* The Eloquent relationship name used to scope records to the current tenant.
|
|
*/
|
|
protected static string $globalSearchTenantRelationship = 'tenant';
|
|
|
|
public static function getGlobalSearchEloquentQuery(): Builder
|
|
{
|
|
$query = static::getModel()::query();
|
|
|
|
if (! static::isScopedToTenant()) {
|
|
$panel = Filament::getCurrentOrDefaultPanel();
|
|
|
|
if ($panel?->hasTenancy()) {
|
|
$query->withoutGlobalScope($panel->getTenancyScopeName());
|
|
}
|
|
}
|
|
|
|
$tenant = static::resolveGlobalSearchTenant();
|
|
|
|
if (! $tenant instanceof Model) {
|
|
return $query->whereRaw('1 = 0');
|
|
}
|
|
|
|
$user = auth()->user();
|
|
|
|
if (! $user || ! method_exists($user, 'canAccessTenant') || ! $user->canAccessTenant($tenant)) {
|
|
return $query->whereRaw('1 = 0');
|
|
}
|
|
|
|
return $query->whereBelongsTo($tenant, static::$globalSearchTenantRelationship);
|
|
}
|
|
|
|
protected static function resolveGlobalSearchTenant(): ?Model
|
|
{
|
|
if (Filament::getCurrentPanel()?->getId() === 'admin') {
|
|
$tenant = app(OperateHubShell::class)->activeEntitledTenant(request());
|
|
|
|
return $tenant instanceof Tenant ? $tenant : null;
|
|
}
|
|
|
|
$tenant = Filament::getTenant();
|
|
|
|
return $tenant instanceof Model ? $tenant : null;
|
|
}
|
|
}
|