From ee8d5eb5f4f4a1049002ee32c9fe01e2e1d086d3 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Tue, 19 Dec 2023 16:14:43 -0500
Subject: [PATCH 01/27] Add site filter to the entries selector

---
 .../inputs/relationship/Selector.vue          | 22 +++++++++++++++++--
 src/Query/Scopes/Filters/Site.php             |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index 10772c78ac..475d4c2083 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -240,7 +240,8 @@ export default {
             columns: this.initialColumns,
             visibleColumns: this.initialColumns.filter(column => column.visible),
             view: 'list',
-            lastItemClicked: null
+            lastItemClicked: null,
+            currentSite: this.site,
         }
     },
 
@@ -251,7 +252,7 @@ export default {
                 sort: this.sortColumn,
                 order: this.sortDirection,
                 page: this.page,
-                site: this.site,
+                site: this.currentSite,
                 exclusions: this.exclusions,
                 filters: utf8btoa(JSON.stringify(this.activeFilters)),
                 columns: this.visibleColumns.map(column => column.field).join(','),
@@ -293,12 +294,25 @@ export default {
 
         this.getFilters().then(() => {
             this.autoApplyFilters(this.filters);
+            this.setSiteFilter(this.currentSite)
             this.initialRequest();
         });
     },
 
     watch: {
 
+        activeFilters: {
+            deep: true,
+            handler(filters) {
+                this.currentSite = filters.site ? filters.site.site : null;
+            }
+        },
+
+        currentSite(site) {
+            this.setSiteFilter(site);
+            this.$emit('site-changed', site);
+        },
+
         parameters: {
             deep: true,
             handler(after, before) {
@@ -345,6 +359,10 @@ export default {
             });
         },
 
+        setSiteFilter(site) {
+            this.filterChanged({ handle: 'site', values: { site }});
+        },
+
         initialRequest() {
             return this.request().then(() => {
                 if (this.search && this.view === 'list') this.$refs.search.focus();
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index c316400c08..a8b9177273 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -46,7 +46,7 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return $key === 'entries' && Facades\Site::hasMultiple();
+        return in_array($key, ['entries', 'entries-fieldtype']) && Facades\Site::hasMultiple();
     }
 
     protected function options()

From 7c2222d564e684ff12aea13ad92899ebd2602430 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Tue, 19 Dec 2023 18:52:16 -0500
Subject: [PATCH 02/27] Only query sites the user has permission to

---
 src/Fieldtypes/Entries.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index f29272c518..cbfc3838bd 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -203,8 +203,8 @@ protected function getIndexQuery($request)
 
         $query = $this->toSearchQuery($query, $request);
 
-        if ($site = $request->site) {
-            $query->where('site', $site);
+        if (Site::hasMultiple()) {
+            $query->whereIn('site', Site::authorized()->map->handle()->all());
         }
 
         if ($request->exclusions) {

From a5ea34a65067763b68294d4624a30557da50e408 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Tue, 19 Dec 2023 18:58:13 -0500
Subject: [PATCH 03/27] Hide filter if only one authorized site

---
 resources/js/components/inputs/relationship/Selector.vue | 8 +++++++-
 src/Query/Scopes/Filters/Site.php                        | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index 475d4c2083..a4a6b072f2 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -285,7 +285,11 @@ export default {
 
         viewLocalStorageKey() {
             return `statamic.selector.field.${this.name}`;
-        }
+        },
+
+        hasSiteFilter() {
+            return this.filters.some(filter => filter.handle === 'site');
+        },
 
     },
 
@@ -360,6 +364,8 @@ export default {
         },
 
         setSiteFilter(site) {
+            if (!this.hasSiteFilter) return;
+
             this.filterChanged({ handle: 'site', values: { site }});
         },
 
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index a8b9177273..f47e1b82f7 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -46,7 +46,8 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return in_array($key, ['entries', 'entries-fieldtype']) && Facades\Site::hasMultiple();
+        return in_array($key, ['entries', 'entries-fieldtype'])
+            && Facades\Site::authorized()->count() > 1;
     }
 
     protected function options()

From 7714328b2034046236d0a7e39af6d4b845516650 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Tue, 19 Dec 2023 19:13:55 -0500
Subject: [PATCH 04/27] Only show configured sites in the site filter

---
 src/Query/Scopes/Filters/Site.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index f47e1b82f7..4eb5dc3267 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -3,6 +3,7 @@
 namespace Statamic\Query\Scopes\Filters;
 
 use Statamic\Facades;
+use Statamic\Facades\Collection;
 use Statamic\Query\Scopes\Filter;
 
 class Site extends Filter
@@ -52,8 +53,10 @@ public function visibleTo($key)
 
     protected function options()
     {
-        return Facades\Site::authorized()->mapWithKeys(function ($site) {
-            return [$site->handle() => __($site->name())];
-        });
+        $configuredSites = Collection::find($this->context['collection'])->sites();
+
+        return Facades\Site::authorized()
+            ->filter(fn ($site) => $configuredSites->contains($site->handle()))
+            ->mapWithKeys(fn ($site) => [$site->handle() => __($site->name())]);
     }
 }

From 9b6b24002a28199708836ff0e8b50001a716f57e Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Tue, 19 Dec 2023 19:56:51 -0500
Subject: [PATCH 05/27] Account for multiple collections

---
 src/Query/Scopes/Filters/Site.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index 4eb5dc3267..3ec5cdb098 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Query\Scopes\Filters;
 
+use Illuminate\Support\Arr;
 use Statamic\Facades;
 use Statamic\Facades\Collection;
 use Statamic\Query\Scopes\Filter;
@@ -48,15 +49,32 @@ public function badge($values)
     public function visibleTo($key)
     {
         return in_array($key, ['entries', 'entries-fieldtype'])
-            && Facades\Site::authorized()->count() > 1;
+            && $this->availableSites()->count() > 1;
     }
 
     protected function options()
     {
-        $configuredSites = Collection::find($this->context['collection'])->sites();
+        return $this->availableSites()
+            ->mapWithKeys(fn ($site) => [$site->handle() => __($site->name())]);
+    }
+
+    protected function availableSites()
+    {
+        // Get the configured sites of a single collection when on the entries index view.
+        if ($collection = Arr::get($this->context, 'collection')) {
+            $configuredSites = Collection::find($collection)->sites();
+        }
+
+        // Get the configured sites of multiple collections when in the entries fieldtype.
+        if ($collections = Arr::get($this->context, 'collections')) {
+            $configuredSites = collect($collections)->flatMap(fn ($collection) => Collection::find($collection)->sites());
+        }
+
+        if (! isset($configuredSites)) {
+            return Facades\Site::authorized();
+        }
 
         return Facades\Site::authorized()
-            ->filter(fn ($site) => $configuredSites->contains($site->handle()))
-            ->mapWithKeys(fn ($site) => [$site->handle() => __($site->name())]);
+            ->filter(fn ($site) => $configuredSites->contains($site->handle()));
     }
 }

From e7c6294041f44cf6397586f3e530bb508daec7ff Mon Sep 17 00:00:00 2001
From: edalzell <erin@silentz.co>
Date: Wed, 20 Dec 2023 11:45:47 -0800
Subject: [PATCH 06/27] fallback to selected site

---
 .../fieldtypes/relationship/RelationshipFieldtype.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 90962a95b8..d92b261a7c 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -94,7 +94,7 @@ export default {
         site() {
             if (! this.storeName) return this.$config.get('selectedSite');
 
-            return this.$store.state.publish[this.storeName].site;
+            return this.$store.state.publish[this.storeName].site ?? this.$config.get('selectedSite');
         },
 
         canEdit() {

From be7086edf1d7c696967566c038015ec4d5ba98a2 Mon Sep 17 00:00:00 2001
From: edalzell <erin@silentz.co>
Date: Wed, 20 Dec 2023 11:46:04 -0800
Subject: [PATCH 07/27] handle `select` mode

---
 src/Fieldtypes/Entries.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index cbfc3838bd..66315e6f7c 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -203,8 +203,9 @@ protected function getIndexQuery($request)
 
         $query = $this->toSearchQuery($query, $request);
 
+
         if (Site::hasMultiple()) {
-            $query->whereIn('site', Site::authorized()->map->handle()->all());
+            $query->whereIn('site', $this->getSites($request));
         }
 
         if ($request->exclusions) {
@@ -216,6 +217,15 @@ protected function getIndexQuery($request)
         return $query;
     }
 
+    private function getSites($request): array
+    {
+        if ($request->site && Arr::get($this->field()->config(), 'mode') == 'select') {
+            return [$request->site];
+        }
+
+        return Site::authorized()->map->handle()->all();
+    }
+
     private function toSearchQuery($query, $request)
     {
         if (! $search = $request->search) {

From fa3b1b11168b9988cb6272d568dd2ca75311dfc8 Mon Sep 17 00:00:00 2001
From: edalzell <erin@silentz.co>
Date: Wed, 20 Dec 2023 12:31:17 -0800
Subject: [PATCH 08/27] add site when in stack mode and have multiple sites

---
 src/Fieldtypes/Entries.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 66315e6f7c..3d5ae9cf62 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -6,6 +6,7 @@
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\CP\Column;
+use Statamic\CP\Columns;
 use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
@@ -203,7 +204,6 @@ protected function getIndexQuery($request)
 
         $query = $this->toSearchQuery($query, $request);
 
-
         if (Site::hasMultiple()) {
             $query->whereIn('site', $this->getSites($request));
         }
@@ -400,20 +400,18 @@ public function getColumns()
         if (count($this->getConfiguredCollections()) === 1) {
             $columns = $this->getBlueprint()->columns();
 
-            $status = Column::make('status')
-                ->listable(true)
-                ->visible(true)
-                ->defaultVisibility(true)
-                ->sortable(false);
-
-            $columns->put('status', $status);
+            $this->addColumn($columns, 'status');
 
             $columns->setPreferred("collections.{$this->getConfiguredCollections()[0]}.columns");
 
             return $columns->rejectUnlisted()->values();
         }
 
-        return $this->getBlueprint()->columns()->values()->all();
+        $columns = $this->getBlueprint()->columns();
+
+        $this->addColumn($columns, 'site');
+
+        return $columns->values();
     }
 
     protected function getItemsForPreProcessIndex($values): SupportCollection
@@ -449,4 +447,15 @@ public function preload()
             'expectsRoot' => $collection->structure()->expectsRoot(),
         ]]);
     }
+
+    private function addColumn(Columns $columns, string $columnKey): void
+    {
+        $column = Column::make($columnKey)
+            ->listable(true)
+            ->visible(true)
+            ->defaultVisibility(true)
+            ->sortable(false);
+
+        $columns->put($columnKey, $column);
+    }
 }

