Optimize IdentifyTenant to reuse existing tenant if set

packages/panels/src/Http/Middleware/IdentifyTenant.php

@@ -29,7 +29,7 @@ public function handle(Request $request, Closure $next): mixed
             abort(404);
         }
 
-        $tenant = $panel->getTenant($request->route()->parameter('tenant'));
+        $tenant = $panel->resolveTenantForRequest($request->route()->parameter('tenant'));
 
         if (! $user->canAccessTenant($tenant)) {
             abort(404);

packages/panels/src/Panel/Concerns/HasTenancy.php

@@ -42,6 +42,8 @@ trait HasTenancy
 
     protected ?string $tenantOwnershipRelationshipName = null;
 
+    protected ?Closure $tenantIdentifier = null;
+
     /**
      * @var array<Action | Closure | MenuItem>
      */
@@ -137,6 +139,13 @@ public function tenantRegistration(?string $page): static
         return $this;
     }
 
+    public function identifyTenant(?Closure $callback): static
+    {
+        $this->tenantIdentifier = $callback;
+
+        return $this;
+    }
+
     public function hasTenancy(): bool
     {
         return filled($this->getTenantModel());
@@ -202,6 +211,17 @@ public function getTenantRegistrationPage(): ?string
         return $this->tenantRegistrationPage;
     }
 
+    public function resolveTenantForRequest(string $key): Model
+    {
+        if ($this->tenantIdentifier) {
+            return $this->evaluate($this->tenantIdentifier, [
+                'key' => $key,
+            ]);
+        }
+
+        return $this->getTenant($key);
+    }
+
     public function getTenant(string $key): Model
     {
         $tenantModel = $this->getTenantModel();