From 85d88e797f8135fa3247b406642384240e643812 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 12 Jul 2024 18:09:19 -0400
Subject: [PATCH 01/12] wip

---
 .../inputs/relationship/SelectField.vue       |  6 ++++
 src/Fieldtypes/Entries.php                    | 11 +++++--
 .../CP/Entries/EntriesFieldtypeEntries.php    | 32 +++++++++++++++++++
 .../CP/Entries/EntriesFieldtypeEntry.php      | 31 ++++++++++++++++++
 4 files changed, 78 insertions(+), 2 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 cfb11ff52a..3a9a2d57f6 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -22,6 +22,12 @@
             @search:focus="$emit('focus')"
             @search:blur="$emit('blur')"
         >
+            <template #option="{ title, hint }">
+                <div class="flex justify-between">
+                    <div v-text="title" />
+                    <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>
             <template #search="{ events, attributes }" v-if="multiple">
                 <input
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 4b36a21819..bce4f2bf68 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -15,7 +15,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;
@@ -146,7 +146,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' => [
@@ -462,4 +462,11 @@ public function preload()
             'blueprints' => $blueprints,
         ]]);
     }
+
+    public function getItemOptionHint($item): ?string
+    {
+        return collect([
+            count($this->getConfiguredCollections()) > 1 ? $item->collection()->title() : null,
+        ])->filter()->implode(', ');
+    }
 }
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 35f2db594d04229f11765c8fb4ffddfdff7372bd Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 12 Jul 2024 18:14:06 -0400
Subject: [PATCH 02/12] add to parent

---
 src/Fieldtypes/Relationship.php | 5 +++++
 1 file changed, 5 insertions(+)

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)

From 6b51ec87e9050aced7a1a0470a471d7a48787280 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:15:44 -0400
Subject: [PATCH 03/12] rename

---
 src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php       | 2 +-
 ...ntriesFieldtypeEntry.php => EntriesFieldtypeListedEntry.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Http/Resources/CP/Entries/{EntriesFieldtypeEntry.php => EntriesFieldtypeListedEntry.php} (92%)

diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
index d3ab798b82..c6e4a0193f 100644
--- a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntries.php
@@ -8,7 +8,7 @@
 class EntriesFieldtypeEntries extends Entries
 {
     private EntriesFieldtype $fieldtype;
-    public $collects = EntriesFieldtypeEntry::class;
+    public $collects = EntriesFieldtypeListedEntry::class;
 
     public function __construct($resource, EntriesFieldtype $fieldtype)
     {
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
similarity index 92%
rename from src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
rename to src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
index 667dbf15b7..8bff5c8543 100644
--- a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
@@ -4,7 +4,7 @@
 
 use Statamic\Fieldtypes\Entries as EntriesFieldtype;
 
-class EntriesFieldtypeEntry extends ListedEntry
+class EntriesFieldtypeListedEntry extends ListedEntry
 {
     private EntriesFieldtype $fieldtype;
 

From f16c99ce4a308c7f5ebb1d2d2069b42a0cfd7566 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:37:09 -0400
Subject: [PATCH 04/12] use same item components whether its in stack or
 dropdown mode

---
 .../inputs/relationship/RelationshipInput.vue |  8 +++----
 .../inputs/relationship/SelectField.vue       | 22 -------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index 547002b328..b8f0940e2d 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -19,8 +19,8 @@
 
         <loading-graphic v-if="initializing" :inline="true" />
 
-        <template v-if="!initializing && !usesSelectField">
-            <div ref="items" class="relationship-input-items space-y-1 outline-none">
+        <template v-if="!initializing">
+            <div ref="items" class="relationship-input-items space-y-1 outline-none" :class="{ 'mt-4': usesSelectField && items.length }">
                 <component
                     :is="itemComponent"
                     v-for="(item, i) in items"
@@ -178,7 +178,7 @@ export default {
         },
 
         canSelectOrCreate() {
-            return !this.readOnly && !this.maxItemsReached;
+            return !this.usesSelectField && !this.readOnly && !this.maxItemsReached;
         },
 
         usesSelectField() {
@@ -288,7 +288,7 @@ export default {
         },
 
         selectFieldSelected(selectedItemData) {
-            this.$emit('item-data-updated', selectedItemData.map(item => ({ id: item.id, title: item.title })));
+            this.$emit('item-data-updated', selectedItemData);
             this.update(selectedItemData.map(item => item.id));
         },
 
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 3a9a2d57f6..327bf19456 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -41,28 +41,6 @@
              <template #no-options>
                 <div class="text-sm text-gray-700 rtl:text-right ltr:text-left py-2 px-4" v-text="__('No options to choose from.')" />
             </template>
-            <template #footer="{ deselect }" v-if="multiple">
-                <sortable-list
-                    item-class="sortable-item"
-                    handle-class="sortable-item"
-                    :value="items"
-                    :distance="5"
-                    :mirror="false"
-                    @input="input"
-                >
-                    <div class="vs__selected-options-outside flex flex-wrap">
-                        <span v-for="item in items" :key="item.id" class="vs__selected mt-2" :class="{ 'sortable-item': !readOnly }">
-                            {{ __(item.title) }}
-                            <button v-if="!readOnly" @click="deselect(item)" type="button" :aria-label="__('Deselect option')" class="vs__deselect">
-                                <span>×</span>
-                            </button>
-                            <button v-else type="button" class="vs__deselect">
-                                <span class="opacity-50">×</span>
-                            </button>
-                        </span>
-                    </div>
-                </sortable-list>
-            </template>
         </v-select>
     </div>
 

From 8b9058c68313669f68b2db575e42e1fc951b6a04 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:38:03 -0400
Subject: [PATCH 05/12] Make a resource intended just for the entries fieldtype
  ...

Its a copy of the "Entry" resource, but with just the keys necessary. It also has the hint.
---
 src/Fieldtypes/Entries.php                    |  4 +--
 .../CP/Entries/EntriesFieldtypeEntry.php      | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index bce4f2bf68..5a825194cd 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -16,7 +16,7 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
-use Statamic\Http\Resources\CP\Entries\Entry as EntryResource;
+use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntry as EntryResource;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
@@ -317,7 +317,7 @@ protected function toItemArray($id)
             return $this->invalidItemArray($id);
         }
 
-        return (new EntryResource($entry))->resolve()['data'];
+        return (new EntryResource($entry, $this))->resolve()['data'];
     }
 
     protected function collect($value)
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
new file mode 100644
index 0000000000..84ce865510
--- /dev/null
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Entries;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Statamic\Fieldtypes\Entries as EntriesFieldtype;
+
+class EntriesFieldtypeEntry extends JsonResource
+{
+    private EntriesFieldtype $fieldtype;
+
+    public function __construct($resource, EntriesFieldtype $fieldtype)
+    {
+        $this->fieldtype = $fieldtype;
+
+        parent::__construct($resource);
+    }
+
+    public function toArray($request)
+    {
+        $data = [
+            'id' => $this->resource->id(),
+            'title' => $this->resource->value('title'),
+            'status' => $this->resource->status(),
+            'edit_url' => $this->resource->editUrl(),
+            'hint' => $this->fieldtype->getItemOptionHint($this->resource),
+        ];
+
+        return ['data' => $data];
+    }
+}

From 64aadff8d1940c702ea515aa5018c446418ea4ed Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:38:54 -0400
Subject: [PATCH 06/12] Use the hint in the component

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

diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index 8ad749c8dc..fb497fef3d 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -27,7 +27,7 @@
             />
 
             <div class="flex items-center flex-1 justify-end">
-                <div v-if="item.collection" v-text="__(item.collection.title)" class="text-4xs text-gray-600 uppercase whitespace-nowrap rtl:ml-2 ltr:mr-2 hidden @sm:block" />
+                <div v-if="item.hint" v-text="item.hint" class="text-4xs text-gray-600 uppercase whitespace-nowrap rtl:ml-2 ltr:mr-2 hidden @sm:block" />
 
                 <div class="flex items-center" v-if="!readOnly">
                     <dropdown-list>

From 412d603e6ef81fa300a1fd5409515fc102c952e9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:39:01 -0400
Subject: [PATCH 07/12] Use translation

---
 src/Fieldtypes/Entries.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 5a825194cd..fa9f329df2 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -466,7 +466,7 @@ public function preload()
     public function getItemOptionHint($item): ?string
     {
         return collect([
-            count($this->getConfiguredCollections()) > 1 ? $item->collection()->title() : null,
+            count($this->getConfiguredCollections()) > 1 ? __($item->collection()->title()) : null,
         ])->filter()->implode(', ');
     }
 }

From fded6008d3a77c90ed1433ee6b327144cb551366 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 16:41:02 -0400
Subject: [PATCH 08/12] Remove the word "option" now that it's used outside of
 dropdowns.

---
 src/Fieldtypes/Entries.php                                    | 2 +-
 src/Fieldtypes/Relationship.php                               | 2 +-
 src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php       | 2 +-
 src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index fa9f329df2..e6514f8fab 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -463,7 +463,7 @@ public function preload()
         ]]);
     }
 