From 73b93355ba87cfb18f22051bc454deb2515b49f0 Mon Sep 17 00:00:00 2001
From: edalzell <erin@silentz.co>
Date: Wed, 20 Dec 2023 12:32:54 -0800
Subject: [PATCH 09/27] tidy

---
 src/Fieldtypes/Entries.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 3d5ae9cf62..70a69b1ce2 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -217,15 +217,6 @@ protected function getIndexQuery($request)
         return $query;
     }
 
-    private function getSites($request): array
-    {
-        if ($request->site && Arr::get($this->field()->config(), 'mode') == 'select') {
-            return [$request->site];
-        }
-
-        return Site::authorized()->map->handle()->all();
-    }
-
     private function toSearchQuery($query, $request)
     {
         if (! $search = $request->search) {
@@ -458,4 +449,13 @@ private function addColumn(Columns $columns, string $columnKey): void
 
         $columns->put($columnKey, $column);
     }
+
+    private function getSites($request): array
+    {
+        if ($request->site && Arr::get($this->field()->config(), 'mode') == 'select') {
+            return [$request->site];
+        }
+
+        return Site::authorized()->map->handle()->all();
+    }
 }

From 5a45cbfbe8d5d90faada90dfd593252a99c8017d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 29 Jan 2024 15:31:35 -0500
Subject: [PATCH 10/27] prevent deselecting

