From 6c2042675720238c3d9de8b32751ed9b28e21ae3 Mon Sep 17 00:00:00 2001
From: Boy132 <Boy132@users.noreply.github.com>
Date: Tue, 20 May 2025 08:33:33 +0200
Subject: [PATCH] Put `whereHas`-`orDoesntHave` in own `where` (#1387)

---
 app/Filament/Admin/Resources/DatabaseHostResource.php | 8 +++++---
 app/Filament/Admin/Resources/MountResource.php        | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Filament/Admin/Resources/DatabaseHostResource.php b/app/Filament/Admin/Resources/DatabaseHostResource.php
index 0b6fb29b5..084e1f72a 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource.php
+++ b/app/Filament/Admin/Resources/DatabaseHostResource.php
@@ -164,8 +164,10 @@ class DatabaseHostResource extends Resource
     {
         $query = parent::getEloquentQuery();
 
-        return $query->whereHas('nodes', function (Builder $query) {
-            $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
-        })->orDoesntHave('nodes');
+        return $query->where(function (Builder $query) {
+            return $query->whereHas('nodes', function (Builder $query) {
+                $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
+            })->orDoesntHave('nodes');
+        });
     }
 }
diff --git a/app/Filament/Admin/Resources/MountResource.php b/app/Filament/Admin/Resources/MountResource.php
index 7336cb741..ea1a8ebf3 100644
--- a/app/Filament/Admin/Resources/MountResource.php
+++ b/app/Filament/Admin/Resources/MountResource.php
@@ -176,8 +176,10 @@ class MountResource extends Resource
     {
         $query = parent::getEloquentQuery();
 
-        return $query->whereHas('nodes', function (Builder $query) {
-            $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
-        })->orDoesntHave('nodes');
+        return $query->where(function (Builder $query) {
+            return $query->whereHas('nodes', function (Builder $query) {
+                $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
+            })->orDoesntHave('nodes');
+        });
     }
 }