-    public function getItemOptionHint($item): ?string
+    public function getItemHint($item): ?string
     {
         return collect([
             count($this->getConfiguredCollections()) > 1 ? __($item->collection()->title()) : null,
diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index 549189593e..9143052e1b 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -231,7 +231,7 @@ public function getItemData($values)
         })->values();
     }
 
-    public function getItemOptionHint($item): ?string
+    public function getItemHint($item): ?string
     {
         return null;
     }
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
index 84ce865510..dad09d47d3 100644
--- a/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeEntry.php
@@ -23,7 +23,7 @@ public function toArray($request)
             'title' => $this->resource->value('title'),
             'status' => $this->resource->status(),
             'edit_url' => $this->resource->editUrl(),
-            'hint' => $this->fieldtype->getItemOptionHint($this->resource),
+            'hint' => $this->fieldtype->getItemHint($this->resource),
         ];
 
         return ['data' => $data];
diff --git a/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php b/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
index 8bff5c8543..687ac098bb 100644
--- a/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
+++ b/src/Http/Resources/CP/Entries/EntriesFieldtypeListedEntry.php
@@ -21,7 +21,7 @@ public function toArray($request)
 
         if (
             in_array($this->fieldtype->config('mode'), ['select', 'typeahead'])
-            && ($hint = $this->fieldtype->getItemOptionHint($this->resource))
+            && ($hint = $this->fieldtype->getItemHint($this->resource))
         ) {
             $arr['hint'] = $hint;
         }

From 45f5143aa6428919f6e2940adea6bc11f2953d47 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 17:04:14 -0400
Subject: [PATCH 09/12] add status icons to dropdown options

---
 .../js/components/inputs/relationship/SelectField.vue      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 327bf19456..ab079a299d 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -22,9 +22,12 @@
             @search:focus="$emit('focus')"
             @search:blur="$emit('blur')"
         >
-            <template #option="{ title, hint }">
+            <template #option="{ title, hint, status }">
                 <div class="flex justify-between">
-                    <div v-text="title" />
+                    <div class="flex items-center">
+                        <div v-if="status" class="little-dot rtl:ml-2 ltr:mr-2 hidden@sm:block" :class="status" />
+                        <div v-text="title" />
+                    </div>
                     <div v-if="hint" class="text-2xs text-gray-700" v-text="hint" />
                 </div>
             </template>

From 9c8847250d413ff93f5cc7558734767b257334b4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 17:15:14 -0400
Subject: [PATCH 10/12] copy style over (and fix typo)

---
 resources/js/components/inputs/relationship/Item.vue        | 2 +-
 resources/js/components/inputs/relationship/SelectField.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index fb497fef3d..33cd2379cd 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -6,7 +6,7 @@
     >
         <div class="item-move" v-if="sortable">&nbsp;</div>
         <div class="item-inner">
-            <div v-if="statusIcon" class="little-dot rtl:ml-2 ltr:mr-2 hidden@sm:block" :class="item.status" />
+            <div v-if="statusIcon" class="little-dot rtl:ml-2 ltr:mr-2 hidden @sm:block" :class="item.status" />
 
             <div
                 v-if="item.invalid"
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index ab079a299d..4d31c01b7c 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -23,12 +23,12 @@
             @search:blur="$emit('blur')"
         >
             <template #option="{ title, hint, status }">
-                <div class="flex justify-between">
+                <div class="flex justify-between items-center">
                     <div class="flex items-center">
                         <div v-if="status" class="little-dot rtl:ml-2 ltr:mr-2 hidden@sm:block" :class="status" />
                         <div v-text="title" />
                     </div>