---
 resources/js/components/inputs/relationship/Selector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index a4a6b072f2..d0506e6905 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -366,7 +366,7 @@ export default {
         setSiteFilter(site) {
             if (!this.hasSiteFilter) return;
 
-            this.filterChanged({ handle: 'site', values: { site }});
+            this.filterChanged({ handle: 'site', values: { site }}, false);
         },
 
         initialRequest() {

From 8b137df98d19db0744cd70fc976050c81ceccf29 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 09:38:19 -0500
Subject: [PATCH 11/27] opting into the site setting opts out of localizing
 during augmentation

---
 src/Fieldtypes/Entries.php       | 13 +++++++++----
 tests/Fieldtypes/EntriesTest.php |  6 ++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 70a69b1ce2..802068b622 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -326,13 +326,18 @@ public function augment($values)
             $site = $parent->locale();
         }
 
+        // If they've opted into selecting across sites, we won't automatically localize or
+        // filter out entries that don't exist in the current site. They would do that.
+        $shouldLocalize = ! $this->config('select_across_sites', false);
+
         $ids = (new OrderedQueryBuilder(Entry::query(), $ids = Arr::wrap($values)))
             ->whereIn('id', $ids)
             ->get()
-            ->map(function ($entry) use ($site) {
-                return optional($entry->in($site))->id();
-            })
-            ->filter()
+            ->when($shouldLocalize, fn ($entries) => $entries
+                ->map(fn ($entry) => $entry->in($site))
+                ->filter()
+            )
+            ->map->id()
             ->all();
 
         $query = (new StatusQueryBuilder(new OrderedQueryBuilder(Entry::query(), $ids)))
diff --git a/tests/Fieldtypes/EntriesTest.php b/tests/Fieldtypes/EntriesTest.php
index 2d3890657f..1556cef840 100644
--- a/tests/Fieldtypes/EntriesTest.php
+++ b/tests/Fieldtypes/EntriesTest.php
@@ -360,6 +360,12 @@ public function it_localizes_the_shallow_augmented_item_to_the_current_sites_loc
         $this->assertNull($augmented); // 456 isnt localized
     }
 
+    /** @test */
+    public function it_doesnt_localize_when_select_across_sites_setting_is_enabled()
+    {
+        $this->markTestIncomplete();
+    }
+
     public function fieldtype($config = [], $parent = null)
     {
         $field = new Field('test', array_merge([

From 57476b9b12abd12483175f2df3b0dcc92fb21fe9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 10:31:30 -0500
Subject: [PATCH 12/27] undo unnecessary js changes

---
 .../inputs/relationship/Selector.vue          | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index d0506e6905..10772c78ac 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -240,8 +240,7 @@ export default {
             columns: this.initialColumns,
             visibleColumns: this.initialColumns.filter(column => column.visible),
             view: 'list',
-            lastItemClicked: null,
-            currentSite: this.site,
+            lastItemClicked: null
         }
     },
 
@@ -252,7 +251,7 @@ export default {
                 sort: this.sortColumn,
                 order: this.sortDirection,
                 page: this.page,
-                site: this.currentSite,
+                site: this.site,
                 exclusions: this.exclusions,
                 filters: utf8btoa(JSON.stringify(this.activeFilters)),
                 columns: this.visibleColumns.map(column => column.field).join(','),
@@ -285,11 +284,7 @@ export default {
 
         viewLocalStorageKey() {
             return `statamic.selector.field.${this.name}`;
-        },
-
-        hasSiteFilter() {
-            return this.filters.some(filter => filter.handle === 'site');
-        },
+        }
 
     },
 
@@ -298,25 +293,12 @@ export default {
 
         this.getFilters().then(() => {
             this.autoApplyFilters(this.filters);
-            this.setSiteFilter(this.currentSite)
             this.initialRequest();
         });
     },
 
     watch: {
 
-        activeFilters: {
-            deep: true,
-            handler(filters) {
-                this.currentSite = filters.site ? filters.site.site : null;
-            }
-        },
-
-        currentSite(site) {
-            this.setSiteFilter(site);
-            this.$emit('site-changed', site);
-        },
-
         parameters: {
             deep: true,
             handler(after, before) {
@@ -363,12 +345,6 @@ export default {
             });
         },
 
-        setSiteFilter(site) {
-            if (!this.hasSiteFilter) return;
-
-            this.filterChanged({ handle: 'site', values: { site }}, false);
-        },
-
         initialRequest() {
             return this.request().then(() => {
                 if (this.search && this.view === 'list') this.$refs.search.focus();

From a654e32e73d963104f00e880cfe791f0e91b0546 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 10:34:51 -0500
Subject: [PATCH 13/27] wrap in option

---
 resources/lang/en/fieldtypes.php  |  1 +
 src/Fieldtypes/Entries.php        | 25 +++++++++++++++++++++----
 src/Query/Scopes/Filters/Site.php | 15 +++++++++++++--
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/resources/lang/en/fieldtypes.php b/resources/lang/en/fieldtypes.php
index 9c2d9a928c..cc800d6a96 100644
--- a/resources/lang/en/fieldtypes.php
+++ b/resources/lang/en/fieldtypes.php
@@ -76,6 +76,7 @@
     'entries.config.collections' => 'Choose which collections the user can select from.',
     'entries.config.query_scopes' => 'Choose which query scopes should be applied when retrieving selectable entries.',
     'entries.config.search_index' => 'An appropriate search index will be used automatically where possible, but you may define an explicit one.',
+    'entries.config.select_across_sites' => 'Allow selecting entries from other sites. This also disables localizing options on the front-end. Learn more in the [documentation](https://statamic.dev/fieldtypes/entries). ',
     'entries.title' => 'Entries',
     'float.title' => 'Float',
     'form.config.max_items' => 'Set a maximum number of selectable forms.',
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 802068b622..62ab444fab 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -106,6 +106,11 @@ protected function configFieldItems(): array
                         'instructions' => __('statamic::fieldtypes.entries.config.query_scopes'),
                         'type' => 'taggable',
                     ],
+                    'select_across_sites' => [
+                        'display' => __('Select Across Sites'),
+                        'instructions' => __('statamic::fieldtypes.entries.config.select_across_sites'),
+                        'type' => 'toggle',
+                    ],
                 ],
             ],
         ];
@@ -204,8 +209,10 @@ protected function getIndexQuery($request)
 
         $query = $this->toSearchQuery($query, $request);
 
-        if (Site::hasMultiple()) {
+        if ($this->canSelectAcrossSites()) {
             $query->whereIn('site', $this->getSites($request));
+        } elseif ($site = $request->site) {
+            $query->where('site', $site);
         }
 
         if ($request->exclusions) {
@@ -328,7 +335,7 @@ public function augment($values)
 
         // If they've opted into selecting across sites, we won't automatically localize or
         // filter out entries that don't exist in the current site. They would do that.
-        $shouldLocalize = ! $this->config('select_across_sites', false);
+        $shouldLocalize = ! $this->canSelectAcrossSites();
 
         $ids = (new OrderedQueryBuilder(Entry::query(), $ids = Arr::wrap($values)))
             ->whereIn('id', $ids)
@@ -370,7 +377,10 @@ public function getSelectionFilters()
 
     protected function getSelectionFilterContext()
     {
-        return ['collections' => $this->getConfiguredCollections()];
+        return [
+            'collections' => $this->getConfiguredCollections(),
+            'showSiteFilter' => $this->canSelectAcrossSites(),
+        ];
     }
 
     protected function getConfiguredCollections()
@@ -405,7 +415,9 @@ public function getColumns()
 
         $columns = $this->getBlueprint()->columns();
 
-        $this->addColumn($columns, 'site');
+        if ($this->canSelectAcrossSites()) {
+            $this->addColumn($columns, 'site');
+        }
 
         return $columns->values();
     }
@@ -463,4 +475,9 @@ private function getSites($request): array
 
         return Site::authorized()->map->handle()->all();
     }
+
+    private function canSelectAcrossSites(): bool
+    {
+        return $this->config('select_across_sites', false);
+    }
 }
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index 3ec5cdb098..a51ed00704 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -48,8 +48,15 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return in_array($key, ['entries', 'entries-fieldtype'])
-            && $this->availableSites()->count() > 1;
+        if ($this->availableSites()->isEmpty()) {
+            return false;
+        }
+
+        if ($key === 'entries') {
+            return true;
+        }
+
+        return $key === 'entries-fieldtype' && $this->context['showSiteFilter'];
     }
 
     protected function options()
@@ -60,6 +67,10 @@ protected function options()
 
     protected function availableSites()
     {
+        if (! Facades\Site::hasMultiple()) {
+            return collect();
+        }
+
         // Get the configured sites of a single collection when on the entries index view.
         if ($collection = Arr::get($this->context, 'collection')) {
             $configuredSites = Collection::find($collection)->sites();

From 09b524bb7024b583b47a8b5a7032e7def17881a6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:02:23 -0500
Subject: [PATCH 14/27] rework condition so it prevents checking sites if we
 know its not an an entry listing

---
 src/Query/Scopes/Filters/Site.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index a51ed00704..e359fad65f 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -48,15 +48,11 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        if ($this->availableSites()->isEmpty()) {
-            return false;
-        }
-
-        if ($key === 'entries') {
+        if ($key === 'entries' && $this->availableSites()->isNotEmpty()) {
             return true;
         }
 
-        return $key === 'entries-fieldtype' && $this->context['showSiteFilter'];
+        return $key === 'entries-fieldtype' && $this->context['showSiteFilter'] && $this->availableSites()->isNotEmpty();
     }
 
     protected function options()

From 5dd82eabb89e0fb1e0db7cbe52e5931e44eff4c9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:07:06 -0500
Subject: [PATCH 15/27] more than one

---
 src/Query/Scopes/Filters/Site.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index e359fad65f..a54af04de1 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -48,11 +48,11 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        if ($key === 'entries' && $this->availableSites()->isNotEmpty()) {
+        if ($key === 'entries' && $this->availableSites()->count() > 1) {
             return true;
         }
 
-        return $key === 'entries-fieldtype' && $this->context['showSiteFilter'] && $this->availableSites()->isNotEmpty();
+        return $key === 'entries-fieldtype' && $this->context['showSiteFilter'] && $this->availableSites()->count() > 1;
     }
 
     protected function options()

From 61a9033c83c2e9b8f93a974791ec8592cc87f65a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:11:48 -0500
Subject: [PATCH 16/27] fluent

---
 src/Query/Scopes/Filters/Site.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index a54af04de1..31273cda6b 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -77,11 +77,7 @@ protected function availableSites()
             $configuredSites = collect($collections)->flatMap(fn ($collection) => Collection::find($collection)->sites());
         }
 
-        if (! isset($configuredSites)) {
-            return Facades\Site::authorized();
-        }
-
         return Facades\Site::authorized()
-            ->filter(fn ($site) => $configuredSites->contains($site->handle()));
+            ->when(isset($configuredSites), fn ($sites) => $sites->filter(fn ($site) => $configuredSites->contains($site->handle())));
     }
 }

