Abstract

Author: aerni

src/Fieldtypes/Entries.php

@@ -16,6 +16,7 @@
 use Statamic\Facades\Search;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
+use Statamic\Http\Controllers\CP\Collections\QueriesAuthorEntries;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntry as EntryResource;
 use Statamic\Query\OrderedQueryBuilder;
@@ -31,7 +32,8 @@
 
 class Entries extends Relationship
 {
-    use QueriesFilters;
+    use QueriesAuthorEntries,
+        QueriesFilters;
 
     protected $categories = ['relationship'];
     protected $keywords = ['entry'];
@@ -147,28 +149,7 @@ public function getIndexItems($request)
         collect($this->getConfiguredCollections())
             ->map(fn ($handle) => Collection::findByHandle($handle))
             ->filter(fn ($collection) => User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection]))
-            ->each(function ($collection) use ($query) {
-                $blueprints = $collection->entryBlueprints();
-
-                $blueprintsWithAuthor = $blueprints
-                    ->filter(fn ($blueprint) => $blueprint->hasField('author'))
-                    ->map->handle()->all();
-
-                $blueprintsWithoutAuthor = $blueprints
-                    ->diff($blueprintsWithAuthor)
-                    ->map->handle()->all();
-
-                $query
-                    ->whereNotIn('collection', [$collection->handle()])
-                    ->orWhere(fn ($query) => $query
-                        ->where(fn ($query) => $query
-                            ->whereIn('blueprint', $blueprintsWithAuthor)
-                            ->whereIn('author', [User::current()->id()])
-                            ->orWhereJsonContains('author', User::current()->id())
-                        )
-                        ->orWhereIn('blueprint', $blueprintsWithoutAuthor)
-                    );
-            });
+            ->each(fn ($collection) => $this->queryAuthorEntries($query, $collection));
 
         $this->activeFilterBadges = $this->queryFilters($query, $filters, $this->getSelectionFilterContext());
 

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

@@ -24,6 +24,8 @@
 
 class CollectionsController extends CpController
 {
+    use QueriesAuthorEntries;
+
     public function index(Request $request)
     {
         $this->authorize('index', CollectionContract::class, __('You are not authorized to view collections.'));
@@ -57,26 +59,10 @@ private function collections()
         })->map(function ($collection) {
             $entriesCount = $collection->queryEntries()
                 ->where('site', Site::selected())
-                ->when(User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection]), function ($query) use ($collection) {
-                    $blueprints = $collection->entryBlueprints();
-
-                    $blueprintsWithAuthor = $blueprints
-                        ->filter(fn ($blueprint) => $blueprint->hasField('author'))
-                        ->map->handle()->all();
-
-                    $blueprintsWithoutAuthor = $blueprints
-                        ->diff($blueprintsWithAuthor)
-                        ->map->handle()->all();
-
-                    $query->where(fn ($query) => $query
-                        ->where(fn ($query) => $query
-                            ->whereIn('blueprint', $blueprintsWithAuthor)
-                            ->whereIn('author', [User::current()->id()])
-                            ->orWhereJsonContains('author', User::current()->id())
-                        )
-                        ->orWhereIn('blueprint', $blueprintsWithoutAuthor)
-                    );
-                })
+                ->when(
+                    User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection]),
+                    fn ($query) => $this->queryAuthorEntries($query, $collection)
+                )
                 ->count();
 
             return [

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

@@ -25,6 +25,7 @@
 class EntriesController extends CpController
 {
     use ExtractsFromEntryFields,
+        QueriesAuthorEntries,
         QueriesFilters;
 
     public function index(FilteredRequest $request, $collection)
@@ -85,24 +86,7 @@ protected function indexQuery($collection)
         }
 
         if (User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection])) {
-            $blueprints = $collection->entryBlueprints();
-
-            $blueprintsWithAuthor = $blueprints
-                ->filter(fn ($blueprint) => $blueprint->hasField('author'))
-                ->map->handle()->all();
-
-             $blueprintsWithoutAuthor = $blueprints
-                ->diff($blueprintsWithAuthor)
-                ->map->handle()->all();
-
-            $query->where(fn ($query) => $query
-                ->where(fn ($query) => $query
-                    ->whereIn('blueprint', $blueprintsWithAuthor)
-                    ->whereIn('author', [User::current()->id()])
-                    ->orWhereJsonContains('author', User::current()->id())
-                )
-                ->orWhereIn('blueprint', $blueprintsWithoutAuthor)
-            );
+            $this->queryAuthorEntries($query, $collection);
         }
 
         return $query;

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

@@ -0,0 +1,40 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Collections;
+
+use Statamic\Contracts\Entries\Collection;
+use Statamic\Contracts\Query\Builder;
+use Statamic\Facades\User;
+use Statamic\Fields\Blueprint;
+use Statamic\Support\FileCollection;
+
+trait QueriesAuthorEntries
+{
+    protected function queryAuthorEntries(Builder $query, Collection $collection): void
+    {
+        $query
+            ->where(fn ($query) => $query
+                ->whereNotIn('collection', [$collection->handle()]) // Needed for entries fieldtypes configured for multiple collections
+                ->orWhere(fn ($query) => $query
+                    ->whereIn('blueprint', $this->blueprintsWithAuthor($collection->entryBlueprints()))
+                    ->whereIn('author', [User::current()->id()])
+                    ->orWhereJsonContains('author', User::current()->id())
+                )
+                ->orWhereIn('blueprint', $this->blueprintsWithoutAuthor($collection->entryBlueprints()))
+            );
+    }
+
+    protected function blueprintsWithAuthor(FileCollection $blueprints): array
+    {
+        return $blueprints
+            ->filter(fn (Blueprint $blueprint) => $blueprint->hasField('author'))
+            ->map->handle()->all();
+    }
+
+    protected function blueprintsWithoutAuthor(FileCollection $blueprints): array
+    {
+        return $blueprints
+            ->filter(fn (Blueprint $blueprint) => ! $blueprint->hasField('author'))
+            ->map->handle()->all();
+    }
+}