diff --git a/apps/platform/app/Providers/Filament/AdminPanelProvider.php b/apps/platform/app/Providers/Filament/AdminPanelProvider.php index e1eb7498..5b08f6ff 100644 --- a/apps/platform/app/Providers/Filament/AdminPanelProvider.php +++ b/apps/platform/app/Providers/Filament/AdminPanelProvider.php @@ -40,6 +40,7 @@ use App\Support\Filament\PanelThemeAsset; use App\Support\Navigation\NavigationScope; use App\Support\OperationRunLinks; +use App\Support\Tenants\TenantPageCategory; use App\Support\Workspaces\WorkspaceContext; use Filament\Http\Middleware\Authenticate; use Filament\Http\Middleware\AuthenticateSession; @@ -180,7 +181,8 @@ public function panel(Panel $panel): Panel ) ->renderHook( PanelsRenderHook::PAGE_START, - fn (): string => request()->routeIs('admin.workspace.managed-environments.index', 'admin.onboarding', 'admin.onboarding.draft', 'filament.admin.pages.choose-environment') + fn (): string => TenantPageCategory::fromRequest(request()) === TenantPageCategory::OnboardingWorkflow + || request()->routeIs('admin.workspace.managed-environments.index', 'filament.admin.pages.choose-environment') ? '' : ((bool) config('tenantpilot.bulk_operations.progress_widget_enabled', true) ? view('livewire.bulk-operation-progress-wrapper')->render() diff --git a/apps/platform/tests/Feature/Onboarding/OnboardingDraftRoutingTest.php b/apps/platform/tests/Feature/Onboarding/OnboardingDraftRoutingTest.php index 5b746748..39b212e1 100644 --- a/apps/platform/tests/Feature/Onboarding/OnboardingDraftRoutingTest.php +++ b/apps/platform/tests/Feature/Onboarding/OnboardingDraftRoutingTest.php @@ -3,6 +3,7 @@ declare(strict_types=1); use App\Filament\Pages\Workspaces\ManagedEnvironmentOnboardingWizard; +use App\Livewire\BulkOperationProgress; use App\Models\ManagedEnvironment; use App\Models\ManagedEnvironmentOnboardingSession; use App\Models\User; @@ -27,6 +28,7 @@ ->get(route('admin.onboarding')) ->assertSuccessful() ->assertSee('Create or resume a managed environment in this workspace.') + ->assertDontSeeLivewire(BulkOperationProgress::class) ->assertDontSee('Multiple onboarding drafts are available.'); }); @@ -94,6 +96,7 @@ $this->actingAs($user) ->get(route('admin.onboarding.draft', ['onboardingDraft' => $draft->getKey()])) ->assertSuccessful() + ->assertDontSeeLivewire(BulkOperationProgress::class) ->assertSee('Onboarding draft') ->assertSee('Contoso GmbH') ->assertSee('22222222-2222-2222-2222-222222222222')