From 43428b17d7de6058e32a162123b93b5e717aa9a7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:13:51 -0500
Subject: [PATCH 17/27] do a single flatmap for both situations

---
 src/Query/Scopes/Filters/Site.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index 31273cda6b..21ed0dcea7 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -67,15 +67,15 @@ protected function availableSites()
             return collect();
         }
 
+        // Get the configured sites of multiple collections when in the entries fieldtype.
+        $collections = Arr::get($this->context, 'collections');
+
         // Get the configured sites of a single collection when on the entries index view.
         if ($collection = Arr::get($this->context, 'collection')) {
-            $configuredSites = Collection::find($collection)->sites();
+            $collections = [$collection];
         }
 
-        // Get the configured sites of multiple collections when in the entries fieldtype.
-        if ($collections = Arr::get($this->context, 'collections')) {
-            $configuredSites = collect($collections)->flatMap(fn ($collection) => Collection::find($collection)->sites());
-        }
+        $configuredSites = collect($collections)->flatMap(fn ($collection) => Collection::find($collection)->sites());
 
         return Facades\Site::authorized()
             ->when(isset($configuredSites), fn ($sites) => $sites->filter(fn ($site) => $configuredSites->contains($site->handle())));

From 39d54065168adbbc300a17b2666033f62750114a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:38:29 -0500
Subject: [PATCH 18/27] itll be here

---
 resources/lang/en/fieldtypes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/fieldtypes.php b/resources/lang/en/fieldtypes.php
index cc800d6a96..e5be81d17d 100644
--- a/resources/lang/en/fieldtypes.php
+++ b/resources/lang/en/fieldtypes.php
@@ -76,7 +76,7 @@
     'entries.config.collections' => 'Choose which collections the user can select from.',
     'entries.config.query_scopes' => 'Choose which query scopes should be applied when retrieving selectable entries.',
     'entries.config.search_index' => 'An appropriate search index will be used automatically where possible, but you may define an explicit one.',
-    'entries.config.select_across_sites' => 'Allow selecting entries from other sites. This also disables localizing options on the front-end. Learn more in the [documentation](https://statamic.dev/fieldtypes/entries). ',
+    'entries.config.select_across_sites' => 'Allow selecting entries from other sites. This also disables localizing options on the front-end. Learn more in the [documentation](https://statamic.dev/fieldtypes/entries#select-across-sites).',
     'entries.title' => 'Entries',
     'float.title' => 'Float',
     'form.config.max_items' => 'Set a maximum number of selectable forms.',

