Fix author filtering for search entries

Author: aerni

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

@@ -6,6 +6,7 @@
 use Statamic\Contracts\Query\Builder;
 use Statamic\Facades\User;
 use Statamic\Fields\Blueprint;
+use Statamic\Search\QueryBuilder as SearchQueryBuilder;
 
 trait QueriesAuthorEntries
 {
@@ -21,10 +22,20 @@ protected function queryAuthorEntries(Builder $query, Collection $collection): v
             // Exclude entries from other collections (for entries fieldtypes with multiple collections)
             ->whereNotIn('collectionHandle', [$collection->handle()])
             // Include entries with blueprints where the current user is the author
-            ->orWhere(fn ($query) => $query
-                ->whereIn('blueprint', $blueprintsWithAuthor)
-                ->whereHas('author', fn ($query) => $query->where('id', User::current()->id()))
-            )
+            ->orWhere(function ($query) use ($collection, $blueprintsWithAuthor) {
+                $query->whereIn('blueprint', $blueprintsWithAuthor);
+
+                if ($query instanceof SearchQueryBuilder) {
+                    $ids = $collection->queryEntries()
+                        ->whereHas('author', fn ($query) => $query->where('id', User::current()->id()))
+                        ->pluck('id')
+                        ->all();
+
+                    return $query->whereIn('id', $ids);
+                }
+
+                return $query->whereHas('author', fn ($query) => $query->where('id', User::current()->id()));
+            })
             // Include entries with blueprints that don't have an author
             ->orWhereIn('blueprint', $this->blueprintsWithoutAuthor($collection))
         );

tests/Feature/Entries/ViewEntryListingTest.php

@@ -44,6 +44,31 @@ public function it_shows_entries_index()
         $this->assertEquals(['one', 'two', 'three'], $entries->pluck('slug')->all());
     }
 
+    #[Test]
+    public function it_can_search_entries_without_viewing_other_authors_entries()
+    {
+        $handle = 'view-other-authors-search';
+
+        $this->setTestRole('view-own-entries', [
+            'access cp',
+            "view {$handle} entries",
+        ]);
+
+        $user = tap(User::make()->assignRole('view-own-entries'))->save();
+
+        Blueprint::make('with-author')
+            ->setNamespace("collections/{$handle}")
+            ->ensureField('author', ['type' => 'users'])
+            ->save();
+
+        tap(Collection::make($handle)->searchIndex('default'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.index', ['collection' => $handle, 'search' => 'entry']))
+            ->assertOk();
+    }
+
     #[Test]
     public function it_shows_only_entries_in_index_for_sites_user_can_access()
     {