Move filtering to the controller

Author: aerni

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Entries\Collection;
+use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
@@ -24,6 +25,18 @@ public function index(Request $request, Collection $collection)
             'site' => $site,
         ]);
 
+        if (User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection])) {
+            $entriesFromOtherAuthors = collect($pages)
+                ->map(fn ($page) => Entry::find($page['entry']))
+                ->filter(fn ($entry) => $entry->blueprint()->hasField('author'))
+                ->filter(fn ($entry) => ! $entry->authors()->contains(User::current()->id()))
+                ->map->id();
+
+            $pages = collect($pages)
+                ->filter(fn ($page) => ! $entriesFromOtherAuthors->contains($page['entry']))
+                ->values()->all();
+        }
+
         return ['pages' => $pages];
     }
 

src/Structures/CollectionStructure.php

@@ -2,12 +2,10 @@
 
 namespace Statamic\Structures;
 
-use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Structures\CollectionTree;
 use Statamic\Contracts\Structures\CollectionTreeRepository;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
-use Statamic\Facades\User;
 
 class CollectionStructure extends Structure
 {
@@ -76,16 +74,6 @@ public function validateTree(array $tree, string $locale): array
 
         $thisCollectionsEntries = $this->collection()->queryEntries()
             ->where('site', $locale)
-            ->when(User::current()->cant('view-other-authors-entries', [Entry::class, $this->collection()]), function ($query) {
-                $blueprintsWithoutAuthor = $this->collection()->entryBlueprints()
-                    ->filter(fn ($blueprint) => ! $blueprint->hasField('author'))
-                    ->map->handle()->all();
-
-                $query->where(fn ($query) => $query
-                    ->whereIn('blueprint', $blueprintsWithoutAuthor)
-                    ->orWhere('author', User::current()->id())
-                );
-            })
             ->pluck('id');
 
         $otherCollectionEntries = $entryIds->diff($thisCollectionsEntries);