From 78afe75a2ea5631a1d9cbba1bda707876c96c0bf Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 11:46:52 -0500
Subject: [PATCH 19/27] test

---
 tests/Fieldtypes/EntriesTest.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/Fieldtypes/EntriesTest.php b/tests/Fieldtypes/EntriesTest.php
index 1556cef840..2c1d2eb5da 100644
--- a/tests/Fieldtypes/EntriesTest.php
+++ b/tests/Fieldtypes/EntriesTest.php
@@ -363,7 +363,17 @@ public function it_localizes_the_shallow_augmented_item_to_the_current_sites_loc
     /** @test */
     public function it_doesnt_localize_when_select_across_sites_setting_is_enabled()
     {
-        $this->markTestIncomplete();
+        $parent = EntryFactory::id('parent')->collection('blog')->slug('theparent')->locale('fr')->create();
+
+        EntryFactory::id('123-fr')->origin('123')->locale('fr')->collection('blog')->slug('one-fr')->data(['title' => 'Le One'])->date('2021-01-02')->create();
+        EntryFactory::id('789-fr')->origin('789')->locale('fr')->collection('blog')->slug('three-fr')->data(['title' => 'Le Three'])->date('2021-01-02')->published(false)->create();
+        EntryFactory::id('910-fr')->origin('910')->locale('fr')->collection('blog')->slug('four-fr')->data(['title' => 'Le Four'])->date('2021-01-02')->create();
+
+        $augmented = $this->fieldtype(['select_across_sites' => true], $parent)->augment(['123', 'invalid', 456, 789, 910, 'draft', 'scheduled', 'expired']);
+
+        $this->assertInstanceOf(Builder::class, $augmented);
+        $this->assertEveryItemIsInstanceOf(Entry::class, $augmented->get());
+        $this->assertEquals(['one', 'two', 'three', 'four'], $augmented->get()->map->slug()->all());
     }
 
     public function fieldtype($config = [], $parent = null)

From 3b2e77a6bac4f32b19ce9b1cb5d58e2b0d8021e3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 30 Jan 2024 14:30:15 -0500
Subject: [PATCH 20/27] allow the select ui mode to pick from other sites too

---
 .../relationship/RelationshipFieldtype.vue    |  1 +
 .../inputs/relationship/RelationshipInput.vue |  2 ++
 .../inputs/relationship/SelectField.vue       | 12 ++++++-
 src/Fieldtypes/Entries.php                    | 32 ++++++++++++-------
 src/Http/Resources/CP/Entries/ListedEntry.php |  1 +
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index b0efc76512..91892378bf 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -7,6 +7,7 @@
         :mode="config.mode"
         :can-edit="canEdit"
         :config="config"
+        :meta="meta"
         :can-create="canCreate"
         :can-reorder="canReorder"
         :site="site"
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index 3ba22ab8ee..f9ed71acf1 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -5,6 +5,7 @@
         <relationship-select-field
             v-if="!initializing && usesSelectField"
             :config="config"
+            :meta="meta"
             :items="items"
             :multiple="maxItems > 1"
             :typeahead="mode === 'typeahead'"
@@ -102,6 +103,7 @@ export default {
         name: String,
         value: { required: true },
         config: Object,
+        meta: Object,
         data: Array,
         maxItems: Number,
         itemComponent: {
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 5f1b21a1c9..d1dd93c85a 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -11,7 +11,6 @@
             :multiple="multiple"
             :options="options"
             :get-option-key="(option) => option.id"
-            :get-option-label="(option) => option.title"
             :create-option="(value) => ({ title: value, id: value })"
             :placeholder="__(config.placeholder) || __('Choose...')"
             :searchable="true"
@@ -22,6 +21,12 @@
             @search:focus="$emit('focus')"
             @search:blur="$emit('blur')"
         >
+            <template #option="{ title, site }">
+                <div class="flex justify-between">
+                    <div>{{ title }}</div>
+                    <div v-if="showSiteLabel" class="text-2xs text-gray-700">{{ site.name }}</div>
+                </div>
+            </template>
             <template #selected-option-container v-if="multiple"><i class="hidden"></i></template>
             <template #search="{ events, attributes }" v-if="multiple">
                 <input
@@ -88,6 +93,7 @@ export default {
         multiple: Boolean,
         taggable: Boolean,
         config: Object,
+        meta: Object,
         readOnly: Boolean,
         site: String,
     },
@@ -111,6 +117,10 @@ export default {
                 paginate: false,
                 columns: 'title,id',
             }
+        },
+
+        showSiteLabel() {
+            return this.meta.availableSites.length > 1;
         }
     },
 
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 62ab444fab..816b035f1d 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -210,7 +210,7 @@ protected function getIndexQuery($request)
         $query = $this->toSearchQuery($query, $request);
 
         if ($this->canSelectAcrossSites()) {
-            $query->whereIn('site', $this->getSites($request));
+            $query->whereIn('site', Site::authorized()->map->handle()->all());
         } elseif ($site = $request->site) {
             $query->where('site', $site);
         }