-                    <div v-if="hint" class="text-2xs text-gray-700" v-text="hint" />
+                    <div v-if="hint" class="text-4xs text-gray-600 uppercase whitespace-nowrap" v-text="hint" />
                 </div>
             </template>
             <template #selected-option-container v-if="multiple"><i class="hidden"></i></template>

From cdba33e7aa043124c174cee77cf4f34d498006d8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 15 Jul 2024 17:15:25 -0400
Subject: [PATCH 11/12] use bullet

---
 src/Fieldtypes/Entries.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index e6514f8fab..06e14cfc0b 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -467,6 +467,6 @@ public function getItemHint($item): ?string
     {
         return collect([
             count($this->getConfiguredCollections()) > 1 ? __($item->collection()->title()) : null,
-        ])->filter()->implode(', ');
+        ])->filter()->implode(' • ');
     }
 }

From 1792f749fdd982b85be7f726fa866c84194b189c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 16 Jul 2024 09:57:19 -0400
Subject: [PATCH 12/12] Apply treatment to terms fieldtype

---
 src/Fieldtypes/Terms.php                      | 12 +++++--
 .../Taxonomies/TermsFieldtypeListedTerm.php   | 31 ++++++++++++++++++
 .../CP/Taxonomies/TermsFieldtypeTerms.php     | 32 +++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 src/Http/Resources/CP/Taxonomies/TermsFieldtypeListedTerm.php
 create mode 100644 src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php

diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index e166e30dd7..3b4770999e 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -19,7 +19,7 @@
 use Statamic\Facades\Term;
 use Statamic\Facades\User;
 use Statamic\GraphQL\Types\TermInterface;
-use Statamic\Http\Resources\CP\Taxonomies\Terms as TermsResource;
+use Statamic\Http\Resources\CP\Taxonomies\TermsFieldtypeTerms as TermsResource;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Fields\Terms as TermsFilter;
@@ -252,7 +252,7 @@ public function getIndexItems($request)
 
     public function getResourceCollection($request, $items)
     {
-        return (new TermsResource($items))
+        return (new TermsResource($items, $this))
             ->blueprint($this->getBlueprint($request))
             ->columnPreferenceKey("taxonomies.{$this->getFirstTaxonomyFromRequest($request)->handle()}.columns");
     }
@@ -368,6 +368,7 @@ protected function toItemArray($id)
             'published' => $term->published(),
             'private' => $term->private(),
             'edit_url' => $term->editUrl(),
+            'hint' => $this->getItemHint($term),
         ];
     }
 
@@ -478,4 +479,11 @@ protected function getItemsForPreProcessIndex($values): Collection
 
         return $this->config('max_items') === 1 ? collect([$augmented]) : $augmented->get();
     }
+
+    public function getItemHint($item): ?string
+    {
+        return collect([
+            count($this->getConfiguredTaxonomies()) > 1 ? __($item->taxonomy()->title()) : null,
+        ])->filter()->implode(' • ');
+    }
 }
diff --git a/src/Http/Resources/CP/Taxonomies/TermsFieldtypeListedTerm.php b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeListedTerm.php
new file mode 100644
index 0000000000..6e1cbf4399
--- /dev/null
+++ b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeListedTerm.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Taxonomies;
+
+use Statamic\Fieldtypes\Terms as TermsFieldtype;
+
+class TermsFieldtypeListedTerm extends ListedTerm
+{
+    private TermsFieldtype $fieldtype;
+
+    public function fieldtype(TermsFieldtype $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->getItemHint($this->resource))
+        ) {
+            $arr['hint'] = $hint;
+        }
+
+        return $arr;
+    }
+}
diff --git a/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php
new file mode 100644
index 0000000000..160587532c
--- /dev/null
+++ b/src/Http/Resources/CP/Taxonomies/TermsFieldtypeTerms.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Statamic\Http\Resources\CP\Taxonomies;
+
+use Illuminate\Pagination\AbstractPaginator;
+use Statamic\Fieldtypes\Terms as TermsFieldtype;
+
+class TermsFieldtypeTerms extends Terms
+{
+    private TermsFieldtype $fieldtype;
+    public $collects = TermsFieldtypeListedTerm::class;
+
+    public function __construct($resource, TermsFieldtype $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;
+    }
+}