From 83daffa75bd9f97837ea5c0607bb4594a44ff4fb Mon Sep 17 00:00:00 2001
From: Daniele Rosario <daniele@weble.it>
Date: Wed, 7 Feb 2024 17:55:06 +0100
Subject: [PATCH] fixes

---
 packages/panels/routes/web.php           | 12 +++++++++---
 tests/src/DomainTenancyPanelProvider.php |  8 +++++++-
 tests/src/TenancyPanelProvider.php       |  7 ++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/panels/routes/web.php b/packages/panels/routes/web.php
index 8e5585532d..2f5f507472 100644
--- a/packages/panels/routes/web.php
+++ b/packages/panels/routes/web.php
@@ -126,18 +126,24 @@ Route::name('filament.')
                                             $resource::registerRoutes($panel);
                                         }
                                     });
-
                             });
 
                         if ($hasTenancy) {
-                            Route::middleware($panel->getTenantMiddleware())
-                                ->prefix((($tenantRoutePrefix) ? "{$tenantRoutePrefix}/" : '') . '{tenant' . (($tenantSlugAttribute) ? ":{$tenantSlugAttribute}" : '') . '}')
+                            $route = Route::middleware($panel->getTenantMiddleware())
+                                ->prefix((($tenantRoutePrefix) ? "{$tenantRoutePrefix}/" : '') . '{tenant' . (($tenantSlugAttribute) ? ":{$tenantSlugAttribute}" : '') . '}');
+
+                            if ($tenantDomain) {
+                                $route->domain($tenantDomain);
+                            }
+
+                            $route
                                 ->group(function () use ($panel): void {
                                     if ($routes = $panel->getTenantRoutes()) {
                                         $routes($panel);
                                     }
                                 });
                         }
+
                     });
             }
         }
diff --git a/tests/src/DomainTenancyPanelProvider.php b/tests/src/DomainTenancyPanelProvider.php
index 8a839df522..64e294a5cc 100644
--- a/tests/src/DomainTenancyPanelProvider.php
+++ b/tests/src/DomainTenancyPanelProvider.php
@@ -6,9 +6,12 @@ use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Http\Middleware\IdentifyTenant;
+use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
+use Filament\Tests\Actions\Fixtures\Pages\Actions;
 use Filament\Tests\Models\DomainTeam;
+use Filament\Tests\Panels\Fixtures\Pages\Settings;
 use Filament\Tests\Panels\Fixtures\Resources\PostCategoryResource;
 use Filament\Tests\Panels\Fixtures\Resources\PostResource;
 use Filament\Tests\Panels\Fixtures\Resources\ProductResource;
@@ -27,6 +30,7 @@ class DomainTenancyPanelProvider extends PanelProvider
     {
         return $panel
             ->id('domain-tenancy')
+            ->path('/domain-tenancy')
             ->tenant(DomainTeam::class)
             ->tenantDomain('{tenant}', 'domain')
             ->login()
@@ -40,7 +44,9 @@ class DomainTenancyPanelProvider extends PanelProvider
                 UserResource::class,
             ])
             ->pages([
-
+                Pages\Dashboard::class,
+                Actions::class,
+                Settings::class,
             ])
             ->middleware([
                 EncryptCookies::class,
diff --git a/tests/src/TenancyPanelProvider.php b/tests/src/TenancyPanelProvider.php
index 04aa856f27..68379bd465 100644
--- a/tests/src/TenancyPanelProvider.php
+++ b/tests/src/TenancyPanelProvider.php
@@ -6,9 +6,12 @@ use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Http\Middleware\IdentifyTenant;
+use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
+use Filament\Tests\Actions\Fixtures\Pages\Actions;
 use Filament\Tests\Models\Team;
+use Filament\Tests\Panels\Fixtures\Pages\Settings;
 use Filament\Tests\Panels\Fixtures\Resources\PostCategoryResource;
 use Filament\Tests\Panels\Fixtures\Resources\PostResource;
 use Filament\Tests\Panels\Fixtures\Resources\ProductResource;
@@ -40,7 +43,9 @@ class TenancyPanelProvider extends PanelProvider
                 UserResource::class,
             ])
             ->pages([
-
+                Pages\Dashboard::class,
+                Actions::class,
+                Settings::class,
             ])
             ->middleware([
                 EncryptCookies::class,