@@ -440,15 +440,19 @@ public function filter()
 
     public function preload()
     {
+        $preloaded = array_merge(parent::preload(), [
+            'availableSites' => $this->availableSites(),
+        ]);
+
         $collection = count($this->getConfiguredCollections()) === 1
             ? Collection::findByHandle($this->getConfiguredCollections()[0])
             : null;
 
         if (! $collection || ! $collection->hasStructure()) {
-            return parent::preload();
+            return $preloaded;
         }
 
-        return array_merge(parent::preload(), ['tree' => [
+        return array_merge($preloaded, ['tree' => [
             'title' => $collection->title(),
             'url' => cp_route('collections.tree.index', $collection),
             'showSlugs' => $collection->structure()->showSlugs(),
@@ -467,17 +471,23 @@ private function addColumn(Columns $columns, string $columnKey): void
         $columns->put($columnKey, $column);
     }
 
-    private function getSites($request): array
+    private function canSelectAcrossSites(): bool
     {
-        if ($request->site && Arr::get($this->field()->config(), 'mode') == 'select') {
-            return [$request->site];
-        }
-
-        return Site::authorized()->map->handle()->all();
+        return $this->config('select_across_sites', false);
     }
 
-    private function canSelectAcrossSites(): bool
+    private function availableSites()
     {
-        return $this->config('select_across_sites', false);
+        if (! Site::hasMultiple()) {
+            return [];
+        }
+
+        $configuredSites = collect($this->getConfiguredCollections())->flatMap(fn ($collection) => Collection::find($collection)->sites());
+
+        return Site::authorized()
+            ->when(isset($configuredSites), fn ($sites) => $sites->filter(fn ($site) => $configuredSites->contains($site->handle())))
+            ->map->handle()
+            ->values()
+            ->all();
     }
 }
diff --git a/src/Http/Resources/CP/Entries/ListedEntry.php b/src/Http/Resources/CP/Entries/ListedEntry.php
index 557a6d2c66..deabf54d03 100644
--- a/src/Http/Resources/CP/Entries/ListedEntry.php
+++ b/src/Http/Resources/CP/Entries/ListedEntry.php
@@ -41,6 +41,7 @@ public function toArray($request)
 
             $this->merge($this->values(['slug' => $entry->slug()])),
 
+            'site' => ['handle' => $entry->locale(), 'name' => $entry->site()->name()],
             'permalink' => $entry->absoluteUrl(),
             'edit_url' => $entry->editUrl(),
             'collection' => array_merge($entry->collection()->toArray(), ['dated' => $entry->collection()->dated()]),

From 0039d1c58fc2119940a8a5cf0ecb7fbb7e26d0ef Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 12 Jul 2024 18:02:50 -0400
Subject: [PATCH 21/27] use a more generic approach for hints, and show
 collections in the hint

---
 .../inputs/relationship/SelectField.vue       |  8 ++---
 src/Fieldtypes/Entries.php                    | 20 +++++++-----
 src/Fieldtypes/Relationship.php               |  5 +++
 .../CP/Entries/EntriesFieldtypeEntries.php    | 32 +++++++++++++++++++
 .../CP/Entries/EntriesFieldtypeEntry.php      | 31 ++++++++++++++++++
 5 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
 create mode 100644 src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php

diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 6efe39aa23..75c1e67ce8 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -21,10 +21,10 @@
             @search:focus="$emit('focus')"
             @search:blur="$emit('blur')"
         >
-            <template #option="{ title, site }">
+            <template #option="{ title, hint }">
                 <div class="flex justify-between">
                     <div>{{ __(title) }}</div>
-                    <div v-if="showSiteLabel" class="text-2xs text-gray-700">{{ site.name }}</div>
+                    <div v-if="hint" class="text-2xs text-gray-700" v-text="hint" />
                 </div>
             </template>
             <template #selected-option-container v-if="multiple"><i class="hidden"></i></template>
@@ -118,10 +118,6 @@ export default {
                 columns: 'title,id',
             }
         },
-
-        showSiteLabel() {
-            return this.meta.availableSites.length > 1;
-        }
     },
 
     created() {
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index b6dcc17ea4..d0011bb3ca 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -16,7 +16,7 @@
 use Statamic\Facades\Search;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
-use Statamic\Http\Resources\CP\Entries\Entries as EntriesResource;
+use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
 use Statamic\Http\Resources\CP\Entries\Entry as EntryResource;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
@@ -152,7 +152,7 @@ public function getIndexItems($request)
 
     public function getResourceCollection($request, $items)
     {
-        return (new EntriesResource($items))
+        return (new EntriesFieldtypeEntries($items, $this))
             ->blueprint($this->getBlueprint($request))
             ->columnPreferenceKey("collections.{$this->getFirstCollectionFromRequest($request)->handle()}.columns")
             ->additional(['meta' => [
@@ -452,16 +452,12 @@ public function filter()
 
     public function preload()
     {
-        $preloaded = array_merge(parent::preload(), [
-            'availableSites' => $this->availableSites(),
-        ]);
-
         $collection = count($this->getConfiguredCollections()) === 1
             ? Collection::findByHandle($this->getConfiguredCollections()[0])
             : null;
 
         if (! $collection || ! $collection->hasStructure()) {
-            return $preloaded;
+            return parent::preload();
         }
 
         $blueprints = $collection
@@ -474,7 +470,7 @@ public function preload()
                 ];
             })->values();
 
-        return array_merge($preloaded, ['tree' => [
+        return array_merge(parent::preload(), ['tree' => [
             'title' => $collection->title(),
             'url' => cp_route('collections.tree.index', $collection),
             'showSlugs' => $collection->structure()->showSlugs(),
@@ -483,6 +479,14 @@ public function preload()
         ]]);
     }
 
+    public function getItemOptionHint($item): ?string
+    {
+        return collect([
+            count($this->getConfiguredCollections()) > 1 ? $item->collection()->title() : null,
+            $this->canSelectAcrossSites() && count($this->availableSites()) > 1 ? $item->site()->name() : null,
+        ])->filter()->implode(', ');
+    }
+
     private function addColumn(Columns $columns, string $columnKey): void
     {
         $column = Column::make($columnKey)
diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index dec63e417b..549189593e 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -231,6 +231,11 @@ public function getItemData($values)
         })->values();
     }
 
+    public function getItemOptionHint($item): ?string
+    {
+        return null;
+    }
+
     abstract protected function toItemArray($id);
 
     protected function invalidItemArray($id)
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
new file mode 100644
index 0000000000..d3ab798b82
--- /dev/null
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Entries;
+
+use Illuminate\Pagination\AbstractPaginator;
+use Statamic\Fieldtypes\Entries as EntriesFieldtype;
+
+class EntriesFieldtypeEntries extends Entries
+{
+    private EntriesFieldtype $fieldtype;
+    public $collects = EntriesFieldtypeEntry::class;
+
+    public function __construct($resource, EntriesFieldtype $fieldtype)
+    {
+        $this->fieldtype = $fieldtype;
+
+        parent::__construct($resource);
+    }
+
+    protected function collectResource($resource)
+    {
+        $collection = parent::collectResource($resource);
+
+        if ($collection instanceof AbstractPaginator) {
+            $collection->getCollection()->each->fieldtype($this->fieldtype);
+        } else {
+            $collection->each->fieldtype($this->fieldtype);
+        }
+
+        return $collection;
+    }
+}
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
new file mode 100644
index 0000000000..667dbf15b7
--- /dev/null
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Entries;
+
+use Statamic\Fieldtypes\Entries as EntriesFieldtype;
+
+class EntriesFieldtypeEntry extends ListedEntry
+{
+    private EntriesFieldtype $fieldtype;
+
+    public function fieldtype(EntriesFieldtype $fieldtype): self
+    {
+        $this->fieldtype = $fieldtype;
+
+        return $this;
+    }
+
+    public function toArray($request)
+    {
+        $arr = parent::toArray($request);
+
+        if (
+            in_array($this->fieldtype->config('mode'), ['select', 'typeahead'])
+            && ($hint = $this->fieldtype->getItemOptionHint($this->resource))
+        ) {
+            $arr['hint'] = $hint;
+        }
+
+        return $arr;
+    }
+}

From 79653c0a612951ca9f186499881bf50f03d6ba10 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 17 Jul 2024 13:13:49 -0400
Subject: [PATCH 22/27] wip

---
 resources/js/components/inputs/relationship/SelectField.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 851a03eac6..5f7fa7cb78 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -98,7 +98,7 @@ export default {
                 paginate: false,
                 columns: 'title,id',
             }
-        },
+        }
     },
 
     created() {

From 23546e22de5b0c195db163b57488b0708c8c0640 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jul 2024 15:58:50 -0400
Subject: [PATCH 23/27] add option for nav to opt into picking entries across
 sites

---
 resources/js/components/navigation/View.vue              | 4 +++-
 resources/js/components/structures/PageSelector.vue      | 2 ++
 resources/lang/en/messages.php                           | 1 +
 resources/views/navigation/show.blade.php                | 1 +
 .../Controllers/CP/Navigation/NavigationController.php   | 9 +++++++++
 src/Stache/Stores/NavigationStore.php                    | 1 +
 src/Structures/Nav.php                                   | 9 +++++++++
 tests/Feature/Navigation/MocksStructures.php             | 1 +
 tests/Feature/Navigation/UpdateNavigationTest.php        | 1 +
 9 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index a67ac5b811..2f24bdaf71 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -128,6 +128,7 @@
             ref="selector"
             :site="site"
             :collections="collections"
+            :can-select-across-sites="canSelectAcrossSites"
             @selected="entriesSelected"
         />
 
@@ -202,7 +203,8 @@ export default {
         site: { type: String, required: true },
         sites: { type: Array, required: true },
         blueprint: { type: Object, required: true },
-        canEdit: { type: Boolean, required: true }
+        canEdit: { type: Boolean, required: true },
+        canSelectAcrossSites: { type: Boolean, required: true }
     },
 
     data() {
diff --git a/resources/js/components/structures/PageSelector.vue b/resources/js/components/structures/PageSelector.vue
index 3d3bae9458..e6e277cb75 100644
--- a/resources/js/components/structures/PageSelector.vue
+++ b/resources/js/components/structures/PageSelector.vue
@@ -27,6 +27,7 @@ export default {
     props: {
         site: String,
         collections: Array,
+        canSelectAcrossSites: Boolean,
     },
 
     data() {
@@ -34,6 +35,7 @@ export default {
             config: {
                 type: 'entries',
                 collections: this.collections,
+                select_across_sites: this.canSelectAcrossSites,
             },
             columns: [
                 { label: __('Title'), field: 'title' },
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index b4c985c413..5cf70d7e6d 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -169,6 +169,7 @@
     'navigation_configure_intro' => 'Navigations are multi-level lists of links that can be used to build navbars, footers, sitemaps, and other forms of frontend navigation.',
     'navigation_configure_settings_intro' => 'Enable linking to collections, set a max depth, and other behaviors.',
     'navigation_configure_title_instructions' => 'We recommend a name that matches where it will be used, like "Main Nav" or "Footer Nav".',
+    'navigation_configure_select_across_sites' => 'Allow selecting entries from other sites.',
     'navigation_documentation_instructions' => 'Learn more about building, configuring, and rendering Navigations.',
     'navigation_link_to_entry_instructions' => 'Add a link to an entry. Enable linking to additional collections in the config area.',
     'navigation_link_to_url_instructions' => 'Add a link to any internal or external URL. Enable linking to entries in the config area.',
diff --git a/resources/views/navigation/show.blade.php b/resources/views/navigation/show.blade.php
index d262d04511..277d06323d 100644
--- a/resources/views/navigation/show.blade.php
+++ b/resources/views/navigation/show.blade.php
@@ -18,6 +18,7 @@
         :expects-root="{{ $str::bool($expectsRoot) }}"
         :blueprint="{{ json_encode($blueprint) }}"
         :can-edit="{{ Statamic\Support\Str::bool($user->can('edit', $nav)) }}"
+        :can-select-across-sites="{{ Statamic\Support\Str::bool($nav->canSelectAcrossSites()) }}"
     >
         <template #twirldown>
             @can('edit', $nav)
diff --git a/src/Http/Controllers/CP/Navigation/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
index 1a7bb706c8..03cb46bc4e 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -49,6 +49,7 @@ public function edit($nav)
             'root' => $nav->expectsRoot(),
             'sites' => $nav->trees()->keys()->all(),
             'max_depth' => $nav->maxDepth(),
+            'select_across_sites' => $nav->canSelectAcrossSites(),
         ];
 
         $fields = ($blueprint = $this->editFormBlueprint($nav))
@@ -132,6 +133,8 @@ public function update(Request $request, $nav)
             foreach (array_diff($existingSites, $sites) as $site) {
                 $nav->in($site)->delete();
             }
+
+            $nav->canSelectAcrossSites($values['select_across_sites']);
         }
 
         $nav->save();
@@ -231,6 +234,12 @@ public function editFormBlueprint($nav)
                 'mode' => 'select',
                 'required' => true,
             ];
+
+            $contents['options']['fields']['select_across_sites'] = [
+                'display' => __('Select Across Sites'),
+                'instructions' => __('statamic::messages.navigation_configure_select_across_sites'),
+                'type' => 'toggle',
+            ];
         }
 
         return Blueprint::makeFromTabs($contents);
diff --git a/src/Stache/Stores/NavigationStore.php b/src/Stache/Stores/NavigationStore.php
index 4eb886de79..fb6b75e1c4 100644
--- a/src/Stache/Stores/NavigationStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -37,6 +37,7 @@ public function makeItemFromFile($path, $contents)
             ->maxDepth($data['max_depth'] ?? null)
             ->collections($data['collections'] ?? null)
             ->expectsRoot($data['root'] ?? false)
+            ->canSelectAcrossSites($data['select_across_sites'] ?? false)
             ->initialPath($path);
     }
 
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index ef997fcf3c..0f64a7adc9 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -22,6 +22,7 @@ class Nav extends Structure implements Contract
     use ExistsAsFile;
 
     protected $collections;
+    protected $canSelectAcrossSites = false;
     private $blueprintCache;
 
     public function save()
@@ -59,6 +60,7 @@ public function fileData()
         return [
             'title' => $this->title,
             'collections' => $this->collections,
+            'select_across_sites' => $this->canSelectAcrossSites ? true : null,
             'max_depth' => $this->maxDepth,
             'root' => $this->expectsRoot ?: null,
         ];
@@ -139,4 +141,11 @@ public function blueprint()
 
         return $blueprint;
     }
+
+    public function canSelectAcrossSites($canSelect = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('canSelectAcrossSites')
+            ->args(func_get_args());
+    }
 }
diff --git a/tests/Feature/Navigation/MocksStructures.php b/tests/Feature/Navigation/MocksStructures.php
index 49a2239702..73b434561d 100644
--- a/tests/Feature/Navigation/MocksStructures.php
+++ b/tests/Feature/Navigation/MocksStructures.php
@@ -21,6 +21,7 @@ private function createNav($handle)
             $s->shouldReceive('collections')->andReturn(collect());
             $s->shouldReceive('expectsRoot')->andReturnFalse();
             $s->shouldReceive('maxDepth')->andReturnNull();
+            $s->shouldReceive('canSelectAcrossSites')->andReturnFalse();
             $s->shouldReceive('sites')->andReturn(collect(['en']));
         });
     }
