Implements Spec 077 refinements: workspace Global Mode and navigation/context-bar redundancy cleanup.
Summary
- Global Mode: `/admin/workspaces` is workspace-optional (lists only member workspaces); explicit allowlist in `EnsureWorkspaceSelected`.
- Navigation cleanup: workspace switching is topbar-only; no sidebar “Switch workspace”; removes redundant “Manage workspaces” entry from context-bar.
- Context bar: when no workspace selected, tenant picker is disabled with guidance; on tenant-scoped routes `/admin/t/{tenant}/…` the tenant indicator is read-only (Filament tenant menu remains primary).
- Authorization: workspace creation is policy-driven (`WorkspacePolicy::create()`), enforced in `ChooseWorkspace` via Gate.
Safety / Compliance
- Livewire v4.0+ compliant (Filament v5).
- Panel provider registration remains in `bootstrap/providers.php` (no changes required).
- Global search: no new globally searchable resources added; no behavior changes introduced.
- Destructive actions: none added/changed.
- Assets: no new assets registered; deploy process unchanged (if assets are registered elsewhere, ensure `php artisan filament:assets` runs in deploy as usual).
Tests
- `vendor/bin/sail bin pint --dirty`
- `vendor/bin/sail artisan test --compact tests/Feature/Workspaces tests/Feature/Monitoring tests/Feature/OpsUx tests/Feature/Filament/WorkspaceContextTopbarAndTenantSelectionTest.php`
Spec artifacts
- `specs/077-workspace-nav-monitoring-hub/{spec,plan,tasks}.md`
- `specs/077-workspace-nav-monitoring-hub/contracts/routes.md`
Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box>
Reviewed-on: #94
101 lines
3.0 KiB
PHP
101 lines
3.0 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Middleware;
|
|
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use App\Models\WorkspaceMembership;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use App\Support\Workspaces\WorkspaceIntendedUrl;
|
|
use Closure;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Response as HttpResponse;
|
|
use Illuminate\Support\Facades\Gate;
|
|
use Illuminate\Support\Facades\Schema;
|
|
use Symfony\Component\HttpFoundation\Response;
|
|
|
|
class EnsureWorkspaceSelected
|
|
{
|
|
/**
|
|
* Handle an incoming request.
|
|
*
|
|
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
|
|
*/
|
|
public function handle(Request $request, Closure $next): Response
|
|
{
|
|
$routeName = $request->route()?->getName();
|
|
|
|
if (is_string($routeName) && str_contains($routeName, '.auth.')) {
|
|
return $next($request);
|
|
}
|
|
|
|
$path = '/'.ltrim($request->path(), '/');
|
|
|
|
if ($this->isWorkspaceOptionalPath($request, $path)) {
|
|
return $next($request);
|
|
}
|
|
|
|
if (str_starts_with($path, '/admin/t/')) {
|
|
return $next($request);
|
|
}
|
|
|
|
$user = $request->user();
|
|
|
|
if (! $user instanceof User) {
|
|
return $next($request);
|
|
}
|
|
|
|
/** @var WorkspaceContext $context */
|
|
$context = app(WorkspaceContext::class);
|
|
|
|
$workspace = $context->resolveInitialWorkspaceFor($user, $request);
|
|
|
|
if ($workspace !== null) {
|
|
return $next($request);
|
|
}
|
|
|
|
$membershipQuery = WorkspaceMembership::query()->where('user_id', $user->getKey());
|
|
|
|
$hasAnyActiveMembership = Schema::hasColumn('workspaces', 'archived_at')
|
|
? $membershipQuery
|
|
->join('workspaces', 'workspace_memberships.workspace_id', '=', 'workspaces.id')
|
|
->whereNull('workspaces.archived_at')
|
|
->exists()
|
|
: $membershipQuery->exists();
|
|
|
|
$canCreateWorkspace = Gate::forUser($user)->check('create', Workspace::class);
|
|
|
|
$target = ($hasAnyActiveMembership || $canCreateWorkspace)
|
|
? '/admin/choose-workspace'
|
|
: '/admin/no-access';
|
|
|
|
if ($target === '/admin/choose-workspace') {
|
|
WorkspaceIntendedUrl::storeFromRequest($request);
|
|
}
|
|
|
|
return new HttpResponse('', 302, ['Location' => $target]);
|
|
}
|
|
|
|
private function isWorkspaceOptionalPath(Request $request, string $path): bool
|
|
{
|
|
if (str_starts_with($path, '/admin/workspaces')) {
|
|
return true;
|
|
}
|
|
|
|
if (in_array($path, ['/admin/choose-workspace', '/admin/no-access', '/admin/onboarding'], true)) {
|
|
return true;
|
|
}
|
|
|
|
if ($path === '/livewire/update') {
|
|
$refererPath = parse_url((string) $request->headers->get('referer', ''), PHP_URL_PATH) ?? '';
|
|
$refererPath = '/'.ltrim((string) $refererPath, '/');
|
|
|
|
if (preg_match('#^/admin/operations/[^/]+$#', $refererPath) === 1) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return preg_match('#^/admin/operations/[^/]+$#', $path) === 1;
|
|
}
|
|
}
|