diff --git a/tests/Feature/Navigation/UpdateNavigationTest.php b/tests/Feature/Navigation/UpdateNavigationTest.php
index ec5f8e6925..92809c1032 100644
--- a/tests/Feature/Navigation/UpdateNavigationTest.php
+++ b/tests/Feature/Navigation/UpdateNavigationTest.php
@@ -118,6 +118,7 @@ private function validParams($overrides = [])
             'collections' => ['pages'],
             'root' => true,
             'max_depth' => 2,
+            'select_across_sites' => false,
         ], $overrides);
     }
 

From 5f08a749d7afd5d083a2d58dd9ee74de061f9dbd Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jul 2024 16:00:17 -0400
Subject: [PATCH 24/27] not needed

---
 src/Http/Resources/CP/Entries/ListedEntry.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Http/Resources/CP/Entries/ListedEntry.php b/src/Http/Resources/CP/Entries/ListedEntry.php
index 00822a1b7f..c6ccb2135d 100644
--- a/src/Http/Resources/CP/Entries/ListedEntry.php
+++ b/src/Http/Resources/CP/Entries/ListedEntry.php
@@ -41,7 +41,6 @@ public function toArray($request)
 
             $this->merge($this->values(['slug' => $entry->slug()])),
 
-            'site' => ['handle' => $entry->locale(), 'name' => $entry->site()->name()],
             'permalink' => $entry->absoluteUrl(),
             'edit_url' => $entry->editUrl(),
             'collection' => array_merge($entry->collection()->toArray(), ['dated' => $entry->collection()->dated()]),

From bedc87193d623d31aafa2ba5315e2be0b8f63420 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jul 2024 16:31:39 -0400
Subject: [PATCH 25/27] revert

---
 resources/js/components/inputs/relationship/SelectField.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 5f7fa7cb78..1109601f52 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -11,6 +11,7 @@
             :multiple="multiple"
             :options="options"
             :get-option-key="(option) => option.id"
+            :get-option-label="(option) => __(option.title)"
             :create-option="(value) => ({ title: value, id: value })"
             :placeholder="__(config.placeholder) || __('Choose...')"
             :searchable="true"

From 076a37eca7bf5e14d9307c542adad849db282709 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jul 2024 16:36:26 -0400
Subject: [PATCH 26/27] revert

---
 .../fieldtypes/relationship/RelationshipFieldtype.vue           | 1 -
 .../js/components/inputs/relationship/RelationshipInput.vue     | 2 --
 resources/js/components/inputs/relationship/SelectField.vue     | 1 -
 3 files changed, 4 deletions(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 91892378bf..b0efc76512 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -7,7 +7,6 @@
         :mode="config.mode"
         :can-edit="canEdit"
         :config="config"
-        :meta="meta"
         :can-create="canCreate"
         :can-reorder="canReorder"
         :site="site"
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index 38b9929131..e6e69e4bfd 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -5,7 +5,6 @@
         <relationship-select-field
             v-if="!initializing && usesSelectField"
             :config="config"
-            :meta="meta"
             :items="items"
             :multiple="maxItems > 1"
             :typeahead="mode === 'typeahead'"
@@ -103,7 +102,6 @@ export default {
         name: String,
         value: { required: true },
         config: Object,
-        meta: Object,
         data: Array,
         maxItems: Number,
         itemComponent: {
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 1109601f52..4d31c01b7c 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -75,7 +75,6 @@ export default {
         multiple: Boolean,
         taggable: Boolean,
         config: Object,
-        meta: Object,
         readOnly: Boolean,
         site: String,
     },

From 50596e8d774cf04b26f0f3daca5d79aa060294be Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jul 2024 16:38:34 -0400
Subject: [PATCH 27/27] alphabetize

---
 resources/lang/en/messages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 5cf70d7e6d..7610ff84c4 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -167,9 +167,9 @@
     'navigation_configure_collections_instructions' => 'Enable linking to entries in these collections.',
     'navigation_configure_handle_instructions' => 'Used to reference this navigation on the frontend. It\'s non-trivial to change later.',
     'navigation_configure_intro' => 'Navigations are multi-level lists of links that can be used to build navbars, footers, sitemaps, and other forms of frontend navigation.',
+    'navigation_configure_select_across_sites' => 'Allow selecting entries from other sites.',
     'navigation_configure_settings_intro' => 'Enable linking to collections, set a max depth, and other behaviors.',
     'navigation_configure_title_instructions' => 'We recommend a name that matches where it will be used, like "Main Nav" or "Footer Nav".',
-    'navigation_configure_select_across_sites' => 'Allow selecting entries from other sites.',
     'navigation_documentation_instructions' => 'Learn more about building, configuring, and rendering Navigations.',
     'navigation_link_to_entry_instructions' => 'Add a link to an entry. Enable linking to additional collections in the config area.',
     'navigation_link_to_url_instructions' => 'Add a link to any internal or external URL. Enable linking to entries in the config area.',