From 2e5ed242f1af306276be7ef2828a60b950b08eee Mon Sep 17 00:00:00 2001
From: joseph-d <joseph.d@nirada.co.th>
Date: Thu, 12 Oct 2023 18:01:11 +0100
Subject: [PATCH 001/175] [4.x] Console warning generated by invalid tabulator
 config (#8834)

---
 src/View/Debugbar/AntlersProfiler/resources/widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Debugbar/AntlersProfiler/resources/widget.js b/src/View/Debugbar/AntlersProfiler/resources/widget.js
index 453dcea48d..909fcfc29a 100644
--- a/src/View/Debugbar/AntlersProfiler/resources/widget.js
+++ b/src/View/Debugbar/AntlersProfiler/resources/widget.js
@@ -541,7 +541,7 @@
                     dataTree: true,
                     dataTreeStartExpanded: true,
                     dataTreeChildField: 'children',
-                    layout: 'responsive',
+                    responsiveLayout: true,
                     tooltips: true,
                     rowFormatter: function (row) {
                         var data = row.getData(),

From d183d12b2ef9487b305b7b8e35d1127515895c54 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 12 Oct 2023 18:14:30 +0100
Subject: [PATCH 002/175] [4.x] Only show status indicator in stack view if
 item has a status (#8832)

---
 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 c5b9af8b1d..a5200ee27a 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -49,7 +49,7 @@
                             >
                                 <template slot="cell-title" slot-scope="{ row: entry }">
                                     <div class="flex items-center">
-                                        <div class="little-dot mr-2" v-tooltip="getStatusLabel(entry)" :class="getStatusClass(entry)" v-if="! columnShowing('status')" />
+                                        <div class="little-dot mr-2" v-tooltip="getStatusLabel(entry)" :class="getStatusClass(entry)" v-if="entry.status && ! columnShowing('status')" />
                                         {{ entry.title }}
                                     </div>
                                 </template>

From 2316439032258a7999c9448a83f2cd3bbeede4de Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 12 Oct 2023 20:55:15 +0100
Subject: [PATCH 003/175] [4.x] Allow user defined fields in the CP to be
 translatable (#8664)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/GlobalSiteSelector.vue       |  4 ++--
 .../js/components/fieldtypes/HasInputOptions.js      |  2 +-
 resources/js/components/fieldtypes/IconFieldtype.vue |  6 +++---
 .../js/components/fieldtypes/IntegerFieldtype.vue    |  4 ++--
 .../js/components/fieldtypes/RangeFieldtype.vue      |  4 ++--
 .../js/components/fieldtypes/RevealerFieldtype.vue   |  4 ++--
 .../js/components/fieldtypes/SelectFieldtype.vue     |  6 +++---
 .../js/components/fieldtypes/TableFieldtype.vue      |  2 +-
 resources/js/components/fieldtypes/TagsFieldtype.vue |  2 +-
 .../js/components/fieldtypes/TemplateFieldtype.vue   |  2 +-
 resources/js/components/fieldtypes/TextFieldtype.vue |  6 +++---
 .../js/components/fieldtypes/TextareaFieldtype.vue   |  2 +-
 .../js/components/fieldtypes/ToggleFieldtype.vue     |  4 ++--
 .../js/components/fieldtypes/VideoFieldtype.vue      |  2 +-
 .../js/components/fieldtypes/bard/BardFieldtype.vue  |  4 ++--
 resources/js/components/fieldtypes/bard/Set.vue      |  6 +++---
 resources/js/components/fieldtypes/grid/Grid.vue     |  8 ++++----
 .../js/components/fieldtypes/grid/HeaderCell.vue     |  4 ++--
 .../js/components/fieldtypes/replicator/Field.vue    |  4 ++--
 .../components/fieldtypes/replicator/Replicator.vue  |  4 ++--
 .../js/components/fieldtypes/replicator/Set.vue      |  6 +++---
 .../components/fieldtypes/replicator/SetPicker.vue   | 12 ++++++------
 resources/js/components/inputs/Select.vue            |  4 ++--
 resources/js/components/inputs/Text.vue              |  4 ++--
 .../components/inputs/relationship/SelectField.vue   |  4 ++--
 resources/js/components/publish/Field.vue            |  4 ++--
 resources/js/components/publish/Sections.vue         |  4 ++--
 resources/js/components/publish/Tabs.vue             |  4 ++--
 src/Query/Scopes/Filters/Site.php                    |  4 ++--
 29 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/resources/js/components/GlobalSiteSelector.vue b/resources/js/components/GlobalSiteSelector.vue
index 9bcdc8281c..b4c8e9dc08 100644
--- a/resources/js/components/GlobalSiteSelector.vue
+++ b/resources/js/components/GlobalSiteSelector.vue
@@ -13,11 +13,11 @@
             <template #selected-option="option">
                 <div class="flex items-center px-2 text-sm text-gray hover:text-gray-800 anti">
                     <svg-icon name="light/sites" class="mr-2 h-4 w-4" />
-                    <div class="whitespace-nowrap">{{ option.name }}</div>
+                    <div class="whitespace-nowrap">{{ __(option.name) }}</div>
                 </div>
             </template>
             <template #option="{ name, handle }">
-                <div :class="{ 'text-gray-500': handle === active }">{{ name }}</div>
+                <div :class="{ 'text-gray-500': handle === active }">{{ __(name) }}</div>
             </template>
         </v-select>
     </div>
diff --git a/resources/js/components/fieldtypes/HasInputOptions.js b/resources/js/components/fieldtypes/HasInputOptions.js
index a394603b32..44125bf0c3 100644
--- a/resources/js/components/fieldtypes/HasInputOptions.js
+++ b/resources/js/components/fieldtypes/HasInputOptions.js
@@ -4,7 +4,7 @@ export default {
             return _.map(options, (value, key) => {
                 return {
                     'value': Array.isArray(options) ? value : key,
-                    'label': value || key
+                    'label': __(value) || key
                 };
             });
         }
diff --git a/resources/js/components/fieldtypes/IconFieldtype.vue b/resources/js/components/fieldtypes/IconFieldtype.vue
index 6c90e5bd02..15dad9381e 100644
--- a/resources/js/components/fieldtypes/IconFieldtype.vue
+++ b/resources/js/components/fieldtypes/IconFieldtype.vue
@@ -9,7 +9,7 @@
             :name="name"
             :disabled="config.disabled || isReadOnly"
             :options="options"
-            :placeholder="config.placeholder || 'Search ...'"
+            :placeholder="__(config.placeholder || 'Search ...')"
             :searchable="true"
             :multiple="false"
             :close-on-select="true"
@@ -22,14 +22,14 @@
                 <div class="flex items-center">
                     <svg-icon v-if="!option.html" :name="`${meta.set}/${option.label}`" class="w-5 h-5" />
                     <div v-if="option.html" v-html="option.html" class="w-5 h-5" />
-                    <span class="text-xs ml-4 text-gray-800 truncate">{{ option.label }}</span>
+                    <span class="text-xs ml-4 text-gray-800 truncate">{{ __(option.label) }}</span>
                 </div>
             </template>
             <template slot="selected-option" slot-scope="option">
                 <div class="flex items-center">
                     <svg-icon v-if="!option.html" :name="`${meta.set}/${option.label}`" class="w-5 h-5 flex items-center" />
                     <div v-if="option.html" v-html="option.html" class="w-5 h-5" />
-                    <span class="text-xs ml-4 text-gray-800 truncate">{{ option.label }}</span>
+                    <span class="text-xs ml-4 text-gray-800 truncate">{{ __(option.label) }}</span>
                 </div>
             </template>
         </v-select>
diff --git a/resources/js/components/fieldtypes/IntegerFieldtype.vue b/resources/js/components/fieldtypes/IntegerFieldtype.vue
index c82a4f599f..e46f1b04bd 100644
--- a/resources/js/components/fieldtypes/IntegerFieldtype.vue
+++ b/resources/js/components/fieldtypes/IntegerFieldtype.vue
@@ -8,8 +8,8 @@
         :is-read-only="isReadOnly"
         :id="fieldId"
         :min="config.min"
-        :prepend="config.prepend"
-        :append="config.append"
+        :prepend="__(config.prepend)"
+        :append="__(config.append)"
         @input="updateDebounced"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
diff --git a/resources/js/components/fieldtypes/RangeFieldtype.vue b/resources/js/components/fieldtypes/RangeFieldtype.vue
index ab567664f3..7a7d7533a8 100644
--- a/resources/js/components/fieldtypes/RangeFieldtype.vue
+++ b/resources/js/components/fieldtypes/RangeFieldtype.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="range-fieldtype-wrapper bg-gray-200 rounded py-2 px-4 border">
         <div class="flex items-center">
-            <div v-if="config.prepend" v-text="config.prepend" class="mr-2" />
+            <div v-if="config.prepend" v-text="__(config.prepend)" class="mr-2" />
             <input
                 type="range"
                 v-model="val"
@@ -16,7 +16,7 @@
                 class="flex-1 min-w-0"
             />
             <div class="rounded border px-2 py-1 mx-2 bg-gray-100">{{ val }}</div>
-            <div v-if="config.append" v-text="config.append" />
+            <div v-if="config.append" v-text="__(config.append)" />
         </div>
     </div>
 </template>
diff --git a/resources/js/components/fieldtypes/RevealerFieldtype.vue b/resources/js/components/fieldtypes/RevealerFieldtype.vue
index d2cf49550d..830c1a4cc4 100644
--- a/resources/js/components/fieldtypes/RevealerFieldtype.vue
+++ b/resources/js/components/fieldtypes/RevealerFieldtype.vue
@@ -4,7 +4,7 @@
         <template v-if="isToggleMode">
             <div class="toggle-fieldtype-wrapper">
                 <toggle-input :value="isRevealed" @input="update" :read-only="isReadOnly" />
-                <label v-if="config.input_label" class="ml-2 font-normal">{{ config.input_label }}</label>
+                <label v-if="config.input_label" class="ml-2 font-normal">{{ __(config.input_label) }}</label>
             </div>
         </template>
 
@@ -13,7 +13,7 @@
                 @click="buttonReveal"
                 class="btn"
                 :disabled="isReadOnly"
-                :v-tooltip="config.instructions"
+                :v-tooltip="__(config.instructions)"
                 v-text="config.input_label || __('Show Fields')" />
         </template>
     </div>
diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue
index 65360ed2ef..9294730f42 100644
--- a/resources/js/components/fieldtypes/SelectFieldtype.vue
+++ b/resources/js/components/fieldtypes/SelectFieldtype.vue
@@ -10,7 +10,7 @@
             :clearable="config.clearable"
             :disabled="config.disabled || isReadOnly || (config.multiple && limitReached)"
             :options="options"
-            :placeholder="config.placeholder"
+            :placeholder="__(config.placeholder)"
             :searchable="config.searchable || config.taggable"
             :taggable="config.taggable"
             :push-tags="config.push_tags"
@@ -26,7 +26,7 @@
                 <template #selected-option-container v-if="config.multiple"><i class="hidden"></i></template>
                 <template #search="{ events, attributes }" v-if="config.multiple">
                     <input
-                        :placeholder="config.placeholder"
+                        :placeholder="__(config.placeholder)"
                         class="vs__search"
                         type="search"
                         v-on="events"
@@ -56,7 +56,7 @@
                     <div class="vs__selected-options-outside flex flex-wrap">
                         <span v-for="option in selectedOptions" :key="option.value" class="vs__selected mt-2 sortable-item">
                             <div v-if="config.label_html" v-html="option.label"></div>
-                            <template v-else>{{ option.label }}</template>
+                            <template v-else>{{ __(option.label) }}</template>
                             <button v-if="!readOnly" @click="deselect(option)" type="button" :aria-label="__('Deselect option')" class="vs__deselect">
                                 <span>×</span>
                             </button>
diff --git a/resources/js/components/fieldtypes/TableFieldtype.vue b/resources/js/components/fieldtypes/TableFieldtype.vue
index 73ae6a9128..8dad81c814 100644
--- a/resources/js/components/fieldtypes/TableFieldtype.vue
+++ b/resources/js/components/fieldtypes/TableFieldtype.vue
@@ -2,7 +2,7 @@
     <portal name="table-fullscreen" :disabled="!fullScreenMode" target-class="table-fieldtype">
         <div class="table-fieldtype-container" :class="{'table-fullscreen bg-white': fullScreenMode }">
             <header class="bg-gray-200 border-b py-3 pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
-                <h2 v-text="config.display" />
+                <h2 v-text="__(config.display)" />
                 <button class="btn-close absolute top-2 right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>
             </header>
             <section :class="{'p-4': fullScreenMode}">
diff --git a/resources/js/components/fieldtypes/TagsFieldtype.vue b/resources/js/components/fieldtypes/TagsFieldtype.vue
index 5f50d68ee9..0065199f3f 100644
--- a/resources/js/components/fieldtypes/TagsFieldtype.vue
+++ b/resources/js/components/fieldtypes/TagsFieldtype.vue
@@ -6,7 +6,7 @@
         :close-on-select="false"
         :disabled="config.disabled || isReadOnly"
         :multiple="true"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :searchable="true"
         :select-on-key-codes="[9, 13, 188]"
         :taggable="true"
diff --git a/resources/js/components/fieldtypes/TemplateFieldtype.vue b/resources/js/components/fieldtypes/TemplateFieldtype.vue
index 86f9d5d94b..2f91f53e74 100644
--- a/resources/js/components/fieldtypes/TemplateFieldtype.vue
+++ b/resources/js/components/fieldtypes/TemplateFieldtype.vue
@@ -7,7 +7,7 @@
             append-to-body
             :calculate-position="positionOptions"
             :clearable="config.clearable"
-            :placeholder="config.placeholder"
+            :placeholder="__(config.placeholder)"
             :disabled="isReadOnly"
             :options="options"
             :reduce="selection => selection.value"
diff --git a/resources/js/components/fieldtypes/TextFieldtype.vue b/resources/js/components/fieldtypes/TextFieldtype.vue
index 76308c7a17..16de06afe8 100644
--- a/resources/js/components/fieldtypes/TextFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextFieldtype.vue
@@ -7,10 +7,10 @@
         :autoselect="config.autoselect"
         :type="config.input_type"
         :isReadOnly="isReadOnly"
-        :prepend="config.prepend"
-        :append="config.append"
+        :prepend="__(config.prepend)"
+        :append="__(config.append)"
         :limit="config.character_limit"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :name="name"
         :id="fieldId"
         @input="updateDebounced"
diff --git a/resources/js/components/fieldtypes/TextareaFieldtype.vue b/resources/js/components/fieldtypes/TextareaFieldtype.vue
index 9f8832b9f2..b3b8a0c2b8 100644
--- a/resources/js/components/fieldtypes/TextareaFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextareaFieldtype.vue
@@ -3,7 +3,7 @@
         :name="name"
         :isReadOnly="isReadOnly"
         :limit="config.character_limit || null"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :value="value"
         :id="fieldId"
         @blur="$emit('blur')"
diff --git a/resources/js/components/fieldtypes/ToggleFieldtype.vue b/resources/js/components/fieldtypes/ToggleFieldtype.vue
index f18d163db0..7898b20955 100644
--- a/resources/js/components/fieldtypes/ToggleFieldtype.vue
+++ b/resources/js/components/fieldtypes/ToggleFieldtype.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="toggle-fieldtype-wrapper">
         <toggle-input :value="value" @input="update" :read-only="isReadOnly" :id="fieldId" />
-        <label v-if="inlineLabel" class="inline-label" v-html="$options.filters.markdown(inlineLabel)"></label>
+        <label v-if="inlineLabel" class="inline-label" v-html="$options.filters.markdown(__(inlineLabel))"></label>
     </div>
 </template>
 
@@ -16,7 +16,7 @@ export default {
         },
 
         replicatorPreview() {
-            return (this.value ? '✓' : '✗') + ' ' + this.config.display;
+            return (this.value ? '✓' : '✗') + ' ' + __(this.config.display);
         }
 
     }
diff --git a/resources/js/components/fieldtypes/VideoFieldtype.vue b/resources/js/components/fieldtypes/VideoFieldtype.vue
index 6365754c1d..cd89f49cce 100644
--- a/resources/js/components/fieldtypes/VideoFieldtype.vue
+++ b/resources/js/components/fieldtypes/VideoFieldtype.vue
@@ -9,7 +9,7 @@
                     :class="{ 'bg-white': !isReadOnly }"
                     :id="fieldId"
                     :readonly="isReadOnly"
-                    :placeholder="config.placeholder || 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'"
+                    :placeholder="__(config.placeholder) || 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'"
                     @focus="$emit('focus')"
                     @blur="$emit('blur')" />
             </div>
diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index a6c10ea80e..8645e2d4ca 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -295,7 +295,7 @@ export default {
                 } else if (node.type === 'set') {
                     const handle = node.attrs.values.type;
                     const set = this.setConfigs.find(set => set.handle === handle);
-                    text += ` [${set ? set.display : handle}]`;
+                    text += ` [${__(set ? set.display : handle)}]`;
                 }
                 if (text.length > 150) {
                     break;
@@ -666,7 +666,7 @@ export default {
                 Gapcursor,
                 History,
                 Paragraph,
-                Placeholder.configure({ placeholder: this.config.placeholder }),
+                Placeholder.configure({ placeholder: __(this.config.placeholder) }),
                 Set.configure({ bard: this }),
                 Text
             ];
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 37c4a10890..373bebde97 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -11,7 +11,7 @@
                 <div class="flex items-center flex-1 p-2 replicator-set-header-inner cursor-pointer" :class="{'flex items-center': collapsed}" @click="toggleCollapsedState">
                     <label v-text="display || config.handle" class="text-xs whitespace-nowrap mr-2"/>
                     <div class="flex items-center" v-if="config.instructions && !collapsed">
-                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(config.instructions), html:true }" />
+                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(__(config.instructions)), html:true }" />
                     </div>
                     <div v-show="collapsed" class="flex-1 min-w-0 w-1 pr-8">
                         <div
@@ -88,7 +88,7 @@ export default {
         },
 
         display() {
-            return this.config.display || this.values.type;
+            return __(this.config.display || this.values.type);
         },
 
         values() {
@@ -137,7 +137,7 @@ export default {
         },
 
         instructions() {
-            return this.config.instructions ? markdown(this.config.instructions) : null;
+            return this.config.instructions ? markdown(__(this.config.instructions)) : null;
         },
 
         hasError() {
diff --git a/resources/js/components/fieldtypes/grid/Grid.vue b/resources/js/components/fieldtypes/grid/Grid.vue
index 1c9948f802..e1ac28b9c3 100644
--- a/resources/js/components/fieldtypes/grid/Grid.vue
+++ b/resources/js/components/fieldtypes/grid/Grid.vue
@@ -6,7 +6,7 @@
     <div class="grid-fieldtype-container" :class="{'grid-fullscreen bg-white': fullScreenMode }">
 
         <header class="bg-gray-200 border-b py-3 pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
-            <h2 v-text="config.display" />
+            <h2 v-text="__(config.display)" />
             <button class="btn-close absolute top-2 right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>
         </header>
 
@@ -40,7 +40,7 @@
             <button
                 class="btn"
                 v-if="canAddRows"
-                v-text="addRowButtonLabel"
+                v-text="__(addRowButtonLabel)"
                 @click.prevent="addRow" />
 
         </section>
@@ -115,7 +115,7 @@ export default {
         },
 
         addRowButtonLabel() {
-            return this.config.add_row || __('Add Row');
+            return __(this.config.add_row) || __('Add Row');
         },
 
         hasMaxRows() {
@@ -135,7 +135,7 @@ export default {
         },
 
         replicatorPreview() {
-            return `${this.config.display}: ${__n(':count row|:count rows', this.value.length)}`;
+            return `${__(this.config.display)}: ${__n(':count row|:count rows', this.value.length)}`;
         }
 
     },
diff --git a/resources/js/components/fieldtypes/grid/HeaderCell.vue b/resources/js/components/fieldtypes/grid/HeaderCell.vue
index bb7a21e80a..13b8e922d7 100644
--- a/resources/js/components/fieldtypes/grid/HeaderCell.vue
+++ b/resources/js/components/fieldtypes/grid/HeaderCell.vue
@@ -2,8 +2,8 @@
 
     <th v-show="field.type !== 'hidden'">
         <div class="flex items-center justify-between">
-            <div><template v-if="!field.hide_display">{{ field.display || field.handle }}</template></div>
-            <svg-icon name="micro/circle-help" class="text-gray-600 hover:text-gray-700 h-3 w-3 text-xs" v-if="field.instructions" v-tooltip="{ content: $options.filters.markdown(field.instructions), html:true }" />
+            <div><template v-if="!field.hide_display">{{ __(field.display || field.handle) }}</template></div>
+            <svg-icon name="micro/circle-help" class="text-gray-600 hover:text-gray-700 h-3 w-3 text-xs" v-if="field.instructions" v-tooltip="{ content: $options.filters.markdown(__(field.instructions)), html:true }" />
         </div>
     </th>
 
diff --git a/resources/js/components/fieldtypes/replicator/Field.vue b/resources/js/components/fieldtypes/replicator/Field.vue
index 771d3073ad..6c0465f4aa 100644
--- a/resources/js/components/fieldtypes/replicator/Field.vue
+++ b/resources/js/components/fieldtypes/replicator/Field.vue
@@ -84,12 +84,12 @@ export default {
         },
 
         display() {
-            return this.field.display || this.field.handle[0].toUpperCase() + this.field.handle.slice(1)
+            return __(this.field.display || this.field.handle[0].toUpperCase() + this.field.handle.slice(1))
         },
 
         instructions() {
             return this.field.instructions
-                ? this.$options.filters.markdown(this.field.instructions)
+                ? this.$options.filters.markdown(__(this.field.instructions))
                 : null
         },
 
diff --git a/resources/js/components/fieldtypes/replicator/Replicator.vue b/resources/js/components/fieldtypes/replicator/Replicator.vue
index 602bf22e03..73ecb5f153 100644
--- a/resources/js/components/fieldtypes/replicator/Replicator.vue
+++ b/resources/js/components/fieldtypes/replicator/Replicator.vue
@@ -9,7 +9,7 @@
 <div class="replicator-fieldtype-container" :class="{'replicator-fullscreen bg-gray-200': fullScreenMode }">
 
     <header class="bg-white fixed top-0 inset-x-0 border-b p-3 pl-4 flex items-center justify-between shadow z-max" v-if="fullScreenMode">
-        <h2 v-text="config.display" class="flex-1" />
+        <h2 v-text="__(config.display)" class="flex-1" />
             <div class="flex items-center">
                 <div class="btn-group">
                     <button @click="expandAll" class="btn btn-icon flex items-center" v-tooltip="__('Expand Sets')" v-if="config.collapse !== 'accordion' && value.length > 0">
@@ -172,7 +172,7 @@ export default {
         },
 
         replicatorPreview() {
-            return `${this.config.display}: ${__n(':count set|:count sets', this.value.length)}`;
+            return `${__(this.config.display)}: ${__n(':count set|:count sets', this.value.length)}`;
         }
     },
 
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index 675927142f..1c72e7631f 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -9,7 +9,7 @@
                 <div class="flex items-center flex-1 p-2 replicator-set-header-inner cursor-pointer" :class="{'flex items-center': collapsed}" @click="toggleCollapsedState">
                     <label v-text="display || config.handle" class="text-xs whitespace-nowrap mr-2 cursor-pointer"/>
                     <div class="flex items-center" v-if="config.instructions && !collapsed">
-                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(config.instructions), html:true }" />
+                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(__(config.instructions)), html:true }" />
                     </div>
                     <div v-show="collapsed" class="flex-1 min-w-0 w-1 pr-8">
                         <div
@@ -134,11 +134,11 @@ export default {
         },
 
         display() {
-            return this.config.display || this.values.type;
+            return __(this.config.display) || this.values.type;
         },
 
         instructions() {
-            return this.config.instructions ? markdown(this.config.instructions) : null;
+            return this.config.instructions ? markdown(__(this.config.instructions)) : null;
         },
 
         hasMultipleFields() {
diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue
index d8aa96ff6a..a949e8582a 100644
--- a/resources/js/components/fieldtypes/replicator/SetPicker.vue
+++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue
@@ -31,8 +31,8 @@
                             <svg-icon :name="item.icon ? `plump/${item.icon}` : 'folder-generic'" class="text-gray-800" />
                         </div>
                         <div class="flex-1">
-                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ item.display || item.handle }}</div>
-                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ item.instructions }}</div>
+                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
+                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
                         </div>
                         <svg-icon name="micro/chevron-right-thin" class="text-gray-600 group-hover:text-gray-800" />
                     </div>
@@ -41,8 +41,8 @@
                             <svg-icon :name="item.icon ? `plump/${item.icon}` : 'light/add'" class="text-gray-800" />
                         </div>
                         <div class="flex-1">
-                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ item.display || item.handle }}</div>
-                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ item.instructions }}</div>
+                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
+                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
                         </div>
                     </div>
                 </div>
@@ -100,7 +100,7 @@ export default {
         },
 
         selectedGroupDisplayText() {
-            return this.selectedGroup ? this.selectedGroup.display || this.selectedGroup.handle : null;
+            return this.selectedGroup ? __(this.selectedGroup.display || this.selectedGroup.handle) : null;
         },
 
         visibleSets() {
@@ -112,7 +112,7 @@ export default {
 
             if (this.search) {
                 return sets.filter(set => {
-                    return set.display.toLowerCase().includes(this.search.toLowerCase())
+                    return __(set.display).toLowerCase().includes(this.search.toLowerCase())
                         || set.handle.toLowerCase().includes(this.search.toLowerCase());
                 });
             }
diff --git a/resources/js/components/inputs/Select.vue b/resources/js/components/inputs/Select.vue
index 7ba735bb25..28d44747d3 100644
--- a/resources/js/components/inputs/Select.vue
+++ b/resources/js/components/inputs/Select.vue
@@ -15,7 +15,7 @@
 
             <option
                 v-if="placeholder"
-                v-text="placeholder"
+                v-text="__(placeholder)"
                 value=""
                 disabled
                 :selected="value === null" />
@@ -23,7 +23,7 @@
             <option
                 v-for="option in options"
                 :key="option.value"
-                v-text="option.label"
+                v-text="__(option.label)"
                 :value="option.value"
                 :selected="isOptionSelected(option)" />
 
diff --git a/resources/js/components/inputs/Text.vue b/resources/js/components/inputs/Text.vue
index fd20a91174..72d3f17aad 100644
--- a/resources/js/components/inputs/Text.vue
+++ b/resources/js/components/inputs/Text.vue
@@ -3,7 +3,7 @@
         <div class="input-group">
             <slot name="prepend" v-if="prepend">
                 <div class="input-group-prepend">
-                    {{ prepend }}
+                    {{ __(prepend) }}
                 </div>
             </slot>
             <input
@@ -27,7 +27,7 @@
             >
             <slot name="append" v-if="append">
                 <div class="input-group-append">
-                    {{ append }}
+                    {{ __(append) }}
                 </div>
             </slot>
         </div>
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index b08a42c852..5f1b21a1c9 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -13,7 +13,7 @@
             :get-option-key="(option) => option.id"
             :get-option-label="(option) => option.title"
             :create-option="(value) => ({ title: value, id: value })"
-            :placeholder="config.placeholder || __('Choose...')"
+            :placeholder="__(config.placeholder) || __('Choose...')"
             :searchable="true"
             :taggable="isTaggable"
             :value="items"
@@ -25,7 +25,7 @@
             <template #selected-option-container v-if="multiple"><i class="hidden"></i></template>
             <template #search="{ events, attributes }" v-if="multiple">
                 <input
-                    :placeholder="config.placeholder || __('Choose...')"
+                    :placeholder="__(config.placeholder) || __('Choose...')"
                     class="vs__search"
                     type="search"
                     v-on="events"
diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
index ae3beddff5..dcf4cf21a2 100644
--- a/resources/js/components/publish/Field.vue
+++ b/resources/js/components/publish/Field.vue
@@ -12,7 +12,7 @@
                     v-if="showLabelText"
                     class="mr-1"
                     :class="{ 'text-gray-600': syncable && isSynced }"
-                    v-text="labelText"
+                    v-text="__(labelText)"
                     v-tooltip="{content: config.handle, delay: 500, autoHide: false}"
                 />
                 <i class="required mr-1" v-if="config.required">*</i>
@@ -126,7 +126,7 @@ export default {
 
         instructions() {
             return this.config.instructions
-                ? this.renderMarkdownAndLinks(this.config.instructions)
+                ? this.renderMarkdownAndLinks(__(this.config.instructions))
                 : null
         },
 
diff --git a/resources/js/components/publish/Sections.vue b/resources/js/components/publish/Sections.vue
index 50442357c3..75bf816204 100644
--- a/resources/js/components/publish/Sections.vue
+++ b/resources/js/components/publish/Sections.vue
@@ -4,8 +4,8 @@
             <div class="card p-0">
                 <header class="publish-section-header @container" v-if="section.display">
                     <div class="publish-section-header-inner">
-                        <label v-text="section.display" class="text-base font-semibold" />
-                        <div class="help-block" v-if="section.instructions"><p v-html="$options.filters.markdown(section.instructions)" /></div>
+                        <label v-text="__(section.display)" class="text-base font-semibold" />
+                        <div class="help-block" v-if="section.instructions"><p v-html="$options.filters.markdown(__(section.instructions))" /></div>
                     </div>
                 </header>
                 <publish-fields
diff --git a/resources/js/components/publish/Tabs.vue b/resources/js/components/publish/Tabs.vue
index f5980bba13..d509eb3a4d 100644
--- a/resources/js/components/publish/Tabs.vue
+++ b/resources/js/components/publish/Tabs.vue
@@ -34,7 +34,7 @@
                     :aria-selected="isActive(tab.handle)"
                     :tabindex="isActive(tab.handle) ? 0 : -1"
                     @click="setActive(tab.handle)"
-                    v-text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
+                    v-text="__(tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`)"
                 />
             </div>
             <div class="fade-left" v-if="canScrollLeft" />
@@ -46,7 +46,7 @@
                     v-for="(tab, index) in mainTabs"
                     v-show="shouldShowInDropdown(index)"
                     :key="tab.handle"
-                    :text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
+                    :text="__(tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`)"
                     @click.prevent="setActive(tab.handle)"
                 />
             </dropdown-list>
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index fcfa0ebde8..c316400c08 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -41,7 +41,7 @@ public function badge($values)
     {
         $site = Facades\Site::get($values['site']);
 
-        return __('Site').': '.$site->name();
+        return __('Site').': '.__($site->name());
     }
 
     public function visibleTo($key)
@@ -52,7 +52,7 @@ public function visibleTo($key)
     protected function options()
     {
         return Facades\Site::authorized()->mapWithKeys(function ($site) {
-            return [$site->handle() => $site->name()];
+            return [$site->handle() => __($site->name())];
         });
     }
 }

From 35641dee960946008304ac1c2671d632e4fa9318 Mon Sep 17 00:00:00 2001
From: Joshua Blum <hallo@joshuablum.de>
Date: Fri, 13 Oct 2023 17:12:14 +0200
Subject: [PATCH 004/175] [4.x] Fix lowercasing asset filenames to include file
 extension (#8842)

---
 src/Assets/AssetUploader.php |  5 +++++
 tests/Assets/AssetTest.php   | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index 746705bce2..f13c2e4ac5 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -27,6 +27,11 @@ public static function asset(Asset $asset)
     protected function uploadPath(UploadedFile $file)
     {
         $ext = $this->getNewExtension() ?? $file->getClientOriginalExtension();
+
+        if (config('statamic.assets.lowercase')) {
+            $ext = strtolower($ext);
+        }
+
         $filename = self::getSafeFilename(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
 
         $directory = $this->asset->folder();
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 5cd5b5cee7..b26d6bfdf2 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -1830,10 +1830,10 @@ public function it_appends_timestamp_to_uploaded_files_filename_if_it_already_ex
     public function it_lowercases_uploaded_filenames_by_default()
     {
         Event::fake();
-        $asset = $this->container->makeAsset('path/to/lowercase-THIS-asset.jpg');
+        $asset = $this->container->makeAsset('path/to/lowercase-THIS-asset.JPG');
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
 
-        $asset->upload(UploadedFile::fake()->image('lowercase-THIS-asset.jpg'));
+        $asset->upload(UploadedFile::fake()->image('lowercase-THIS-asset.JPG'));
 
         Storage::disk('test')->assertExists('path/to/lowercase-this-asset.jpg');
         $this->assertEquals('path/to/lowercase-this-asset.jpg', $asset->path());
@@ -1913,13 +1913,13 @@ public function it_doesnt_lowercase_uploaded_filenames_when_configured()
         config(['statamic.assets.lowercase' => false]);
 
         Event::fake();
-        $asset = $this->container->makeAsset('path/to/do-NOT-lowercase-THIS-asset.jpg');
+        $asset = $this->container->makeAsset('path/to/do-NOT-lowercase-THIS-asset.JPG');
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
 
-        $asset->upload(UploadedFile::fake()->image('do-NOT-lowercase-THIS-asset.jpg'));
+        $asset->upload(UploadedFile::fake()->image('do-NOT-lowercase-THIS-asset.JPG'));
 
-        Storage::disk('test')->assertExists('path/to/do-NOT-lowercase-THIS-asset.jpg');
-        $this->assertEquals('path/to/do-NOT-lowercase-THIS-asset.jpg', $asset->path());
+        Storage::disk('test')->assertExists('path/to/do-NOT-lowercase-THIS-asset.JPG');
+        $this->assertEquals('path/to/do-NOT-lowercase-THIS-asset.JPG', $asset->path());
         Event::assertDispatched(AssetUploaded::class, function ($event) use ($asset) {
             return $event->asset = $asset;
         });

From a37a141cdc2a8a17691237cd9b74e951c28e8d23 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 12:22:15 -0400
Subject: [PATCH 005/175] [4.x] PHP 8.3 (#8843)

---
 .github/workflows/tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f5e408e7ff..69686c4326 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.0, 8.1, 8.2, 8.3]
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -29,6 +29,8 @@ jobs:
         exclude:
           - php: 8.0
             laravel: 10.*
+          - php: 8.3
+            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

From 12d2bc7d9a189e0babb823dc77f52edcf8fe8c0d Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Fri, 13 Oct 2023 18:22:53 +0200
Subject: [PATCH 006/175] [4.x] French translations (#8835)

---
 resources/lang/fr/validation.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 30d30361cc..a973341399 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -10,7 +10,7 @@
     'alpha_dash' => 'Peut uniquement contenir des lettres, des chiffres, des tirets et des traits de soulignement.',
     'alpha_num' => 'Peut uniquement contenir des lettres et des chiffres.',
     'array' => 'Doit être un tableau.',
-    'ascii' => 'Peut uniquement contenir des symboles et caractères alpanumériques mono-bits.',
+    'ascii' => 'Peut uniquement contenir des symboles et caractères alphanumériques mono-bits.',
     'before' => 'Doit être une date strictement antérieure à :date.',
     'before_or_equal' => 'Doit être une date antérieure ou égale à :date.',
     'between.array' => 'Doit avoir entre :min et :max éléments.',
@@ -24,7 +24,7 @@
     'date' => 'Date non valide.',
     'date_equals' => 'Doit être une date égale à :date.',
     'date_format' => 'Ne correspond pas au format :format.',
-    'decimal' => 'Doit faire :decimal décimales.',
+    'decimal' => 'Doit avoir :decimal décimales.',
     'declined' => 'Doit être décliné.',
     'declined_if' => 'Doit être décliné quand :other correspond à :value.',
     'different' => 'Ce champ et :other doivent être différents.',
@@ -32,7 +32,7 @@
     'digits_between' => 'Doit être compris entre :min et :max chiffres.',
     'dimensions' => 'Dimensions de l’image non valides.',
     'distinct' => 'Ce champ a une valeur en double.',
-    'doesnt_end_with' => 'Ne doit pas se terminer avec l’une des valeurs suivantes : :values.',
+    'doesnt_end_with' => 'Ne doit pas se terminer par l’une des valeurs suivantes : :values.',
     'doesnt_start_with' => 'Ne doit pas commencer par l’une des valeurs suivantes : :values.',
     'email' => 'Doit être une adresse e-mail valide.',
     'ends_with' => 'Doit se terminer par :values',
@@ -41,13 +41,13 @@
     'file' => 'Doit être un fichier.',
     'filled' => 'Doit avoir une valeur.',
     'gt.array' => 'Doit avoir plus de :value éléments.',
-    'gt.file' => 'Doit être supérieur à :value kilo-octets.',
+    'gt.file' => 'Doit faire strictement plus de :value kilo-octets.',
     'gt.numeric' => 'Doit être supérieur à :value.',
-    'gt.string' => 'Doit faire plus de :value caractères.',
-    'gte.array' => 'Doit avoir :value éléments ou plus.',
-    'gte.file' => 'Doit être supérieur ou égal à :value kilo-octets.',
+    'gt.string' => 'Doit avoir plus de :value caractères.',
+    'gte.array' => 'Doit avoir au moins :value éléments.',
+    'gte.file' => 'Doit faire au moins :value kilo-octets.',
     'gte.numeric' => 'Doit être supérieur ou égal à :value.',
-    'gte.string' => 'Doit être supérieur ou égal à :value caractères.',
+    'gte.string' => 'Doit avoir au moins :value caractères.',
     'image' => 'Doit être une image.',
     'in' => 'Ceci est invalide.',
     'in_array' => 'Ce champ n’existe pas dans :other.',
@@ -57,26 +57,26 @@
     'ipv6' => 'Doit être une adresse IPv6 valide.',
     'json' => 'Doit être une chaîne JSON valide.',
     'lowercase' => 'Doit être en minuscules.',
-    'lt.array' => 'Doit être strictement inférieur à :value éléments.',
-    'lt.file' => 'Doit être strictement inférieur à :value kilo-octets.',
+    'lt.array' => 'Doit avoir strictement moins de :value éléments.',
+    'lt.file' => 'Doit faire strictement moins de :value kilo-octets.',
     'lt.numeric' => 'Doit être strictement inférieur à :value.',
-    'lt.string' => 'Doit être strictement inférieur à :value caractères.',
+    'lt.string' => 'Doit avoir strictement moins de :value caractères.',
     'lte.array' => 'Ne doit pas avoir plus de :value éléments.',
-    'lte.file' => 'Doit être inférieur ou égal à :value kilo-octets.',
+    'lte.file' => 'Ne doit pas faire plus de :value kilo-octets.',
     'lte.numeric' => 'Doit être inférieur ou égal à :value.',
-    'lte.string' => 'Doit être inférieur ou égal à :value caractères.',
+    'lte.string' => 'Ne doit pas avoir plus de :value caractères.',
     'mac_address' => 'Doit être une adresse MAC valide.',
     'max.array' => 'Ne peut pas avoir plus de :max éléments.',
     'max.file' => 'Ne peut pas être supérieur à :max kilo-octets.',
     'max.numeric' => 'Ne peut pas être supérieur à :max.',
-    'max.string' => 'Ne peut pas être supérieur à :max caractères.',
+    'max.string' => 'Ne peut pas avoir plus de :max caractères.',
     'max_digits' => 'Ne peut pas avoir plus de :max chiffres.',
     'mimes' => 'Doit être un fichier de type :values.',
     'mimetypes' => 'Doit être un fichier de type :values.',
     'min.array' => 'Doit avoir au moins :min éléments.',
     'min.file' => 'Doit faire au moins :min kilo-octets.',
     'min.numeric' => 'Doit faire au moins :min.',
-    'min.string' => 'Doit faire au moins :min caractères.',
+    'min.string' => 'Doit avoir au moins :min caractères.',
     'min_digits' => 'Doit faire au moins :min chiffres.',
     'missing' => 'Doit être absent.',
     'missing_if' => 'Doit être absent quand :other correspond à :value.',
@@ -98,8 +98,8 @@
     'required_if' => 'Ce champ est obligatoire lorsque :other est :value.',
     'required_if_accepted' => 'Ce champ est obligatoire quand :other est accepté.',
     'required_unless' => 'Ce champ est obligatoire, sauf si :other est dans :values.',
-    'required_with' => 'Ce champ est requis lorsque :values est présent.',
-    'required_with_all' => 'Ce champ est requis lorsque :values est présent.',
+    'required_with' => 'Ce champ est obligatoire lorsque :values est présent.',
+    'required_with_all' => 'Ce champ est obligatoire lorsque :values sont présentes.',
     'required_without' => 'Ce champ est obligatoire lorsque :values n’est pas présente.',
     'required_without_all' => 'Ce champ est obligatoire lorsqu’aucune des :values n’est présente.',
     'same' => 'Ce champ et :other doivent correspondre.',

From 1f7c152f097c8b55dd6905263b02c2d62092e5a1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 13:58:31 -0400
Subject: [PATCH 007/175] [4.x] Revert adding PHP 8.3 tests (#8846)

---
 .github/workflows/tests.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 69686c4326..f5e408e7ff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2, 8.3]
+        php: [8.0, 8.1, 8.2]
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -29,8 +29,6 @@ jobs:
         exclude:
           - php: 8.0
             laravel: 10.*
-          - php: 8.3
-            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

From bbf6c1992344f509ee0a465aa85598ccea11b8d5 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 16:31:59 -0400
Subject: [PATCH 008/175] changelog

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8602ea7583..92044ffef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Release Notes
 
+## 4.28.0 (2023-10-13)
+
+### What's new
+- Allow user defined fields in the CP to be translatable. [#8664](https://github.com/statamic/cms/issues/8664) by @ryanmitchell
+
+### What's improved
+- French translations. [#8835](https://github.com/statamic/cms/issues/8835) [#8831](https://github.com/statamic/cms/issues/8831) by @ebeauchamps
+
+### What's fixed
+- Fix lowercasing of asset filenames to include file extension. [#8842](https://github.com/statamic/cms/issues/8842) by @joshuablum
+- Only show status indicator in stack view if item has a status. [#8832](https://github.com/statamic/cms/issues/8832) by @ryanmitchell
+- Fix console warning generated by invalid tabulator config. [#8834](https://github.com/statamic/cms/issues/8834) by @joseph-d
+
+
+
 ## 4.27.0 (2023-10-11)
 
 ### What's new

From e5665acd38da125a6915e2c8ae04543493aadde3 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 16 Oct 2023 17:23:52 +0100
Subject: [PATCH 009/175] [4.x] Fix missing replicator set previews (#8855)

---
 resources/js/components/fieldtypes/replicator/Set.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index 1c72e7631f..d1a8581397 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -127,6 +127,12 @@ export default {
         }
     },
 
+    data() {
+        return {
+            fieldPreviews: this.previews,
+        }
+    },
+
     computed: {
 
         fields() {
@@ -166,7 +172,7 @@ export default {
         },
 
         previewUpdated(handle, value) {
-            this.$emit('previews-updated', { ...this.previews, [handle]: value });
+            this.$emit('previews-updated', this.fieldPreviews = { ...this.fieldPreviews, [handle]: value });
         },
 
         destroy() {

From 323fa4ef3a7baba24ed3891d43398f3cb7d99b6d Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Mon, 16 Oct 2023 20:20:27 +0200
Subject: [PATCH 010/175] [4.x] French translations (#8848)

---
 resources/lang/fr/permissions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/fr/permissions.php b/resources/lang/fr/permissions.php
index 5ebe7cf2de..a994aa35cb 100644
--- a/resources/lang/fr/permissions.php
+++ b/resources/lang/fr/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Permet d’accéder à la section des addons pour en installer ou désinstaller.',
     'manage_preferences' => 'Gérer les préférences',
     'manage_preferences_desc' => 'Possibilité de personnaliser les préférences globales et celles spécifiques au rôle.',
+    'group_sites' => 'Sites',
+    'access_{site}_site' => 'Accéder au site :site',
     'group_collections' => 'Collections',
     'configure_collections' => 'Configurer les collections',
     'configure_collections_desc' => 'Permet d’accéder à toutes les autorisations liées à la collection.',

From eb1a1fcff6b40c0a8d4f5d8ccb46487020928cc0 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Mon, 16 Oct 2023 21:03:47 +0200
Subject: [PATCH 011/175] [4.x] Allow overwriting the column for
 `unique_user_value` validation (#8852)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Validation/UniqueUserValue.php       |  6 ++++--
 tests/Validation/UniqueUserValueTest.php | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Validation/UniqueUserValue.php b/src/Validation/UniqueUserValue.php
index 06c4513ea8..9584fd1625 100644
--- a/src/Validation/UniqueUserValue.php
+++ b/src/Validation/UniqueUserValue.php
@@ -8,10 +8,12 @@ class UniqueUserValue
 {
     public function validate($attribute, $value, $parameters, $validator)
     {
-        [$except] = array_pad($parameters, 1, null);
+        [$except, $column] = array_pad($parameters, 2, null);
+
+        $column ??= $attribute;
 
         $existing = User::query()
-            ->where($attribute, $value)
+            ->where($column, $value)
             ->first();
 
         if (! $existing) {
diff --git a/tests/Validation/UniqueUserValueTest.php b/tests/Validation/UniqueUserValueTest.php
index 0df19292a7..ed4340b597 100644
--- a/tests/Validation/UniqueUserValueTest.php
+++ b/tests/Validation/UniqueUserValueTest.php
@@ -35,4 +35,15 @@ public function it_passes_when_updating()
             ['email' => 'unique_user_value:123']
         )->passes());
     }
+
+    /** @test */
+    public function it_supports_overwriting_the_column()
+    {
+        User::make()->email('foo@bar.com')->save();
+
+        $this->assertTrue(Validator::make(
+            ['baz' => 'foo@bar.com'],
+            ['baz' => 'unique_user_value:null,email']
+        )->fails());
+    }
 }

From 99c3f33d9c59610e72bb697f836ec06f310c818a Mon Sep 17 00:00:00 2001
From: Daniel Kaufmann <hello@danielkaufmann.ch>
Date: Tue, 17 Oct 2023 17:06:32 +0200
Subject: [PATCH 012/175] [4.x] German translations (#8857)

---
 resources/lang/de.json               |  4 ++
 resources/lang/de/fieldtypes.php     |  7 ++--
 resources/lang/de/messages.php       |  2 +-
 resources/lang/de/permissions.php    |  2 +
 resources/lang/de/validation.php     | 60 ++++++++++++++++++++--------
 resources/lang/de_CH.json            |  4 ++
 resources/lang/de_CH/fieldtypes.php  |  5 ++-
 resources/lang/de_CH/messages.php    |  2 +-
 resources/lang/de_CH/permissions.php |  2 +
 resources/lang/de_CH/validation.php  | 60 ++++++++++++++++++++--------
 10 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/resources/lang/de.json b/resources/lang/de.json
index 9f7f2e05ba..9b26e93abe 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -137,6 +137,7 @@
     "Before": "Bevor",
     "Behavior": "Verhalten",
     "Below": "Unterhalb",
+    "Between": "Zwischen",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint created": "Blueprint erstellt",
@@ -497,6 +498,7 @@
     "Inline": "Inline",
     "Inline Code": "Inline-Code",
     "Inline Label": "Inline Beschriftung",
+    "Inline Label when True": "Inline Beschriftung wenn aktiv",
     "Input Behavior": "Eingabeverhalten",
     "Input Label": "Beschriftung",
     "Input Type": "Eingabetyp",
@@ -659,6 +661,7 @@
     "Per Page": "Pro Seite",
     "Per-site": "Pro Website",
     "Permissions": "Berechtigungen",
+    "Phone": "Telefon",
     "PHP Info": "PHP Info",
     "Pick Color": "Farbe wählen",
     "Pin to Favorites": "Als Favorit speichern",
@@ -1010,6 +1013,7 @@
     "You are not authorized to view collections.": "Du bist nicht berechtigt, Sammlungen anzuzeigen.",
     "You are not authorized to view navs.": "Du bist nicht berechtigt, Navigationen anzuzeigen.",
     "You are not authorized to view this collection.": "Du bist nicht berechtigt, diese Sammlung anzuzeigen.",
+    "You are now impersonating": "Du gibst dich jetzt aus als",
     "Your Favorites": "Meine Favoriten",
     "Your working copy will be replaced by the contents of this revision.": "Deine Arbeitskopie wird durch den Inhalt dieser Überarbeitung ersetzt."
 }
diff --git a/resources/lang/de/fieldtypes.php b/resources/lang/de/fieldtypes.php
index 6b3a58351a..234ec79011 100644
--- a/resources/lang/de/fieldtypes.php
+++ b/resources/lang/de/fieldtypes.php
@@ -154,8 +154,8 @@
     'slug.title' => 'Slug',
     'structures.title' => 'Strukturen',
     'table.title' => 'Tabelle',
-    'taggable.title' => 'Tags',
     'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
+    'taggable.title' => 'Tags',
     'taxonomies.title' => 'Taxonomien',
     'template.config.blueprint' => 'Fügt die Option „Korrespondiert mit Blueprint“ hinzu. Erfahre mehr in der [Dokumentation](https://statamic.dev/views#inferring-templates-from-entry-blueprints).',
     'template.config.folder' => 'Nur Templates aus diesem Ordner anzeigen.',
@@ -175,11 +175,12 @@
     'textarea.title' => 'Textbereich',
     'time.config.seconds_enabled' => 'Sekunden im Timepicker anzeigen.',
     'time.title' => 'Zeit',
-    'toggle.config.inline_label' => 'Inline-Beschriftung festlegen, welche neben dem Schalter angezeigt werden soll.',
+    'toggle.config.inline_label' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird.',
+    'toggle.config.inline_label_when_true' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird, wenn der Wert true ist.',
     'toggle.title' => 'Schalter',
     'user_groups.title' => 'Benutzergruppen',
-    'users.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Benutzer:innen angewendet werden sollen.',
     'user_roles.title' => 'Benutzerrollen',
+    'users.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Benutzer:innen angewendet werden sollen.',
     'users.title' => 'Benutzer:innen',
     'video.title' => 'Video',
     'width.config.options' => 'Verfügbare Breiten festlegen.',
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index c469864768..6c10ed5fc2 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -81,7 +81,7 @@
     'field_validation_required_instructions' => 'Steuert, ob dieses Feld erforderlich ist oder nicht.',
     'field_validation_sometimes_instructions' => 'Dieses Feld wird nur validiert, wenn es sichtbar ist oder abgeschickt wird.',
     'fields_blueprints_description' => 'Blueprints definieren die Felder für den inhaltlichen Aufbau von Sammlungen, Taxonomien, Benutzer:innen und Formularen.',
-    'fields_default_instructions' => 'Standardwert festlegen.',
+    'fields_default_instructions' => 'Diesen Wert immer dann einfügen, wenn das Feld in einem Veröffentlichungsformular leer ist.',
     'fields_display_instructions' => 'Name des Feldes im Control Panel.',
     'fields_duplicate_instructions' => 'Soll dieses Feld beim Duplizieren des Eintrags berücksichtigt werden?',
     'fields_fieldsets_description' => 'Fieldsets sind einfache, flexible und völlig optionale Gruppen von Feldern, mit deren Hilfe wiederverwendbare, vorkonfigurierte Blöcke organisiert werden können.',
diff --git a/resources/lang/de/permissions.php b/resources/lang/de/permissions.php
index 56f790409b..166b65b5aa 100644
--- a/resources/lang/de/permissions.php
+++ b/resources/lang/de/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Ermöglicht den Zugriff auf den Addon-Bereich zum Installieren und Deinstallieren von Addons.',
     'manage_preferences' => 'Voreinstellungen verwalten',
     'manage_preferences_desc' => 'Ermöglicht globale und rollenspezifische Voreinstellungen anzupassen.',
+    'group_sites' => 'Websites',
+    'access_{site}_site' => 'Zugriff auf :site',
     'group_collections' => 'Sammlungen',
     'configure_collections' => 'Sammlungen konfigurieren',
     'configure_collections_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Sammlungen.',
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index 629cf5e3af..ad8f01d46b 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Muss akzeptiert werden.',
+    'accepted_if' => 'Muss akzeptiert werden, wenn :other gleich :value ist.',
     'active_url' => 'Dies ist keine gültige URL.',
     'after' => 'Muss ein Datum nach dem :date sein.',
     'after_or_equal' => 'Muss ein Datum nach oder gleich dem :date sein.',
@@ -9,35 +10,44 @@
     'alpha_dash' => 'Darf nur Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten.',
     'alpha_num' => 'Darf nur Buchstaben und Zahlen enthalten.',
     'array' => 'Muss ein Array sein.',
+    'ascii' => 'Darf nur alphanumerische Ein-Byte-Zeichen und Symbole enthalten.',
     'before' => 'Muss ein Datum vor dem :date sein.',
     'before_or_equal' => 'Muss ein Datum vor oder gleich dem :date sein.',
-    'between.numeric' => 'Muss zwischen :min und :max liegen.',
+    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'between.file' => 'Muss zwischen :min und :max Kilobyte liegen.',
+    'between.numeric' => 'Muss zwischen :min und :max liegen.',
     'between.string' => 'Muss zwischen :min und :max Zeichen liegen.',
-    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'boolean' => 'Muss wahr oder falsch sein.',
+    'can' => 'Enthält einen unzulässigen Wert.',
     'confirmed' => 'Bestätigung stimmt nicht überein.',
     'current_password' => 'Das Passwort ist falsch.',
     'date' => 'Kein gültiges Datum.',
+    'date_equals' => 'Das Datum muss gleich :date sein.',
     'date_format' => 'Entspricht nicht dem Format :format .',
+    'decimal' => 'Muss :decimal Dezimalstellen haben.',
+    'declined' => 'Muss abgelehnt werden.',
+    'declined_if' => 'Muss abgelehnt werden, wenn :other gleich :value ist.',
     'different' => 'Dieses Feld und :other müssen unterschiedlich sein.',
     'digits' => 'Muss aus :digits Ziffern bestehen.',
     'digits_between' => 'Muss zwischen den Ziffern :min und :max liegen.',
     'dimensions' => 'Ungültige Bildabmessungen.',
     'distinct' => 'Dieses Feld hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Darf nicht mit einer der folgenden Angaben enden: :values.',
+    'doesnt_start_with' => 'Darf nicht mit einer der folgenden Angaben beginnen: :values.',
     'email' => 'Muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => 'Muss auf :values enden',
+    'enum' => 'Das ausgewählte :attribute ist ungültig.',
     'exists' => 'Dies ist ungültig.',
     'file' => 'Muss eine Datei sein.',
     'filled' => 'Muss einen Wert haben.',
-    'gt.numeric' => 'Muss größer als :value sein.',
+    'gt.array' => 'Muss mehr als :value Elemente haben.',
     'gt.file' => 'Muss größer als :value Kilobyte sein.',
+    'gt.numeric' => 'Muss größer als :value sein.',
     'gt.string' => 'Muss größer als :value Zeichen sein.',
-    'gt.array' => 'Muss mehr als :value Elemente haben.',
-    'gte.numeric' => 'Muss größer oder gleich :value sein.',
+    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'gte.file' => 'Muss größer oder gleich :value Kilobyte sein.',
+    'gte.numeric' => 'Muss größer oder gleich :value sein.',
     'gte.string' => 'Muss größer oder gleich :value Zeichen sein.',
-    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'image' => 'Muss ein Bild sein.',
     'in' => 'Dies ist ungültig.',
     'in_array' => 'Dieses Feld existiert nicht in :other .',
@@ -47,47 +57,65 @@
     'ipv6' => 'Muss eine gültige IPv6-Adresse sein.',
     'json' => 'Muss eine gültige JSON-Zeichenfolge sein.',
     'lowercase' => 'Muss klein geschrieben sein.',
-    'lt.numeric' => 'Muss kleiner als :value sein.',
+    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
     'lt.file' => 'Muss kleiner als :value Kilobyte sein.',
+    'lt.numeric' => 'Muss kleiner als :value sein.',
     'lt.string' => 'Muss aus weniger als :value Zeichen bestehen.',
-    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
-    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
+    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
     'lte.file' => 'Muss kleiner oder gleich :value Kilobyte sein.',
+    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
     'lte.string' => 'Muss kleiner oder gleich :value Zeichen sein.',
-    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
-    'max.numeric' => 'Darf nicht größer als :max sein.',
+    'mac_address' => 'Muss eine gültige MAC-Adresse sein.',
+    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
     'max.file' => 'Darf nicht größer als :max kilobytes sein.',
+    'max.numeric' => 'Darf nicht größer als :max sein.',
     'max.string' => 'Darf nicht mehr als :max Zeichen haben.',
-    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
+    'max_digits' => 'Darf nicht mehr als :max Ziffern enthalten.',
     'mimes' => 'Muss eine Datei vom Typ :values sein.',
     'mimetypes' => 'Muss eine Datei vom Typ :values sein.',
-    'min.numeric' => 'Muss mindestens :min sein.',
+    'min.array' => 'Muss mindestens :min Elemente enthalten.',
     'min.file' => 'Muss mindestens :min Kilobyte sein.',
+    'min.numeric' => 'Muss mindestens :min sein.',
     'min.string' => 'Muss mindestens :min Zeichen haben.',
-    'min.array' => 'Muss mindestens :min Elemente enthalten.',
+    'min_digits' => 'Darf nicht weniger als :max Ziffern enthalten.',
+    'missing' => 'Muss fehlen.',
+    'missing_if' => 'Muss fehlen, wenn :other gleich :value ist.',
+    'missing_unless' => 'Muss fehlen, wenn :other nicht :value ist.',
+    'missing_with' => 'Muss fehlen, wenn :values vorhanden ist.',
+    'missing_with_all' => 'Muss fehlen, wenn :values vorhanden sind.',
+    'multiple_of' => 'Muss ein Vielfaches von :value sein.',
     'not_in' => 'Dies ist ungültig.',
     'not_regex' => 'Das Format ist ungültig.',
     'numeric' => 'Muss eine Nummer sein.',
     'present' => 'Muss vorhanden sein.',
+    'prohibited' => 'Unzulässig.',
+    'prohibited_if' => 'Unzulässig, wenn :other gleich :value ist.',
+    'prohibited_unless' => 'Unzulässig, wenn :other nicht in :values enthalten ist.',
+    'prohibits' => 'Verbietet :other die Anwesenheit.',
     'regex' => 'Das Format ist ungültig.',
     'required' => 'Dieses Feld wird benötigt.',
+    'required_array_keys' => 'Muss Einträge für :values enthalten.',
     'required_if' => 'Dieses Feld ist erforderlich, wenn :other den Wert :value hat.',
+    'required_if_accepted' => 'Dieses Feld ist erforderlich, wenn :other zugelassen ist.',
     'required_unless' => 'Dieses Feld ist erforderlich, es sei denn, :other hat den Wert :values.',
     'required_with' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_with_all' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_without' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist.',
     'required_without_all' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist:',
     'same' => 'Dieses Feld und :other müssen übereinstimmen.',
-    'size.numeric' => 'Muss :size sein.',
+    'size.array' => 'Muss :size Elemente enthalten.',
     'size.file' => 'Muss :size Kilobyte sein.',
+    'size.numeric' => 'Muss :size sein.',
     'size.string' => 'Muss :size Zeichen haben.',
-    'size.array' => 'Muss :size Elemente enthalten.',
     'starts_with' => 'Muss mit :values beginnen',
     'string' => 'Muss eine Zeichenfolge sein.',
     'timezone' => 'Muss eine gültige Zeitzone sein.',
     'unique' => 'Dieser Wert wurde bereits vergeben.',
     'uploaded' => 'Der Upload ist fehlgeschlagen.',
+    'uppercase' => 'Muss in Großbuchstaben geschrieben sein.',
     'url' => 'Das Format ist ungültig.',
+    'ulid' => 'Muss eine gültige ULID sein.',
+    'uuid' => 'Muss eine gültige UUID sein.',
     'unique_entry_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_term_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_user_value' => 'Dieser Wert wurde bereits vergeben.',
diff --git a/resources/lang/de_CH.json b/resources/lang/de_CH.json
index 2143cb0789..2d15b40bc4 100644
--- a/resources/lang/de_CH.json
+++ b/resources/lang/de_CH.json
@@ -137,6 +137,7 @@
     "Before": "Bevor",
     "Behavior": "Verhalten",
     "Below": "Unterhalb",
+    "Between": "Zwischen",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint created": "Blueprint erstellt",
@@ -497,6 +498,7 @@
     "Inline": "Inline",
     "Inline Code": "Inline-Code",
     "Inline Label": "Inline Beschriftung",
+    "Inline Label when True": "Inline Beschriftung wenn aktiv",
     "Input Behavior": "Eingabeverhalten",
     "Input Label": "Beschriftung",
     "Input Type": "Eingabetyp",
@@ -659,6 +661,7 @@
     "Per Page": "Pro Seite",
     "Per-site": "Pro Website",
     "Permissions": "Berechtigungen",
+    "Phone": "Telefon",
     "PHP Info": "PHP Info",
     "Pick Color": "Farbe wählen",
     "Pin to Favorites": "Als Favorit speichern",
@@ -1010,6 +1013,7 @@
     "You are not authorized to view collections.": "Du bist nicht berechtigt, Sammlungen anzuzeigen.",
     "You are not authorized to view navs.": "Du bist nicht berechtigt, Navigationen anzuzeigen.",
     "You are not authorized to view this collection.": "Du bist nicht berechtigt, diese Sammlung anzuzeigen.",
+    "You are now impersonating": "Du gibst dich jetzt aus als",
     "Your Favorites": "Meine Favoriten",
     "Your working copy will be replaced by the contents of this revision.": "Deine Arbeitskopie wird durch den Inhalt dieser Überarbeitung ersetzt."
 }
diff --git a/resources/lang/de_CH/fieldtypes.php b/resources/lang/de_CH/fieldtypes.php
index fc32a71232..d091a99f03 100644
--- a/resources/lang/de_CH/fieldtypes.php
+++ b/resources/lang/de_CH/fieldtypes.php
@@ -154,8 +154,8 @@
     'slug.title' => 'Slug',
     'structures.title' => 'Strukturen',
     'table.title' => 'Tabelle',
-    'taggable.title' => 'Tags',
     'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
+    'taggable.title' => 'Tags',
     'taxonomies.title' => 'Taxonomien',
     'template.config.blueprint' => 'Fügt die Option «Korrespondiert mit Blueprint» hinzu. Erfahre mehr in der [Dokumentation](https://statamic.dev/views#inferring-templates-from-entry-blueprints).',
     'template.config.folder' => 'Nur Templates aus diesem Ordner anzeigen.',
@@ -175,7 +175,8 @@
     'textarea.title' => 'Textbereich',
     'time.config.seconds_enabled' => 'Sekunden im Timepicker anzeigen.',
     'time.title' => 'Zeit',
-    'toggle.config.inline_label' => 'Inline-Beschriftung festlegen, welche neben dem Schalter angezeigt werden soll.',
+    'toggle.config.inline_label' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird.',
+    'toggle.config.inline_label_when_true' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird, wenn der Wert true ist.',
     'toggle.title' => 'Schalter',
     'user_groups.title' => 'Benutzergruppen',
     'user_roles.title' => 'Benutzerrollen',
diff --git a/resources/lang/de_CH/messages.php b/resources/lang/de_CH/messages.php
index 2a1bb20b29..d1b7e43300 100644
--- a/resources/lang/de_CH/messages.php
+++ b/resources/lang/de_CH/messages.php
@@ -81,7 +81,7 @@
     'field_validation_required_instructions' => 'Steuert, ob dieses Feld erforderlich ist oder nicht.',
     'field_validation_sometimes_instructions' => 'Dieses Feld wird nur validiert, wenn es sichtbar ist oder abgeschickt wird.',
     'fields_blueprints_description' => 'Blueprints definieren die Felder für den inhaltlichen Aufbau von Sammlungen, Taxonomien, Benutzer:innen und Formularen.',
-    'fields_default_instructions' => 'Standardwert festlegen.',
+    'fields_default_instructions' => 'Diesen Wert immer dann einfügen, wenn das Feld in einem Veröffentlichungsformular leer ist.',
     'fields_display_instructions' => 'Name des Feldes im Control Panel.',
     'fields_duplicate_instructions' => 'Soll dieses Feld beim Duplizieren des Eintrags berücksichtigt werden?',
     'fields_fieldsets_description' => 'Fieldsets sind einfache, flexible und völlig optionale Gruppen von Feldern, mit deren Hilfe wiederverwendbare, vorkonfigurierte Blöcke organisiert werden können.',
diff --git a/resources/lang/de_CH/permissions.php b/resources/lang/de_CH/permissions.php
index 56f790409b..166b65b5aa 100644
--- a/resources/lang/de_CH/permissions.php
+++ b/resources/lang/de_CH/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Ermöglicht den Zugriff auf den Addon-Bereich zum Installieren und Deinstallieren von Addons.',
     'manage_preferences' => 'Voreinstellungen verwalten',
     'manage_preferences_desc' => 'Ermöglicht globale und rollenspezifische Voreinstellungen anzupassen.',
+    'group_sites' => 'Websites',
+    'access_{site}_site' => 'Zugriff auf :site',
     'group_collections' => 'Sammlungen',
     'configure_collections' => 'Sammlungen konfigurieren',
     'configure_collections_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Sammlungen.',
diff --git a/resources/lang/de_CH/validation.php b/resources/lang/de_CH/validation.php
index b7c836ac79..df664d270b 100644
--- a/resources/lang/de_CH/validation.php
+++ b/resources/lang/de_CH/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Muss akzeptiert werden.',
+    'accepted_if' => 'Muss akzeptiert werden, wenn :other gleich :value ist.',
     'active_url' => 'Dies ist keine gültige URL.',
     'after' => 'Muss ein Datum nach dem :date sein.',
     'after_or_equal' => 'Muss ein Datum nach oder gleich dem :date sein.',
@@ -9,35 +10,44 @@
     'alpha_dash' => 'Darf nur Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten.',
     'alpha_num' => 'Darf nur Buchstaben und Zahlen enthalten.',
     'array' => 'Muss ein Array sein.',
+    'ascii' => 'Darf nur alphanumerische Ein-Byte-Zeichen und Symbole enthalten.',
     'before' => 'Muss ein Datum vor dem :date sein.',
     'before_or_equal' => 'Muss ein Datum vor oder gleich dem :date sein.',
-    'between.numeric' => 'Muss zwischen :min und :max liegen.',
+    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'between.file' => 'Muss zwischen :min und :max Kilobyte liegen.',
+    'between.numeric' => 'Muss zwischen :min und :max liegen.',
     'between.string' => 'Muss zwischen :min und :max Zeichen liegen.',
-    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'boolean' => 'Muss wahr oder falsch sein.',
+    'can' => 'Enthält einen unzulässigen Wert.',
     'confirmed' => 'Bestätigung stimmt nicht überein.',
     'current_password' => 'Das Passwort ist falsch.',
     'date' => 'Kein gültiges Datum.',
+    'date_equals' => 'Das Datum muss gleich :date sein.',
     'date_format' => 'Entspricht nicht dem Format :format .',
+    'decimal' => 'Muss :decimal Dezimalstellen haben.',
+    'declined' => 'Muss abgelehnt werden.',
+    'declined_if' => 'Muss abgelehnt werden, wenn :other gleich :value ist.',
     'different' => 'Dieses Feld und :other müssen unterschiedlich sein.',
     'digits' => 'Muss aus :digits Ziffern bestehen.',
     'digits_between' => 'Muss zwischen den Ziffern :min und :max liegen.',
     'dimensions' => 'Ungültige Bildabmessungen.',
     'distinct' => 'Dieses Feld hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Darf nicht mit einer der folgenden Angaben enden: :values.',
+    'doesnt_start_with' => 'Darf nicht mit einer der folgenden Angaben beginnen: :values.',
     'email' => 'Muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => 'Muss auf :values enden',
+    'enum' => 'Das ausgewählte :attribute ist ungültig.',
     'exists' => 'Dies ist ungültig.',
     'file' => 'Muss eine Datei sein.',
     'filled' => 'Muss einen Wert haben.',
-    'gt.numeric' => 'Muss grösser als :value sein.',
+    'gt.array' => 'Muss mehr als :value Elemente haben.',
     'gt.file' => 'Muss grösser als :value Kilobyte sein.',
+    'gt.numeric' => 'Muss grösser als :value sein.',
     'gt.string' => 'Muss grösser als :value Zeichen sein.',
-    'gt.array' => 'Muss mehr als :value Elemente haben.',
-    'gte.numeric' => 'Muss grösser oder gleich :value sein.',
+    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'gte.file' => 'Muss grösser oder gleich :value Kilobyte sein.',
+    'gte.numeric' => 'Muss grösser oder gleich :value sein.',
     'gte.string' => 'Muss grösser oder gleich :value Zeichen sein.',
-    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'image' => 'Muss ein Bild sein.',
     'in' => 'Dies ist ungültig.',
     'in_array' => 'Dieses Feld existiert nicht in :other .',
@@ -47,47 +57,65 @@
     'ipv6' => 'Muss eine gültige IPv6-Adresse sein.',
     'json' => 'Muss eine gültige JSON-Zeichenfolge sein.',
     'lowercase' => 'Muss klein geschrieben sein.',
-    'lt.numeric' => 'Muss kleiner als :value sein.',
+    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
     'lt.file' => 'Muss kleiner als :value Kilobyte sein.',
+    'lt.numeric' => 'Muss kleiner als :value sein.',
     'lt.string' => 'Muss aus weniger als :value Zeichen bestehen.',
-    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
-    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
+    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
     'lte.file' => 'Muss kleiner oder gleich :value Kilobyte sein.',
+    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
     'lte.string' => 'Muss kleiner oder gleich :value Zeichen sein.',
-    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
-    'max.numeric' => 'Darf nicht grösser als :max sein.',
+    'mac_address' => 'Muss eine gültige MAC-Adresse sein.',
+    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
     'max.file' => 'Darf nicht grösser als :max kilobytes sein.',
+    'max.numeric' => 'Darf nicht grösser als :max sein.',
     'max.string' => 'Darf nicht mehr als :max Zeichen haben.',
-    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
+    'max_digits' => 'Darf nicht mehr als :max Ziffern enthalten.',
     'mimes' => 'Muss eine Datei vom Typ :values sein.',
     'mimetypes' => 'Muss eine Datei vom Typ :values sein.',
-    'min.numeric' => 'Muss mindestens :min sein.',
+    'min.array' => 'Muss mindestens :min Elemente enthalten.',
     'min.file' => 'Muss mindestens :min Kilobyte sein.',
+    'min.numeric' => 'Muss mindestens :min sein.',
     'min.string' => 'Muss mindestens :min Zeichen haben.',
-    'min.array' => 'Muss mindestens :min Elemente enthalten.',
+    'min_digits' => 'Darf nicht weniger als :max Ziffern enthalten.',
+    'missing' => 'Muss fehlen.',
+    'missing_if' => 'Muss fehlen, wenn :other gleich :value ist.',
+    'missing_unless' => 'Muss fehlen, wenn :other nicht :value ist.',
+    'missing_with' => 'Muss fehlen, wenn :values vorhanden ist.',
+    'missing_with_all' => 'Muss fehlen, wenn :values vorhanden sind.',
+    'multiple_of' => 'Muss ein Vielfaches von :value sein.',
     'not_in' => 'Dies ist ungültig.',
     'not_regex' => 'Das Format ist ungültig.',
     'numeric' => 'Muss eine Nummer sein.',
     'present' => 'Muss vorhanden sein.',
+    'prohibited' => 'Unzulässig.',
+    'prohibited_if' => 'Unzulässig, wenn :other gleich :value ist.',
+    'prohibited_unless' => 'Unzulässig, wenn :other nicht in :values enthalten ist.',
+    'prohibits' => 'Verbietet :other die Anwesenheit.',
     'regex' => 'Das Format ist ungültig.',
     'required' => 'Dieses Feld wird benötigt.',
+    'required_array_keys' => 'Muss Einträge für :values enthalten.',
     'required_if' => 'Dieses Feld ist erforderlich, wenn :other den Wert :value hat.',
+    'required_if_accepted' => 'Dieses Feld ist erforderlich, wenn :other zugelassen ist.',
     'required_unless' => 'Dieses Feld ist erforderlich, es sei denn, :other hat den Wert :values.',
     'required_with' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_with_all' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_without' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist.',
     'required_without_all' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist:',
     'same' => 'Dieses Feld und :other müssen übereinstimmen.',
-    'size.numeric' => 'Muss :size sein.',
+    'size.array' => 'Muss :size Elemente enthalten.',
     'size.file' => 'Muss :size Kilobyte sein.',
+    'size.numeric' => 'Muss :size sein.',
     'size.string' => 'Muss :size Zeichen haben.',
-    'size.array' => 'Muss :size Elemente enthalten.',
     'starts_with' => 'Muss mit :values beginnen',
     'string' => 'Muss eine Zeichenfolge sein.',
     'timezone' => 'Muss eine gültige Zeitzone sein.',
     'unique' => 'Dieser Wert wurde bereits vergeben.',
     'uploaded' => 'Der Upload ist fehlgeschlagen.',
+    'uppercase' => 'Muss in Grossbuchstaben geschrieben sein.',
     'url' => 'Das Format ist ungültig.',
+    'ulid' => 'Muss eine gültige ULID sein.',
+    'uuid' => 'Muss eine gültige UUID sein.',
     'unique_entry_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_term_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_user_value' => 'Dieser Wert wurde bereits vergeben.',

From 497b845256ddb21193de2ef43ae053a4e63c48df Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 18 Oct 2023 15:51:05 +0100
Subject: [PATCH 013/175] [4.x] Add config to enable frontend route binding and
 support binding by field (#8853)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 config/routes.php                      |  13 +
 src/Providers/RouteServiceProvider.php | 300 ++++++--
 tests/Routing/RouteBindingTest.php     | 974 +++++++++++++++++++++++++
 tests/Routing/RoutesTest.php           |  63 ++
 4 files changed, 1304 insertions(+), 46 deletions(-)
 create mode 100644 tests/Routing/RouteBindingTest.php

diff --git a/config/routes.php b/config/routes.php
index aa40a8b16b..95a6427684 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -16,6 +16,19 @@
 
     'enabled' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Route Bindings
+    |--------------------------------------------------------------------------
+    |
+    | Whether route bindings for Statamic repositories (entry, taxonomy,
+    | collections, etc) are enabled for front end routes. This may be
+    | useful if you want to make your own custom routes with them.
+    |
+    */
+
+    'bindings' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Action Route Prefix
diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
index 551fe06a92..224e5ab5ee 100644
--- a/src/Providers/RouteServiceProvider.php
+++ b/src/Providers/RouteServiceProvider.php
@@ -2,7 +2,8 @@
 
 namespace Statamic\Providers;
 
-use Illuminate\Support\Facades\Route;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Route as Routes;
 use Illuminate\Support\ServiceProvider;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Asset;
@@ -29,7 +30,7 @@ public function register()
 
     public function boot()
     {
-        Route::mixin(new Router);
+        Routes::mixin(new Router);
 
         $this->bindCollections();
         $this->bindEntries();
@@ -45,13 +46,19 @@ public function boot()
 
     protected function bindCollections()
     {
-        Route::bind('collection', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('collection', function ($handle, $route = null) {
+            if (! $this->needsCollectionBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('collection') ?? 'handle';
+
+            $collection = $field == 'handle'
+                ? Collection::findByHandle($handle)
+                : Collection::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $collection = Collection::findByHandle($handle),
+                $collection,
                 new NotFoundHttpException("Collection [$handle] not found.")
             );
 
@@ -59,15 +66,32 @@ protected function bindCollections()
         });
     }
 
+    private function needsCollectionBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        return $this->isCpOrApiRoute($route) || $this->isFrontendBindingEnabled();
+    }
+
     protected function bindEntries()
     {
-        Route::bind('entry', function ($handle, $route = null) {
-            if ($this->isApiRoute($route) || ! $this->isCpRoute($route)) {
+        Routes::bind('entry', function ($handle, $route = null) {
+            if (! $this->needsEntryBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('entry') ?? 'id';
+
+            $entry = $field == 'id'
+                ? Entry::find($handle)
+                : Entry::query()->where($field, $handle)->first();
+
+            $collection = $route->parameter('collection');
+
             throw_if(
-                ! ($entry = Entry::find($handle)) || $entry->collection()->id() !== $route->parameter('collection')->id(),
+                ! $entry || ($collection && $entry->collection()->id() !== $collection->id()),
                 new NotFoundHttpException("Entry [$handle] not found.")
             );
 
@@ -75,15 +99,38 @@ protected function bindEntries()
         });
     }
 
+    private function needsEntryBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindTaxonomies()
     {
-        Route::bind('taxonomy', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('taxonomy', function ($handle, $route = null) {
+            if (! $this->needsTaxonomyBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('taxonomy') ?? 'handle';
+
+            $taxonomy = $field == 'handle'
+                ? Taxonomy::findByHandle($handle)
+                : Taxonomy::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $taxonomy = Taxonomy::findByHandle($handle),
+                $taxonomy,
                 new NotFoundHttpException("Taxonomy [$handle] not found.")
             );
 
@@ -91,18 +138,46 @@ protected function bindTaxonomies()
         });
     }
 
+    private function needsTaxonomyBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindTerms()
     {
-        Route::bind('term', function ($handle, $route = null) {
-            if ($this->isApiRoute($route) || ! $this->isCpRoute($route)) {
+        Routes::bind('term', function ($handle, $route = null) {
+            if (! $this->needsTermBinding($route)) {
                 return $handle;
             }
 
-            $id = $route->parameter('taxonomy')->handle().'::'.$handle;
+            $field = $route->bindingFieldFor('term') ?? 'id';
+
+            $taxonomy = $route->parameter('taxonomy');
+
+            if ($field == 'id' && $taxonomy) {
+                $handle = $taxonomy->handle().'::'.$handle;
+            }
+
             $site = $route->parameter('site') ?? Site::default()->handle();
 
+            $term = $field == 'id'
+                ? Term::find($handle)?->in($site)
+                : Term::query()
+                    ->where($field, $handle)
+                    ->where('site', $site)
+                    ->when($taxonomy, fn ($query) => $query->where('taxonomy', $taxonomy->handle()))
+                    ->first();
+
             throw_unless(
-                ($term = Term::find($id)->in($site)) && $term->taxonomy()->id() === $route->parameter('taxonomy')->id(),
+                $term || ($term && $taxonomy && $term->taxonomy()->id() === $taxonomy->id()),
                 new NotFoundHttpException("Taxonomy term [$handle] not found.")
             );
 
@@ -110,15 +185,38 @@ protected function bindTerms()
         });
     }
 
+    private function needsTermBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindAssetContainers()
     {
-        Route::bind('asset_container', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('asset_container', function ($handle, $route = null) {
+            if (! $this->needsAssetContainerBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('asset_container') ?? 'handle';
+
+            $container = $field == 'handle'
+                ? AssetContainer::findByHandle($handle)
+                : AssetContainer::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $container = AssetContainer::findByHandle($handle),
+                $container,
                 new NotFoundHttpException("Asset container [$handle] not found.")
             );
 
@@ -126,17 +224,40 @@ protected function bindAssetContainers()
         });
     }
 
+    private function needsAssetContainerBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindAssets()
     {
-        Route::bind('asset', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('asset', function ($handle, $route = null) {
+            if (! $this->needsAssetBinding($route)) {
                 return $handle;
             }
 
-            $id = $route->parameter('asset_container')->handle().'::'.$handle;
+            $field = $route->bindingFieldFor('asset') ?? 'id';
+
+            $container = $route->parameter('asset_container');
+
+            if ($field == 'id') {
+                $handle = $container->handle().'::'.$handle;
+            }
+
+            $asset = $field == 'id'
+                ? Asset::find($handle)
+                : $container->queryAssets()->where($field, $handle)->first();
 
             throw_unless(
-                $asset = Asset::find($id),
+                $asset,
                 new NotFoundHttpException("Asset [$handle] not found.")
             );
 
@@ -144,17 +265,36 @@ protected function bindAssets()
         });
     }
 
+    private function needsAssetBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindGlobalSets()
     {
-        Route::bind('global', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('global', function ($handle, $route = null) {
+            if (! $this->needsGlobalsBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('global') ?? 'handle';
+
+            $global = $field == 'handle'
+                ? GlobalSet::findByHandle($handle)
+                : GlobalSet::all()->first(fn ($set) => $set->$field($handle));
+
             $site = Site::default()->handle();
 
             throw_unless(
-                $globalSet = GlobalSet::findByHandle($handle)->in($site),
+                $globalSet = $global?->in($site),
                 new NotFoundHttpException("Global set [$handle] not found.")
             );
 
@@ -162,15 +302,34 @@ protected function bindGlobalSets()
         });
     }
 
+    private function needsGlobalsBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindSites()
     {
-        Route::bind('site', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('site', function ($handle, $route = null) {
+            if (! $this->needsSiteBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('site') ?? 'handle';
+
+            $site = $field == 'handle'
+                ? Site::get($handle)
+                : Site::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $site = Site::get($handle),
+                $site,
                 new NotFoundHttpException("Site [$handle] not found.")
             );
 
@@ -178,10 +337,23 @@ protected function bindSites()
         });
     }
 
+    private function needsSiteBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindRevisions()
     {
-        Route::bind('revision', function ($reference, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('revision', function ($reference, $route = null) {
+            if (! $this->needsRevisionBinding($route)) {
                 return $reference;
             }
 
@@ -202,16 +374,38 @@ protected function bindRevisions()
         });
     }
 
+    private function needsRevisionBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindForms()
     {
-        Route::bind('form', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)
-                && ! Str::startsWith($route->uri(), config('statamic.routes.action').'/forms/')) {
+        Routes::bind('form', function ($handle, $route = null) {
+            if (! $this->needsFormBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('form') ?? 'handle';
+
+            $form = $field == 'handle'
+                ? Form::find($handle)
+                : Form::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $form = Form::find($handle),
+                $form,
                 new NotFoundHttpException("Form [$handle] not found.")
             );
 
@@ -219,12 +413,34 @@ protected function bindForms()
         });
     }
 
-    private function isApiRoute(\Illuminate\Routing\Route $route = null)
+    private function needsFormBinding(?Route $route): bool
     {
-        if (is_null($route)) {
+        if (! $route) {
             return false;
         }
 
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        if ($this->isFrontendBindingEnabled()) {
+            return true;
+        }
+
+        if ($route) {
+            return Str::startsWith($route->uri(), config('statamic.routes.action').'/forms/');
+        }
+
+        return false;
+    }
+
+    private function isFrontendBindingEnabled()
+    {
+        return config('statamic.routes.bindings', false);
+    }
+
+    private function isApiRoute(Route $route)
+    {
         $api = Str::ensureRight(config('statamic.api.route'), '/');
 
         if ($api === '/') {
@@ -234,12 +450,8 @@ private function isApiRoute(\Illuminate\Routing\Route $route = null)
         return Str::startsWith($route->uri(), $api);
     }
 
-    private function isCpRoute(\Illuminate\Routing\Route $route = null)
+    private function isCpRoute(Route $route)
     {
-        if (is_null($route)) {
-            return false;
-        }
-
         $cp = Str::ensureRight(config('statamic.cp.route'), '/');
 
         if ($cp === '/') {
@@ -249,12 +461,8 @@ private function isCpRoute(\Illuminate\Routing\Route $route = null)
         return Str::startsWith($route->uri(), $cp);
     }
 
-    private function isCpOrApiRoute(\Illuminate\Routing\Route $route = null)
+    private function isCpOrApiRoute(Route $route)
     {
-        if (is_null($route)) {
-            return false;
-        }
-
         return $this->isCpRoute($route) || $this->isApiRoute($route);
     }
 }
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
new file mode 100644
index 0000000000..bdc4d721e9
--- /dev/null
+++ b/tests/Routing/RouteBindingTest.php
@@ -0,0 +1,974 @@
+<?php
+
+use Facades\Tests\Factories\EntryFactory;
+use Illuminate\Contracts\Routing\BindingRegistrar;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Storage;
+use Statamic\Contracts\Assets\Asset;
+use Statamic\Contracts\Assets\AssetContainer;
+use Statamic\Contracts\Entries\Collection;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Contracts\Forms\Form;
+use Statamic\Contracts\Globals\Variables;
+use Statamic\Contracts\Revisions\Revision;
+use Statamic\Contracts\Taxonomies\Taxonomy;
+use Statamic\Contracts\Taxonomies\Term;
+use Statamic\Facades;
+use Statamic\Sites\Site;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class RouteBindingTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private $route;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app->booted(function () {
+            Route::middleware(SubstituteBindings::class)->group(function () {
+                collect([
+                    // entries and collections
+                    'cp/custom/collections/{collection}',
+                    'cp/custom/collections/{collection}/entries/{entry}',
+                    'api/custom/collections/{collection}',
+                    'api/custom/collections/{collection}/entries/{entry}',
+                    'custom/collections/title/{collection:title}',
+                    'custom/collections/{collection}',
+                    'custom/entries/slug/{entry:slug}',
+                    'custom/entries/{entry}',
+                    'custom/collections/{collection}/entries/{entry}',
+
+                    // terms and taxonomies
+                    'cp/custom/taxonomies/{taxonomy}',
+                    'cp/custom/taxonomies/{taxonomy}/terms/{term}',
+                    'api/custom/taxonomies/{taxonomy}',
+                    'api/custom/taxonomies/{taxonomy}/terms/{term}',
+                    'custom/taxonomies/title/{taxonomy:title}',
+                    'custom/taxonomies/{taxonomy}',
+                    'custom/terms/slug/{term:slug}',
+                    'custom/terms/{term}',
+                    'custom/taxonomies/{taxonomy}/terms/{term}',
+
+                    // assets and containers (more below)
+                    'cp/custom/containers/{asset_container}',
+                    'api/custom/containers/{asset_container}',
+                    'custom/containers/title/{asset_container:title}',
+                    'custom/containers/{asset_container}',
+                    'custom/assets/alt/{asset_container}/assets/{asset:alt}',
+
+                    // globals
+                    'cp/custom/globals/{global}',
+                    'api/custom/globals/{global}',
+                    'custom/globals/title/{global:title}',
+                    'custom/globals/{global}',
+
+                    // sites
+                    'cp/custom/sites/{site}',
+                    'api/custom/sites/{site}',
+                    'custom/sites/locale/{site:locale}',
+                    'custom/sites/{site}',
+
+                    // revisions
+                    'cp/custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'cp/custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'cp/custom/revisions/{revision}',
+                    'api/custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'api/custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'api/custom/revisions/{revision}',
+                    'custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'custom/revisions/{revision}',
+
+                    // forms
+                    'cp/custom/forms/{form}',
+                    'api/custom/forms/{form}',
+                    'custom/forms/title/{form:title}',
+                    'custom/forms/{form}',
+                ])->each(fn ($uri) => Route::get($uri, fn () => $this->route()));
+
+                // assets are special because they have a path
+                Route::get('cp/custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+                Route::get('api/custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+                Route::get('custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+            });
+        });
+    }
+
+    private function route()
+    {
+        $this->route = request()->route();
+    }
+
+    public function bindingsEnabled($app)
+    {
+        $app['config']->set('statamic.routes.bindings', true);
+    }
+
+    public function bindingsDisabled($app)
+    {
+        $app['config']->set('statamic.routes.bindings', false);
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider statamicRouteProvider
+     */
+    public function binds_route_parameters_in_statamic_routes(
+        $uri,
+        $expectationCallback = null
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($expectationCallback) {
+            $response->assertOk();
+            $this->assertTrue($expectationCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider statamicRouteProvider
+     */
+    public function binds_route_parameters_in_statamic_routes_with_bindings_disabled(
+        $uri,
+        $expectationCallback = null
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($expectationCallback) {
+            $response->assertOk();
+            $this->assertTrue($expectationCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider frontendRouteProvider
+     */
+    public function binds_route_parameters_in_frontend_routes(
+        $uri,
+        Closure $enabledCallback = null,
+        Closure $disabledCallback = null,
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($enabledCallback) {
+            $response->assertOk();
+            $this->assertTrue($enabledCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider frontendRouteProvider
+     */
+    public function binds_route_parameters_in_frontend_routes_with_bindings_disabled(
+        $uri,
+        Closure $enabledCallback = null,
+        Closure $disabledCallback = null,
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($disabledCallback) {
+            $response->assertOk();
+            $this->assertTrue($disabledCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    private function setupContent()
+    {
+        Facades\Collection::make('blog')->title('The Blog')->save();
+        $entry = EntryFactory::id('123')->slug('alfa')->collection('blog')->create();
+        $entryRevision = $entry->makeRevision()->id('1');
+        Facades\Revision::shouldReceive('whereKey')->with('collections/blog/en/123')->andReturn(collect(['1' => $entryRevision]));
+
+        Facades\Taxonomy::make('tags')->title('Product Tags')->save();
+        $term = tap(Facades\Term::make()->taxonomy('tags')->inDefaultLocale()->slug('bravo')->data([]))->save();
+        $termRevision = $term->inDefaultLocale()->makeRevision()->id('2');
+        Facades\Revision::shouldReceive('whereKey')->with('taxonomies/tags/en/bravo')->andReturn(collect(['2' => $termRevision]));
+
+        Facades\AssetContainer::make('files')->disk('files')->title('The Files')->save();
+        Storage::fake('files');
+        Storage::disk('files')->put('foo/bar.txt', '');
+        Storage::disk('files')->put('foo/.meta/bar.txt.yaml', "data:\n  alt: 'the alt text'");
+
+        $set = Facades\GlobalSet::make('seo')->title('SEO Settings');
+        $set->addLocalization($set->makeLocalization('en'));
+        $set->save();
+
+        Facades\Form::make('contact')->title('Contact Us')->save();
+    }
+
+    public function statamicRouteProvider()
+    {
+
+        return [
+
+            // entries and collections
+
+            'cp collection' => [
+                'cp/custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+            ],
+
+            'cp missing collection' => [
+                'cp/custom/collections/invalid',
+            ],
+
+            'api collection' => [
+                'api/custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+            ],
+
+            'api missing collection' => [
+                'api/custom/collections/invalid',
+            ],
+
+            'cp collection and entry' => [
+                'cp/custom/collections/blog/entries/123',
+                function (Collection $collection, Entry $entry) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123';
+                },
+            ],
+
+            'cp missing collection and entry' => [
+                'cp/custom/collections/invalid/entries/123',
+            ],
+
+            'cp collection and missing entry' => [
+                'cp/custom/collections/blog/entries/invalid',
+            ],
+
+            'api collection and entry' => [
+                'api/custom/collections/blog/entries/123',
+                function (Collection $collection, string $entry) {
+                    return $collection->handle() === 'blog' && $entry === '123';
+                },
+            ],
+
+            'api missing collection and entry' => [
+                'api/custom/collections/invalid/entries/123',
+            ],
+
+            'api collection and missing entry' => [
+                'api/custom/collections/blog/entries/invalid',
+                function (Collection $collection, string $entry) {
+                    return $collection->handle() === 'blog' && $entry === 'invalid';
+                },
+            ],
+
+            // terms and taxonomies
+
+            'cp taxonomy' => [
+                'cp/custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+            ],
+
+            'cp missing taxonomy' => [
+                'cp/custom/taxonomies/invalid',
+            ],
+
+            'api taxonomy' => [
+                'api/custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+            ],
+
+            'api missing taxonomy' => [
+                'api/custom/taxonomies/invalid',
+            ],
+
+            'cp taxonomy and term' => [
+                'cp/custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, Term $term) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo';
+                },
+            ],
+
+            'cp missing taxonomy and term' => [
+                'cp/custom/taxonomies/invalid/terms/bravo',
+            ],
+
+            'cp taxonomy and missing term' => [
+                'cp/custom/taxonomies/tags/terms/invalid',
+            ],
+
+            'api taxonomy and term' => [
+                'api/custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, string $term) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo';
+                },
+            ],
+
+            'api missing taxonomy and term' => [
+                'api/custom/taxonomies/invalid/terms/bravo',
+            ],
+
+            'api taxonomy and missing term' => [
+                'api/custom/taxonomies/tags/terms/invalid',
+                function (Taxonomy $taxonomy, string $term) {
+                    return $taxonomy->handle() === 'tags' && $term === 'invalid';
+                },
+            ],
+
+            // assets and containers
+
+            'cp container' => [
+                'cp/custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+            ],
+
+            'cp missing container' => [
+                'cp/custom/containers/invalid',
+            ],
+
+            'api container' => [
+                'api/custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+            ],
+
+            'api missing container' => [
+                'api/custom/containers/invalid',
+            ],
+
+            'cp container and asset' => [
+                'cp/custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+            ],
+
+            'cp missing container and asset' => [
+                'cp/custom/assets/invalid/assets/foo/bar.txt',
+            ],
+
+            'cp container and missing asset' => [
+                'cp/custom/assets/files/assets/invalid',
+            ],
+
+            'api container and asset' => [
+                'api/custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+            ],
+
+            'api missing container and asset' => [
+                'api/custom/assets/invalid/assets/foo/bar.txt',
+            ],
+
+            'api container and missing asset' => [
+                'api/custom/assets/files/assets/foo/invalid.txt',
+            ],
+
+            // globals
+
+            'cp global' => [
+                'cp/custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+            ],
+
+            'cp missing global' => [
+                'cp/custom/globals/invalid',
+            ],
+
+            'api global' => [
+                'api/custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+            ],
+
+            'api missing global' => [
+                'api/custom/globals/invalid',
+            ],
+
+            // sites
+
+            'cp site' => [
+                'cp/custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+            ],
+
+            'cp missing site' => [
+                'cp/custom/sites/invalid',
+            ],
+
+            'api site' => [
+                'api/custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+            ],
+
+            'api missing site' => [
+                'api/custom/sites/invalid',
+            ],
+
+            // revisions
+
+            'cp entry revision' => [
+                'cp/custom/entries/blog/123/revisions/1',
+                function (Collection $collection, Entry $entry, Revision $revision) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123' && $revision->id() === '1';
+                },
+            ],
+
+            'cp entry missing revision' => [
+                'cp/custom/entries/blog/123/revisions/invalid',
+            ],
+
+            'cp term revision' => [
+                'cp/custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, Term $term, Revision $revision) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo' && $revision->id() === '2';
+                },
+            ],
+
+            'cp term missing revision' => [
+                'cp/custom/terms/tags/bravo/revisions/invalid',
+            ],
+
+            'cp invalid content revision' => [
+                'cp/custom/revisions/1',
+            ],
+
+            'api entry revision' => [
+                'api/custom/entries/blog/123/revisions/1',
+                function (Collection $collection, string $entry, string $revision) {
+                    return $collection->handle() === 'blog' && $entry === '123' && $revision === '1';
+                },
+            ],
+
+            'api entry missing revision' => [
+                'api/custom/entries/blog/123/revisions/invalid',
+                function (Collection $collection, string $entry, string $revision) {
+                    return $collection->handle() === 'blog' && $entry === '123' && $revision === 'invalid';
+                },
+            ],
+
+            'api term revision' => [
+                'api/custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, string $term, $revision) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo' && $revision === '2';
+                },
+            ],
+
+            'api term missing revision' => [
+                'api/custom/terms/tags/bravo/revisions/invalid',
+                function (Taxonomy $taxonomy, string $term, string $revision) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo' && $revision === 'invalid';
+                },
+            ],
+
+            'api invalid content revision' => [
+                'api/custom/revisions/1',
+                function (string $revision) {
+                    return $revision === '1';
+                },
+            ],
+
+            // forms
+
+            'cp form' => [
+                'cp/custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+            ],
+
+            'cp missing form' => [
+                'cp/custom/forms/invalid',
+            ],
+
+            'api form' => [
+                'cp/custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+            ],
+
+            'api missing form' => [
+                'api/custom/forms/invalid',
+            ],
+
+        ];
+    }
+
+    public function frontendRouteProvider()
+    {
+        return [
+
+            // entries and collections
+
+            'collection' => [
+                'custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+                function (string $collection) {
+                    return $collection === 'blog';
+                },
+            ],
+
+            'collection with custom binding' => [
+                'custom/collections/title/The%20Blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+                function (string $collection) {
+                    return $collection === 'The Blog';
+                },
+            ],
+
+            'missing collection' => [
+                'custom/collections/invalid',
+                null,
+                function (string $collection) {
+                    return $collection === 'invalid';
+                },
+            ],
+
+            'entry' => [
+                'custom/entries/123',
+                function (Entry $entry) {
+                    return $entry->id() === '123';
+                },
+                function (string $entry) {
+                    return $entry === '123';
+                },
+            ],
+
+            'missing entry' => [
+                'custom/entries/invalid',
+                null,
+                function (string $entry) {
+                    return $entry === 'invalid';
+                },
+            ],
+
+            'collection and entry' => [
+                'custom/collections/blog/entries/123',
+                function (Collection $collection, Entry $entry) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123';
+                },
+                function (string $collection, string $entry) {
+                    return $collection === 'blog' && $entry === '123';
+                },
+            ],
+
+            'missing collection and entry' => [
+                'custom/collections/invalid/entries/123',
+                null,
+                function (string $collection, string $entry) {
+                    return $collection === 'invalid' && $entry === '123';
+                },
+            ],
+
+            'collection and missing entry' => [
+                'custom/collections/blog/entries/invalid',
+                null,
+                function (string $collection, string $entry) {
+                    return $collection === 'blog' && $entry === 'invalid';
+                },
+            ],
+
+            'entry with custom binding' => [
+                'custom/entries/slug/alfa',
+                function (Entry $entry) {
+                    return $entry->id() === '123';
+                },
+                function (string $entry) {
+                    return $entry === 'alfa';
+                },
+            ],
+
+            // terms and taxonomies
+
+            'taxonomy' => [
+                'custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+                function (string $taxonomy) {
+                    return $taxonomy === 'tags';
+                },
+            ],
+
+            'taxonomy with custom binding' => [
+                'custom/taxonomies/title/Product%20Tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+                function (string $taxonomy) {
+                    return $taxonomy === 'Product Tags';
+                },
+            ],
+
+            'missing taxonomy' => [
+                'custom/taxonomies/invalid',
+                null,
+                function (string $taxonomy) {
+                    return $taxonomy === 'invalid';
+                },
+            ],
+
+            'term' => [
+                'custom/terms/tags::bravo',
+                function (Term $term) {
+                    return $term->id() === 'tags::bravo';
+                },
+                function (string $term) {
+                    return $term === 'tags::bravo';
+                },
+            ],
+
+            'missing term' => [
+                'custom/terms/tags::invalid',
+                null,
+                function (string $term) {
+                    return $term === 'tags::invalid';
+                },
+            ],
+
+            'taxonomy and term' => [
+                'custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, Term $term) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo';
+                },
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'tags' && $term === 'bravo';
+                },
+            ],
+
+            'missing taxonomy and term' => [
+                'custom/taxonomies/invalid/terms/bravo',
+                null,
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'invalid' && $term === 'bravo';
+                },
+            ],
+
+            'taxonomy and missing term' => [
+                'custom/taxonomies/tags/terms/invalid',
+                null,
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'tags' && $term === 'invalid';
+                },
+            ],
+
+            'term with custom binding' => [
+                'custom/terms/slug/bravo',
+                function (Term $term) {
+                    return $term->id() === 'tags::bravo';
+                },
+                function (string $term) {
+                    return $term === 'bravo';
+                },
+            ],
+
+            // assets and containers
+
+            'container' => [
+                'custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+                function (string $asset_container) {
+                    return $asset_container === 'files';
+                },
+            ],
+
+            'container with custom binding' => [
+                'custom/containers/title/The%20Files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+                function (string $asset_container) {
+                    return $asset_container === 'The Files';
+                },
+            ],
+
+            'missing container' => [
+                'custom/containers/invalid',
+                null,
+                function (string $asset_container) {
+                    return $asset_container === 'invalid';
+                },
+            ],
+
+            'container and asset' => [
+                'custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'foo/bar.txt';
+                },
+            ],
+
+            'missing container and asset' => [
+                'custom/assets/invalid/assets/foo/bar.txt',
+                null,
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'invalid' && $asset === 'foo/bar.txt';
+                },
+            ],
+
+            'container and missing asset' => [
+                'custom/assets/files/assets/invalid',
+                null,
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'invalid';
+                },
+            ],
+
+            'asset with custom binding' => [
+                'custom/assets/alt/files/assets/the%20alt%20text',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'the alt text';
+                },
+            ],
+
+            // globals
+
+            'global' => [
+                'custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+                function (string $global) {
+                    return $global === 'seo';
+                },
+            ],
+
+            'global with custom binding' => [
+                'custom/globals/title/SEO%20Settings',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+                function (string $global) {
+                    return $global === 'SEO Settings';
+                },
+            ],
+
+            'missing global' => [
+                'custom/globals/invalid',
+                null,
+                function (string $global) {
+                    return $global === 'invalid';
+                },
+            ],
+
+            // sites
+
+            'site' => [
+                'custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+                function (string $site) {
+                    return $site === 'en';
+                },
+            ],
+
+            'site with custom binding' => [
+                'custom/sites/locale/en_US',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+                function (string $site) {
+                    return $site === 'en_US';
+                },
+            ],
+
+            'missing site' => [
+                'custom/sites/invalid',
+                null,
+                function (string $site) {
+                    return $site === 'invalid';
+                },
+            ],
+
+            // revisions
+
+            'entry revision' => [
+                'custom/entries/blog/123/revisions/1',
+                function (Collection $collection, Entry $entry, Revision $revision) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123' && $revision->id() === '1';
+                },
+                function (string $collection, string $entry, string $revision) {
+                    return $collection === 'blog' && $entry === '123' && $revision === '1';
+                },
+            ],
+
+            'entry missing revision' => [
+                'custom/entries/blog/123/revisions/invalid',
+                null,
+                function (string $collection, string $entry, string $revision) {
+                    return $collection === 'blog' && $entry === '123' && $revision === 'invalid';
+                },
+            ],
+
+            'term revision' => [
+                'custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, Term $term, Revision $revision) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo' && $revision->id() === '2';
+                },
+                function (string $taxonomy, string $term, string $revision) {
+                    return $taxonomy === 'tags' && $term === 'bravo' && $revision === '2';
+                },
+            ],
+
+            'term missing revision' => [
+                'custom/terms/tags/bravo/revisions/invalid',
+                null,
+                function (string $taxonomy, string $term, string $revision) {
+                    return $taxonomy === 'tags' && $term === 'bravo' && $revision === 'invalid';
+                },
+            ],
+
+            'invalid content revision' => [
+                'custom/revisions/1',
+                null,
+                function (string $revision) {
+                    return $revision === '1';
+                },
+            ],
+
+            // forms
+
+            'form' => [
+                'custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+                function (string $form) {
+                    return $form === 'contact';
+                },
+            ],
+
+            'form with custom binding' => [
+                'custom/forms/title/Contact%20Us',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+                function (string $form) {
+                    return $form === 'Contact Us';
+                },
+            ],
+
+            'missing form' => [
+                'custom/forms/invalid',
+                null,
+                function (string $form) {
+                    return $form === 'invalid';
+                },
+            ],
+
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider bypassForBroadcastingProvider
+     */
+    public function it_bypasses_binding_for_broadcasting($binding)
+    {
+        $this->bypassForBroadcasting($binding);
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider bypassForBroadcastingProvider
+     */
+    public function it_bypasses_binding_for_broadcasting_with_bindings_enabled($binding)
+    {
+        $this->bypassForBroadcasting($binding);
+    }
+
+    public function bypassForBroadcasting(string $binding)
+    {
+        $binder = app(BindingRegistrar::class);
+
+        // Evaluate the binding closure, passing in the value.
+        // e.g. If you hit /something/{entry} then the closure will receive literally "entry" as the first argument.
+        $value = call_user_func($binder->getBindingCallback($binding), 'test');
+
+        // We want to make sure it just spits the value right back without any errors.
+        $this->assertEquals('test', $value);
+    }
+
+    public function bypassForBroadcastingProvider()
+    {
+        return collect([
+            'collection',
+            'entry',
+            'taxonomy',
+            'term',
+            'asset_container',
+            'asset',
+            'global',
+            'site',
+            'revision',
+            'form',
+        ])->mapWithKeys(fn ($key) => [$key => [$key]])->all();
+    }
+}
diff --git a/tests/Routing/RoutesTest.php b/tests/Routing/RoutesTest.php
index 69e0bba53b..d27257bec4 100644
--- a/tests/Routing/RoutesTest.php
+++ b/tests/Routing/RoutesTest.php
@@ -5,6 +5,9 @@
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Facades\Route;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Config;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
 use Tests\FakesViews;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -67,6 +70,26 @@ protected function resolveApplicationConfiguration($app)
             Route::statamic('/xml-with-custom-type', 'feed', [
                 'content_type' => 'json',
             ]);
+
+            Route::middleware(\Illuminate\Routing\Middleware\SubstituteBindings::class)->group(function () {
+
+                Route::get('/bindings/entry/{entry}', function ($entry) {
+                    return ['title' => $entry->get('title')];
+                });
+
+                Route::get('/bindings/entry/slug/{entry:slug}', function ($entry) {
+                    return ['title' => $entry->get('title')];
+                });
+
+                Route::get('/bindings/term/{term}', function ($term) {
+                    return ['title' => $term->get('title')];
+                });
+
+                Route::get('/bindings/term/title/{term:slug}', function ($term) {
+                    return ['title' => $term->get('title')];
+                });
+
+            });
         });
     }
 
@@ -249,4 +272,44 @@ public function xml_template_with_custom_content_type_does_not_change_to_xml()
             ->get('/xml-with-custom-type')
             ->assertHeader('Content-Type', 'application/json');
     }
+
+    /** @test */
+    public function it_loads_entry_by_binding()
+    {
+        Config::set('statamic.routes.bindings', true);
+
+        $collection = Collection::make('pages')->save();
+        EntryFactory::id('pages-blog')->collection($collection)->slug('blog')->data(['title' => 'Blog'])->create();
+
+        $this->get('/bindings/entry/pages-blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/entry/slug/blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/entry/slug/blog2')
+            ->assertNotFound();
+    }
+
+    /** @test */
+    public function it_loads_term_by_binding()
+    {
+        Config::set('statamic.routes.bindings', true);
+
+        $taxonomy = Taxonomy::make('pages')->save();
+        Term::make()->taxonomy('pages')->slug('blog')->data(['title' => 'Blog'])->save();
+
+        $this->get('/bindings/term/pages::blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/term/title/Blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/term/title/Blog2')
+            ->assertNotFound();
+    }
 }

From db283987666ad3fcb313d9e297a13465785da67a Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 18 Oct 2023 15:57:22 +0100
Subject: [PATCH 014/175] [4.x] Fix navigation 'Save Changes' button state
 (#8864)

---
 resources/js/components/navigation/View.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 630f7d9258..4c62b50f87 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -383,9 +383,9 @@ export default {
         },
 
         treeSaved(response) {
-            this.changed = false;
-
             this.replaceGeneratedIds(response.data.generatedIds);
+
+            this.changed = false;
         },
 
         replaceGeneratedIds(ids) {

From 8a1ba28509bbdada4fa037478158caff0f584c57 Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Thu, 19 Oct 2023 03:16:52 +1100
Subject: [PATCH 015/175] [4.x] Remove double-render of fields in Form tag
 (#8861)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Forms/Tags.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index dc876d4011..aefe86df6b 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -64,7 +64,9 @@ public function create()
         $jsDriver = $this->parseJsParamDriverAndOptions($this->params->get('js'), $form);
 
         $data['sections'] = $this->getSections($this->sessionHandle(), $jsDriver);
-        $data['fields'] = $this->getFields($this->sessionHandle(), $jsDriver);
+
+        $data['fields'] = collect($data['sections'])->flatMap->fields->all();
+
         $data['honeypot'] = $form->honeypot();
 
         if ($jsDriver) {

From 0e0b4846364e8ea6a4359478775a81de9c5323ca Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:18:16 +1100
Subject: [PATCH 016/175] [4.x] Add form reference to field during render
 (#8862)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Fields/Field.php       | 14 ++++++++++++++
 src/Forms/Tags.php         |  5 ++++-
 tests/Fields/FieldTest.php | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index f2b82e0ff8..bf9bee6e5d 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Lang;
 use Rebing\GraphQL\Support\Field as GqlField;
+use Statamic\Contracts\Forms\Form;
 use Statamic\Facades\GraphQL;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -20,6 +21,7 @@ class Field implements Arrayable
     protected $parent;
     protected $parentField;
     protected $validationContext;
+    protected ?Form $form = null;
 
     public function __construct($handle, array $config)
     {
@@ -409,4 +411,16 @@ public function isRelationship(): bool
     {
         return $this->fieldtype()->isRelationship();
     }
+
+    public function setForm(Form $form)
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function form(): ?Form
+    {
+        return $this->form;
+    }
 }
diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index aefe86df6b..1800713d82 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -242,7 +242,10 @@ protected function getSections($sessionHandle, $jsDriver)
      */
     protected function getFields($sessionHandle, $jsDriver, $fields = null)
     {
-        return collect($fields ?? $this->form()->fields())
+        $form = $this->form();
+
+        return collect($fields ?? $form->fields())
+            ->each(fn ($field) => $field->setForm($form))
             ->map(function ($field) use ($sessionHandle, $jsDriver) {
                 return $this->getRenderableField($field, $sessionHandle, function ($data, $field) use ($jsDriver) {
                     return $jsDriver
diff --git a/tests/Fields/FieldTest.php b/tests/Fields/FieldTest.php
index c2dfa6368c..55e1e66b0e 100644
--- a/tests/Fields/FieldTest.php
+++ b/tests/Fields/FieldTest.php
@@ -6,6 +6,7 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
+use Statamic\Forms\Form;
 use Tests\TestCase;
 
 class FieldTest extends TestCase
@@ -618,4 +619,17 @@ public function isRelationship(): bool
 
         $this->assertTrue($field->isRelationship());
     }
+
+    /** @test */
+    public function it_gets_and_sets_the_form()
+    {
+        $field = new Field('test', ['type' => 'text']);
+
+        $this->assertNull($field->form());
+
+        $return = $field->setForm($form = new Form);
+
+        $this->assertEquals($field, $return);
+        $this->assertEquals($form, $field->form());
+    }
 }

From 99d264ad0abd018dcb1d89e1e7afa49a0ac20b98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:29:37 -0400
Subject: [PATCH 017/175] [4.x] Bump @babel/traverse from 7.21.3 to 7.23.2
 (#8870)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 125 +++++++++++++++++++++++-----------------------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15690075c6..2123d8a913 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,12 +111,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -162,12 +163,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
-      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.3",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -290,9 +291,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -311,25 +312,25 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -459,30 +460,30 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -527,13 +528,13 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -541,9 +542,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1708,33 +1709,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
-      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.3",
-        "@babel/types": "^7.21.3",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1743,13 +1744,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
-      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {

From e8a24fe6a910e54ca3a8f59cedb4b4afd14d0794 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 19 Oct 2023 13:45:41 -0400
Subject: [PATCH 018/175] changelog

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92044ffef9..e3df7b2cd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Release Notes
 
+## 4.29.0 (2023-10-19)
+
+### What's new
+- Add form reference to field during render. [#8862](https://github.com/statamic/cms/issues/8862) by @martyf
+- Add config to enable frontend route binding and support binding by field. [#8853](https://github.com/statamic/cms/issues/8853) by @ryanmitchell
+- Allow overwriting the column for `unique_user_value` validation. [#8852](https://github.com/statamic/cms/issues/8852) by @marcorieser
+
+### What's improved
+- German translations [#8857](https://github.com/statamic/cms/issues/8857) by @helloDanuk
+- French translations [#8848](https://github.com/statamic/cms/issues/8848) by @ebeauchamps
+
+### What's fixed
+- Remove double-render of fields in Form tag. [#8861](https://github.com/statamic/cms/issues/8861) by @martyf
+- Fix navigation 'Save Changes' button state. [#8864](https://github.com/statamic/cms/issues/8864) by @duncanmcclean
+- Fix missing replicator set previews. [#8855](https://github.com/statamic/cms/issues/8855) by @jacksleight
+- Bump @babel/traverse from 7.21.3 to 7.23.2 [#8870](https://github.com/statamic/cms/issues/8870) by @dependabot
+
+
+
 ## 4.28.0 (2023-10-13)
 
 ### What's new

From 6da8c8856bdb73be99c0e8bca70d6957b07319ef Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 20 Oct 2023 16:31:28 +0100
Subject: [PATCH 019/175] [4.x] Default to using the CP broker when multiple
 are available (#8872)

---
 src/Auth/User.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Auth/User.php b/src/Auth/User.php
index ccb5db6dab..572b2ecac6 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -233,6 +233,10 @@ public function generatePasswordResetToken()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
 
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
         return Password::broker($broker)->createToken($this);
     }
 
@@ -240,6 +244,10 @@ public function generateActivateAccountToken()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_ACTIVATIONS);
 
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
         return Password::broker($broker)->createToken($this);
     }
 

From 49d96a5b2eae80a54fbd465dc91800daebbf87b9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:59:32 +0100
Subject: [PATCH 020/175] [4.x] Multi-site Duplicator Support (#8665)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/lang/en/messages.php       |   3 +
 src/Actions/DuplicateEntry.php       | 110 ++++---
 tests/Actions/DuplicateEntryTest.php | 444 +++++++++++++++++++++++++--
 3 files changed, 498 insertions(+), 59 deletions(-)

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index c967e26463..a33e865c0d 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -68,6 +68,9 @@
     'collections_sort_direction_instructions' => 'The default sort direction.',
     'collections_preview_target_refresh_instructions' => 'Automatically refresh the preview while editing. Disabling this will use postMessage.',
     'collections_taxonomies_instructions' => 'Connect entries in this collection to taxonomies. Fields will be automatically added to publish forms.',
+    'duplicate_action_warning_localization' => 'This entry is a localization. The origin entry will be duplicated.',
+    'duplicate_action_warning_localizations' => 'One or more selected entries are localizations. In those cases, the origin entry will be duplicated instead.',
+    'duplicate_action_localizations_confirmation' => 'Are you sure you want to run this action? Localizations will also be duplicated.',
     'email_utility_configuration_description' => 'Mail settings are configured in <code>:path</code>',
     'email_utility_description' => 'Check email configuration settings and send test emails.',
     'entry_origin_instructions' => 'The new localization will inherit values from the entry in the selected site.',
diff --git a/src/Actions/DuplicateEntry.php b/src/Actions/DuplicateEntry.php
index 388f513c74..0737468330 100644
--- a/src/Actions/DuplicateEntry.php
+++ b/src/Actions/DuplicateEntry.php
@@ -5,7 +5,7 @@
 use Illuminate\Support\Str;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Facades\Entry as Entries;
-use Statamic\Facades\Site;
+use Statamic\Facades\User;
 
 class DuplicateEntry extends Action
 {
@@ -16,45 +16,83 @@ public static function title()
 
     public function visibleTo($item)
     {
-        return $item instanceof Entry && ! Site::hasMultiple();
+        return $item instanceof Entry;
+    }
+
+    public function confirmationText()
+    {
+        $hasDescendants = $this->items
+            ->map(fn ($entry) => $entry->hasOrigin() ? $entry->root() : $entry)
+            ->unique()
+            ->contains(fn ($entry) => $entry->descendants()->count());
+
+        if ($hasDescendants) {
+            return 'duplicate_action_localizations_confirmation';
+        }
+
+        return parent::confirmationText();
+    }
+
+    public function warningText()
+    {
+        if ($this->items->contains(fn ($entry) => $entry->hasOrigin())) {
+            return $this->items->count() === 1
+                ? 'duplicate_action_warning_localization'
+                : 'duplicate_action_warning_localizations';
+        }
     }
 
     public function run($items, $values)
     {
-        $items->each(function (Entry $original) {
-            $originalParent = $this->getEntryParentFromStructure($original);
-            [$title, $slug] = $this->generateTitleAndSlug($original);
-
-            $data = $original
-                ->data()
-                ->except($original->blueprint()->fields()->all()->reject->shouldBeDuplicated()->keys())
-                ->merge(['title' => $title,
-                    'duplicated_from' => $original->id(),
-                ])->all();
-
-            $entry = Entries::make()
-                ->collection($original->collection())
-                ->blueprint($original->blueprint()->handle())
-                ->published(false)
-                ->data($data);
-
-            if ($original->collection()->requiresSlugs()) {
-                $entry->slug($slug);
-            }
+        $items
+            ->map(fn ($entry) => $entry->hasOrigin() ? $entry->root() : $entry)
+            ->unique()
+            ->each(fn ($original) => $this->duplicateEntry($original));
+    }
 
-            if ($original->hasDate()) {
-                $entry->date($original->date());
-            }
+    private function duplicateEntry(Entry $original, string $origin = null)
+    {
+        $originalParent = $this->getEntryParentFromStructure($original);
+        [$title, $slug] = $this->generateTitleAndSlug($original);
+
+        $data = $original
+            ->data()
+            ->except($original->blueprint()->fields()->all()->reject->shouldBeDuplicated()->keys())
+            ->merge(['title' => $title,
+                'duplicated_from' => $original->id(),
+            ])->all();
+
+        $entry = Entries::make()
+            ->locale($original->locale())
+            ->collection($original->collection())
+            ->blueprint($original->blueprint()->handle())
+            ->published(false)
+            ->data($data)
+            ->origin($origin);
+
+        if ($original->collection()->requiresSlugs()) {
+            $entry->slug($slug);
+        }
 
-            $entry->save();
+        if ($original->hasDate()) {
+            $entry->date($original->date());
+        }
 
-            if ($originalParent && $originalParent !== $original->id()) {
-                $entry->structure()
-                    ->in($original->locale())
-                    ->appendTo($originalParent->id(), $entry)
-                    ->save();
-            }
-        });
+        $entry->save();
+
+        $original
+            ->directDescendants()
+            ->filter(fn ($entry) => User::current()->can('create', [Entry::class, $entry->collection(), $entry->site()]))
+            ->each(function ($descendant) use ($entry) {
+                $this->duplicateEntry($descendant, origin: $entry->id());
+            });
+
+        if ($originalParent && $originalParent !== $original->id()) {
+            $entry->structure()
+                ->in($original->locale())
+                ->appendTo($originalParent->id(), $entry)
+                ->save();
+        }
     }
 
     protected function getEntryParentFromStructure(Entry $entry)
@@ -82,7 +120,7 @@ protected function getEntryParentFromStructure(Entry $entry)
 
     protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
     {
-        $title = $entry->get('title');
+        $title = $entry->value('title');
         $slug = $entry->slug();
         $suffix = ' ('.__('Duplicated').')';
 
@@ -101,7 +139,7 @@ protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
         $slug .= '-'.$attempt;
 
         // If the slug we've just built already exists, we'll try again, recursively.
-        if ($entry->collection()->queryEntries()->where('slug', $slug)->count()) {
+        if ($entry->collection()->queryEntries()->where('locale', $entry->locale())->where('slug', $slug)->count()) {
             [$title, $slug] = $this->generateTitleAndSlug($entry, $attempt + 1);
         }
 
@@ -110,6 +148,6 @@ protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
 
     public function authorize($user, $item)
     {
-        return $user->can('create', [Entry::class, $item->collection()]);
+        return $user->can('create', [Entry::class, $item->collection(), $item->site()]);
     }
 }
diff --git a/tests/Actions/DuplicateEntryTest.php b/tests/Actions/DuplicateEntryTest.php
index 00ef6c360d..3baec45ce4 100644
--- a/tests/Actions/DuplicateEntryTest.php
+++ b/tests/Actions/DuplicateEntryTest.php
@@ -6,6 +6,7 @@
 use Statamic\Actions\DuplicateEntry;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -33,7 +34,7 @@ public function it_duplicates_an_entry()
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
             Entry::find('charlie-id'),
-        ]), collect());
+        ]), []);
 
         $this->assertEquals([
             ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa']],
@@ -53,7 +54,7 @@ public function it_increments_the_number_if_duplicate_already_exists()
 
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
-        ]), collect());
+        ]), []);
 
         $this->assertEquals([
             ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa']],
@@ -62,26 +63,132 @@ public function it_increments_the_number_if_duplicate_already_exists()
         ], $this->entryData());
     }
 
-    /** @test */
-    public function user_with_create_permission_is_authorized()
+    /**
+     * @test
+     *
+     * @dataProvider authorizationProvider
+     */
+    public function it_authorizes(
+        bool $isMultisite,
+        array $permissions,
+        bool $expectedToBeAuthorized
+    ) {
+        $this->setTestRoles(['test' => $permissions]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = Collection::make('test');
+
+        if ($isMultisite) {
+            Site::setConfig(['sites' => [
+                'en' => ['url' => '/', 'locale' => 'en'],
+                'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+            ]]);
+
+            $collection->sites(['en', 'fr']);
+        }
+
+        $collection->save();
+
+        $item = EntryFactory::collection('test')->slug('alfa')->locale('en')->create();
+
+        $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorize($user, $item));
+    }
+
+    public function authorizationProvider()
     {
-        $this->setTestRoles([
-            'access' => ['create test entries'],
-            'noaccess' => [],
-        ]);
+        return [
+            'no permission' => [
+                $multisite = false,
+                $permissions = [],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to no sites, but not using multisite' => [
+                $multisite = false,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to site' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access en site'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to no sites' => [
+                $multisite = true,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to a different site' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access fr site'],
+                $expectedToBeAuthorized = false,
+            ],
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @dataProvider bulkAuthorizationProvider
+     */
+    public function it_authorizes_in_bulk(
+        bool $isMultisite,
+        array $permissions,
+        bool $expectedToBeAuthorized
+    ) {
+        $this->setTestRoles(['test' => $permissions]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = Collection::make('test');
+
+        if ($isMultisite) {
+            Site::setConfig(['sites' => [
+                'en' => ['url' => '/', 'locale' => 'en'],
+                'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+                'de' => ['url' => '/de/', 'locale' => 'de'],
+            ]]);
+
+            $collection->sites(['en', 'fr', 'de']);
+        }
+
+        $collection->save();
 
-        Collection::make('test')->save();
-        $userWithPermission = tap(User::make()->assignRole('access'))->save();
-        $userWithoutPermission = tap(User::make()->assignRole('noaccess'))->save();
         $items = collect([
-            EntryFactory::collection('test')->slug('alfa')->create(),
-            EntryFactory::collection('test')->slug('bravo')->create(),
+            EntryFactory::collection('test')->slug('alfa')->locale('en')->create(),
+            EntryFactory::collection('test')->slug('bravo')->locale($isMultisite ? 'fr' : 'en')->create(),
         ]);
 
-        $this->assertTrue((new DuplicateEntry)->authorize($userWithPermission, $items->first()));
-        $this->assertTrue((new DuplicateEntry)->authorizeBulk($userWithPermission, $items));
-        $this->assertFalse((new DuplicateEntry)->authorize($userWithoutPermission, $items->first()));
-        $this->assertFalse((new DuplicateEntry)->authorizeBulk($userWithoutPermission, $items));
+        $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorizeBulk($user, $items));
+    }
+
+    public function bulkAuthorizationProvider()
+    {
+        return [
+            'no permission' => [
+                $multisite = false,
+                $permissions = [],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to no sites, but not using multisite' => [
+                $multisite = false,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to all sites' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access en site', 'access fr site'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to no sites' => [
+                $multisite = true,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to a site that the entries arent in' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access de site'],
+                $expectedToBeAuthorized = false,
+            ],
+        ];
     }
 
     /** @test */
@@ -101,7 +208,7 @@ public function it_respects_the_collection_not_requiring_slugs()
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
             Entry::find('charlie-id'),
-        ]), collect());
+        ]), []);
 
         $alfaDuplicate = Entry::query()->where('duplicated_from', 'alfa-id')->first();
 
@@ -116,12 +223,303 @@ public function it_respects_the_collection_not_requiring_slugs()
         $this->assertEquals($id.'.md', basename($charlieDuplicate->path()));
     }
 
+    /** @test */
+    public function it_duplicates_an_entry_with_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'de' => ['url' => 'http://domain.com/de/', 'locale' => 'de'], // Add additional site that the entry doesn't exist in, to ensure it doesn't get duplicated into it.
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'de', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)'])->save();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_duplicates_an_entry_with_nested_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'fr_ca' => ['url' => 'http://domain.com/fr-ca/', 'locale' => 'fr_CA'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'fr_ca', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+        $french = tap($entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)']))->save();
+        $french->makeLocalization('fr_ca')->id('alfa-id-fr-ca')->data(['title' => 'Alfa (French Canadian)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+            'access fr site',
+            'access fr_ca site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French Canadian) (Duplicated)', 'duplicated_from' => 'alfa-id-fr-ca'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_only_duplicates_authorized_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)'])->save();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_doesnt_duplicate_authorized_descendants_of_unauthorized_localizations()
+    {
+        // 🤯
+
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'fr_ca' => ['url' => 'http://domain.com/fr-ca/', 'locale' => 'fr_CA'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'fr_ca', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+        $french = tap($entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)']))->save();
+        $french->makeLocalization('fr_ca')->id('alfa-id-fr-ca')->data(['title' => 'Alfa (French Canadian)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+            // 'access fr site', // no permission for fr
+            'access fr_ca site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+            // No french *or* french canadian, even though french canadian is authorized.
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_duplicates_an_entry_from_a_non_default_site()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->locale('fr')->collection('test')->slug('bravo')->data(['title' => 'Bravo'])->create();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'bravo', 'published' => true, 'data' => ['title' => 'Bravo'], 'locale' => 'fr', 'origin' => null],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('bravo-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'bravo', 'published' => true, 'data' => ['title' => 'Bravo'], 'locale' => 'fr', 'origin' => null],
+            ['slug' => 'bravo-1', 'published' => false, 'data' => ['title' => 'Bravo (Duplicated)', 'duplicated_from' => 'bravo-id'], 'locale' => 'fr', 'origin' => null],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function if_an_entry_has_an_origin_it_duplicates_the_root_origin()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->slug('alfa-fr')->data(['title' => 'Alfa (French)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id-fr'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function if_an_entry_has_an_origin_and_the_root_origin_is_also_selected_it_only_duplicates_the_root_origin()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->slug('alfa-fr')->data(['title' => 'Alfa (French)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id-fr'),
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
     private function entryData()
     {
-        return Entry::all()->map(fn ($entry) => [
-            'slug' => $entry->slug(),
-            'published' => $entry->published(),
-            'data' => $entry->data()->all(),
-        ])->all();
+        return Entry::all()->map(function ($entry) {
+            $arr = [
+                'slug' => $entry->slug(),
+                'published' => $entry->published(),
+                'data' => $entry->data()->all(),
+            ];
+
+            if (Site::hasMultiple()) {
+                $arr['locale'] = $entry->locale();
+                // Use locale.slug string instead of id since we won't always know it in advance
+                $arr['origin'] = $entry->hasOrigin() ? $entry->origin()->locale().'.'.$entry->origin()->slug() : null;
+            }
+
+            return $arr;
+        })->all();
     }
 }

From 00cb12e6567b0dc272476e05c8e1ad59f1ae06d4 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 20 Oct 2023 18:11:03 +0100
Subject: [PATCH 021/175] [4.x] Add `EntryDeleting` to allow you to prevent
 items being deleted (#8833)

---
 src/Entries/Entry.php            |  5 +++++
 src/Events/EntryDeleting.php     | 23 ++++++++++++++++++++
 tests/Data/Entries/EntryTest.php | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/Events/EntryDeleting.php

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 51b1ba6738..65e3b30ed9 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -29,6 +29,7 @@
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
 use Statamic\Events\EntryDeleted;
+use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
 use Statamic\Events\EntrySaving;
 use Statamic\Facades;
@@ -166,6 +167,10 @@ public function newAugmentedInstance(): Augmented
 
     public function delete()
     {
+        if (EntryDeleting::dispatch($this) === false) {
+            return false;
+        }
+
         if ($this->descendants()->map->fresh()->filter()->isNotEmpty()) {
             throw new \Exception('Cannot delete an entry with localizations.');
         }
diff --git a/src/Events/EntryDeleting.php b/src/Events/EntryDeleting.php
new file mode 100644
index 0000000000..3b2e64ce8f
--- /dev/null
+++ b/src/Events/EntryDeleting.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class EntryDeleting extends Event
+{
+    public $entry;
+
+    public function __construct($entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index c3022292b3..f0dcd3bc67 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -21,6 +21,8 @@
 use Statamic\Entries\Entry;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
+use Statamic\Events\EntryDeleted;
+use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
 use Statamic\Events\EntrySaving;
 use Statamic\Facades;
@@ -1856,6 +1858,40 @@ public function it_deletes_through_the_api()
         $this->assertTrue($return);
     }
 
+    /** @test */
+    public function it_fires_a_deleting_event()
+    {
+        Event::fake();
+
+        $entry = EntryFactory::collection('test')->create();
+
+        $entry->delete();
+
+        Event::assertDispatched(EntryDeleting::class, function ($event) use ($entry) {
+            return $event->entry === $entry;
+        });
+    }
+
+    /** @test */
+    public function it_does_not_delete_when_a_deleting_event_returns_false()
+    {
+        Facades\Entry::spy();
+        Event::fake([EntryDeleted::class]);
+
+        Event::listen(EntryDeleting::class, function () {
+            return false;
+        });
+
+        $collection = tap(Collection::make('test'))->save();
+        $entry = (new Entry)->collection($collection);
+
+        $return = $entry->delete();
+
+        $this->assertFalse($return);
+        Facades\Entry::shouldNotHaveReceived('delete');
+        Event::assertNotDispatched(EntryDeleted::class);
+    }
+
     /** @test */
     public function it_prevents_deleting_if_there_are_descendants()
     {

From 329000b43e5df19eecfea3d192a482ebc0e6ae95 Mon Sep 17 00:00:00 2001
From: Jonas Siewertsen <jonas.siewertsen@spiegel.de>
Date: Fri, 20 Oct 2023 22:12:36 +0200
Subject: [PATCH 022/175] [4.x] Cache Blueprint columns (#8840)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Fields/Blueprint.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 307cee257f..66272c2a7a 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -39,6 +39,7 @@ class Blueprint implements Arrayable, ArrayAccess, Augmentable, QueryableValue
     protected $ensuredFields = [];
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
+    private ?Columns $columns = null;
 
     public function setHandle(string $handle)
     {
@@ -359,6 +360,10 @@ public function field($field)
 
     public function columns()
     {
+        if ($this->columns) {
+            return $this->columns;
+        }
+
         $columns = $this->fields()
             ->all()
             ->values()
@@ -375,7 +380,7 @@ public function columns()
             })
             ->keyBy('field');
 
-        return new Columns($columns);
+        return $this->columns = new Columns($columns);
     }
 
     public function isEmpty(): bool

From c24b6985543c91655100f6b8a7f27074a45ad3b9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 20 Oct 2023 16:20:22 -0400
Subject: [PATCH 023/175] changelog

---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3df7b2cd5..9530435edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 4.30.0 (2023-10-20)
+
+### What's new
+- Multi-site Duplicator Support. [#8665](https://github.com/statamic/cms/issues/8665) by @duncanmcclean
+- Add `EntryDeleting` to allow you to prevent items being deleted [#8833](https://github.com/statamic/cms/issues/8833) by @ryanmitchell
+
+### What's improved
+- Cache Blueprint columns. [#8840](https://github.com/statamic/cms/issues/8840) by @jonassiewertsen
+
+### What's fixed
+- Default to using the CP broker when multiple are available. [#8872](https://github.com/statamic/cms/issues/8872) by @ryanmitchell
+
+
+
 ## 4.29.0 (2023-10-19)
 
 ### What's new

From 992790984ed6adf68e5cdcd4760c4f904ecc7908 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 27 Oct 2023 15:13:49 +0100
Subject: [PATCH 024/175] [4.x] Fix Bard text align when no headings are
 enabled (#8878)

---
 resources/js/components/fieldtypes/bard/BardFieldtype.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 8645e2d4ca..bfeae26145 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -703,12 +703,15 @@ export default {
             if (btns.includes('h6')) levels.push(6);
             if (levels.length) exts.push(Heading.configure({ levels }));
 
+            let alignmentTypes = ['paragraph'];
+            if (levels.length) alignmentTypes.push('heading');
+
             let alignments = [];
             if (btns.includes('alignleft')) alignments.push('left');
             if (btns.includes('aligncenter')) alignments.push('center');
             if (btns.includes('alignright')) alignments.push('right');
             if (btns.includes('alignjustify')) alignments.push('justify');
-            if (alignments.length) exts.push(TextAlign.configure({ types: ['heading', 'paragraph'], alignments }));
+            if (alignments.length) exts.push(TextAlign.configure({ types: alignmentTypes, alignments }));
 
             if (btns.includes('table')) {
                 exts.push(

From 26e5277864222805b4c02da55f0d8e598cdd106d Mon Sep 17 00:00:00 2001
From: Erin Dalzell <erin@silentz.co>
Date: Fri, 27 Oct 2023 07:14:48 -0700
Subject: [PATCH 025/175] [4.x] Improve Entries fieldtype search index logic,
 and add option to define an explicit one. (#8885)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/lang/en/fieldtypes.php |  1 +
 src/Fieldtypes/Entries.php       | 67 ++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/resources/lang/en/fieldtypes.php b/resources/lang/en/fieldtypes.php
index 8cc5d230cf..b501d28d33 100644
--- a/resources/lang/en/fieldtypes.php
+++ b/resources/lang/en/fieldtypes.php
@@ -74,6 +74,7 @@
     'entries.config.create' => 'Allow creation of new entries.',
     '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.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 21b5371ade..7c08fa44da 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -10,6 +10,7 @@
 use Statamic\Facades\Entry;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Scope;
+use Statamic\Facades\Search;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Http\Resources\CP\Entries\Entries as EntriesResource;
@@ -18,6 +19,7 @@
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 use Statamic\Query\Scopes\Filters\Fields\Entries as EntriesFilter;
 use Statamic\Query\StatusQueryBuilder;
+use Statamic\Search\Index;
 use Statamic\Search\Result;
 use Statamic\Support\Arr;
 
@@ -91,6 +93,11 @@ protected function configFieldItems(): array
                         'type' => 'collections',
                         'mode' => 'select',
                     ],
+                    'search_index' => [
+                        'display' => __('Search Index'),
+                        'instructions' => __('statamic::fieldtypes.entries.config.search_index'),
+                        'type' => 'text',
+                    ],
                     'query_scopes' => [
                         'display' => __('Query Scopes'),
                         'instructions' => __('statamic::fieldtypes.entries.config.query_scopes'),
@@ -182,22 +189,7 @@ protected function getIndexQuery($request)
     {
         $query = Entry::query();
 
-        if ($search = $request->search) {
-            $usingSearchIndex = false;
-            $collections = collect($this->getConfiguredCollections());
-
-            if ($collections->count() == 1) {
-                $collection = Collection::findByHandle($collections->first());
-                if ($collection && $collection->hasSearchIndex()) {
-                    $query = $collection->searchIndex()->ensureExists()->search($search);
-                    $usingSearchIndex = true;
-                }
-            }
-
-            if (! $usingSearchIndex) {
-                $query->where('title', 'like', '%'.$search.'%');
-            }
-        }
+        $query = $this->toSearchQuery($query, $request);
 
         if ($site = $request->site) {
             $query->where('site', $site);
@@ -212,6 +204,49 @@ protected function getIndexQuery($request)
         return $query;
     }
 
+    private function toSearchQuery($query, $request)
+    {
+        if (! $search = $request->search) {
+            return $query;
+        }
+
+        if ($index = $this->getSearchIndex($request)) {
+            return $index->search($search);
+        }
+
+        return $query->where('title', 'like', '%'.$search.'%');
+    }
+
+    private function getSearchIndex($request): ?Index
+    {
+        $index = $this->getExplicitSearchIndex() ?? $this->getCollectionSearchIndex($request);
+
+        return $index?->ensureExists();
+    }
+
+    private function getExplicitSearchIndex(): ?Index
+    {
+        return ($explicit = $this->config('search_index'))
+            ? Search::in($explicit)
+            : null;
+    }
+
+    private function getCollectionSearchIndex($request): ?Index
+    {
+        // Use the collections being filtered, or the configured collections.
+        $collections = collect(
+            $request->input('filters.collection.collections') ?? $this->getConfiguredCollections()
+        );
+
+        $indexes = $collections->map(fn ($handle) => Collection::findByHandle($handle)->searchIndex());
+
+        // If all the collections use the same index, return it.
+        // Even if they're all null, that's fine. It'll just return null.
+        return $indexes->unique()->count() === 1
+            ? $indexes->first()
+            : null;
+    }
+
     protected function getCreatables()
     {
         if ($url = $this->getCreateItemUrl()) {

From 57e5335f478d523af693d13958867c363fc79503 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Mon, 30 Oct 2023 14:31:08 +0100
Subject: [PATCH 026/175] [4.x] French translations (#8889)

---
 resources/lang/fr.json         | 4 ++--
 resources/lang/fr/messages.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index d7bb6899a9..68c8196f9d 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -668,8 +668,8 @@
     "Pin to Top Level": "Epingler au niveau supérieur",
     "Pinned Item": "Elément épinglé",
     "Placeholder": "Espace réservé",
-    "Pop in": "Entrer",
-    "Pop out": "Sortir",
+    "Pop in": "Regrouper",
+    "Pop out": "Détacher",
     "Port": "Port",
     "Preferences": "Préférences",
     "Prefix": "Préfixe",
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index b569731bfc..57e6e8af7d 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -63,7 +63,7 @@
     'collections_mount_instructions' => 'Choisissez une entrée sur laquelle cette collection doit être montée. Apprenez-en plus dans la [documentation](https://statamic.dev/collections#mounting).',
     'collections_orderable_instructions' => 'Activez le réordonnancement manuel par glisser-déposer.',
     'collections_past_date_behavior_instructions' => 'Conditions d’accès aux entrées datées ayant expiré.',
-    'collections_preview_target_refresh_instructions' => 'Rafraîchi automatiquement l’Aperçu pendant la modification. Désactiver cela entraînera l’utilisation de postMessage.',
+    'collections_preview_target_refresh_instructions' => 'Rafraîchit automatiquement l’Aperçu pendant la modification. Désactiver cela entraînera l’utilisation de postMessage.',
     'collections_preview_targets_instructions' => 'Les URLs qui seront visibles dans l’Aperçu en direct. Apprenez-en plus dans la [documentation](https://statamic.dev/live-preview#preview-targets).',
     'collections_route_instructions' => 'La route contrôle le modèle d’URL des entrées. Apprenez-en plus dans la [documentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Le sens de tri par défaut.',

From 8b4cdadc5d9ec408f4f44f2b8b0002357547ab73 Mon Sep 17 00:00:00 2001
From: Oliver Mesieh <olivermesieh@gmail.com>
Date: Mon, 30 Oct 2023 15:11:11 +0100
Subject: [PATCH 027/175] [4.x] Fix global site selector not closing when click
 outside (#8888)

---
 resources/css/components/global-header.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/css/components/global-header.css b/resources/css/components/global-header.css
index 4c9f4e022b..604bc82678 100644
--- a/resources/css/components/global-header.css
+++ b/resources/css/components/global-header.css
@@ -108,10 +108,13 @@
     .v-select { @apply h-full }
     .vs__dropdown-toggle { @apply border-none bg-none }
     .vs__actions { @apply hidden }
-    .vs__search { @apply hidden }
+    .vs__search { @apply p-0 }
     .vs__selected-options { @apply border-none shadow-none p-0 bg-none }
     .vs__selected { @apply flex }
-    .vs__dropdown-toggle { @apply h-full rounded-none bg-transparent }
+    .vs__dropdown-toggle {
+        @apply h-full rounded-none bg-transparent;
+        box-shadow: none;
+    }
 
     .vs--single.vs--unsearchable .vs__selected-options { @apply bg-none }
 }

From 4a753dcb1506c12772ea365dba34f661f1989965 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 30 Oct 2023 18:37:03 +0000
Subject: [PATCH 028/175] [4.x] Allow custom form exporters to be defined
 (#8837)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 config/forms.php                              | 28 +++----
 resources/views/forms/show.blade.php          | 10 ++-
 src/Contracts/Forms/Exporter.php              | 28 -------
 src/Forms/Exporters/AbstractExporter.php      | 38 ---------
 src/Forms/Exporters/CsvExporter.php           | 43 ++++------
 src/Forms/Exporters/Exporter.php              | 84 +++++++++++++++++++
 src/Forms/Exporters/ExporterRepository.php    | 25 ++++++
 src/Forms/Exporters/JsonExporter.php          | 25 +++---
 src/Forms/Form.php                            | 14 ++++
 src/Forms/FormRepository.php                  |  6 ++
 .../CP/Forms/FormExportController.php         | 25 +-----
 11 files changed, 178 insertions(+), 148 deletions(-)
 delete mode 100644 src/Contracts/Forms/Exporter.php
 delete mode 100644 src/Forms/Exporters/AbstractExporter.php
 create mode 100644 src/Forms/Exporters/Exporter.php
 create mode 100644 src/Forms/Exporters/ExporterRepository.php

diff --git a/config/forms.php b/config/forms.php
index 33fdcce9e8..f2e1f23f6f 100644
--- a/config/forms.php
+++ b/config/forms.php
@@ -48,27 +48,21 @@
 
     /*
     |--------------------------------------------------------------------------
-    | CSV Export Delimiter
+    | Exporters
     |--------------------------------------------------------------------------
     |
-    | Statamic will use this character as delimiter for csv exports.
+    | Here you may define all the available form submission exporters.
+    | You may customize the options within each exporter's array.
     |
     */
 
-    'csv_delimiter' => ',',
-
-    /*
-    |--------------------------------------------------------------------------
-    | CSV Export Headings
-    |--------------------------------------------------------------------------
-    |
-    | The values to be used in the csv export header rows.
-    | Can be the field handle or the field display text.
-    |
-    | Supported values: "handle", "display"
-    |
-    */
-
-    'csv_headers' => 'handle',
+    'exporters' => [
+        'csv' => [
+            'class' => Statamic\Forms\Exporters\CsvExporter::class,
+        ],
+        'json' => [
+            'class' => Statamic\Forms\Exporters\JsonExporter::class,
+        ],
+    ],
 
 ];
diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index 241646094c..9c720c30e3 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -30,11 +30,17 @@
                 @endcan
             </dropdown-list>
 
+            @if ($exporters = $form->exporters())
             <dropdown-list>
                 <button class="btn" slot="trigger">{{ __('Export Submissions') }}</button>
-                <dropdown-item :text="__('Export as CSV')" redirect="{{ cp_route('forms.export', ['type' => 'csv', 'form' => $form->handle()]) }}?download=true"></dropdown-item>
-                <dropdown-item :text="__('Export as JSON')" redirect="{{ cp_route('forms.export', ['type' => 'json', 'form' => $form->handle()]) }}?download=true"></dropdown-item>
+                @foreach ($exporters as $exporter)
+                    <dropdown-item
+                        text="{{ $exporter->title() }}"
+                        redirect="{{ $exporter->downloadUrl() }}"
+                    ></dropdown-item>
+                @endforeach
             </dropdown-list>
+            @endif
         </div>
     </header>
 
diff --git a/src/Contracts/Forms/Exporter.php b/src/Contracts/Forms/Exporter.php
deleted file mode 100644
index ef3d656381..0000000000
--- a/src/Contracts/Forms/Exporter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Statamic\Contracts\Forms;
-
-interface Exporter
-{
-    /**
-     * Perform the export.
-     *
-     * @return string
-     */
-    public function export();
-
-    /**
-     * Get or set the form.
-     *
-     * @param  Statamic\Contracts\Forms\Form|null  $form
-     * @return Statamic\Contracts\Forms\Form
-     */
-    public function form($form = null);
-
-    /**
-     * Get the content type.
-     *
-     * @return string
-     */
-    public function contentType();
-}
diff --git a/src/Forms/Exporters/AbstractExporter.php b/src/Forms/Exporters/AbstractExporter.php
deleted file mode 100644
index 6f10c74044..0000000000
--- a/src/Forms/Exporters/AbstractExporter.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Statamic\Forms\Exporters;
-
-use Statamic\Contracts\Forms\Exporter;
-
-abstract class AbstractExporter implements Exporter
-{
-    /**
-     * @var Statamic\Contracts\Forms\Form
-     */
-    private $form;
-
-    /**
-     * Get or set the form.
-     *
-     * @param  Statamic\Contracts\Forms\Form|null  $form
-     * @return Statamic\Contracts\Forms\Form|void
-     */
-    public function form($form = null)
-    {
-        if (is_null($form)) {
-            return $this->form;
-        }
-
-        $this->form = $form;
-    }
-
-    /**
-     * Get the content type.
-     *
-     * @return string
-     */
-    public function contentType()
-    {
-        return 'text/plain';
-    }
-}
diff --git a/src/Forms/Exporters/CsvExporter.php b/src/Forms/Exporters/CsvExporter.php
index a9818e8784..202139874c 100644
--- a/src/Forms/Exporters/CsvExporter.php
+++ b/src/Forms/Exporters/CsvExporter.php
@@ -4,30 +4,18 @@
 
 use League\Csv\Writer;
 use SplTempFileObject;
+use Statamic\Support\Arr;
 
-class CsvExporter extends AbstractExporter
+class CsvExporter extends Exporter
 {
-    /**
-     * @var Writer
-     */
-    private $writer;
-
-    /**
-     * Create a new CsvExporter.
-     */
-    public function __construct()
+    private Writer $writer;
+    protected static string $title = 'CSV';
+
+    public function export(): string
     {
         $this->writer = Writer::createFromFileObject(new SplTempFileObject);
-        $this->writer->setDelimiter(config('statamic.forms.csv_delimiter', ','));
-    }
+        $this->writer->setDelimiter(Arr::get($this->config, 'delimiter', config('statamic.forms.csv_delimiter', ',')));
 
-    /**
-     * Perform the export.
-     *
-     * @return string
-     */
-    public function export()
-    {
         $this->insertHeaders();
 
         $this->insertData();
@@ -35,14 +23,11 @@ public function export()
         return (string) $this->writer;
     }
 
-    /**
-     * Insert the headers into the CSV.
-     */
     private function insertHeaders()
     {
-        $key = config('statamic.forms.csv_headers', 'handle');
+        $key = Arr::get($this->config, 'headers', config('statamic.forms.csv_headers', 'handle'));
 
-        $headers = $this->form()->fields()
+        $headers = $this->form->fields()
             ->map(fn ($field) => $key === 'display' ? $field->display() : $field->handle())
             ->push($key === 'display' ? __('Date') : 'date')
             ->values()->all();
@@ -50,12 +35,9 @@ private function insertHeaders()
         $this->writer->insertOne($headers);
     }
 
-    /**
-     * Insert the submission data into the CSV.
-     */
     private function insertData()
     {
-        $data = $this->form()->submissions()->map(function ($submission) {
+        $data = $this->form->submissions()->map(function ($submission) {
             $submission = $submission->toArray();
 
             $submission['date'] = (string) $submission['date'];
@@ -69,4 +51,9 @@ private function insertData()
 
         $this->writer->insertAll($data);
     }
+
+    public function extension(): string
+    {
+        return 'csv';
+    }
 }
diff --git a/src/Forms/Exporters/Exporter.php b/src/Forms/Exporters/Exporter.php
new file mode 100644
index 0000000000..fff2aaf19f
--- /dev/null
+++ b/src/Forms/Exporters/Exporter.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Statamic\Forms\Exporters;
+
+use Illuminate\Http\Response;
+use Statamic\Contracts\Forms\Form;
+use Statamic\Facades\File;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+abstract class Exporter
+{
+    protected static string $title;
+    protected array $config;
+    protected string $handle;
+    protected Form $form;
+
+    abstract public function export(): string;
+
+    public function setHandle(string $handle)
+    {
+        $this->handle = $handle;
+
+        return $this;
+    }
+
+    public function setConfig(array $config)
+    {
+        $this->config = $config;
+
+        return $this;
+    }
+
+    public function setForm(Form $form)
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function contentType(): string
+    {
+        return 'text/plain';
+    }
+
+    public function extension(): string
+    {
+        return 'txt';
+    }
+
+    public function title(): string
+    {
+        return __($this->config['title'] ?? static::$title);
+    }
+
+    public function allowedOnForm(Form $form)
+    {
+        return ! isset($this->config['forms']) || in_array($form->handle(), $this->config['forms']);
+    }
+
+    public function downloadUrl()
+    {
+        return cp_route('forms.export', [
+            'type' => $this->handle,
+            'form' => $this->form->handle(),
+            'download' => true,
+        ]);
+    }
+
+    public function response(): Response
+    {
+        return response($this->export())->header('Content-Type', $this->contentType());
+    }
+
+    public function download(): BinaryFileResponse
+    {
+        $content = $this->export();
+
+        $path = storage_path('statamic/tmp/forms/'.$this->form->handle().'-'.time().'.'.$this->extension());
+
+        File::put($path, $content);
+
+        return response()->download($path)->deleteFileAfterSend();
+    }
+}
diff --git a/src/Forms/Exporters/ExporterRepository.php b/src/Forms/Exporters/ExporterRepository.php
new file mode 100644
index 0000000000..c5bdf31e78
--- /dev/null
+++ b/src/Forms/Exporters/ExporterRepository.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Statamic\Forms\Exporters;
+
+use Exception;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Support\Collection;
+use Statamic\Support\Arr;
+
+class ExporterRepository
+{
+    public function all(): Collection
+    {
+        return collect(config('statamic.forms.exporters', []))
+            ->map(function ($config, $handle) {
+                try {
+                    $exporter = app($class = Arr::pull($config, 'class'));
+                } catch (BindingResolutionException $e) {
+                    throw new Exception("Class [$class] does not exist, defined in exporter [$handle].");
+                }
+
+                return $exporter->setHandle($handle)->setConfig($config);
+            });
+    }
+}
diff --git a/src/Forms/Exporters/JsonExporter.php b/src/Forms/Exporters/JsonExporter.php
index caefaca1f7..b91ef490fc 100644
--- a/src/Forms/Exporters/JsonExporter.php
+++ b/src/Forms/Exporters/JsonExporter.php
@@ -2,27 +2,24 @@
 
 namespace Statamic\Forms\Exporters;
 
-class JsonExporter extends AbstractExporter
+class JsonExporter extends Exporter
 {
-    /**
-     * Perform the export.
-     *
-     * @return string
-     */
-    public function export()
+    protected static string $title = 'JSON';
+
+    public function export(): string
     {
-        $submissions = $this->form()->submissions()->toArray();
+        $submissions = $this->form->submissions()->toArray();
 
         return json_encode($submissions);
     }
 
-    /**
-     * Get the content type.
-     *
-     * @return string
-     */
-    public function contentType()
+    public function contentType(): string
     {
         return 'application/json';
     }
+
+    public function extension(): string
+    {
+        return 'json';
+    }
 }
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 117fe58f6f..277b07aa49 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -19,6 +19,7 @@
 use Statamic\Facades\Form as FormFacade;
 use Statamic\Facades\YAML;
 use Statamic\Forms\Exceptions\BlueprintUndefinedException;
+use Statamic\Forms\Exporters\Exporter;
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
@@ -389,4 +390,17 @@ public function actionUrl()
     {
         return route('statamic.forms.submit', $this->handle());
     }
+
+    public function exporters()
+    {
+        return FormFacade::exporters()
+            ->all()
+            ->filter->allowedOnForm($this)
+            ->each->setForm($this);
+    }
+
+    public function exporter(string $handle): ?Exporter
+    {
+        return $this->exporters()->get($handle);
+    }
 }
diff --git a/src/Forms/FormRepository.php b/src/Forms/FormRepository.php
index b4093d827a..7b8ccd5e18 100644
--- a/src/Forms/FormRepository.php
+++ b/src/Forms/FormRepository.php
@@ -8,6 +8,7 @@
 use Statamic\Contracts\Forms\Submission as SubmissionContract;
 use Statamic\Facades\File;
 use Statamic\Facades\Folder;
+use Statamic\Forms\Exporters\ExporterRepository;
 
 class FormRepository implements Contract
 {
@@ -83,6 +84,11 @@ public function getSubmissionRedirect(SubmissionContract $submission)
         return $callback($submission);
     }
 
+    public function exporters()
+    {
+        return app(ExporterRepository::class);
+    }
+
     public static function bindings(): array
     {
         return [
diff --git a/src/Http/Controllers/CP/Forms/FormExportController.php b/src/Http/Controllers/CP/Forms/FormExportController.php
index 79f6051437..116968d603 100644
--- a/src/Http/Controllers/CP/Forms/FormExportController.php
+++ b/src/Http/Controllers/CP/Forms/FormExportController.php
@@ -2,10 +2,8 @@
 
 namespace Statamic\Http\Controllers\CP\Forms;
 
-use Statamic\Exceptions\FatalException;
-use Statamic\Facades\File;
+use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Http\Controllers\CP\CpController;
-use Statamic\Support\Str;
 
 class FormExportController extends CpController
 {
@@ -13,25 +11,10 @@ public function export($form, $type)
     {
         $this->authorize('view', $form);
 
-        $exporter = 'Statamic\Forms\Exporters\\'.Str::studly($type).'Exporter';
-
-        if (! class_exists($exporter)) {
-            throw new FatalException("Exporter of type [$type] does not exist.");
-        }
-
-        $exporter = new $exporter;
-        $exporter->form($form);
-
-        $content = $exporter->export();
-
-        if ($this->request->has('download')) {
-            $path = storage_path('statamic/tmp/forms/'.$form->handle().'-'.time().'.'.$type);
-            File::put($path, $content);
-            $response = response()->download($path)->deleteFileAfterSend(true);
-        } else {
-            $response = response($content)->header('Content-Type', $exporter->contentType());
+        if (! $exporter = $form->exporter($type)) {
+            throw new NotFoundHttpException;
         }
 
-        return $response;
+        return $this->request->has('download') ? $exporter->download() : $exporter->response();
     }
 }

From 89bd9d5e2dee71ba85982b4c7b50b7b0c790b1fb Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:38:44 +0000
Subject: [PATCH 029/175] [4.x] Refresh Live Preview when relationship items
 are updated (#8893)

---
 resources/js/components/inputs/relationship/Item.vue | 4 ++++
 resources/js/components/live-preview/LivePreview.vue | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index 04da455eaa..a1133cc5db 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -53,6 +53,8 @@ export default {
         InlineEditForm
     },
 
+    inject: ['storeName'],
+
     props: {
         item: Object,
         config: Object,
@@ -83,6 +85,8 @@ export default {
             this.item.published = responseData.published;
             this.item.private = responseData.private;
             this.item.status = responseData.status;
+
+            this.$events.$emit(`live-preview.${this.storeName}.refresh`);
         },
 
     }
diff --git a/resources/js/components/live-preview/LivePreview.vue b/resources/js/components/live-preview/LivePreview.vue
index e7f185aec3..1d5b53f909 100644
--- a/resources/js/components/live-preview/LivePreview.vue
+++ b/resources/js/components/live-preview/LivePreview.vue
@@ -215,6 +215,10 @@ export default {
         this.keybinding = this.$keys.bindGlobal('mod+shift+p', () => {
             this.previewing ? this.close() : this.$emit('opened-via-keyboard');
         });
+
+        this.$events.$on(`live-preview.${this.name}.refresh`, () => {
+            this.update();
+        });
     },
 
     beforeDestroy() {

From b3e634f1a0c7f1867237ba544aec97398529aa1a Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 30 Oct 2023 19:05:04 +0000
Subject: [PATCH 030/175] [4.x] Allow using Global Set variables in form email
 configs (#8892)

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Forms/Email.php       |  9 +++++++--
 tests/Forms/EmailTest.php | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/Forms/Email.php b/src/Forms/Email.php
index 1c6f429d8c..ec4d3b2eda 100644
--- a/src/Forms/Email.php
+++ b/src/Forms/Email.php
@@ -22,6 +22,7 @@ class Email extends Mailable
     protected $submissionData;
     protected $config;
     protected $site;
+    private $globalData;
 
     public function __construct(Submission $submission, array $config, Site $site)
     {
@@ -160,6 +161,10 @@ protected function getRenderableFieldData($values)
 
     private function getGlobalsData()
     {
+        if (! is_null($this->globalData)) {
+            return $this->globalData;
+        }
+
         $data = [];
 
         foreach (GlobalSet::all() as $global) {
@@ -172,7 +177,7 @@ private function getGlobalsData()
             $data[$global->handle()] = $global->toAugmentedArray();
         }
 
-        return array_merge($data, $data['global'] ?? []);
+        return $this->globalData = array_merge($data, $data['global'] ?? []);
     }
 
     protected function addresses($addresses)
@@ -203,7 +208,7 @@ protected function parseConfig(array $config)
         return collect($config)->map(function ($value) {
             $value = Parse::env($value); // deprecated
 
-            return (string) Antlers::parse($value, $this->submissionData);
+            return (string) Antlers::parse($value, array_merge($this->submissionData, $this->getGlobalsData()));
         });
     }
 }
diff --git a/tests/Forms/EmailTest.php b/tests/Forms/EmailTest.php
index b942bc9ec7..4eeaaf94b6 100644
--- a/tests/Forms/EmailTest.php
+++ b/tests/Forms/EmailTest.php
@@ -7,6 +7,7 @@
 use Mockery;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Form;
+use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Site;
 use Statamic\Forms\Email;
 use Statamic\Forms\Submission;
@@ -92,6 +93,12 @@ public function singleAddressProvider()
             'single email with name using antlers' => ['{{ name }} <{{ email }}>', [
                 ['address' => 'foo@bar.com', 'name' => 'Foo Bar'],
             ]],
+            'single email from global set using antlers' => ['{{ company_information:email }}', [
+                ['address' => 'info@example.com', 'name' => null],
+            ]],
+            'single email with name from global set using antlers' => ['{{ company_information:name }} <{{ company_information:email }}>', [
+                ['address' => 'info@example.com', 'name' => 'Example Company'],
+            ]],
         ];
     }
 
@@ -190,12 +197,28 @@ private function makeEmailWithSubmission(Submission $submission)
 
     private function makeEmailWithConfig(array $config)
     {
+        $globalSet = GlobalSet::make()->handle('company_information');
+        $globalSet->addLocalization($globalSet->makeLocalization('en')->data([
+            'name' => 'Example Company',
+            'email' => 'info@example.com',
+        ]));
+        $globalSet->save();
+
         $formBlueprint = Blueprint::makeFromFields([
             'name' => ['type' => 'text'],
             'email' => ['type' => 'text'],
         ]);
+
+        $companyInformationBlueprint = Blueprint::makeFromFields([
+            'name' => ['type' => 'text'],
+            'email' => ['type' => 'text'],
+        ]);
+
         BlueprintRepository::shouldReceive('find')->with('forms.test')->andReturn($formBlueprint);
+        BlueprintRepository::shouldReceive('find')->with('globals.company_information')->andReturn($companyInformationBlueprint);
+
         $form = tap(Form::make('test'))->save();
+
         $submission = $form->makeSubmission()->data([
             'name' => 'Foo Bar',
             'email' => 'foo@bar.com',

From eb3f89cd8aecd28f98df3af167fe85569b425000 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Mon, 30 Oct 2023 15:13:11 -0400
Subject: [PATCH 031/175] [4.x] Decrease the width of the link type selector
 (#8882)

---
 resources/js/components/fieldtypes/LinkFieldtype.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/LinkFieldtype.vue b/resources/js/components/fieldtypes/LinkFieldtype.vue
index b89e3bc2e6..10abb9a817 100644
--- a/resources/js/components/fieldtypes/LinkFieldtype.vue
+++ b/resources/js/components/fieldtypes/LinkFieldtype.vue
@@ -2,7 +2,7 @@
     <div class="flex items-center">
 
         <!-- Link type selector -->
-        <div class="w-40 mr-4">
+        <div class="w-28 mr-4">
             <v-select
                 v-model="option"
                 append-to-body

From b1041a678ff0cea5e9211f046d7b313be4e08bf8 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 30 Oct 2023 19:23:26 +0000
Subject: [PATCH 032/175] [4.x] PHP 8.3 support (#8845)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 .github/workflows/tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f5e408e7ff..67d8b7ae83 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.0, 8.1, 8.2, 8.3]
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -29,6 +29,8 @@ jobs:
         exclude:
           - php: 8.0
             laravel: 10.*
+          - php: 8.3
+            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -50,6 +52,7 @@ jobs:
             tests
             composer.json
             phpunit.xml.dist
+            .github/workflows/tests.yml
             **.php
 
       - name: Determine whether tests should run
@@ -60,8 +63,7 @@ jobs:
       - name: Update apt sources
         if: steps.should-run-tests.outputs.result == 'true' && matrix.os == 'ubuntu-latest'
         run: |
-          sudo gem install apt-spy2
-          sudo apt-spy2 fix --commit --launchpad --country=US
+          sudo apt-get check || sudo apt --fix-broken install -y
           sudo apt-get update
 
       - name: Install French Locale

From 5b6c38f9e819f1eb1add0471be52151c06b99a09 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:21:34 +0000
Subject: [PATCH 033/175] [4.x] Ignore single smart quotes when slugifying
 string (#8895)

---
 resources/js/plugins/slugify.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/plugins/slugify.js b/resources/js/plugins/slugify.js
index 0e1f1b4154..126ce59237 100644
--- a/resources/js/plugins/slugify.js
+++ b/resources/js/plugins/slugify.js
@@ -12,6 +12,9 @@ export default {
             // Remove apostrophes in all languages
             custom["'"] = "";
 
+            // Remove smart single quotes
+            custom["’"] = "";
+
             return getSlug(text, {
                 separator: glue || '-',
                 lang,

From 5f282ec2f2c9667025f2d4a5d9bc6d2b5b887484 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 30 Oct 2023 20:39:09 +0000
Subject: [PATCH 034/175] [4.x] Add `RevisionSaving` event (#8551)

---
 src/Events/RevisionSaving.php | 23 +++++++++++++++++++++++
 src/Revisions/Revision.php    |  5 +++++
 2 files changed, 28 insertions(+)
 create mode 100644 src/Events/RevisionSaving.php

diff --git a/src/Events/RevisionSaving.php b/src/Events/RevisionSaving.php
new file mode 100644
index 0000000000..0385891dcf
--- /dev/null
+++ b/src/Events/RevisionSaving.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class RevisionSaving extends Event
+{
+    public $revision;
+
+    public function __construct($revision)
+    {
+        $this->revision = $revision;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Revisions/Revision.php b/src/Revisions/Revision.php
index ed135ea218..d82a032cf9 100644
--- a/src/Revisions/Revision.php
+++ b/src/Revisions/Revision.php
@@ -8,6 +8,7 @@
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\RevisionDeleted;
 use Statamic\Events\RevisionSaved;
+use Statamic\Events\RevisionSaving;
 use Statamic\Facades;
 use Statamic\Facades\Revision as Revisions;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
@@ -130,6 +131,10 @@ public function toArray()
 
     public function save()
     {
+        if (RevisionSaving::dispatch($this) === false) {
+            return false;
+        }
+
         Revisions::save($this);
 
         RevisionSaved::dispatch($this);

From 29d70960b1ec605421d46606c382538f68abcd80 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 30 Oct 2023 21:06:40 +0000
Subject: [PATCH 035/175] [4.x] Fixed issue when resetting columns on Entry
 Listing Table (#8896)

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

diff --git a/src/Http/Resources/CP/Entries/Entries.php b/src/Http/Resources/CP/Entries/Entries.php
index 115f2c9a74..6674ed200d 100644
--- a/src/Http/Resources/CP/Entries/Entries.php
+++ b/src/Http/Resources/CP/Entries/Entries.php
@@ -36,6 +36,7 @@ private function setColumns()
             ->listable(true)
             ->visible(true)
             ->defaultVisibility(true)
+            ->defaultOrder($columns->count() + 1)
             ->sortable(false);
 
         $columns->put('status', $status);

From 6a540f3b698f094539262ea33a0af91792706690 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 30 Oct 2023 17:33:13 -0400
Subject: [PATCH 036/175] changelog

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9530435edf..909a7e51a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Release Notes
 
+## 4.31.0 (2023-10-30)
+
+### What's new
+- PHP 8.3 support [#8845](https://github.com/statamic/cms/issues/8845) by @jasonvarga
+- Custom form submission exporters. [#8837](https://github.com/statamic/cms/issues/8837) by @ryanmitchell
+- Add `RevisionSaving` event. [#8551](https://github.com/statamic/cms/issues/8551) by @ryanmitchell
+- Allow using globals in form email configs. [#8892](https://github.com/statamic/cms/issues/8892) by @duncanmcclean
+- Improve Entries fieldtype search index logic, and add option to define an explicit one. [#8885](https://github.com/statamic/cms/issues/8885) by @edalzell
+
+### What's improved
+- Improve UI of link fieldtype in smaller spaces. [#8882](https://github.com/statamic/cms/issues/8882) by @godismyjudge95
+- French translations. [#8889](https://github.com/statamic/cms/issues/8889) by @ebeauchamps
+
+### What's fixed
+- Fix status column moving when resetting columns on entry listing. [#8896](https://github.com/statamic/cms/issues/8896) by @duncanmcclean
+- Ignore single smart quotes when slugifying entries. [#8895](https://github.com/statamic/cms/issues/8895) by @duncanmcclean
+- Fix Live Preview not updating when relationship items are updated. [#8893](https://github.com/statamic/cms/issues/8893) by @duncanmcclean
+- Fix global site selector not closing when clicking outside. [#8888](https://github.com/statamic/cms/issues/8888) by @o1y
+- Fix Bard text align when no headings are enabled. [#8878](https://github.com/statamic/cms/issues/8878) by @jacksleight
+
+
+
 ## 4.30.0 (2023-10-20)
 
 ### What's new

From 366ff26360d0f9898e74143cb0a107b4621a639c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 1 Nov 2023 10:59:18 -0400
Subject: [PATCH 037/175] [4.x] Add helper arg for addons to easily remove
 child item in core nav (#8883)

---
 src/CP/Navigation/Nav.php       | 49 +++++++++++++++++--
 tests/CP/Navigation/NavTest.php | 85 ++++++++++++++++++++++++++++++++-
 2 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/src/CP/Navigation/Nav.php b/src/CP/Navigation/Nav.php
index e2567a4d70..d890839348 100644
--- a/src/CP/Navigation/Nav.php
+++ b/src/CP/Navigation/Nav.php
@@ -45,12 +45,13 @@ public function item($name)
     }
 
     /**
-     * Find or create nav item.
+     * Find nav item.
      *
      * @param  string  $section
      * @param  string  $name
+     * @return NavItem|null
      */
-    public function findOrCreate($section, $name)
+    public function find($section, $name)
     {
         $item = collect($this->items)->first(function ($item) use ($section, $name) {
             return $item->section() === $section
@@ -58,7 +59,19 @@ public function findOrCreate($section, $name)
                 && ! $item->isChild();
         });
 
-        return $item ?: $this->create($name)->section($section);
+        return $item;
+    }
+
+    /**
+     * Find or create nav item.
+     *
+     * @param  string  $section
+     * @param  string  $name
+     * @return NavItem
+     */
+    public function findOrCreate($section, $name)
+    {
+        return $this->find($section, $name) ?: $this->create($name)->section($section);
     }
 
     /**
@@ -66,10 +79,15 @@ public function findOrCreate($section, $name)
      *
      * @param  string  $section
      * @param  string|null  $name
+     * @param  string|null  $childName
      * @return $this
      */
-    public function remove($section, $name = null)
+    public function remove($section, $name = null, $childName = null)
     {
+        if ($childName) {
+            return $this->removeChildItem($section, $name, $childName);
+        }
+
         $this->items = collect($this->items)
             ->reject(function ($item) use ($section, $name) {
                 return $name
@@ -81,6 +99,29 @@ public function remove($section, $name = null)
         return $this;
     }
 
+    /**
+     * Remove nav item.
+     *
+     * @param  string  $section
+     * @param  string|null  $name
+     * @param  string|null  $childName
+     * @return $this
+     */
+    protected function removeChildItem($section, $name, $childName)
+    {
+        if (! $parent = $this->find($section, $name)) {
+            return $this;
+        }
+
+        if (! $children = $parent->resolveChildren()->children()) {
+            return $this;
+        }
+
+        $parent->children($children->reject(fn ($child) => $child->display() === $childName));
+
+        return $this;
+    }
+
     /**
      * Build navigation.
      *
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index 491a8f3c83..3b9c9f885b 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -124,7 +124,7 @@ public function it_can_create_a_nav_item_with_a_custom_svg_icon()
     }
 
     /** @test */
-    public function it_can_get_and_modify_an_existing_item()
+    public function it_can_find_and_modify_an_existing_item()
     {
         $this->actingAs(tap(User::make()->makeSuper())->save());
 
@@ -132,6 +132,27 @@ public function it_can_get_and_modify_an_existing_item()
             ->url('/pit-droid')
             ->icon('<svg>...</svg>');
 
+        Nav::find('Droids', 'WAC-47')
+            ->url('/d-squad');
+
+        $item = $this->build()->get('Droids')->first();
+
+        $this->assertEquals('Droids', $item->section());
+        $this->assertEquals('WAC-47', $item->display());
+        $this->assertEquals('<svg>...</svg>', $item->icon());
+        $this->assertEquals('http://localhost/d-squad', $item->url());
+    }
+
+    /** @test */
+    public function it_can_find_and_modify_an_existing_item_using_magic_constructor()
+    {
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        Nav::droids('WAC-47')
+            ->url('/pit-droid')
+            ->icon('<svg>...</svg>');
+
+        // Callign the same constructor does a `findOrCreate()` under the hood...
         Nav::droids('WAC-47')
             ->url('/d-squad');
 
@@ -344,6 +365,41 @@ public function it_can_remove_a_specific_nav_item()
         $this->assertEquals('A-Wing', $ships->first()->display());
     }
 
+    /** @test */
+    public function it_can_remove_a_specific_nav_child_item()
+    {
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        Nav::ships('Y-Wing')
+            ->url('/y-wing')
+            ->icon('y-wing')
+            ->children(function () {
+                return [
+                    Nav::item('Foo'),
+                    Nav::item('Bar'),
+                ];
+            });
+
+        Nav::ships('A-Wing')
+            ->url('/a-wing')
+            ->icon('a-wing')
+            ->children(function () {
+                return [
+                    Nav::item('Foo'),
+                    Nav::item('Bar'),
+                ];
+            });
+
+        $this->assertCount(2, $this->build()->get('Ships'));
+
+        Nav::remove('Ships', 'Y-Wing', 'Foo');
+
+        $this->assertCount(2, $ships = $this->build()->get('Ships'));
+
+        $this->assertEquals(['Bar'], $ships->first()->resolveChildren()->children()->map->display()->all());
+        $this->assertEquals(['Foo', 'Bar'], $ships->last()->resolveChildren()->children()->map->display()->all());
+    }
+
     /** @test */
     public function it_can_use_extend_to_defer_until_after_statamic_core_nav_items_are_built()
     {
@@ -378,6 +434,33 @@ public function it_can_use_extend_to_remove_a_default_statamic_nav_item()
         $this->assertNotContains('Collections', $this->build()->get('Content')->map->display());
     }
 
+    /** @test */
+    public function it_can_use_extend_to_remove_a_default_statamic_child_nav_item()
+    {
+        Facades\Collection::make('articles')->save();
+        Facades\Collection::make('pages')->save();
+
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        $nav = Nav::build();
+
+        $collectionsChildren = function () {
+            return $this->build()
+                ->get('Content')
+                ->first(fn ($item) => $item->display() === 'Collections')
+                ->resolveChildren()
+                ->children();
+        };
+
+        $this->assertEquals(['Articles', 'Pages'], $collectionsChildren()->map->display()->all());
+
+        Nav::extend(function ($nav) {
+            $nav->remove('Content', 'Collections', 'Articles');
+        });
+
+        $this->assertEquals(['Pages'], $collectionsChildren()->map->display()->all());
+    }
+
     /** @test */
     public function it_checks_if_active()
     {

From 69f23163268f065dd3f4ac305b565bc5ab82fe39 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 1 Nov 2023 16:37:28 +0000
Subject: [PATCH 038/175] [4.x] Validate that Select & Button Group options
 have keys (#8905)

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/lang/en/validation.php     |  1 +
 src/Fieldtypes/ButtonGroup.php       |  7 +++++
 src/Fieldtypes/Select.php            |  7 +++++
 tests/Fieldtypes/ButtonGroupTest.php | 43 ++++++++++++++++++++++++++++
 tests/Fieldtypes/SelectTest.php      | 43 ++++++++++++++++++++++++++++
 5 files changed, 101 insertions(+)

diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index f366eaa7cb..25f437ab11 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -175,6 +175,7 @@
     'date_fieldtype_end_date_required' => 'End date is required.',
     'date_fieldtype_end_date_invalid' => 'Not a valid end date.',
     'code_fieldtype_rulers' => 'This is invalid.',
+    'options_require_keys' => 'All options must have keys.',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/Fieldtypes/ButtonGroup.php b/src/Fieldtypes/ButtonGroup.php
index f071746b20..70cc827638 100644
--- a/src/Fieldtypes/ButtonGroup.php
+++ b/src/Fieldtypes/ButtonGroup.php
@@ -23,6 +23,13 @@ protected function configFieldItems(): array
                         'type' => 'array',
                         'value_header' => __('Label').' ('.__('Optional').')',
                         'add_button' => __('Add Option'),
+                        'validate' => [function ($attribute, $value, $fail) {
+                            $optionsWithoutKeys = collect($value)->keys()->filter(fn ($key) => empty($key) || $key === 'null');
+
+                            if ($optionsWithoutKeys->isNotEmpty()) {
+                                $fail(__('statamic::validation.options_require_keys'));
+                            }
+                        }],
                     ],
                     'default' => [
                         'display' => __('Default Value'),
diff --git a/src/Fieldtypes/Select.php b/src/Fieldtypes/Select.php
index 8e0d45f3b6..5288044c72 100644
--- a/src/Fieldtypes/Select.php
+++ b/src/Fieldtypes/Select.php
@@ -25,6 +25,13 @@ protected function configFieldItems(): array
                         'key_header' => __('Key'),
                         'value_header' => __('Label').' ('.__('Optional').')',
                         'add_button' => __('Add Option'),
+                        'validate' => [function ($attribute, $value, $fail) {
+                            $optionsWithoutKeys = collect($value)->keys()->filter(fn ($key) => empty($key) || $key === 'null');
+
+                            if ($optionsWithoutKeys->isNotEmpty()) {
+                                $fail(__('statamic::validation.options_require_keys'));
+                            }
+                        }],
                     ],
                     'taggable' => [
                         'display' => __('Allow additions'),
diff --git a/tests/Fieldtypes/ButtonGroupTest.php b/tests/Fieldtypes/ButtonGroupTest.php
index acd87e2957..5aca87df76 100644
--- a/tests/Fieldtypes/ButtonGroupTest.php
+++ b/tests/Fieldtypes/ButtonGroupTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Fieldtypes;
 
+use Facades\Statamic\Fields\FieldtypeRepository;
+use Illuminate\Validation\ValidationException;
 use Statamic\Fields\Field;
 use Statamic\Fieldtypes\ButtonGroup;
 use Tests\TestCase;
@@ -16,4 +18,45 @@ private function field($config)
 
         return $ft->setField(new Field('test', array_merge($config, ['type' => $ft->handle()])));
     }
+
+    /** @test */
+    public function throws_a_validation_error_when_key_is_missing_from_option()
+    {
+        $fieldtype = FieldtypeRepository::find('button_group');
+        $blueprint = $fieldtype->configBlueprint();
+
+        $fields = $blueprint
+            ->fields()
+            ->addValues([
+                'options' => [
+                    'one' => 'One',
+                    'two' => 'Two',
+                    '' => 'Three',
+                ],
+            ]);
+
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessage(__('statamic::validation.options_require_keys'));
+
+        $fields->validate();
+    }
+
+    /** @test */
+    public function does_not_throw_a_validation_error_when_all_options_have_keys()
+    {
+        $fieldtype = FieldtypeRepository::find('button_group');
+        $blueprint = $fieldtype->configBlueprint();
+
+        $fields = $blueprint
+            ->fields()
+            ->addValues($values = [
+                'options' => [
+                    'one' => 'One',
+                    'two' => 'Two',
+                    'three' => 'Three',
+                ],
+            ]);
+
+        $this->assertEquals($values, $fields->validate());
+    }
 }
diff --git a/tests/Fieldtypes/SelectTest.php b/tests/Fieldtypes/SelectTest.php
index 44923088b3..84127456e3 100644
--- a/tests/Fieldtypes/SelectTest.php
+++ b/tests/Fieldtypes/SelectTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Fieldtypes;
 
+use Facades\Statamic\Fields\FieldtypeRepository;
+use Illuminate\Validation\ValidationException;
 use Statamic\Fields\Field;
 use Statamic\Fieldtypes\Select;
 use Tests\TestCase;
@@ -16,4 +18,45 @@ private function field($config)
 
         return $ft->setField(new Field('test', array_merge($config, ['type' => $ft->handle()])));
     }
+
+    /** @test */
+    public function throws_a_validation_error_when_key_is_missing_from_option()
+    {
+        $fieldtype = FieldtypeRepository::find('select');
+        $blueprint = $fieldtype->configBlueprint();
+
+        $fields = $blueprint
+            ->fields()
+            ->addValues([
+                'options' => [
+                    'one' => 'One',
+                    'two' => 'Two',
+                    '' => 'Three',
+                ],
+            ]);
+
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessage(__('statamic::validation.options_require_keys'));
+
+        $fields->validate();
+    }
+
+    /** @test */
+    public function does_not_throw_a_validation_error_when_all_options_have_keys()
+    {
+        $fieldtype = FieldtypeRepository::find('select');
+        $blueprint = $fieldtype->configBlueprint();
+
+        $fields = $blueprint
+            ->fields()
+            ->addValues($values = [
+                'options' => [
+                    'one' => 'One',
+                    'two' => 'Two',
+                    'three' => 'Three',
+                ],
+            ]);
+
+        $this->assertEquals($values, $fields->validate());
+    }
 }

From c26ee82da75643d7d6d14dd69d37780744217adb Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 1 Nov 2023 12:38:17 -0400
Subject: [PATCH 039/175] [4.x] Fix CP nav item active status regressions
 (#8880)

---
 src/CP/Navigation/Nav.php                     |   8 +
 src/CP/Navigation/NavBuilder.php              | 170 +++-
 src/CP/Navigation/NavItem.php                 | 112 ++-
 .../Preferences/Nav/DefaultNavController.php  |   4 +
 .../CP/Preferences/Nav/RoleNavController.php  |   4 +
 .../CP/Preferences/Nav/UserNavController.php  |   5 +
 tests/CP/Navigation/ActiveNavItemTest.php     | 861 ++++++++++++++++++
 tests/CP/Navigation/NavPreferencesTest.php    |   8 +-
 tests/CP/Navigation/NavTest.php               | 127 ---
 9 files changed, 1143 insertions(+), 156 deletions(-)
 create mode 100644 tests/CP/Navigation/ActiveNavItemTest.php

diff --git a/src/CP/Navigation/Nav.php b/src/CP/Navigation/Nav.php
index d890839348..27b4ebee96 100644
--- a/src/CP/Navigation/Nav.php
+++ b/src/CP/Navigation/Nav.php
@@ -143,6 +143,14 @@ public function buildWithoutPreferences($withHidden = false)
         return $this->build(false, $withHidden);
     }
 
+    /**
+     * Clear cached urls.
+     */
+    public function clearCachedUrls()
+    {
+        return NavBuilder::clearCachedUrls();
+    }
+
     /**
      * Make base items.
      *
diff --git a/src/CP/Navigation/NavBuilder.php b/src/CP/Navigation/NavBuilder.php
index 659114ac7d..4219e56c2e 100644
--- a/src/CP/Navigation/NavBuilder.php
+++ b/src/CP/Navigation/NavBuilder.php
@@ -3,6 +3,8 @@
 namespace Statamic\CP\Navigation;
 
 use Exception;
+use Illuminate\Support\Facades\Cache;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Preference;
 use Statamic\Facades\User;
 use Statamic\Support\Arr;
@@ -10,14 +12,20 @@
 
 class NavBuilder
 {
+    const UNRESOLVED_CHILDREN_URLS_CACHE_KEY = 'cp-nav-urls-unresolved-children';
+    const ALL_URLS_CACHE_KEY = 'cp-nav-urls-all';
+
     protected $items = [];
     protected $pendingItems = [];
     protected $withHidden = false;
+    protected $itemsWithChildrenClosures = [];
     protected $sections = [];
     protected $sectionsOriginalItemIds = [];
     protected $sectionsManipulations = [];
     protected $sectionsOrder = [];
     protected $sectionsWithReorderedItems = [];
+    protected $urlsUnresolvedChildren = [];
+    protected $urlsAll = [];
     protected $built;
 
     /**
@@ -45,7 +53,8 @@ public function build($preferences = true)
         }
 
         return $this
-            ->buildChildren()
+            ->trackChildrenClosures()
+            ->resolveChildrenClosures()
             ->validateNesting()
             ->validateViews()
             ->authorizeItems()
@@ -53,17 +62,33 @@ public function build($preferences = true)
             ->syncOriginal()
             ->trackCoreSections()
             ->trackOriginalSectionItems()
+            ->trackUrls()
             ->applyPreferenceOverrides($preferences)
             ->buildSections()
+            ->blinkUrls()
             ->get();
     }
 
     /**
-     * Build children closures.
+     * Track children closures.
+     *
+     * @return $this
+     */
+    protected function trackChildrenClosures()
+    {
+        collect($this->items)
+            ->filter(fn ($item) => is_callable($item->children()))
+            ->each(fn ($item) => $this->itemsWithChildrenClosures[] = $item->id());
+
+        return $this;
+    }
+
+    /**
+     * Resolve children closures.
      *
      * @return $this
      */
-    protected function buildChildren()
+    protected function resolveChildrenClosures()
     {
         collect($this->items)
             ->filter(fn ($item) => $item->isActive() || $this->withHidden)
@@ -805,6 +830,12 @@ protected function userRemoveItemFromChildren($item)
             return;
         }
 
+        if ($this->urlsUnresolvedChildren->has($parent->id())) {
+            $this->urlsUnresolvedChildren[$parent->id()] = collect($this->urlsUnresolvedChildren[$parent->id()])
+                ->reject(fn ($url) => $url === $item->url())
+                ->all();
+        }
+
         if ($parent->resolveChildren()->children()) {
             $parent->children(
                 $parent->children()->reject(function ($child) use ($item) {
@@ -884,6 +915,139 @@ protected function generateNewItemId($section, $name)
         return (new NavItem)->display($name)->section($section)->id();
     }
 
+    /**
+     * Track URLs for `isActive` checks on nav items.
+     *
+     * @return $this
+     */
+    protected function trackUrls()
+    {
+        // If URLs are already cached, get them from cache so that we don't have to
+        // resolve children closures on every request for performance reasons.
+        if ($this->hasCachedUrls()) {
+            $this->urlsUnresolvedChildren = Cache::get(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY);
+            $this->urlsAll = Cache::get(static::ALL_URLS_CACHE_KEY);
+            $this->ensureUrlCachesAreUpToDate();
+
+            return $this;
+        }
+
+        $this->urlsUnresolvedChildren = collect($this->items)
+            ->filter(fn ($item) => collect($this->itemsWithChildrenClosures)->contains($item->id()))
+            ->mapWithKeys(function ($item) {
+                return [$item->id() => $item->resolveChildren()->children()?->map->url()->all() ?? []];
+            });
+
+        $this->urlsAll = collect($this->items)
+            ->flatMap(function ($item) {
+                return array_merge([$item->url()], $item->resolveChildren()->children()?->map->url()->all() ?? []);
+            })
+            ->unique()
+            ->values();
+
+        $this->cacheUrls();
+
+        return $this;
+    }
+
+    /**
+     * Cache tracked URLs.
+     */
+    protected function cacheUrls()
+    {
+        Cache::put(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY, $this->urlsUnresolvedChildren);
+        Cache::put(static::ALL_URLS_CACHE_KEY, $this->urlsAll);
+    }
+
+    /**
+     * Ensure URL caches are up to date.
+     */
+    protected function ensureUrlCachesAreUpToDate()
+    {
+        $updated = collect($this->items)
+            ->filter(fn ($item) => collect($this->itemsWithChildrenClosures)->contains($item->id()))
+            ->filter(fn ($item) => $item->isActive() || $this->withHidden)
+            ->mapWithKeys(fn ($item) => [$item->id() => $item->children()?->map->url()->all() ?? []])
+            ->filter(fn ($urls, $id) => $this->urlsUnresolvedChildren->get($id) != $urls)
+            ->each(fn ($urls, $id) => $this->trackChangedChildren($id, $urls))
+            ->isNotEmpty();
+
+        if ($updated) {
+            $this->cacheUrls();
+        }
+    }
+
+    /**
+     * Track changed children URLs.
+     */
+    protected function trackChangedChildren($id, $urls)
+    {
+        $this->urlsUnresolvedChildren->put($id, $urls);
+
+        $this->urlsAll = $this->urlsAll
+            ->merge($urls)
+            ->unique()
+            ->values();
+    }
+
+    /**
+     * Check if cache has URLs.
+     *
+     * @return bool
+     */
+    protected function hasCachedUrls()
+    {
+        return Cache::has(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)
+            && Cache::has(static::ALL_URLS_CACHE_KEY);
+    }
+
+    /**
+     * Blink URLs for `isActive` checks during this request.
+     *
+     * @return $this
+     */
+    protected function blinkUrls()
+    {
+        Blink::put(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY, $this->urlsUnresolvedChildren);
+        Blink::put(static::ALL_URLS_CACHE_KEY, $this->urlsAll);
+
+        return $this;
+    }
+
+    /**
+     * Get unresolved children URLs for an item's `isActive` checks.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public static function getUnresolvedChildrenUrlsForItem($item)
+    {
+        return Blink::get(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)?->get($item->id())
+            ?? Cache::get(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)?->get($item->id());
+    }
+
+    /**
+     * Get all URLs explicitly used in nav for `isActive` checks.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public static function getAllUrls()
+    {
+        return Blink::get(static::ALL_URLS_CACHE_KEY)
+            ?? Cache::get(static::ALL_URLS_CACHE_KEY)
+            ?? collect();
+    }
+
+    /**
+     * Clear cached urls. Important when saving/deleting CP nav preferences, etc.
+     */
+    public static function clearCachedUrls()
+    {
+        Cache::forget(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY);
+        Blink::forget(static::UNRESOLVED_CHILDREN_URLS_CACHE_KEY);
+        Cache::forget(static::ALL_URLS_CACHE_KEY);
+        Blink::forget(static::ALL_URLS_CACHE_KEY);
+    }
+
     /**
      * Get built nav.
      *
diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 37f029a180..ec931f7b9c 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -21,6 +21,7 @@ class NavItem
     protected $icon;
     protected $children;
     protected $isChild;
+    protected $wasOriginallyChild;
     protected $authorization;
     protected $active;
     protected $view;
@@ -148,6 +149,21 @@ protected function generateActivePatternForCpUrl($url)
         return $relativeUrl.'(/(.*)?|$)';
     }
 
+    /**
+     * Generate active URL patterns for this item's children.
+     *
+     * @return Collection
+     */
+    protected function generateActivePatternsForChildren()
+    {
+        if (! $this->children()) {
+            return collect();
+        }
+
+        return collect(NavBuilder::getUnresolvedChildrenUrlsForItem($this) ?? [])
+            ->map(fn ($url) => $this->generateActivePatternForCpUrl($url));
+    }
+
     /**
      * Get editable url for nav builder UI.
      */
@@ -253,33 +269,39 @@ public function isChild($isChild = null)
             ->getter(function ($value) {
                 return (bool) $value;
             })
+            ->afterSetter(function ($value) {
+                if ($value === true && ! isset($this->wasOriginallyChild)) {
+                    $this->wasOriginallyChild = $value;
+                }
+            })
             ->value($isChild);
     }
 
     /**
-     * Active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
+     * Check if this nav item was ever a child before user preferences were applied.
      *
-     * @return $this
+     * @param  bool|null  $isChild
+     * @return mixed
      */
-    public function active($pattern = null)
+    protected function wasOriginallyChild()
     {
-        return $this->fluentlyGetOrSet('active')->value($pattern);
+        return (bool) $this->wasOriginallyChild;
     }
 
     /**
-     * Determine when to resolve children for `hasActiveChild()` checks.
+     * Active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
      *
-     * @return bool
+     * Though we still check active patterns for nested URLs internally, having to manually
+     * use this method should not be needed anymore, not to mention it is confusing for
+     * addon devs to know when they even need to use it, thus we are deprecating it.
+     *
+     * @deprecated
+     *
+     * @return $this
      */
-    protected function shouldResolveChildren()
+    public function active($pattern = null)
     {
-        if (! $this->active) {
-            return false;
-        }
-
-        $pattern = preg_quote(config('statamic.cp.route'), '#').'/'.$this->active;
-
-        return preg_match('#'.$pattern.'#', request()->decodedPath()) === 1;
+        return $this->fluentlyGetOrSet('active')->value($pattern);
     }
 
     /**
@@ -343,7 +365,7 @@ public function can($ability = null, $arguments = [])
     }
 
     /**
-     * Get whether the nav item is currently active.
+     * Determine whether the nav item is currently active.
      *
      * @return bool
      */
@@ -353,27 +375,73 @@ public function isActive()
             return true;
         }
 
+        // If the current URL is not explicitly referenced in the CP nav,
+        // and if this item is/was ever a child nav item,
+        // then check against URL heirarchy conventions using regex pattern.
+        if ($this->currentUrlIsNotExplicitlyReferencedInNav() && $this->wasOriginallyChild()) {
+            return $this->isActiveByPattern($this->active);
+        }
+
         return request()->url() === URL::removeQueryAndFragment($this->url);
     }
 
     /**
-     * Get whether the nav item has a currently active child.
+     * Determine whether the nav item has a currently active child.
      *
      * @return bool
      */
     protected function hasActiveChild()
     {
-        if ($this->shouldResolveChildren()) {
-            $this->resolveChildren();
+        // If children are already resolved to a collection, just check `isActive()` on each child item.
+        if ($this->children() instanceof Collection) {
+            return $this
+                ->children()
+                ->filter(fn ($item) => $item->isActive())
+                ->isNotEmpty();
+        }
+
+        // If the current URL is not explicitly referenced in the CP nav,
+        // and if this item has children to check against,
+        // then check against URL heirarchy conventions using regex pattern.
+        if ($this->currentUrlIsNotExplicitlyReferencedInNav() && $this->children()) {
+            return $this->isActiveByPattern($this->generateActivePatternsForChildren());
+        }
+
+        // If children closure has not been resolved, and children urls are cached, check against cached children.
+        if ($childrenUrls = NavBuilder::getUnresolvedChildrenUrlsForItem($this)) {
+            return collect($childrenUrls)
+                ->map(fn ($url) => URL::removeQueryAndFragment($url))
+                ->contains(request()->url());
         }
 
-        if (! $this->children() instanceof Collection) {
+        return false;
+    }
+
+    /**
+     * Determine whether the current URL is explicitly referenced in nav.
+     *
+     * @return bool
+     */
+    protected function currentUrlIsNotExplicitlyReferencedInNav()
+    {
+        return ! NavBuilder::getAllUrls()->contains(request()->url());
+    }
+
+    /**
+     * Determine whether the nav item is currently active using the regex technique for deeply nested hierarchical urls.
+     *
+     * @param  string|array  $active
+     * @return bool
+     */
+    protected function isActiveByPattern($active)
+    {
+        if (! $active) {
             return false;
         }
 
-        return $this
-            ->children()
-            ->filter(fn ($item) => $item->isActive())
+        return collect($active)
+            ->map(fn ($pattern) => preg_quote(config('statamic.cp.route'), '#').'/'.$pattern)
+            ->filter(fn ($pattern) => preg_match('#'.$pattern.'#', request()->decodedPath()) === 1)
             ->isNotEmpty();
     }
 
diff --git a/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php b/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
index f71e1b2d05..b0fcedc41a 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/DefaultNavController.php
@@ -41,6 +41,8 @@ public function update(Request $request)
 
         Preference::default()->set('nav', $nav)->save();
 
+        Nav::clearCachedUrls();
+
         $this->success(__('Saved'));
 
         return true;
@@ -50,6 +52,8 @@ public function destroy()
     {
         Preference::default()->remove('nav')->save();
 
+        Nav::clearCachedUrls();
+
         return true;
     }
 }
diff --git a/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php b/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
index 14bb65f017..ced54f5354 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
@@ -46,6 +46,8 @@ public function update(Request $request, $handle)
 
         $role->setPreference('nav', $nav)->save();
 
+        Nav::clearCachedUrls();
+
         $this->success(__('Saved'));
 
         return true;
@@ -57,6 +59,8 @@ public function destroy($handle)
 
         $role->removePreference('nav')->save();
 
+        Nav::clearCachedUrls();
+
         return true;
     }
 }
diff --git a/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php b/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
index a55c9319d3..6adbee2848 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/UserNavController.php
@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP\Preferences\Nav;
 
 use Illuminate\Http\Request;
+use Statamic\Facades\CP\Nav;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\Controller;
 
@@ -26,6 +27,8 @@ public function update(Request $request)
 
         User::current()->setPreference('nav', $nav)->save();
 
+        Nav::clearCachedUrls();
+
         $this->success(__('Saved'));
 
         return true;
@@ -35,6 +38,8 @@ public function destroy()
     {
         User::current()->removePreference('nav')->save();
 
+        Nav::clearCachedUrls();
+
         return true;
     }
 }
diff --git a/tests/CP/Navigation/ActiveNavItemTest.php b/tests/CP/Navigation/ActiveNavItemTest.php
new file mode 100644
index 0000000000..ce26c7fc03
--- /dev/null
+++ b/tests/CP/Navigation/ActiveNavItemTest.php
@@ -0,0 +1,861 @@
+<?php
+
+namespace Tests\CP\Navigation;
+
+use Closure;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Route;
+use Statamic\CP\Navigation\NavBuilder;
+use Statamic\Facades;
+use Statamic\Facades\Blink;
+use Statamic\Facades\CP\Nav;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ActiveNavItemTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    protected $shouldPreventNavBeingBuilt = false;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        // Always act as super user for these tests
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        // TODO: Other tests are leaving behind forms without titles that are causing failures here?
+        Facades\Form::shouldReceive('all')->andReturn(collect());
+    }
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        // Set up test routes for fake SEO Pro extension
+        $app->booted(function () {
+            Route::get('cp/seo-pro', fn () => 'test');
+            Route::get('cp/seo-pro/section-defaults', fn () => 'test');
+            Route::get('cp/seo-pro/section-defaults/pages', fn () => 'test');
+            Route::get('cp/seo-pro/section-defaults/articles', fn () => 'test');
+            Route::get('cp/totally-custom-url', fn () => 'test');
+            Route::get('cp/totally-custom-url/deeper/descendant', fn () => 'test');
+        });
+    }
+
+    /** @test */
+    public function it_resolves_all_children_only_once_to_build_caches_for_is_active_checks()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        // Clear caches
+        Nav::clearCachedUrls();
+        $this->assertFalse(Cache::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertFalse(Blink::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertFalse(Cache::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertFalse(Blink::has(NavBuilder::ALL_URLS_CACHE_KEY));
+
+        // Ensure that all children are resolved and URLs are cached for `isActive()` checks on first build
+        $nav = Nav::build()->pluck('items', 'display');
+        $this->assertTrue(Cache::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Cache::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertInstanceOf(Collection::class, $this->getItemByDisplay($nav->get('Content'), 'Collections')->children());
+        $this->assertInstanceOf(Collection::class, $this->getItemByDisplay($nav->get('Content'), 'Taxonomies')->children());
+
+        // Ensure that it builds children as unresolved closures on second build
+        $nav = Nav::build()->pluck('items', 'display');
+        $this->assertTrue(Cache::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Cache::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertInstanceOf(Closure::class, $this->getItemByDisplay($nav->get('Content'), 'Collections')->children());
+        $this->assertInstanceOf(Closure::class, $this->getItemByDisplay($nav->get('Content'), 'Taxonomies')->children());
+    }
+
+    /** @test */
+    public function it_updates_caches_when_new_child_urls_are_detected_after_resolving_children()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        // Ensure we clear cached URLs and build nav cache
+        Nav::clearCachedUrls();
+        Nav::build();
+
+        // Assert that our collection children are properly cached
+        $collectionsChildrenUrls = [
+            'http://localhost/cp/collections/articles',
+            'http://localhost/cp/collections/pages',
+        ];
+        $this->assertEquals($collectionsChildrenUrls, Cache::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        $this->assertEquals($collectionsChildrenUrls, Blink::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        collect($collectionsChildrenUrls)->each(function ($url) {
+            $this->assertTrue(Cache::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+            $this->assertTrue(Blink::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+        });
+
+        // Now let's create a new collection
+        Facades\Collection::make('products')->title('Products')->save();
+
+        // Simply building the nav should change what is cached
+        $collectionsChildrenUrls = [
+            'http://localhost/cp/collections/articles',
+            'http://localhost/cp/collections/pages',
+        ];
+        $this->assertEquals($collectionsChildrenUrls, Cache::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        $this->assertEquals($collectionsChildrenUrls, Blink::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        collect($collectionsChildrenUrls)->each(function ($url) {
+            $this->assertTrue(Cache::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+            $this->assertTrue(Blink::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+        });
+
+        // But if we build the nav again by hitting collections url to resolve its' children, the caches should get updated
+        $this
+            ->get('http://localhost/cp/collections')
+            ->assertStatus(200);
+
+        // Assert that our collection children caches are properly updated
+        $updatedChildrenUrls = [
+            'http://localhost/cp/collections/articles',
+            'http://localhost/cp/collections/pages',
+            'http://localhost/cp/collections/products',
+        ];
+        $this->assertEquals($updatedChildrenUrls, Cache::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        $this->assertEquals($updatedChildrenUrls, Blink::get(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY)->get('content::collections'));
+        collect($updatedChildrenUrls)->each(function ($url) {
+            $this->assertTrue(Cache::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+            $this->assertTrue(Blink::get(NavBuilder::ALL_URLS_CACHE_KEY)->contains($url));
+        });
+    }
+
+    /** @test */
+    public function it_builds_core_children_closure_when_not_active()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/dashboard')
+            ->assertStatus(200);
+
+        $collections = $this->buildAndGetItem('Content', 'Collections');
+
+        $this->assertFalse($collections->isActive());
+        $this->assertInstanceOf(Closure::class, $collections->children());
+    }
+
+    /** @test */
+    public function it_resolves_core_children_closure_and_can_check_when_parent_item_is_active()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections')
+            ->assertStatus(200);
+
+        $collections = $this->buildAndGetItem('Content', 'Collections');
+
+        $this->assertTrue($collections->isActive());
+        $this->assertInstanceOf(Collection::class, $collections->children());
+        $this->assertFalse($this->getItemByDisplay($collections->children(), 'Pages')->isActive());
+        $this->assertFalse($this->getItemByDisplay($collections->children(), 'Articles')->isActive());
+    }
+
+    /** @test */
+    public function it_resolves_core_children_closure_and_can_check_when_parent_and_child_item_are_active()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/articles')
+            ->assertStatus(200);
+
+        $collections = $this->buildAndGetItem('Content', 'Collections');
+
+        $this->assertTrue($collections->isActive());
+        $this->assertInstanceOf(Collection::class, $collections->children());
+        $this->assertFalse($this->getItemByDisplay($collections->children(), 'Pages')->isActive());
+        $this->assertTrue($this->getItemByDisplay($collections->children(), 'Articles')->isActive());
+    }
+
+    /** @test */
+    public function it_resolves_core_children_closure_and_can_check_when_parent_and_descendant_of_child_item_is_active()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/articles/entries/create/en')
+            ->assertStatus(200);
+
+        $collections = $this->buildAndGetItem('Content', 'Collections');
+
+        $this->assertTrue($collections->isActive());
+        $this->assertInstanceOf(Collection::class, $collections->children());
+        $this->assertFalse($collections->children()->keyBy->display()->get('Pages')->isActive());
+        $this->assertTrue($collections->children()->keyBy->display()->get('Articles')->isActive());
+    }
+
+    /** @test */
+    public function it_can_check_if_parent_extension_with_array_based_children_item_is_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children([
+                    $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                    $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                ]);
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_can_check_when_parent_and_array_based_child_extension_items_are_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children([
+                    $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                    $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                ]);
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro/section-defaults')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertTrue($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_can_check_when_parent_and_array_based_descendant_of_child_extension_item_is_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children([
+                    $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                    $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                ]);
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro/section-defaults/pages')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertTrue($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_builds_extension_children_closure_when_not_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
+                        $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
+                        $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/dashboard')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertFalse($seoPro->isActive());
+        $this->assertInstanceOf(Closure::class, $seoPro->children());
+    }
+
+    /** @test */
+    public function it_resolves_extension_children_closure_and_can_check_when_parent_item_is_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                        $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_resolves_extension_children_closure_and_can_check_when_parent_and_child_item_are_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                        $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro/section-defaults')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertTrue($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_resolves_extension_children_closure_and_can_check_when_parent_and_descendant_of_child_item_is_active()
+    {
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->tools('SEO Pro')
+                ->url('/cp/seo-pro')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
+                        $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/seo-pro/section-defaults/pages')
+            ->assertStatus(200);
+
+        $seoPro = $this->buildAndGetItem('Tools', 'SEO Pro');
+
+        $this->assertTrue($seoPro->isActive());
+        $this->assertInstanceOf(Collection::class, $seoPro->children());
+        $this->assertFalse($this->getItemByDisplay($seoPro->children(), 'Reports')->isActive());
+        $this->assertTrue($this->getItemByDisplay($seoPro->children(), 'Section Defaults')->isActive());
+    }
+
+    /** @test */
+    public function it_properly_handles_various_edge_cases_when_checking_is_active_on_descendants_of_nav_children()
+    {
+        // Ensure urls are not cached so that we can test regex based isActive() checks
+        Nav::clearCachedUrls();
+
+        // These patterns are only intended to check against descendants of child items, since we have explicit child URLs
+        $parent = Nav::create('parent')
+            ->section('test')
+            ->url('http://localhost/cp/parent')
+            ->children([
+                $hello = Nav::create('hello')->url('http://localhost/cp/hello'),
+                $helloWithQueryParams = Nav::create('helloWithAnchor')->url('http://localhost/cp/hello?params'),
+                $helloWithAnchor = Nav::create('helloWithAnchor')->url('http://localhost/cp/hello#anchor'),
+                $hell = Nav::create('hell')->url('http://localhost/cp/hell'),
+                $localNotCp = Nav::create('localNotCp')->url('/dashboard'),
+                $external = Nav::create('external')->url('http://external.com'),
+                $externalSecure = Nav::create('externalSecure')->url('https://external.com'),
+            ]);
+
+        // Test active status on an explicit item
+        Request::swap(Request::create('http://localhost/cp/hell'));
+        $this->assertTrue($parent->isActive());
+        $this->assertFalse($hello->isActive());
+        $this->assertFalse($helloWithQueryParams->isActive());
+        $this->assertFalse($helloWithAnchor->isActive());
+        $this->assertTrue($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on an explicit item where url params or anchors were set on url
+        Request::swap(Request::create('http://localhost/cp/hello'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertTrue($helloWithQueryParams->isActive());
+        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on a descendant of an explicit item
+        Request::swap(Request::create('http://localhost/cp/hell/test'));
+        $this->assertTrue($parent->isActive());
+        $this->assertFalse($hello->isActive());
+        $this->assertFalse($helloWithQueryParams->isActive());
+        $this->assertFalse($helloWithAnchor->isActive());
+        $this->assertTrue($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on a descendant of an explicit item where url params or anchors were set on url
+        Request::swap(Request::create('http://localhost/cp/hello/test'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertTrue($helloWithQueryParams->isActive());
+        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on a descendant of an explicit item where url param is part of current url
+        Request::swap(Request::create('http://localhost/cp/hello?params'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertTrue($helloWithQueryParams->isActive());
+        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on a descendant of an explicit item where anchor is part of current url
+        Request::swap(Request::create('http://localhost/cp/hello#anchor'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertTrue($helloWithQueryParams->isActive());
+        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Test active status on a deeper descendant of an explicit item where url params and anchors were set on url
+        Request::swap(Request::create('http://localhost/cp/hello/this/is/super/nested?params#anchor'));
+        $this->assertTrue($parent->isActive());
+        $this->assertTrue($hello->isActive());
+        $this->assertTrue($helloWithQueryParams->isActive());
+        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Ensure regex check is not used when checking is active on explicit parent item
+        Request::swap(Request::create('http://localhost/cp/parent'));
+        $this->assertTrue($parent->isActive());
+        $this->assertFalse($hello->isActive());
+        $this->assertFalse($helloWithQueryParams->isActive());
+        $this->assertFalse($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+
+        // Ensure regex check is not used when checking is active on descendant of parent item
+        Request::swap(Request::create('http://localhost/cp/parent/nested/item'));
+        $this->assertFalse($parent->isActive());
+        $this->assertFalse($hello->isActive());
+        $this->assertFalse($helloWithQueryParams->isActive());
+        $this->assertFalse($helloWithAnchor->isActive());
+        $this->assertFalse($hell->isActive());
+        $this->assertFalse($localNotCp->isActive());
+        $this->assertFalse($external->isActive());
+        $this->assertFalse($externalSecure->isActive());
+    }
+
+    /** @test */
+    public function active_nav_check_still_functions_properly_when_custom_nav_extension_hijacks_a_core_item_child()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+        Facades\Collection::make('products')->title('Products')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        // Remove `Products` and `Categories` from core parents, and add to `Schopify` extension item as children
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->remove('Content', 'Collections', 'Products');
+            $nav->remove('Content', 'Taxonomies', 'Categories');
+
+            $nav->tools('Schopify')
+                ->url('/cp/collections/products')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Products')->url('/cp/collections/products'),
+                        $nav->item('Categories')->url('/cp/taxonomies/categories'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/products')
+            ->assertStatus(200);
+
+        $nav = $this->build();
+
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+        $schopify = $this->getItemByDisplay($nav->get('Tools'), 'Schopify');
+
+        // Ensure only the `Schopify` nav item is active, since we moved the current url (ie. `Products`) to this item
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+        $this->assertTrue($schopify->isActive());
+        $this->assertInstanceOf(Collection::class, $schopify->children());
+
+        // Ensure the new `Products` child under `Schopify` is active
+        $this->assertTrue($this->getItemByDisplay($schopify->children(), 'Products')->isActive());
+        $this->assertFalse($this->getItemByDisplay($schopify->children(), 'Categories')->isActive());
+
+        // Ensure hijacked items were properly removed from original parents
+        $this->assertInstanceOf(Collection::class, $collections->children());
+        $this->assertEquals(['Articles', 'Pages'], $collections->children()->map->display()->all());
+        $this->assertInstanceOf(Collection::class, $taxonomies->children());
+        $this->assertEquals(['Tags'], $taxonomies->children()->map->display()->all());
+    }
+
+    /** @test */
+    public function active_nav_descendant_check_still_functions_properly_when_custom_nav_extension_hijacks_a_core_item_child()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+        Facades\Collection::make('products')->title('Products')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        // Remove `Products` and `Categories` from core parents, and add to `Schopify` extension item as children
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->remove('Content', 'Collections', 'Products');
+            $nav->remove('Content', 'Taxonomies', 'Categories');
+
+            $nav->tools('Schopify')
+                ->url('/cp/collections/products')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Products')->url('/cp/collections/products'),
+                        $nav->item('Categories')->url('/cp/taxonomies/categories'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/products/entries/create/en')
+            ->assertStatus(200);
+
+        $nav = $this->build();
+
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+        $schopify = $this->getItemByDisplay($nav->get('Tools'), 'Schopify');
+
+        // Ensure only the `Schopify` nav item is active, since we moved the current url (ie. `Products`) to this item
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+        $this->assertTrue($schopify->isActive());
+        $this->assertInstanceOf(Collection::class, $schopify->children());
+
+        // Ensure the new `Products` child under `Schopify` is active, because the current URL is a descendant of this item
+        $this->assertTrue($this->getItemByDisplay($schopify->children(), 'Products')->isActive());
+        $this->assertFalse($this->getItemByDisplay($schopify->children(), 'Categories')->isActive());
+    }
+
+    /** @test */
+    public function active_nav_descendant_with_unrelated_url_still_functions_properly_when_custom_nav_extension_hijacks_a_core_item_child()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+        Facades\Collection::make('products')->title('Products')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        // Remove `Products` and `Categories` from core parents, and add to `Schopify` extension item as children
+        Facades\CP\Nav::extend(function ($nav) {
+            $nav->remove('Content', 'Collections', 'Products');
+            $nav->remove('Content', 'Taxonomies', 'Categories');
+
+            $nav->tools('Schopify')
+                ->url('/cp/collections/products')
+                ->children(function () use ($nav) {
+                    return [
+                        $nav->item('Products')->url('/cp/collections/products'),
+                        $nav->item('Categories')->url('/cp/taxonomies/categories'),
+                        $nav->item('Unrelated')->url('/cp/totally-custom-url'),
+                    ];
+                });
+        });
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/totally-custom-url/deeper/descendant')
+            ->assertStatus(200);
+
+        $schopify = $this->buildAndGetItem('Tools', 'Schopify');
+
+        // Ensure only the `Schopify` nav item is active and children are resolved
+        $this->assertTrue($schopify->isActive());
+        $this->assertInstanceOf(Collection::class, $schopify->children());
+
+        // Ensure our `Unrelated` totally custom URL item is considered active as well, based on URL hierarchy
+        $this->assertFalse($this->getItemByDisplay($schopify->children(), 'Products')->isActive());
+        $this->assertFalse($this->getItemByDisplay($schopify->children(), 'Categories')->isActive());
+        $this->assertTrue($this->getItemByDisplay($schopify->children(), 'Unrelated')->isActive());
+    }
+
+    /** @test */
+    public function active_nav_check_still_functions_properly_on_moved_items()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/articles')
+            ->assertStatus(200);
+
+        $nav = $this->build([
+            'top_level' => [
+                'content::collections::articles' => [
+                    'action' => '@move',
+                    'children' => [
+                        'content::taxonomies::categories' => '@move',
+                    ],
+                ],
+            ],
+        ]);
+
+        $articles = $this->getItemByDisplay($nav->get('Top Level'), 'Articles');
+        $categories = $this->getItemByDisplay($articles->children(), 'Categories');
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+
+        // Ensure old parents are not active
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+
+        // Ensure moved item is active
+        $this->assertTrue($articles->isActive());
+
+        // Child should not be active in this case though
+        $this->assertFalse($categories->isActive());
+    }
+
+    /** @test */
+    public function active_nav_check_still_functions_properly_on_explicit_child_within_moved_items()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/taxonomies/categories')
+            ->assertStatus(200);
+
+        $nav = $this->build([
+            'top_level' => [
+                'content::collections::articles' => [
+                    'action' => '@move',
+                    'children' => [
+                        'content::taxonomies::categories' => '@move',
+                    ],
+                ],
+            ],
+        ]);
+
+        $articles = $this->getItemByDisplay($nav->get('Top Level'), 'Articles');
+        $categories = $this->getItemByDisplay($articles->children(), 'Categories');
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+
+        // Ensure old parents are not active
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+
+        // Ensure moved item is active
+        $this->assertTrue($articles->isActive());
+
+        // Ensure child of moved item is now active
+        $this->assertTrue($categories->isActive());
+    }
+
+    /** @test */
+    public function active_nav_check_still_functions_properly_on_descendant_of_moved_items()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/articles/entries/create/en')
+            ->assertStatus(200);
+
+        $nav = $this->build([
+            'top_level' => [
+                'content::collections::articles' => [
+                    'action' => '@move',
+                    'children' => [
+                        'content::taxonomies::categories' => '@move',
+                    ],
+                ],
+            ],
+        ]);
+
+        $articles = $this->getItemByDisplay($nav->get('Top Level'), 'Articles');
+        $categories = $this->getItemByDisplay($articles->children(), 'Categories');
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+
+        // Ensure old parents are not active
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+
+        // Ensure moved item is active, due to URL hierarchy of current URL being a descendant
+        $this->assertTrue($articles->isActive());
+
+        // Child should not be active in this case though
+        $this->assertFalse($categories->isActive());
+    }
+
+    /** @test */
+    public function active_nav_check_still_functions_properly_on_descendant_of_child_within_moved_item()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        Facades\Taxonomy::make('tags')->title('Tags')->save();
+        Facades\Taxonomy::make('categories')->title('Categories')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/taxonomies/categories/terms/create/en')
+            ->assertStatus(200);
+
+        $nav = $this->build([
+            'top_level' => [
+                'content::collections::articles' => [
+                    'action' => '@move',
+                    'children' => [
+                        'content::taxonomies::categories' => '@move',
+                    ],
+                ],
+            ],
+        ]);
+
+        $articles = $this->getItemByDisplay($nav->get('Top Level'), 'Articles');
+        $categories = $this->getItemByDisplay($articles->children(), 'Categories');
+        $collections = $this->getItemByDisplay($nav->get('Content'), 'Collections');
+        $taxonomies = $this->getItemByDisplay($nav->get('Content'), 'Taxonomies');
+
+        // Ensure old parents are not active
+        $this->assertFalse($collections->isActive());
+        $this->assertFalse($taxonomies->isActive());
+
+        // Ensure moved item is active
+        $this->assertTrue($articles->isActive());
+
+        // Child should not be active in this case, due to URL hierarchy of current URL being a descendant
+        $this->assertTrue($categories->isActive());
+    }
+
+    protected function prepareNavCaches()
+    {
+        // Clear caches
+        Nav::clearCachedUrls();
+        $this->assertFalse(Cache::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertFalse(Blink::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertFalse(Cache::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertFalse(Blink::has(NavBuilder::ALL_URLS_CACHE_KEY));
+
+        // Ensure the nav is built and cached so that tests can check `isActive()` on children in unresolved closures
+        Nav::build();
+        $this->assertTrue(Cache::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::UNRESOLVED_CHILDREN_URLS_CACHE_KEY));
+        $this->assertTrue(Cache::has(NavBuilder::ALL_URLS_CACHE_KEY));
+        $this->assertTrue(Blink::has(NavBuilder::ALL_URLS_CACHE_KEY));
+
+        return $this;
+    }
+
+    protected function build($preferences = null)
+    {
+        return Nav::build($preferences)->pluck('items', 'display');
+    }
+
+    protected function buildAndGetItem($sectionDisplay, $itemDisplay)
+    {
+        $sectionItems = $this->build()->get($sectionDisplay);
+
+        return $this->getItemByDisplay($sectionItems, $itemDisplay);
+    }
+
+    protected function getItemByDisplay($items, $display)
+    {
+        return $items->keyBy->display()->get($display);
+    }
+}
diff --git a/tests/CP/Navigation/NavPreferencesTest.php b/tests/CP/Navigation/NavPreferencesTest.php
index 5b3b64510e..e5389da582 100644
--- a/tests/CP/Navigation/NavPreferencesTest.php
+++ b/tests/CP/Navigation/NavPreferencesTest.php
@@ -503,8 +503,8 @@ public function it_can_alias_items_within_a_section()
             ],
         ]);
         $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Pages'], $nav->get('Content')->map->display()->all());
-        $this->assertArrayHasKey('Pages', $nav->get('Content')->keyBy->display()->get('Collections')->children()->keyBy->display()->all());
-        $this->assertArrayHasKey('Articles', $nav->get('Content')->keyBy->display()->get('Collections')->children()->keyBy->display()->all());
+        $this->assertArrayHasKey('Pages', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
+        $this->assertArrayHasKey('Articles', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
     }
 
     /** @test */
@@ -596,8 +596,8 @@ public function it_can_alias_items_into_another_section()
             ],
         ]);
         $this->assertEquals(['Dashboard', 'Pages'], $nav->get('Top Level')->map->display()->all());
-        $this->assertArrayHasKey('Pages', $nav->get('Content')->keyBy->display()->get('Collections')->children()->keyBy->display()->all());
-        $this->assertArrayHasKey('Articles', $nav->get('Content')->keyBy->display()->get('Collections')->children()->keyBy->display()->all());
+        $this->assertArrayHasKey('Pages', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
+        $this->assertArrayHasKey('Articles', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
 
         // Aliasing in same section should just copy the item...
         $nav = $this->buildNavWithPreferences([
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index 3b9c9f885b..be2e5656aa 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\CP\Navigation;
 
-use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 use Statamic\CP\Navigation\NavItem;
 use Statamic\Facades;
@@ -461,132 +460,6 @@ public function it_can_use_extend_to_remove_a_default_statamic_child_nav_item()
         $this->assertEquals(['Pages'], $collectionsChildren()->map->display()->all());
     }
 
-    /** @test */
-    public function it_checks_if_active()
-    {
-        $hello = Nav::create('hello')->url('http://localhost/cp/hello');
-        $helloWithQueryParams = Nav::create('helloWithAnchor')->url('http://localhost/cp/hello?params');
-        $helloWithAnchor = Nav::create('helloWithAnchor')->url('http://localhost/cp/hello#anchor');
-        $hell = Nav::create('hell')->url('http://localhost/cp/hell');
-        $localNotCp = Nav::create('localNotCp')->url('/dashboard');
-        $external = Nav::create('external')->url('http://external.com');
-        $externalSecure = Nav::create('externalSecure')->url('https://external.com');
-
-        Request::swap(Request::create('http://localhost/cp/hell'));
-        $this->assertFalse($hello->isActive());
-        $this->assertFalse($helloWithQueryParams->isActive());
-        $this->assertFalse($helloWithAnchor->isActive());
-        $this->assertTrue($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-
-        Request::swap(Request::create('http://localhost/cp/hello'));
-        $this->assertTrue($hello->isActive());
-        $this->assertTrue($helloWithQueryParams->isActive());
-        $this->assertTrue($helloWithAnchor->isActive());
-        $this->assertFalse($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-
-        Request::swap(Request::create('http://localhost/cp/hell/test'));
-        $this->assertFalse($hello->isActive());
-        $this->assertFalse($helloWithQueryParams->isActive());
-        $this->assertFalse($helloWithAnchor->isActive());
-        $this->assertFalse($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-
-        Request::swap(Request::create('http://localhost/cp/hello/test'));
-        $this->assertFalse($hello->isActive());
-        $this->assertFalse($helloWithQueryParams->isActive());
-        $this->assertFalse($helloWithAnchor->isActive());
-        $this->assertFalse($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-
-        Request::swap(Request::create('http://localhost/cp/hello?params'));
-        $this->assertTrue($hello->isActive());
-        $this->assertTrue($helloWithQueryParams->isActive());
-        $this->assertTrue($helloWithAnchor->isActive());
-        $this->assertFalse($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-
-        Request::swap(Request::create('http://localhost/cp/hello#anchor'));
-        $this->assertTrue($hello->isActive());
-        $this->assertTrue($helloWithQueryParams->isActive());
-        $this->assertTrue($helloWithAnchor->isActive());
-        $this->assertFalse($hell->isActive());
-        $this->assertFalse($localNotCp->isActive());
-        $this->assertFalse($external->isActive());
-        $this->assertFalse($externalSecure->isActive());
-    }
-
-    /** @test */
-    public function it_checks_if_has_active_children()
-    {
-        $collections = Nav::content('Collections')
-            ->url('http://localhost/cp/collections')
-            ->children(function () use (&$pages, &$articles) {
-                return [
-                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
-                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
-                ];
-            });
-
-        Request::swap(Request::create('http://localhost/cp/collections/articles'));
-        $this->assertTrue($collections->isActive());
-        $this->assertFalse($pages->isActive());
-        $this->assertTrue($articles->isActive());
-    }
-
-    /** @test */
-    public function it_can_get_has_active_children_status_with_custom_resolve_children_pattern()
-    {
-        $collections = Nav::content('Custom Collections Url')
-            ->url('http://localhost/cp/custom/url')
-            ->active('collections*')
-            ->children(function () use (&$pages, &$articles) {
-                return [
-                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
-                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
-                ];
-            });
-
-        Request::swap(Request::create('http://localhost/cp/collections/articles'));
-        $this->assertTrue($collections->isActive());
-        $this->assertFalse($pages->isActive());
-        $this->assertTrue($articles->isActive());
-    }
-
-    /**
-     * @deprecated
-     *
-     * @test
-     */
-    public function it_can_get_has_active_children_status_with_deprecated_active_pattern()
-    {
-        $collections = Nav::content('Custom Collections Url')
-            ->url('http://localhost/cp/custom/url')
-            ->active('collections*')
-            ->children(function () use (&$pages, &$articles) {
-                return [
-                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
-                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
-                ];
-            });
-
-        Request::swap(Request::create('http://localhost/cp/collections/articles'));
-        $this->assertTrue($collections->isActive());
-        $this->assertFalse($pages->isActive());
-        $this->assertTrue($articles->isActive());
-    }
-
     /** @test */
     public function it_sets_the_url()
     {

From b6f37d357fa5e58763d9f9d362d86f9f9efc65f8 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:44:08 +0000
Subject: [PATCH 040/175] [4.x] Support paste events in Taggable Fieldtype
 (#8903)

---
 resources/js/components/fieldtypes/TagsFieldtype.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/TagsFieldtype.vue b/resources/js/components/fieldtypes/TagsFieldtype.vue
index 0065199f3f..b4c50681f4 100644
--- a/resources/js/components/fieldtypes/TagsFieldtype.vue
+++ b/resources/js/components/fieldtypes/TagsFieldtype.vue
@@ -15,13 +15,14 @@
         @search:focus="$emit('focus')"
         @search:blur="$emit('blur')">
             <template #selected-option-container><i class="hidden"></i></template>
-            <template #search="{ events, attributes }" v-if="config.multiple">
+            <template #search="{ events, attributes }">
                 <input
                     :placeholder="config.placeholder"
                     class="vs__search"
                     type="search"
                     v-on="events"
                     v-bind="attributes"
+                    @paste="onPaste"
                 >
             </template>
              <template #no-options>
@@ -72,6 +73,14 @@ export default {
         focus() {
             this.$refs.input.focus();
         },
+
+        onPaste(event) {
+            const pastedValue = event.clipboardData.getData('text');
+
+            this.update([...this.value, ...pastedValue.split(',')]);
+
+            event.preventDefault();
+        },
     },
 
 };

From 58a73dc9e79b593f6d0493d87ca70d0096750e68 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:54:10 +0000
Subject: [PATCH 041/175] [4.x] Entries Fieldtype: Tree View (#8899)

Co-authored-by: Jack McDade <jack@jackmcdade.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/collections/View.vue  |   1 -
 .../relationship/RelationshipFieldtype.vue    |   1 +
 .../inputs/relationship/RelationshipInput.vue |   5 +-
 .../inputs/relationship/Selector.vue          | 175 +++++++++++++++++-
 resources/js/components/navigation/View.vue   |   1 -
 resources/js/components/structures/Branch.vue |  12 +-
 .../js/components/structures/PageTree.vue     |  16 +-
 src/Fieldtypes/Entries.php                    |  18 ++
 8 files changed, 212 insertions(+), 17 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index ef0d0b9a7f..3e83d1ffea 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -103,7 +103,6 @@
         <page-tree
             v-if="canUseStructureTree && view === 'tree'"
             ref="tree"
-            :has-collection="true"
             :collections="[handle]"
             :create-url="createUrl"
             :pages-url="structurePagesUrl"
diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index cc69fc3cae..63ba451597 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -24,6 +24,7 @@
         :search="canSearch"
         :read-only="isReadOnly"
         :taggable="taggable"
+        :tree="meta.tree"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
         @input="update"
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index 265402c9e7..5aac36bb21 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -65,6 +65,7 @@
             <stack name="item-selector" v-if="isSelecting" @closed="isSelecting = false">
                 <item-selector
                     slot-scope="{ close }"
+                    :name="name"
                     :filters-url="filtersUrl"
                     :selections-url="selectionsUrl"
                     :site="site"
@@ -76,6 +77,7 @@
                     :search="search"
                     :exclusions="exclusions"
                     :type="config.type"
+                    :tree="tree"
                     @selected="selectionsUpdated"
                     @closed="close"
                 />
@@ -128,7 +130,8 @@ export default {
         columns: {
             type: Array,
             default: () => []
-        }
+        },
+        tree: Object,
     },
 
     components: {
diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index a5200ee27a..752a826fe6 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -7,7 +7,7 @@
         </div>
 
         <data-list
-            v-if="!initializing"
+            v-if="!initializing && view === 'list'"
             ref="dataList"
             :rows="items"
             :columns="columns"
@@ -19,9 +19,17 @@
             @selections-updated="selectionsUpdated"
         >
             <div slot-scope="{}" class="flex flex-col h-full">
-                <div class="bg-white bg-gray-200">
-                    <div class="p-2">
+                <div class="bg-white z-1">
+                    <div class="py-2 px-4 flex items-center justify-between">
                         <data-list-search class="h-8 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                        <div class="btn-group ml-4" v-if="canUseTree">
+                            <button class="btn flex items-center px-4" @click="view = 'tree'" :class="{'active': view === 'tree'}" v-tooltip="__('Tree')">
+                                <svg-icon name="light/structures" class="h-4 w-4"/>
+                            </button>
+                            <button class="btn flex items-center px-4" @click="view = 'list'" :class="{'active': view === 'list'}" v-tooltip="__('List')">
+                                <svg-icon name="assets-mode-table" class="h-4 w-4" />
+                            </button>
+                        </div>
                     </div>
                     <div>
                         <data-list-filters
@@ -97,12 +105,90 @@
 
             </div>
         </data-list>
+
+        <template v-if="!initializing && canUseTree && view === 'tree'">
+            <div class="flex flex-col h-full">
+                <div class="bg-white bg-gray-200 shadow px-4 py-2 z-1 h-13 flex items-center justify-end">
+                    <h1 class="flex-1 flex items-center text-xl">{{ tree.title }}</h1>
+                    <div class="btn-group ml-4">
+                        <button class="btn flex items-center px-4" @click="view = 'tree'" :class="{'active': view === 'tree'}" v-tooltip="__('Tree')">
+                            <svg-icon name="light/structures" class="h-4 w-4"/>
+                        </button>
+                        <button class="btn flex items-center px-4" @click="view = 'list'" :class="{'active': view === 'list'}" v-tooltip="__('List')">
+                            <svg-icon name="assets-mode-table" class="h-4 w-4" />
+                        </button>
+                    </div>
+                </div>
+
+                <div class="flex-1 flex flex-col min-h-0">
+                    <div class="flex flex-col h-full justify-start">
+                        <div class="flex-1 overflow-scroll bg-gray-200 p-4">
+                            <page-tree
+                                ref="tree"
+                                :pages-url="tree.url"
+                                :show-slugs="tree.showSlugs"
+                                :expects-root="tree.expectsRoot"
+                                :site="site"
+                                :preferences-prefix="`selector-field.${name}`"
+                                :editable="false"
+                            >
+                                <template #branch-action="{ branch, index }">
+                                    <div>
+                                        <input
+                                            type="checkbox"
+                                            class="mt-3 ml-3"
+                                            :value="branch.id"
+                                            :checked="isSelected(branch.id)"
+                                            :disabled="reachedSelectionLimit && !singleSelect && !isSelected(branch.id)"
+                                            :id="`checkbox-${branch.id}`"
+                                            @click="checkboxClicked(branch, index, $event)"
+                                        />
+                                    </div>
+                                </template>
+
+                                <template #branch-icon="{ branch }">
+                                    <svg-icon v-if="isRedirectBranch(branch)"
+                                        class="inline-block w-4 h-4 text-gray-500"
+                                        name="light/external-link"
+                                        v-tooltip="__('Redirect')" />
+                                </template>
+                            </page-tree>
+                        </div>
+
+                        <div class="p-4 border-t flex items-center justify-between bg-gray-200">
+                            <div class="text-sm text-gray-700"
+                                v-text="hasMaxSelections
+                                    ? __n(':count/:max selected', selections, { max: maxSelections })
+                                    : __n(':count item selected|:count items selected', selections)" />
+
+                            <div>
+                                <button
+                                    type="button"
+                                    class="btn"
+                                    @click="close">
+                                    {{ __('Cancel') }}
+                                </button>
+
+                                <button
+                                    v-if="! hasMaxSelections || maxSelections > 1"
+                                    type="button"
+                                    class="btn-primary ml-2"
+                                    @click="select">
+                                    {{ __('Select') }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
     </div>
 
 </template>
 
 <script>
 import HasFilters from '../../data-list/HasFilters';
+import PageTree from '../../structures/PageTree.vue';
 
 export default {
 
@@ -110,6 +196,10 @@ export default {
         HasFilters,
     ],
 
+    components: {
+        PageTree,
+    },
+
     props: {
         filtersUrl: String,
         selectionsUrl: String,
@@ -120,6 +210,7 @@ export default {
         site: String,
         search: Boolean,
         type: String,
+        name: String,
         exclusions: {
             type: Array,
             default: () => []
@@ -127,7 +218,8 @@ export default {
         initialColumns: {
             type: Array,
             default: () => []
-        }
+        },
+        tree: Object,
     },
 
     data() {
@@ -144,6 +236,8 @@ export default {
             selections: _.clone(this.initialSelections),
             columns: this.initialColumns,
             visibleColumns: this.initialColumns.filter(column => column.visible),
+            view: 'list',
+            lastItemClicked: null
         }
     },
 
@@ -163,11 +257,37 @@ export default {
 
         hasMaxSelections() {
             return (this.maxSelections === Infinity) ? false : Boolean(this.maxSelections);
+        },
+
+        reachedSelectionLimit() {
+            return this.selections.length === this.maxSelections;
+        },
+
+        singleSelect() {
+            return this.maxSelections === 1;
+        },
+
+        canUseTree() {
+            return !! this.tree;
+        },
+
+        initialView() {
+            if (!this.canUseTree) return 'list';
+
+            const fallback = this.canUseTree ? 'tree' : 'list';
+
+            return localStorage.getItem(this.viewLocalStorageKey) || fallback;
+        },
+
+        viewLocalStorageKey() {
+            return `statamic.selector.field.${this.name}`;
         }
 
     },
 
     mounted() {
+        this.view = this.initialView;
+
         this.getFilters().then(() => {
             this.autoApplyFilters(this.filters);
             this.initialRequest();
@@ -206,6 +326,10 @@ export default {
             }
         },
 
+        view(view) {
+            localStorage.setItem(this.viewLocalStorageKey, view);
+        },
+
     },
 
     methods: {
@@ -220,7 +344,7 @@ export default {
 
         initialRequest() {
             return this.request().then(() => {
-                if (this.search) this.$refs.search.focus();
+                if (this.search && this.view === 'list') this.$refs.search.focus();
             });
         },
 
@@ -311,6 +435,47 @@ export default {
             return this.visibleColumns.find(c => c.field === column);
         },
 
+        isRedirectBranch(branch) {
+            return branch.redirect != null;
+        },
+
+        isSelected(id) {
+            return this.selections.includes(id);
+        },
+
+        toggleSelection(id) {
+            const i = this.selections.indexOf(id);
+
+            if (i > -1) {
+                this.selections.splice(i, 1);
+
+                return;
+            }
+
+            if (this.singleSelect) {
+                this.selections.pop();
+            }
+
+            if (! this.reachedSelectionLimit) {
+                this.selections.push(id);
+            }
+        },
+
+        checkboxClicked(row, index, $event) {
+            if ($event.shiftKey && this.lastItemClicked !== null) {
+                this.selectRange(
+                    Math.min(this.lastItemClicked, index),
+                    Math.max(this.lastItemClicked, index)
+                );
+            } else {
+                this.toggleSelection(row.id, index)
+            }
+
+            if ($event.target.checked) {
+                this.lastItemClicked = index
+            }
+        },
+
     }
 
 }
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 4c62b50f87..aa447d24ac 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -48,7 +48,6 @@
 
         <page-tree
             ref="tree"
-            :has-collection="false"
             :pages-url="pagesUrl"
             :submit-url="submitUrl"
             :submit-parameters="{ data: submissionData }"
diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 67d3d53c88..5f577a71c9 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -1,7 +1,9 @@
 <template>
 
     <div class="flex">
-        <div class="page-move w-6" />
+        <slot name="branch-action" :branch="page">
+            <div class="page-move w-6" />
+        </slot>
         <div class="flex items-center flex-1 p-2 ml-2 text-xs leading-normal">
             <div class="flex items-center flex-1">
                 <div class="little-dot mr-2" :class="getStatusClass()" v-tooltip="getStatusTooltip()" />
@@ -24,7 +26,7 @@
                     <svg-icon name="micro/chevron-down-xs" class="h-1.5" />
                 </button>
 
-                <div v-if="page.collection" class="ml-4 flex items-center">
+                <div v-if="page.collection && editable" class="ml-4 flex items-center">
                     <svg-icon name="light/content-writing" class="w-4 h-4" />
                     <div class="ml-1">
                         <a :href="page.collection.create_url" v-text="__('Add')" />
@@ -37,7 +39,7 @@
             <div class="pr-2 flex items-center">
                 <slot name="branch-icon" :branch="page" />
 
-                <dropdown-list class="ml-4" v-if="!isRoot">
+                <dropdown-list class="ml-4" v-if="!isRoot && editable">
                     <slot name="branch-options"
                         :branch="page"
                         :depth="depth"
@@ -63,10 +65,10 @@ export default {
         root: Boolean,
         vm: Object,
         firstPageIsRoot: Boolean,
-        hasCollection: Boolean,
         isOpen: Boolean,
         hasChildren: Boolean,
-        showSlugs: Boolean
+        showSlugs: Boolean,
+        editable: Boolean,
     },
 
     data() {
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 4c12a786a5..289bb062f9 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -24,7 +24,7 @@
 
         <div v-if="!loading" class="page-tree w-full">
             <draggable-tree
-                draggable
+                :draggable="editable"
                 ref="tree"
                 :data="treeData"
                 :space="1"
@@ -39,15 +39,19 @@
                     :depth="vm.level"
                     :vm="vm"
                     :first-page-is-root="expectsRoot"
-                    :has-collection="hasCollection"
                     :is-open="page.open"
                     :has-children="page.children.length > 0"
                     :show-slugs="showSlugs"
+                    :editable="editable"
                     @edit="$emit('edit-page', page, vm, store, $event)"
                     @toggle-open="store.toggleOpen(page)"
                     @removed="pageRemoved"
                     @children-orphaned="childrenOrphaned"
                 >
+                    <template #branch-action="props">
+                        <slot name="branch-action" v-bind="{ ...props, vm }" />
+                    </template>
+
                     <template #branch-icon="props">
                         <slot name="branch-icon" v-bind="{ ...props, vm }" />
                     </template>
@@ -78,7 +82,7 @@ export default {
 
     props: {
         pagesUrl: { type: String, required: true },
-        submitUrl: { type: String, required: true },
+        submitUrl: { type: String },
         submitParameters: { type: Object, default: () => ({}) },
         createUrl: { type: String },
         site: { type: String, required: true },
@@ -86,8 +90,8 @@ export default {
         maxDepth: { type: Number, default: Infinity, },
         expectsRoot: { type: Boolean, required: true },
         showSlugs: { type: Boolean, default: false },
-        hasCollection: { type: Boolean, required: true },
         preferencesPrefix: { type: String },
+        editable: { type: Boolean, default: true },
     },
 
     data() {
@@ -180,6 +184,10 @@ export default {
         },
 
         save() {
+            if (! this.editable) {
+                return;
+            }
+
             this.saving = true;
 
             const payload = {
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 7c08fa44da..8738c3d1f7 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -393,4 +393,22 @@ public function filter()
     {
         return new EntriesFilter($this);
     }
+
+    public function preload()
+    {
+        $collection = count($this->getConfiguredCollections()) === 1
+            ? Collection::findByHandle($this->getConfiguredCollections()[0])
+            : null;
+
+        if (! $collection || ! $collection->hasStructure()) {
+            return parent::preload();
+        }
+
+        return array_merge(parent::preload(), ['tree' => [
+            'title' => $collection->title(),
+            'url' => cp_route('collections.tree.index', $collection),
+            'showSlugs' => $collection->structure()->showSlugs(),
+            'expectsRoot' => $collection->structure()->expectsRoot(),
+        ]]);
+    }
 }

From 16fd55df651e2f7a713712098a9ebf414e310361 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 2 Nov 2023 18:06:04 +0000
Subject: [PATCH 042/175] [4.x] Fix missing translation of some user defined
 strings (#8914)

---
 resources/js/components/collections/Listing.vue      | 2 +-
 resources/js/components/collections/View.vue         | 2 +-
 resources/js/components/data-list/Table.vue          | 4 ++--
 resources/js/components/globals/PublishForm.vue      | 2 +-
 resources/js/components/inputs/relationship/Item.vue | 2 +-
 resources/js/components/navigation/View.vue          | 2 +-
 resources/js/components/taxonomies/Listing.vue       | 2 +-
 resources/js/components/user-groups/PublishForm.vue  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/collections/Listing.vue b/resources/js/components/collections/Listing.vue
index f83af6879a..cdb1e30507 100644
--- a/resources/js/components/collections/Listing.vue
+++ b/resources/js/components/collections/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card overflow-hidden p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table :rows="rows">
                 <template slot="cell-title" slot-scope="{ row: collection }">
-                    <a :href="collection.entries_url">{{ collection.title }}</a>
+                    <a :href="collection.entries_url">{{ __(collection.title) }}</a>
                 </template>
                 <template slot="actions" slot-scope="{ row: collection, index }">
                     <dropdown-list placement="left-start">
diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 3e83d1ffea..08ae9afa2f 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -7,7 +7,7 @@
             <breadcrumb :url="breadcrumbUrl" :title="__('Collections')" />
 
             <div class="flex items-center">
-                <h1 class="flex-1" v-text="title" />
+                <h1 class="flex-1" v-text="__(title)" />
 
                 <dropdown-list class="mr-2" v-if="!!this.$scopedSlots.twirldown">
                     <slot name="twirldown" />
diff --git a/resources/js/components/data-list/Table.vue b/resources/js/components/data-list/Table.vue
index 28d413ba6b..7f5872c46f 100644
--- a/resources/js/components/data-list/Table.vue
+++ b/resources/js/components/data-list/Table.vue
@@ -67,8 +67,8 @@
                 </td>
                 <td class="type-column" v-if="type">
                     <span v-if="type === 'entries' || type === 'terms'" class="rounded px-1 py-px text-2xs uppercase bg-gray-200 text-gray">
-                        <template v-if="type === 'entries'">{{ row.collection.title }}</template>
-                        <template v-if="type === 'terms'">{{ row.taxonomy.title }}</template>
+                        <template v-if="type === 'entries'">{{ __(row.collection.title) }}</template>
+                        <template v-if="type === 'terms'">{{ __(row.taxonomy.title) }}</template>
                     </span>
                 </td>
                 <th class="actions-column">
diff --git a/resources/js/components/globals/PublishForm.vue b/resources/js/components/globals/PublishForm.vue
index 25b3a77aa2..635acde25b 100644
--- a/resources/js/components/globals/PublishForm.vue
+++ b/resources/js/components/globals/PublishForm.vue
@@ -5,7 +5,7 @@
             <breadcrumb :url="globalsUrl" :title="__('Globals')" />
 
             <div class="flex items-center">
-                <h1 class="flex-1" v-text="title" />
+                <h1 class="flex-1" v-text="__(title)" />
 
                 <div class="pt-px text-2xs text-gray-600 ml-4 flex" v-if="! canEdit">
                     <svg-icon name="lock" class="w-4 mr-1 -mt-1" /> {{ __('Read Only') }}
diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index a1133cc5db..e2ea653673 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -28,7 +28,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 mr-2 hidden @sm:block" />
+                <div v-if="item.collection" v-text="__(item.collection.title)" class="text-4xs text-gray-600 uppercase whitespace-nowrap mr-2 hidden @sm:block" />
 
                 <div class="flex items-center" v-if="!readOnly">
                     <dropdown-list>
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index aa447d24ac..d422cffeeb 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -6,7 +6,7 @@
             <breadcrumb :url="breadcrumbUrl" :title="__('Navigation')" />
 
             <div class="flex items-center">
-                <h1 class="flex-1" v-text="title" />
+                <h1 class="flex-1" v-text="__(title)" />
 
                 <dropdown-list class="mr-2">
                     <slot name="twirldown" />
diff --git a/resources/js/components/taxonomies/Listing.vue b/resources/js/components/taxonomies/Listing.vue
index 0e40e645c8..f2f1268fee 100644
--- a/resources/js/components/taxonomies/Listing.vue
+++ b/resources/js/components/taxonomies/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table :rows="rows">
                 <template slot="cell-title" slot-scope="{ row: taxonomy }">
-                    <a :href="taxonomy.terms_url">{{ taxonomy.title }}</a>
+                    <a :href="taxonomy.terms_url">{{ __(taxonomy.title) }}</a>
                 </template>
                 <template slot="actions" slot-scope="{ row: taxonomy, index }">
                     <dropdown-list placement="left-start">
diff --git a/resources/js/components/user-groups/PublishForm.vue b/resources/js/components/user-groups/PublishForm.vue
index bdbb835f88..c379187de2 100644
--- a/resources/js/components/user-groups/PublishForm.vue
+++ b/resources/js/components/user-groups/PublishForm.vue
@@ -5,7 +5,7 @@
         <header class="mb-3">
             <breadcrumb :url="cp_url('user-groups')" :title="__('User Groups')" />
             <div class="flex items-center">
-                <h1 class="flex-1" v-text="title" />
+                <h1 class="flex-1" v-text="__(title)" />
                     <dropdown-list class="mr-2" v-if="canEditBlueprint">
                         <dropdown-item :text="__('Edit Blueprint')" :redirect="actions.editBlueprint" />
                     </dropdown-list>

From e816cf34b3c115658fa71abf2f0a443892187a2a Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 2 Nov 2023 18:19:11 +0000
Subject: [PATCH 043/175] [4.x] Handle empty values in collection tag filters
 (#8915)

---
 src/Tags/Collection/Entries.php               |  6 +--
 src/Tags/Concerns/QueriesConditions.php       |  6 +--
 tests/Tags/Concerns/QueriesConditionsTest.php | 40 +++++++++++++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index 85bd7c5603..d67b7abe39 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -350,8 +350,8 @@ protected function queryRedirects($query)
 
     protected function queryableConditionParams()
     {
-        return $this->traitQueryableConditionParams()->reject(function ($value, $key) {
-            return Str::startsWith($key, 'taxonomy:');
-        });
+        return $this->traitQueryableConditionParams()
+            ->reject(fn ($value, $key) => Str::startsWith($key, 'taxonomy:'))
+            ->reject(fn ($value, $key) => $value === '');
     }
 }
diff --git a/src/Tags/Concerns/QueriesConditions.php b/src/Tags/Concerns/QueriesConditions.php
index 87750c4de4..019160c822 100644
--- a/src/Tags/Concerns/QueriesConditions.php
+++ b/src/Tags/Concerns/QueriesConditions.php
@@ -27,9 +27,9 @@ protected function queryConditions($query)
 
     protected function queryableConditionParams()
     {
-        return $this->params->filter(function ($value, $param) {
-            return Str::contains($param, ':');
-        });
+        return $this->params
+            ->filter(fn ($value, $param) => Str::contains($param, ':'))
+            ->reject(fn ($value, $param) => $value === '');
     }
 
     protected function isQueryingCondition($field)
diff --git a/tests/Tags/Concerns/QueriesConditionsTest.php b/tests/Tags/Concerns/QueriesConditionsTest.php
index a51648c7cb..4abcc92fc3 100644
--- a/tests/Tags/Concerns/QueriesConditionsTest.php
+++ b/tests/Tags/Concerns/QueriesConditionsTest.php
@@ -60,6 +60,16 @@ public function it_filters_by_is_condition()
         $this->assertCount(4, $this->getEntries(['featured:is' => false]));
     }
 
+    /** @test */
+    public function it_does_not_filter_by_is_condition_when_value_is_empty()
+    {
+        $this->makeEntry('a')->set('author', 'john-doe')->save();
+        $this->makeEntry('b')->set('author', 'david-hasselhoff')->save();
+        $this->makeEntry('c')->set('author', 'josiah-bartlet')->save();
+
+        $this->assertCount(3, $this->getEntries(['author:is' => '']));
+    }
+
     /** @test */
     public function it_filters_by_not_condition()
     {
@@ -78,6 +88,16 @@ public function it_filters_by_not_condition()
         $this->assertCount(4, $this->getEntries(['featured:not' => false]));
     }
 
+    /** @test */
+    public function it_does_not_filter_by_not_condition_when_value_is_empty()
+    {
+        $this->makeEntry('a')->set('author', 'john-doe')->save();
+        $this->makeEntry('b')->set('author', 'david-hasselhoff')->save();
+        $this->makeEntry('c')->set('author', 'josiah-bartlet')->save();
+
+        $this->assertCount(3, $this->getEntries(['author:not' => '']));
+    }
+
     /** @test */
     public function it_filters_by_contains_condition()
     {
@@ -89,6 +109,16 @@ public function it_filters_by_contains_condition()
         $this->assertCount(1, $this->getEntries(['title:contains' => 'sto']));
     }
 
+    /** @test */
+    public function it_does_not_filter_by_contains_condition_when_value_is_empty()
+    {
+        $this->makeEntry('dog')->set('title', 'Dog Stories')->save();
+        $this->makeEntry('cat')->set('title', 'Cat Fables')->save();
+        $this->makeEntry('tiger')->set('title', 'Tiger Tales')->save();
+
+        $this->assertCount(3, $this->getEntries(['title:contains' => '']));
+    }
+
     /** @test */
     public function it_filters_by_doesnt_contain_condition()
     {
@@ -100,6 +130,16 @@ public function it_filters_by_doesnt_contain_condition()
         $this->assertCount(2, $this->getEntries(['title:doesnt_contain' => 'sto']));
     }
 
+    /** @test */
+    public function it_does_not_filter_by_doesnt_contains_condition_when_value_is_empty()
+    {
+        $this->makeEntry('dog')->set('title', 'Dog Stories')->save();
+        $this->makeEntry('cat')->set('title', 'Cat Fables')->save();
+        $this->makeEntry('tiger')->set('title', 'Tiger Tales')->save();
+
+        $this->assertCount(3, $this->getEntries(['title:doesnt_contain' => '']));
+    }
+
     /** @test */
     public function it_filters_by_in_condition()
     {

From 660e4a993f49e8aeadeb25a9574f914b9dec52e9 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 2 Nov 2023 18:19:21 +0000
Subject: [PATCH 044/175] [4.x] Hide publish action fields when saving (#8917)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 .../js/components/entries/PublishActions.vue  | 70 ++++++++++---------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/resources/js/components/entries/PublishActions.vue b/resources/js/components/entries/PublishActions.vue
index 772005a7a8..77c9d8b589 100644
--- a/resources/js/components/entries/PublishActions.vue
+++ b/resources/js/components/entries/PublishActions.vue
@@ -18,48 +18,52 @@
                     <loading-graphic text="" />
                 </div>
 
-                <select-input
-                    class="mb-6"
-                    v-model="action"
-                    :options="options"
-                />
+                <template v-else>
 
-                <div v-if="action">
-
-                    <date-fieldtype
-                        v-if="action == 'schedule'"
+                    <select-input
                         class="mb-6"
-                        name="publishTime"
-                        :value="publishTime" />
-
-                    <textarea-input
-                        class="mb-6 text-sm"
-                        v-model="revisionMessage"
-                        :placeholder="__('Notes about this revision')"
-                        @keydown.enter="submit"
-                        :focus="true" />
-
-                    <button
-                        class="btn-primary w-full mb-6"
-                        v-text="submitButtonText"
-                        @click="submit"
+                        v-model="action"
+                        :options="options"
                     />
 
-                    <div class="text-gray text-xs flex mb-6">
-                        <div class="pt-px w-4 mr-2">
-                            <svg-icon name="info-circle" class="pt-px" />
+                    <div v-if="action">
+
+                        <date-fieldtype
+                            v-if="action == 'schedule'"
+                            class="mb-6"
+                            name="publishTime"
+                            :value="publishTime" />
+
+                        <textarea-input
+                            class="mb-6 text-sm"
+                            v-model="revisionMessage"
+                            :placeholder="__('Notes about this revision')"
+                            @keydown.enter="submit"
+                            :focus="true" />
+
+                        <button
+                            class="btn-primary w-full mb-6"
+                            v-text="submitButtonText"
+                            @click="submit"
+                        />
+
+                        <div class="text-gray text-xs flex mb-6">
+                            <div class="pt-px w-4 mr-2">
+                                <svg-icon name="info-circle" class="pt-px" />
+                            </div>
+                            <div class="flex-1" v-text="actionInfoText" />
                         </div>
-                        <div class="flex-1" v-text="actionInfoText" />
-                    </div>
 
-                    <div class="text-gray text-xs flex mb-6 text-red-500" v-if="action === 'schedule'">
-                        <div class="pt-px w-4 mr-2">
-                            <svg-icon name="info-circle" class="pt-px" />
+                        <div class="text-gray text-xs flex mb-6 text-red-500" v-if="action === 'schedule'">
+                            <div class="pt-px w-4 mr-2">
+                                <svg-icon name="info-circle" class="pt-px" />
+                            </div>
+                            <div class="flex-1" v-text="__('messages.publish_actions_current_becomes_draft_because_scheduled')" />
                         </div>
-                        <div class="flex-1" v-text="__('messages.publish_actions_current_becomes_draft_because_scheduled')" />
+
                     </div>
 
-                </div>
+                </template>
 
             </div>
         </div>

From d3bb6dff61a31c7d42d3989840ef107a4fcb1971 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 2 Nov 2023 18:23:11 +0000
Subject: [PATCH 045/175] [4.x] Handle unauthorized response in Inline Publish
 Form (#8918)

---
 .../inputs/relationship/InlinePublishForm.vue | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/inputs/relationship/InlinePublishForm.vue b/resources/js/components/inputs/relationship/InlinePublishForm.vue
index 7711035e75..b7be07963e 100644
--- a/resources/js/components/inputs/relationship/InlinePublishForm.vue
+++ b/resources/js/components/inputs/relationship/InlinePublishForm.vue
@@ -69,14 +69,20 @@ export default {
     methods: {
 
         getItem() {
-            this.$axios.get(this.itemUrl).then(response => {
-                for (const prop in this.componentProps) {
-                    const value = data_get(response.data, this.componentProps[prop]);
-                    this.$set(this.componentPropValues, prop, value);
-                }
-
-                this.loading = false;
-            });
+            this.$axios.get(this.itemUrl)
+                .then(response => {
+                    for (const prop in this.componentProps) {
+                        const value = data_get(response.data, this.componentProps[prop]);
+                        this.$set(this.componentPropValues, prop, value);
+                    }
+
+                    this.loading = false;
+                }).catch((error) => {
+                    if (error.response.status === 403) {
+                        this.$toast.error(__('This action is unauthorized.'));
+                        this.close();
+                    }
+                });
         },
 
         close() {

From 2fda18bf771ec2fface04a0bc6bcb773a403becb Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 3 Nov 2023 00:02:18 +0000
Subject: [PATCH 046/175] [4.x] Prevent root entries being deleted in listing
 view (#8912)

---
 src/Actions/Delete.php               | 2 ++
 src/Actions/DeleteMultisiteEntry.php | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Actions/Delete.php b/src/Actions/Delete.php
index 3bf21c8c83..6270c3f504 100644
--- a/src/Actions/Delete.php
+++ b/src/Actions/Delete.php
@@ -17,6 +17,8 @@ public function visibleTo($item)
     {
         switch (true) {
             case $item instanceof Contracts\Entries\Entry && $item->collection()->sites()->count() === 1:
+                return ! $item->page()?->isRoot();
+                break;
             case $item instanceof Contracts\Taxonomies\Term:
             case $item instanceof Contracts\Assets\Asset:
             case $item instanceof Contracts\Assets\AssetFolder:
diff --git a/src/Actions/DeleteMultisiteEntry.php b/src/Actions/DeleteMultisiteEntry.php
index 32574e264e..78ef6bd8d0 100644
--- a/src/Actions/DeleteMultisiteEntry.php
+++ b/src/Actions/DeleteMultisiteEntry.php
@@ -9,8 +9,11 @@ class DeleteMultisiteEntry extends Delete
 {
     public function visibleTo($item)
     {
-        return $item instanceof Entry
-            && $item->collection()->sites()->count() > 1;
+        if (! ($item instanceof Entry && $item->collection()->sites()->count() > 1)) {
+            return false;
+        }
+
+        return ! $item->page()?->isRoot();
     }
 
     public function fieldItems()

From 022659f9a012cffda0847a3643d71af2a1069c71 Mon Sep 17 00:00:00 2001
From: Oliver Mesieh <olivermesieh@gmail.com>
Date: Fri, 3 Nov 2023 01:11:38 +0100
Subject: [PATCH 047/175] [4.x] Fix collection listing's sort direction on
 reorder (#8910)

---
 resources/js/components/entries/Listing.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index 40b91e564f..ae4a253496 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -222,6 +222,7 @@ export default {
 
             this.page = 1;
             this.sortColumn = 'order';
+            this.sortDirection = 'asc';
         },
 
         cancelReordering() {

From 5d65ec98226e64bd2fac2f23b200c319392a80a6 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 14:32:23 +0000
Subject: [PATCH 048/175] [4.x] Ability to duplicate fields in
 blueprint/fieldset builders (#8916)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/blueprints/Fields.vue | 20 ++++++++++++++++++-
 .../js/components/blueprints/RegularField.vue |  5 ++++-
 resources/svg/icons/light/duplicate.svg       |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 resources/svg/icons/light/duplicate.svg

diff --git a/resources/js/components/blueprints/Fields.vue b/resources/js/components/blueprints/Fields.vue
index a721b7ce15..ed896ef098 100644
--- a/resources/js/components/blueprints/Fields.vue
+++ b/resources/js/components/blueprints/Fields.vue
@@ -21,6 +21,7 @@
                 @updated="$emit('field-updated', i, $event)"
                 @deleted="$emit('field-deleted', i)"
                 @editor-closed="$emit('editor-closed')"
+                @duplicate="duplicateField(field)"
             />
         </div>
 
@@ -140,7 +141,24 @@ export default {
 
             this.$toast.success(__('Field added'));
             this.pendingCreatedField = null;
-        }
+        },
+
+        duplicateField(field) {
+            let handle = `${field.handle}_duplicate`;
+            let display = field.config.display ? `${field.config.display} (Duplicate)` : `${field.handle} (Duplicate)`;
+
+            let pending = {
+                ...field,
+                _id: uniqid(),
+                handle: handle,
+                config: {
+                    ...field.config,
+                    display,
+                }
+            };
+
+            this.$nextTick(() => this.pendingCreatedField = pending);
+        },
 
     }
 
diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
index 4142a56a42..2057317f6d 100644
--- a/resources/js/components/blueprints/RegularField.vue
+++ b/resources/js/components/blueprints/RegularField.vue
@@ -24,7 +24,10 @@
                     >
                         <svg-icon name="light/earth" class="h-4 w-4" />
                     </button>
-                    <button @click.prevent="$emit('deleted')" class="text-gray-600 hover:text-gray-950 flex items-center">
+                    <button @click.prevent="$emit('duplicate')" class="text-gray-600 hover:text-gray-950 flex items-center mr-2" v-tooltip="__('Duplicate')">
+                        <svg-icon name="light/duplicate" class="h-4 w-4" />
+                    </button>
+                    <button @click.prevent="$emit('deleted')" class="text-gray-600 hover:text-gray-950 flex items-center" v-tooltip="__('Remove')">
                         <svg-icon name="micro/trash" class="h-4 w-4" />
                     </button>
                     <stack name="field-settings" v-if="isEditing" @closed="editorClosed">
diff --git a/resources/svg/icons/light/duplicate.svg b/resources/svg/icons/light/duplicate.svg
new file mode 100644
index 0000000000..1c65ad140a
--- /dev/null
+++ b/resources/svg/icons/light/duplicate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.5 -0.5 24 24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M15.812595833333333 5.270833333333334v-0.9526983333333334c0.0007666666666666667 -0.2504604166666667 -0.0966 -0.49125125000000003 -0.27120833333333333 -0.6708333333333333L12.7411375 0.7665535833333333c-0.08950833333333333 -0.09135695833333334 -0.19645833333333332 -0.163860625 -0.314525 -0.21323779166666668 -0.11797083333333334 -0.049377166666666666 -0.24466250000000003 -0.07462733333333334 -0.3726 -0.07426220833333334h-8.795583333333335c-0.22875416666666668 0 -0.44812625000000006 0.09087012500000001 -0.6098833333333333 0.2526205 -0.16174750000000002 0.16174941666666667 -0.25261666666666666 0.381133 -0.25261666666666666 0.6098775833333334V16.866570833333334c0 0.22875416666666668 0.09086916666666667 0.4481166666666667 0.25261666666666666 0.6098833333333333 0.16175708333333333 0.16176666666666667 0.3811291666666667 0.25261666666666666 0.6098833333333333 0.25261666666666666H7.1875" stroke-width="1"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.187595833333333 6.133457916666667c0 -0.22875416666666668 0.09086916666666667 -0.44813583333333334 0.25261666666666666 -0.6098833333333333 0.16175708333333333 -0.16174750000000002 0.3811291666666667 -0.25261666666666666 0.6098833333333333 -0.25261666666666666h8.795583333333335c0.1279375 -0.0003641666666666667 0.2546291666666667 0.024878333333333336 0.3726 0.07426125 0.11806666666666668 0.04937333333333334 0.22501666666666667 0.12188083333333333 0.314525 0.21323875000000003l2.80025 2.88075c0.17460833333333334 0.1795725 0.271975 0.42037291666666665 0.27120833333333333 0.6708333333333333V21.658429166666668c0 0.22875416666666668 -0.09085 0.4481166666666667 -0.25261666666666666 0.6098833333333333 -0.16176666666666667 0.16176666666666667 -0.3811291666666667 0.25261666666666666 -0.6098833333333333 0.25261666666666666h-11.691666666666666c-0.22875416666666668 0 -0.44812625000000006 -0.09085 -0.6098833333333333 -0.25261666666666666 -0.16174750000000002 -0.16176666666666667 -0.25261666666666666 -0.3811291666666667 -0.25261666666666666 -0.6098833333333333V6.133457916666667Z" stroke-width="1"></path><path stroke="currentColor" stroke-linecap="round" d="M11.021025 9.104051666666667h3.354166666666667" stroke-width="1"></path><path stroke="currentColor" stroke-linecap="round" d="M11.021025 11.978783333333332h5.75" stroke-width="1"></path><path stroke="currentColor" stroke-linecap="round" d="M11.021025 14.854070833333335h5.75" stroke-width="1"></path><path stroke="currentColor" stroke-linecap="round" d="M11.021025 17.7292625h5.75" stroke-width="1"></path></svg>

From 09ce7d4d59f1af876d08fa3433355c777bd61f80 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 14:43:34 +0000
Subject: [PATCH 049/175] [4.x] Fix slugify when using hyphens surrounded by
 spaces. (#8923)

---
 resources/js/plugins/slugify.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/plugins/slugify.js b/resources/js/plugins/slugify.js
index 126ce59237..59ce9a715d 100644
--- a/resources/js/plugins/slugify.js
+++ b/resources/js/plugins/slugify.js
@@ -15,6 +15,9 @@ export default {
             // Remove smart single quotes
             custom["’"] = "";
 
+            // Prevent `Block - Hero` turning into `block_-_hero`
+            custom[" - "] = " ";
+
             return getSlug(text, {
                 separator: glue || '-',
                 lang,

From e4be1373f8fafec3a5a6f2cbac25f868c63d3e8d Mon Sep 17 00:00:00 2001
From: Erin Dalzell <erin@silentz.co>
Date: Fri, 3 Nov 2023 07:44:14 -0700
Subject: [PATCH 050/175] [4.x] Make Link field arrayable (#8911)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Fieldtypes/Link.php                       | 30 ++++++++---
 src/Fieldtypes/Link/ArrayableLink.php         | 31 +++++++++++
 src/Routing/ResolveRedirect.php               | 27 +++++++---
 .../GraphQL/Fieldtypes/LinkFieldtypeTest.php  | 18 +++++--
 tests/Fieldtypes/LinkTest.php                 | 54 +++++++++++++++----
 tests/Routing/ResolveRedirectTest.php         | 23 +++++---
 6 files changed, 147 insertions(+), 36 deletions(-)
 create mode 100644 src/Fieldtypes/Link/ArrayableLink.php

diff --git a/src/Fieldtypes/Link.php b/src/Fieldtypes/Link.php
index 816c4c2e2a..61a9371e56 100644
--- a/src/Fieldtypes/Link.php
+++ b/src/Fieldtypes/Link.php
@@ -7,9 +7,11 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
+use Statamic\Facades\GraphQL;
 use Statamic\Facades\Site;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
+use Statamic\Fieldtypes\Link\ArrayableLink;
 use Statamic\Support\Str;
 
 class Link extends Fieldtype
@@ -42,13 +44,11 @@ protected function configFieldItems(): array
 
     public function augment($value)
     {
-        if (! $value) {
-            return null;
-        }
-
-        $redirect = ResolveRedirect::resolve($value, $this->field->parent(), true);
-
-        return $redirect === 404 ? null : $redirect;
+        return new ArrayableLink(
+            $value
+                ? ResolveRedirect::item($value, $this->field->parent(), true)
+                : null
+        );
     }
 
     public function preload()
@@ -174,4 +174,20 @@ private function showAssetOption()
     {
         return $this->config('container') !== null;
     }
+
+    public function toGqlType()
+    {
+        return [
+            'type' => GraphQL::string(),
+            'resolve' => function ($item, $args, $context, $info) {
+                if (! $augmented = $item->resolveGqlValue($info->fieldName)) {
+                    return null;
+                }
+
+                $item = $augmented->value();
+
+                return is_object($item) ? $item->url() : $item;
+            },
+        ];
+    }
 }
diff --git a/src/Fieldtypes/Link/ArrayableLink.php b/src/Fieldtypes/Link/ArrayableLink.php
new file mode 100644
index 0000000000..7ac7d04ec0
--- /dev/null
+++ b/src/Fieldtypes/Link/ArrayableLink.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Statamic\Fieldtypes\Link;
+
+use Statamic\Fields\ArrayableString;
+
+class ArrayableLink extends ArrayableString
+{
+    public function __toString()
+    {
+        return (string) $this->url();
+    }
+
+    public function toArray()
+    {
+        return is_object($this->value)
+            ? $this->value->toAugmentedArray()
+            : ['url' => $this->url()];
+    }
+
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return $this->url(); // Use a string for backwards compatibility in the REST API, etc.
+    }
+
+    private function url()
+    {
+        return is_object($this->value) ? $this->value?->url() : $this->value;
+    }
+}
diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
index cc3b6b6566..a3176085cc 100644
--- a/src/Routing/ResolveRedirect.php
+++ b/src/Routing/ResolveRedirect.php
@@ -22,18 +22,33 @@ public function resolve($redirect, $parent = null, $localize = false)
             return null;
         }
 
+        if (! $item = $this->item($redirect, $parent, $localize)) {
+            return 404;
+        }
+
+        return is_object($item) ? $item->url() : $item;
+    }
+
+    public function item($redirect, $parent = null, $localize = false)
+    {
+        if (is_null($redirect)) {
+            return null;
+        }
+
         if ($redirect === '@child') {
-            $redirect = $this->firstChildUrl($parent);
+            return $this->firstChild($parent);
         }
 
         if (Str::startsWith($redirect, 'entry::')) {
             $id = Str::after($redirect, 'entry::');
-            $redirect = optional($this->findEntry($id, $parent, $localize))->url() ?? 404;
+
+            return $this->findEntry($id, $parent, $localize);
         }
 
         if (Str::startsWith($redirect, 'asset::')) {
             $id = Str::after($redirect, 'asset::');
-            $redirect = optional(Facades\Asset::find($id))->url() ?? 404;
+
+            return Facades\Asset::find($id);
         }
 
         return is_numeric($redirect) ? (int) $redirect : $redirect;
@@ -56,7 +71,7 @@ private function findEntry($id, $parent, $localize)
         return $entry->in($site) ?? $entry;
     }
 
-    private function firstChildUrl($parent)
+    private function firstChild($parent)
     {
         if (! $parent || ! $parent instanceof Entry) {
             throw new \Exception("Cannot resolve a page's child redirect without providing a page.");
@@ -71,9 +86,9 @@ private function firstChildUrl($parent)
             : $parent->pages()->all();
 
         if ($children->isEmpty()) {
-            return 404;
+            return null;
         }
 
-        return $children->first()->url();
+        return $children->first();
     }
 }
diff --git a/tests/Feature/GraphQL/Fieldtypes/LinkFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/LinkFieldtypeTest.php
index 44df5ef77e..cc424e31ee 100644
--- a/tests/Feature/GraphQL/Fieldtypes/LinkFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/LinkFieldtypeTest.php
@@ -3,6 +3,8 @@
 namespace Tests\Feature\GraphQL\Fieldtypes;
 
 use Facades\Statamic\Routing\ResolveRedirect;
+use Mockery;
+use Statamic\Contracts\Entries\Entry;
 
 /** @group graphql */
 class LinkFieldtypeTest extends FieldtypeTestCase
@@ -17,7 +19,7 @@ public function it_gets_null_when_undefined()
             ],
         ]);
 
-        ResolveRedirect::shouldReceive('resolve')->never();
+        ResolveRedirect::shouldReceive('item')->never();
 
         $this->assertGqlEntryHas('link', ['link' => null]);
     }
@@ -32,7 +34,7 @@ public function it_gets_a_hardcoded_url()
             ],
         ]);
 
-        ResolveRedirect::shouldReceive('resolve')->once()->with('/hardcoded', $entry, true)->andReturn('/hardcoded');
+        ResolveRedirect::shouldReceive('item')->once()->with('/hardcoded', $entry, true)->andReturn('/hardcoded');
 
         $this->assertGqlEntryHas('link', ['link' => '/hardcoded']);
     }
@@ -47,7 +49,10 @@ public function it_gets_an_entry()
             ],
         ]);
 
-        ResolveRedirect::shouldReceive('resolve')->once()->with('entry::123', $entry, true)->andReturn('/the-entry-url');
+        $another = Mockery::mock(Entry::class);
+        $another->shouldReceive('url')->once()->andReturn('/the-entry-url');
+
+        ResolveRedirect::shouldReceive('item')->once()->with('entry::123', $entry, true)->andReturn($another);
 
         $this->assertGqlEntryHas('link', ['link' => '/the-entry-url']);
     }
@@ -62,7 +67,10 @@ public function it_gets_a_child_url()
             ],
         ]);
 
-        ResolveRedirect::shouldReceive('resolve')->once()->with('@child', $entry, true)->andReturn('/the-first-child');
+        $another = Mockery::mock(Entry::class);
+        $another->shouldReceive('url')->once()->andReturn('/the-first-child');
+
+        ResolveRedirect::shouldReceive('item')->once()->with('@child', $entry, true)->andReturn($another);
 
         $this->assertGqlEntryHas('link', ['link' => '/the-first-child']);
     }
@@ -77,7 +85,7 @@ public function it_gets_a_404()
             ],
         ]);
 
-        ResolveRedirect::shouldReceive('resolve')->once()->with('entry::unknown', $entry, true)->andReturn(404);
+        ResolveRedirect::shouldReceive('item')->once()->with('entry::unknown', $entry, true)->andReturnNull();
 
         $this->assertGqlEntryHas('link', ['link' => null]);
     }
diff --git a/tests/Fieldtypes/LinkTest.php b/tests/Fieldtypes/LinkTest.php
index a5dc099c3e..f9b1aad5ea 100644
--- a/tests/Fieldtypes/LinkTest.php
+++ b/tests/Fieldtypes/LinkTest.php
@@ -3,7 +3,9 @@
 namespace Tests\Fieldtypes;
 
 use Facades\Statamic\Routing\ResolveRedirect;
+use Mockery;
 use Statamic\Entries\Entry;
+use Statamic\Fields\ArrayableString;
 use Statamic\Fields\Field;
 use Statamic\Fieldtypes\Link;
 use Tests\TestCase;
@@ -11,35 +13,62 @@
 class LinkTest extends TestCase
 {
     /** @test */
-    public function it_augments_to_url()
+    public function it_augments_string_to_string()
     {
-        ResolveRedirect::shouldReceive('resolve')
-            ->with('entry::test', $parent = new Entry, true)
+        ResolveRedirect::shouldReceive('item')
+            ->with('/foo', $parent = new Entry, true)
             ->once()
-            ->andReturn('/the-redirect');
+            ->andReturn('/foo');
 
         $field = new Field('test', ['type' => 'link']);
         $field->setParent($parent);
         $fieldtype = (new Link)->setField($field);
 
-        $this->assertEquals('/the-redirect', $fieldtype->augment('entry::test'));
+        $augmented = $fieldtype->augment('/foo');
+        $this->assertInstanceOf(ArrayableString::class, $augmented);
+        $this->assertEquals('/foo', $augmented->value());
+        $this->assertEquals(['url' => '/foo'], $augmented->toArray());
     }
 
     /** @test */
-    public function it_augments_invalid_entry_to_null()
+    public function it_augments_reference_to_object()
     {
-        // invalid entries come back from the ResolveRedirect class as a 404 integer
+        $entry = Mockery::mock();
+        $entry->shouldReceive('url')->once()->andReturn('/the-entry-url');
+        $entry->shouldReceive('toAugmentedArray')->once()->andReturn('augmented entry array');
 
-        ResolveRedirect::shouldReceive('resolve')
+        ResolveRedirect::shouldReceive('item')
             ->with('entry::test', $parent = new Entry, true)
             ->once()
-            ->andReturn(404);
+            ->andReturn($entry);
+
+        $field = new Field('test', ['type' => 'link']);
+        $field->setParent($parent);
+        $fieldtype = (new Link)->setField($field);
+
+        $augmented = $fieldtype->augment('entry::test');
+        $this->assertInstanceOf(ArrayableString::class, $augmented);
+        $this->assertEquals($entry, $augmented->value());
+        $this->assertEquals('/the-entry-url', (string) $augmented);
+        $this->assertEquals('augmented entry array', $augmented->toArray());
+    }
+
+    /** @test */
+    public function it_augments_invalid_object_to_null()
+    {
+        ResolveRedirect::shouldReceive('item')
+            ->with('entry::invalid', $parent = new Entry, true)
+            ->once()
+            ->andReturnNull();
 
         $field = new Field('test', ['type' => 'link']);
         $field->setParent($parent);
         $fieldtype = (new Link)->setField($field);
 
-        $this->assertNull($fieldtype->augment('entry::test'));
+        $augmented = $fieldtype->augment('entry::invalid');
+        $this->assertInstanceOf(ArrayableString::class, $augmented);
+        $this->assertNull($augmented->value());
+        $this->assertEquals(['url' => null], $augmented->toArray());
     }
 
     /** @test */
@@ -53,6 +82,9 @@ public function it_augments_null_to_null()
         $field->setParent(new Entry);
         $fieldtype = (new Link)->setField($field);
 
-        $this->assertNull($fieldtype->augment(null));
+        $augmented = $fieldtype->augment(null);
+        $this->assertInstanceOf(ArrayableString::class, $augmented);
+        $this->assertNull($augmented->value());
+        $this->assertEquals(['url' => null], $augmented->toArray());
     }
 }
diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
index 596412d10b..76f41bb8e3 100644
--- a/tests/Routing/ResolveRedirectTest.php
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -66,6 +66,7 @@ public function it_resolves_first_child()
         $parent->shouldReceive('pages')->andReturn($children);
 
         $this->assertEquals('/parent/first-child', $resolver('@child', $parent));
+        $this->assertEquals($child, $resolver->item('@child', $parent));
     }
 
     /** @test */
@@ -87,6 +88,7 @@ public function it_resolves_first_child_through_an_entry()
         $parent->shouldReceive('page')->andReturn($parentPage);
 
         $this->assertEquals('/parent/first-child', $resolver('@child', $parent));
+        $this->assertEquals($child, $resolver->item('@child', $parent));
     }
 
     /** @test */
@@ -116,6 +118,7 @@ public function it_resolves_a_first_child_redirect_when_its_a_root_page()
         $root->shouldReceive('structure')->andReturn($structure);
 
         $this->assertEquals('/parent/first-child', $resolver('@child', $root));
+        $this->assertEquals($child, $resolver->item('@child', $root));
     }
 
     /** @test */
@@ -131,6 +134,7 @@ public function a_parent_without_a_child_resolves_to_a_404()
         $parent->shouldReceive('pages')->andReturn($pages);
 
         $this->assertSame(404, $resolver('@child', $parent));
+        $this->assertSame(null, $resolver->item('@child', $parent));
     }
 
     /** @test */
@@ -139,9 +143,10 @@ public function it_resolves_references_to_entries()
         $resolver = new ResolveRedirect;
 
         $entry = Mockery::mock(Entry::class)->shouldReceive('url')->once()->andReturn('/the-entry')->getMock();
-        Facades\Entry::shouldReceive('find')->with('123')->once()->andReturn($entry);
+        Facades\Entry::shouldReceive('find')->with('123')->twice()->andReturn($entry);
 
         $this->assertEquals('/the-entry', $resolver('entry::123'));
+        $this->assertEquals($entry, $resolver->item('entry::123'));
     }
 
     /** @test */
@@ -151,10 +156,11 @@ public function it_resolves_references_to_entries_localized()
 
         $parentEntry = Mockery::mock(Entry::class);
         $frenchEntry = Mockery::mock(Entry::class)->shouldReceive('url')->once()->andReturn('/le-entry')->getMock();
-        $defaultEntry = Mockery::mock(Entry::class)->shouldReceive('in')->once()->andReturn($frenchEntry)->getMock();
-        Facades\Entry::shouldReceive('find')->with('123')->once()->andReturn($defaultEntry);
+        $defaultEntry = Mockery::mock(Entry::class)->shouldReceive('in')->twice()->andReturn($frenchEntry)->getMock();
+        Facades\Entry::shouldReceive('find')->with('123')->twice()->andReturn($defaultEntry);
 
         $this->assertEquals('/le-entry', $resolver('entry::123', $parentEntry, true));
+        $this->assertEquals($frenchEntry, $resolver->item('entry::123', $parentEntry, true));
     }
 
     /** @test */
@@ -164,11 +170,12 @@ public function it_resolves_references_to_entries_localized_with_fallback()
 
         $parentEntry = Mockery::mock(Entry::class);
         $entry = Mockery::mock(Entry::class);
-        $entry->shouldReceive('in')->once()->andReturn(null);
+        $entry->shouldReceive('in')->twice()->andReturn(null);
         $entry->shouldReceive('url')->once()->andReturn('/the-entry');
-        Facades\Entry::shouldReceive('find')->with('123')->once()->andReturn($entry);
+        Facades\Entry::shouldReceive('find')->with('123')->twice()->andReturn($entry);
 
         $this->assertEquals('/the-entry', $resolver('entry::123', $parentEntry, true));
+        $this->assertEquals($entry, $resolver->item('entry::123', $parentEntry, true));
     }
 
     /** @test */
@@ -177,9 +184,10 @@ public function it_resolves_references_to_assets()
         $resolver = new ResolveRedirect;
 
         $asset = Mockery::mock(Asset::class)->shouldReceive('url')->once()->andReturn('/assets/foo/bar/baz.jpg')->getMock();
-        Facades\Asset::shouldReceive('find')->with('foo::bar/baz.jpg')->once()->andReturn($asset);
+        Facades\Asset::shouldReceive('find')->with('foo::bar/baz.jpg')->twice()->andReturn($asset);
 
         $this->assertEquals('/assets/foo/bar/baz.jpg', $resolver('asset::foo::bar/baz.jpg'));
+        $this->assertEquals($asset, $resolver->item('asset::foo::bar/baz.jpg'));
     }
 
     /** @test */
@@ -187,9 +195,10 @@ public function unknown_entry_ids_resolve_to_404()
     {
         $resolver = new ResolveRedirect;
 
-        Facades\Entry::shouldReceive('find')->with('123')->once()->andReturnNull();
+        Facades\Entry::shouldReceive('find')->with('123')->twice()->andReturnNull();
 
         $this->assertSame(404, $resolver('entry::123'));
+        $this->assertSame(null, $resolver->item('entry::123'));
     }
 
     /** @test */

From 9a63a3b48221c66149e45e7e5aaf061fa20e091c Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 3 Nov 2023 15:33:23 +0000
Subject: [PATCH 051/175] [4.x] Remove schema check on import users command
 (#8909)

---
 src/Console/Commands/ImportUsers.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Console/Commands/ImportUsers.php b/src/Console/Commands/ImportUsers.php
index b3e1f09c81..e164e07b11 100644
--- a/src/Console/Commands/ImportUsers.php
+++ b/src/Console/Commands/ImportUsers.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use Illuminate\Support\Facades\Schema;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\File\User as FileUser;
 use Statamic\Auth\UserRepositoryManager;
@@ -62,12 +61,6 @@ private function importUsers()
             return;
         }
 
-        if (! in_array(Schema::getColumnType('users', 'id'), ['guid', 'string'])) {
-            $this->error('Your users table must use UUIDs for ids in order for this migration to run');
-
-            return;
-        }
-
         app()->bind(UserContract::class, FileUser::class);
         app()->bind(UserRepositoryContract::class, FileRepository::class);
 

From d125380ac1c98335ac08dbb9047652b9b8802d15 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 15:56:40 +0000
Subject: [PATCH 052/175] [4.x] Fix entries on the same date being ignored by
 collection previous/next tags (#8921)

---
 src/Tags/Collection/Entries.php          | 56 +++++++++++++++++++-----
 tests/Tags/Collection/CollectionTest.php | 52 ++++++++++++++++++++++
 2 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index d67b7abe39..27699513b2 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -5,12 +5,14 @@
 use Closure;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection as IlluminateCollection;
+use Statamic\Contracts\Entries\QueryBuilder;
 use Statamic\Contracts\Taxonomies\Term;
 use Statamic\Entries\EntryCollection;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Compare;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Tags\Concerns;
@@ -66,18 +68,22 @@ public function next($currentEntry)
         throw_if($this->params->has('offset'), new \Exception('collection:next is not compatible with [offset] parameter'));
         throw_if($this->collections->count() > 1, new \Exception('collection:next is not compatible with multiple collections'));
 
+        if ($this->orderBys->count() === 1) {
+            $this->orderBys[] = new OrderBy('title', 'asc');
+        }
+
         $collection = $this->collections->first();
         $primaryOrderBy = $this->orderBys->first();
+        $secondaryOrderBy = $this->orderBys->get(1);
 
-        if ($primaryOrderBy->direction === 'desc') {
-            $operator = '<';
-        }
+        $primaryOperator = $primaryOrderBy->direction === 'desc' ? '<' : '>';
+        $secondaryOperator = $secondaryOrderBy->direction === 'desc' ? '<' : '>';
 
         if ($primaryOrderBy->sort === 'order') {
             throw_if(! $currentOrder = $currentEntry->order(), new \Exception('Current entry does not have an order'));
-            $query = $this->query()->where('order', $operator ?? '>', $currentOrder);
+            $query = $this->query()->where('order', $primaryOperator, $currentOrder);
         } elseif ($collection->dated() && $primaryOrderBy->sort === 'date') {
-            $query = $this->query()->where('date', $operator ?? '>', $currentEntry->date());
+            $query = $this->queryPreviousNextByDate($currentEntry, $primaryOperator, $secondaryOperator);
         } else {
             throw new \Exception('collection:next requires ordered or dated collection');
         }
@@ -91,18 +97,22 @@ public function previous($currentEntry)
         throw_if($this->params->has('offset'), new \Exception('collection:previous is not compatible with [offset] parameter'));
         throw_if($this->collections->count() > 1, new \Exception('collection:previous is not compatible with multiple collections'));
 
+        if ($this->orderBys->count() === 1) {
+            $this->orderBys[] = new OrderBy('title', 'asc');
+        }
+
         $collection = $this->collections->first();
         $primaryOrderBy = $this->orderBys->first();
+        $secondaryOrderBy = $this->orderBys->get(1);
 
-        if ($primaryOrderBy->direction === 'desc') {
-            $operator = '>';
-        }
+        $primaryOperator = $primaryOrderBy->direction === 'desc' ? '>' : '<';
+        $secondaryOperator = $secondaryOrderBy->direction === 'desc' ? '>' : '<';
 
         if ($primaryOrderBy->sort === 'order') {
             throw_if(! $currentOrder = $currentEntry->order(), new \Exception('Current entry does not have an order'));
-            $query = $this->query()->where('order', $operator ?? '<', $currentOrder);
+            $query = $this->query()->where('order', $primaryOperator, $currentOrder);
         } elseif ($collection->dated() && $primaryOrderBy->sort === 'date') {
-            $query = $this->query()->where('date', $operator ?? '<', $currentEntry->date());
+            $query = $this->queryPreviousNextByDate($currentEntry, $primaryOperator, $secondaryOperator);
         } else {
             throw new \Exception('collection:previous requires ordered or dated collection');
         }
@@ -141,6 +151,32 @@ public function newer($currentEntry)
             : $this->previous($currentEntry);
     }
 
+    protected function queryPreviousNextByDate($currentEntry, string $primaryOperator, string $secondaryOperator): QueryBuilder
+    {
+        $primaryOrderBy = $this->orderBys->first();
+        $secondaryOrderBy = $this->orderBys->get(1);
+
+        $currentEntryDate = $currentEntry->date();
+
+        // Get the IDs of any items that have the same date as the current entry,
+        // but come before/after the current entry sorted by the second column.
+        $previousOfSame = $this->query()
+            ->where('date', $currentEntryDate)
+            ->orderBy($secondaryOrderBy->sort, $secondaryOrderBy->direction)
+            ->where($secondaryOrderBy->sort, $secondaryOperator, $currentEntry->value($secondaryOrderBy->sort))
+            ->get()
+            ->pluck('id')
+            ->toArray();
+
+        return $this->query()
+            ->where(fn ($query) => $query
+                ->where('date', $primaryOperator, $currentEntryDate)
+                ->orWhereIn('id', $previousOfSame)
+            )
+            ->orderBy('date', $primaryOrderBy->direction)
+            ->orderBy($secondaryOrderBy->sort, $secondaryOrderBy->direction);
+    }
+
     protected function query()
     {
         $query = Entry::query()
diff --git a/tests/Tags/Collection/CollectionTest.php b/tests/Tags/Collection/CollectionTest.php
index 02ee17724a..c97447995a 100644
--- a/tests/Tags/Collection/CollectionTest.php
+++ b/tests/Tags/Collection/CollectionTest.php
@@ -342,6 +342,32 @@ public function it_can_get_previous_and_next_entries_in_a_dated_desc_collection(
         $this->assertEquals(['Grape', 'Hummus', 'Fig'], $this->runTagAndGetTitles('newer')); // Alias of prev when date:desc
     }
 
+    /**
+     * @test
+     * https://github.com/statamic/cms/issues/1831
+     */
+    public function it_can_get_previous_and_next_entries_in_a_dated_desc_collection_when_multiple_entries_share_the_same_date()
+    {
+        $this->foods->dated(true)->save();
+
+        $this->makeEntry($this->foods, 'a')->date('2023-01-01')->set('title', 'Apple')->save();
+        $this->makeEntry($this->foods, 'b')->date('2023-02-05')->set('title', 'Banana')->save();
+        $this->makeEntry($this->foods, 'c')->date('2023-02-05')->set('title', 'Carrot')->save();
+        $this->makeEntry($this->foods, 'd')->date('2023-03-07')->set('title', 'Danish')->save();
+
+        $this->setTagParameters([
+            'in' => 'foods',
+            'current' => $this->findEntryByTitle('Carrot')->id(),
+            'order_by' => 'date:desc|title:desc',
+            'limit' => 1,
+        ]);
+
+        $this->assertEquals(['Danish'], $this->runTagAndGetTitles('previous'));
+        $this->assertEquals(['Danish'], $this->runTagAndGetTitles('newer')); // Alias of prev when date:desc
+        $this->assertEquals(['Banana'], $this->runTagAndGetTitles('next'));
+        $this->assertEquals(['Banana'], $this->runTagAndGetTitles('older')); // Alias of next when date:desc
+    }
+
     /** @test */
     public function it_can_get_previous_and_next_entries_in_a_dated_asc_collection()
     {
@@ -384,6 +410,32 @@ public function it_can_get_previous_and_next_entries_in_a_dated_asc_collection()
         $this->assertEquals(['Carrot', 'Banana', 'Danish'], $this->runTagAndGetTitles('older')); // Alias of prev when date:desc
     }
 
+    /**
+     * @test
+     * https://github.com/statamic/cms/issues/1831
+     */
+    public function it_can_get_previous_and_next_entries_in_a_dated_asc_collection_when_multiple_entries_share_the_same_date()
+    {
+        $this->foods->dated(true)->save();
+
+        $this->makeEntry($this->foods, 'a')->date('2023-01-01')->set('title', 'Apple')->save();
+        $this->makeEntry($this->foods, 'b')->date('2023-02-05')->set('title', 'Banana')->save();
+        $this->makeEntry($this->foods, 'c')->date('2023-02-05')->set('title', 'Carrot')->save();
+        $this->makeEntry($this->foods, 'd')->date('2023-03-07')->set('title', 'Danish')->save();
+
+        $this->setTagParameters([
+            'in' => 'foods',
+            'current' => $this->findEntryByTitle('Carrot')->id(),
+            'order_by' => 'date:asc|title:asc',
+            'limit' => 1,
+        ]);
+
+        $this->assertEquals(['Banana'], $this->runTagAndGetTitles('previous'));
+        $this->assertEquals(['Banana'], $this->runTagAndGetTitles('older')); // Alias of previous when date:desc
+        $this->assertEquals(['Danish'], $this->runTagAndGetTitles('next'));
+        $this->assertEquals(['Danish'], $this->runTagAndGetTitles('newer')); // Alias of next when date:asc
+    }
+
     /** @test */
     public function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
     {

From 9d3b156209ed2c04915a85743ac3cfd75c5d6915 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Nov 2023 12:06:29 -0400
Subject: [PATCH 053/175] changelog

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 909a7e51a7..f0f96e12ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Release Notes
 
+## 4.32.0 (2023-11-03)
+
+### What's new
+- Entries fieldtype gets a tree view in the stack selector. [#8899](https://github.com/statamic/cms/issues/8899) by @duncanmcclean
+- Link fieldtype supports array syntax for getting underlying entry, asset, etc. [#8911](https://github.com/statamic/cms/issues/8911) by @edalzell
+- Ability to duplicate fields in blueprint/fieldset builders. [#8916](https://github.com/statamic/cms/issues/8916) by @duncanmcclean
+- Support paste events in Taggable Fieldtype. [#8903](https://github.com/statamic/cms/issues/8903) by @duncanmcclean
+- Add helper to more easily remove child item in CP navigation. [#8883](https://github.com/statamic/cms/issues/8883) by @jesseleite
+
+### What's fixed
+- Fix entries on the same date being ignored by collection previous/next tags. [#8921](https://github.com/statamic/cms/issues/8921) by @duncanmcclean
+- Remove schema check on import users command. [#8909](https://github.com/statamic/cms/issues/8909) by @ryanmitchell
+- Fix slugify when using hyphens surrounded by spaces. [#8923](https://github.com/statamic/cms/issues/8923) by @duncanmcclean
+- Fix collection listing's sort direction on reorder. [#8910](https://github.com/statamic/cms/issues/8910) by @o1y
+- Prevent root entries being deleted in listing view. [#8912](https://github.com/statamic/cms/issues/8912) by @ryanmitchell
+- Handle unauthorized response in Inline Publish Form. [#8918](https://github.com/statamic/cms/issues/8918) by @duncanmcclean
+- Hide publish action fields when saving. [#8917](https://github.com/statamic/cms/issues/8917) by @ryanmitchell
+- Handle empty values in collection tag filters. [#8915](https://github.com/statamic/cms/issues/8915) by @duncanmcclean
+- Fix missing translation of some user defined strings. [#8914](https://github.com/statamic/cms/issues/8914) by @ryanmitchell
+- Fix CP nav item active status regressions. [#8880](https://github.com/statamic/cms/issues/8880) by @jesseleite
+- Validate that Select & Button Group options have keys. [#8905](https://github.com/statamic/cms/issues/8905) by @duncanmcclean
+
+
+
 ## 4.31.0 (2023-10-30)
 
 ### What's new

From 100d3327f5383184e6fb049850d769d12240dd11 Mon Sep 17 00:00:00 2001
From: Joshua Blum <hallo@joshuablum.de>
Date: Fri, 3 Nov 2023 18:35:06 +0100
Subject: [PATCH 054/175] [4.x] Fix permissions for asset upload and folder
 creation buttons in CP (#8925)

---
 resources/js/components/assets/Browser/Browser.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index 09877ce7ea..904ab85f01 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -388,11 +388,11 @@ export default {
         },
 
         canUpload() {
-            return this.folder && this.container.allow_uploads;
+            return this.folder && this.container.allow_uploads && this.can('upload '+ this.container.id +' assets');
         },
 
         canCreateFolders() {
-            return this.folder && this.container.create_folders && ! this.restrictFolderNavigation;
+            return this.folder && this.container.create_folders && ! this.restrictFolderNavigation && this.can('upload '+ this.container.id +' assets');
         },
 
         parameters() {

From 2c46242758d911ae9b10ab8aa8ec9234841a7495 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Nov 2023 14:08:24 -0400
Subject: [PATCH 055/175] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0f96e12ad..13883b1db5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Fix missing translation of some user defined strings. [#8914](https://github.com/statamic/cms/issues/8914) by @ryanmitchell
 - Fix CP nav item active status regressions. [#8880](https://github.com/statamic/cms/issues/8880) by @jesseleite
 - Validate that Select & Button Group options have keys. [#8905](https://github.com/statamic/cms/issues/8905) by @duncanmcclean
+- Fix permissions for asset upload and folder creation buttons in CP [#8925](https://github.com/statamic/cms/issues/8925) by @joshuablum
 
 
 

From 3ef65ca714276acf4e794b042533d4aa0d435ec1 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 20:49:10 +0000
Subject: [PATCH 056/175] [4.x] Slug Fieldtype: Allow targeting sibling fields
 inside a replicator (#8929)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/fieldtypes/SlugFieldtype.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/SlugFieldtype.vue b/resources/js/components/fieldtypes/SlugFieldtype.vue
index cfea82d735..309fcd3c84 100644
--- a/resources/js/components/fieldtypes/SlugFieldtype.vue
+++ b/resources/js/components/fieldtypes/SlugFieldtype.vue
@@ -30,6 +30,7 @@
 </template>
 
 <script>
+import { data_get } from '../../bootstrap/globals';
 import Fieldtype from './Fieldtype.vue';
 
 export default {
@@ -66,8 +67,14 @@ export default {
             if (! this.generate) return;
 
             const field = this.config.from || 'title';
+            let key = field;
 
-            return this.$store.state.publish[this.store].values[field];
+            if (this.fieldPathPrefix) {
+                let dottedPrefix = this.fieldPathPrefix.replace(new RegExp('\.'+this.handle+'$'), '');
+                key = dottedPrefix + '.' + field;
+            }
+
+            return data_get(this.$store.state.publish[this.store].values, key);
         },
 
         language() {

From c4cb5545471ade4d55d2dc0120ac5b96b1b34660 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 20:49:24 +0000
Subject: [PATCH 057/175] [4.x] Add `mount` to augmented collection (#8928)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Entries/Collection.php            |  8 +++++++-
 tests/Data/Entries/CollectionTest.php | 13 ++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 28193e31f2..00998ce0ba 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -846,9 +846,15 @@ public function __toString()
 
     public function augmentedArrayData()
     {
-        return [
+        $data = [
             'title' => $this->title(),
             'handle' => $this->handle(),
         ];
+
+        if (! Statamic::isApiRoute()) {
+            $data['mount'] = $this->mount();
+        }
+
+        return $data;
     }
 }
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index 8bb2635754..fc9a649e0b 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Data\Entries;
 
 use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Event;
 use Statamic\Contracts\Data\Augmentable;
@@ -658,13 +659,15 @@ public function it_gets_the_handle_when_casting_to_a_string()
     /** @test */
     public function it_augments()
     {
-        $collection = (new Collection)->handle('test');
+        $mountedEntry = EntryFactory::collection('pages')->id('blog')->slug('blog')->data(['title' => 'Blog'])->create();
+
+        $collection = (new Collection)->mount('blog')->handle('test');
 
         $this->assertInstanceof(Augmentable::class, $collection);
-        $this->assertEquals([
-            'title' => 'Test',
-            'handle' => 'test',
-        ], $collection->toAugmentedArray());
+        $this->assertCount(3, $augmentedArray = $collection->toAugmentedArray());
+        $this->assertEquals('Test', $augmentedArray['title']);
+        $this->assertEquals('test', $augmentedArray['handle']);
+        $this->assertEquals($mountedEntry, $augmentedArray['mount']->value());
     }
 
     /** @test */

From a0b78dfc112d7fc4a0836c1cb3f30dd166d5a3e5 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 3 Nov 2023 21:09:10 +0000
Subject: [PATCH 058/175] [4.x] Fix "Always Save" toggle not being saved when
 used on linked field (#8927)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/fields/Settings.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/components/fields/Settings.vue b/resources/js/components/fields/Settings.vue
index b16e3b7780..511ae142cd 100644
--- a/resources/js/components/fields/Settings.vue
+++ b/resources/js/components/fields/Settings.vue
@@ -226,6 +226,8 @@ export default {
 
         updateAlwaysSave(alwaysSave) {
             this.values.always_save = alwaysSave;
+
+            this.markFieldEdited('always_save');
         },
 
         markFieldEdited(handle) {

From 8b300b7d07d25947a91c1f6d91f9dc8167a5a0cf Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:01:01 +0000
Subject: [PATCH 059/175] [4.x] Fix infinite loop on listing table of mounted
 collection (#8937)

Fix infinite loop on listing table of mounted collection
---
 src/Entries/Collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 00998ce0ba..e5cdb3d688 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -851,7 +851,7 @@ public function augmentedArrayData()
             'handle' => $this->handle(),
         ];
 
-        if (! Statamic::isApiRoute()) {
+        if (! Statamic::isApiRoute() && ! Statamic::isCpRoute()) {
             $data['mount'] = $this->mount();
         }
 

From 2d1b780f1cefb13e113be82fb3277c3a6502a996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dorien=20Gr=C3=B6nwald?=
 <57871803+doriengr@users.noreply.github.com>
Date: Mon, 6 Nov 2023 21:01:33 +0100
Subject: [PATCH 060/175] [4.x] Fix german translations for duplicate feature
 (#8939)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: add german translations for duplicate feature

Co-authored-by: Dorien Grönwald <dorien.groenwald@visuellverstehen.de>
---
 resources/lang/de/messages.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index 6c10ed5fc2..bb23ae1d66 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -68,6 +68,9 @@
     'collections_route_instructions' => 'Die Route steuert das URL-Schema der Einträge. Weitere Infos dazu findest du in der [Dokumentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Die voreingestellte Sortierrichtung.',
     'collections_taxonomies_instructions' => 'Einträge in dieser Sammlung mit Taxonomien verknüpfen. Die Felder werden automatisch den Eingabemasken hinzugefügt.',
+    'duplicate_action_warning_localization' => 'Dieser Eintrag ist eine Lokalisierung. Der Ursprungseintrag wird dupliziert.',
+    'duplicate_action_warning_localizations' => 'Ein oder mehrere ausgewählte Einträge sind Lokalisierungen. Es wird stattdessen der Ursprungseintrag dupliziert.',
+    'duplicate_action_localizations_confirmation' => 'Sind Sie sicher, dass Sie diese Aktion ausführen wollen? Die Lokalisierungen werden ebenfalls dupliziert.',
     'email_utility_configuration_description' => 'Die E-Mail-Einstellungen werden in <code>:path</code> konfiguriert.',
     'email_utility_description' => 'Überprüfe die E-Mail-Konfigurationseinstellungen und versende Test-E-Mails.',
     'entry_origin_instructions' => 'Die neue Lokalisierung erbt die Werte vom Eintrag in der ausgewählten Website.',

From 7ffbb4c3d75fa9fe48d68084ba61095048dd8cfe Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 6 Nov 2023 20:02:50 +0000
Subject: [PATCH 061/175] [4.x] Support arrays in wrap modifier (#8942)

* Support arrays in wrap modifier

* Rename that var!
---
 src/Modifiers/CoreModifiers.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 039f4064dc..1e5da9a999 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -2812,6 +2812,12 @@ public function wrap($value, $params)
             return $value;
         }
 
+        if (is_array($value)) {
+            return array_map(function ($item) use ($params) {
+                return $this->wrap($item, $params);
+            }, $value);
+        }
+
         $attributes = '';
         $tag = Arr::get($params, 0);
 

From ccbd958ffce67ea19b56e550a13b668f737f12b3 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Mon, 6 Nov 2023 21:03:19 +0100
Subject: [PATCH 062/175] [4.x] French translations (#8934)

Good for 4.32.0
---
 resources/lang/fr.json           | 3 +--
 resources/lang/fr/fieldtypes.php | 1 +
 resources/lang/fr/validation.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 68c8196f9d..79d676e27d 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -394,8 +394,6 @@
     "Expand\/Collapse Sets": "Développer\/Réduire les ensembles",
     "Expect a root page": "S'attendre à une page racine",
     "Expired": "Expirée",
-    "Export as CSV": "Exporter au format CSV",
-    "Export as JSON": "Exporter en JSON",
     "Export Submissions": "Exporter les soumissions",
     "External link": "Lien externe",
     "False": "Faux",
@@ -780,6 +778,7 @@
     "Scaffold Views": "Générer les vues",
     "Scheduled": "Planifiée",
     "Search": "Recherche",
+    "Search Index": "Index de recherche",
     "Search Indexes": "Rechercher dans les index",
     "Search Sets": "Rechercher dans les ensembles",
     "Search...": "Recherche...",
diff --git a/resources/lang/fr/fieldtypes.php b/resources/lang/fr/fieldtypes.php
index c57f12ec42..6b5f23bbbe 100644
--- a/resources/lang/fr/fieldtypes.php
+++ b/resources/lang/fr/fieldtypes.php
@@ -74,6 +74,7 @@
     'entries.config.collections' => 'Choisissez les collections à partir desquelles l’utilisateur pourra sélectionner.',
     'entries.config.create' => 'Autorisez la création de nouvelles entrées.',
     'entries.config.query_scopes' => 'Choisissez les étendues de requête à appliquer lors de la récupération des entrées sélectionnables.',
+    'entries.config.search_index' => 'Un index de recherche approprié sera automatiquement utilisé dès que possible, mais vous pouvez en définir un de manière explicite.',
     'entries.title' => 'Entries',
     'float.title' => 'Float',
     'form.config.max_items' => 'Le nombre maximal de formulaires sélectionnables.',
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index a973341399..ef67207465 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -137,6 +137,7 @@
     'date_fieldtype_end_date_required' => 'Date de fin obligatoire.',
     'date_fieldtype_end_date_invalid' => 'Date de fin invalide.',
     'code_fieldtype_rulers' => 'Les données saisies sont invalides.',
+    'options_require_keys' => 'Toutes les options doivent posséder une clef.',
     'custom.attribute-name.rule-name' => 'message personnalisé',
     'attributes' => [],
 ];

From f7c2521869166e24735cfebf82c41b9732620702 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Mon, 6 Nov 2023 21:17:28 +0100
Subject: [PATCH 063/175] [4.x] French translations (#8945)

---
 resources/lang/fr/messages.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index 57e6e8af7d..9b48cccab5 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -68,6 +68,9 @@
     'collections_route_instructions' => 'La route contrôle le modèle d’URL des entrées. Apprenez-en plus dans la [documentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Le sens de tri par défaut.',
     'collections_taxonomies_instructions' => 'Reliez les entrées de cette collection à des taxonomies. Les champs seront automatiquement ajoutés aux formulaires.',
+    'duplicate_action_warning_localization' => 'Cette entrée est une traduction. L’entrée originale est dupliquée.',
+    'duplicate_action_warning_localizations' => 'Une ou plusieurs entrées sélectionnées sont des traductions. Au lieu de cela, l’entrée originale est dupliquée.',
+    'duplicate_action_localizations_confirmation' => 'Êtes-vous sûr de vouloir effectuer cette action ? Les traductions sont également dupliquées.',
     'email_utility_configuration_description' => 'Les paramètres de messagerie sont configurés dans <code>:path</code>',
     'email_utility_description' => 'Vérifiez les paramètres de messagerie et envoyez des e-mails de test.',
     'entry_origin_instructions' => 'La nouvelle traduction héritera des valeurs qu’a l’entrée dans le site sélectionné.',

From 259f7ae89b2102e922dd5d0a4a8e53b8971c07ab Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:39:35 +0000
Subject: [PATCH 064/175] [4.x] Fix `statamic.web` middleware not being merged
 (#8935)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Providers/AppServiceProvider.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index e356998ccc..b01fb5261a 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -29,10 +29,9 @@ public function boot()
         $this->app->booted(function () {
             Statamic::runBootedCallbacks();
             $this->loadRoutesFrom("{$this->root}/routes/routes.php");
+            $this->registerMiddlewareGroup();
         });
 
-        $this->registerMiddlewareGroup();
-
         $this->app[\Illuminate\Contracts\Http\Kernel::class]
             ->pushMiddleware(\Statamic\Http\Middleware\PoweredByHeader::class)
             ->pushMiddleware(\Statamic\Http\Middleware\CheckComposerJsonScripts::class)
@@ -166,14 +165,16 @@ public function register()
 
     protected function registerMiddlewareGroup()
     {
-        $this->app->make(Router::class)->middlewareGroup('statamic.web', [
+        $router = $this->app->make(Router::class);
+
+        collect([
             \Statamic\Http\Middleware\StacheLock::class,
             \Statamic\Http\Middleware\HandleToken::class,
             \Statamic\Http\Middleware\Localize::class,
             \Statamic\Http\Middleware\AddViewPaths::class,
             \Statamic\Http\Middleware\AuthGuard::class,
             \Statamic\StaticCaching\Middleware\Cache::class,
-        ]);
+        ])->each(fn ($middleware) => $router->pushMiddlewareToGroup('statamic.web', $middleware));
     }
 
     protected function addAboutCommandInfo()

From 176d7167f018d076c150a574579b377c92fd210e Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:49:24 +0000
Subject: [PATCH 065/175] [4.x] Prevent ensuring fields on entries if they
 already exist (#8926)

---
 src/Entries/Collection.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index e5cdb3d688..ccff5aafd4 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -336,20 +336,22 @@ public function fallbackEntryBlueprint()
 
     public function ensureEntryBlueprintFields($blueprint)
     {
-        $blueprint->ensureFieldPrepended('title', [
-            'type' => ($auto = $this->autoGeneratesTitles()) ? 'hidden' : 'text',
-            'required' => ! $auto,
-        ]);
+        if (! $blueprint->hasField('title')) {
+            $blueprint->ensureFieldPrepended('title', [
+                'type' => ($auto = $this->autoGeneratesTitles()) ? 'hidden' : 'text',
+                'required' => ! $auto,
+            ]);
+        }
 
-        if ($this->requiresSlugs()) {
+        if ($this->requiresSlugs() && ! $blueprint->hasField('slug')) {
             $blueprint->ensureField('slug', ['type' => 'slug', 'localizable' => true], 'sidebar');
         }
 
-        if ($this->dated()) {
+        if ($this->dated() && ! $blueprint->hasField('date')) {
             $blueprint->ensureField('date', ['type' => 'date', 'required' => true, 'default' => 'now'], 'sidebar');
         }
 
-        if ($this->hasStructure() && ! $this->orderable()) {
+        if ($this->hasStructure() && ! $this->orderable() && ! $blueprint->hasField('parent')) {
             $blueprint->ensureField('parent', [
                 'type' => 'entries',
                 'collections' => [$this->handle()],
@@ -360,6 +362,10 @@ public function ensureEntryBlueprintFields($blueprint)
         }
 
         foreach ($this->taxonomies() as $taxonomy) {
+            if ($blueprint->hasField($taxonomy->handle())) {
+                continue;
+            }
+
             $blueprint->ensureField($taxonomy->handle(), [
                 'type' => 'terms',
                 'taxonomies' => [$taxonomy->handle()],

From 66581892449b8b84a091ec285c7abe837df6d203 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:57:30 +0000
Subject: [PATCH 066/175] [4.x] Fix missing title on relationship fields in
 multi-site (#8936)

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

diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index 4252e306c8..3a1eef1c73 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -72,7 +72,7 @@ public function preProcessIndex($data)
         return $this->getItemsForPreProcessIndex($data)->map(function ($item) {
             return [
                 'id' => method_exists($item, 'id') ? $item->id() : $item->handle(),
-                'title' => method_exists($item, 'title') ? $item->title() : $item->get('title'),
+                'title' => method_exists($item, 'title') ? $item->title() : $item->value('title'),
                 'edit_url' => $item->editUrl(),
                 'published' => $this->statusIcons ? $item->published() : null,
             ];

From 97f0809a222dd4320d691261f7c497c88bf49301 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 7 Nov 2023 17:48:42 +0000
Subject: [PATCH 067/175] [4.x] Use translations from fallback locale when
 primary locale is missing translations (#8940)

---
 src/Http/View/Composers/JavascriptComposer.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index 6239bc7376..7d6c177cd3 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -39,7 +39,7 @@ private function commonVariables()
             'flash' => Statamic::flash(),
             'toasts' => Toast::toArray(),
             'translationLocale' => app('translator')->locale(),
-            'translations' => app('translator')->toJson(),
+            'translations' => $this->translations(),
             'locale' => config('app.locale'),
             'asciiReplaceExtraSymbols' => $replaceSymbols = config('statamic.system.ascii_replace_extra_symbols'),
             'charmap' => ASCII::charsArray($replaceSymbols),
@@ -99,4 +99,12 @@ protected function user($user)
             'permissions' => $user->permissions()->all(),
         ])->toArray();
     }
+
+    protected function translations(): array
+    {
+        $translations = app('translator')->toJson();
+        $fallbackTranslations = tap(app('translator'))->setLocale(app('translator')->getFallback())->toJson();
+
+        return array_merge($fallbackTranslations, $translations);
+    }
 }

From 87bd8dc9322f5f969e446fce30f12d2d55e052ac Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 7 Nov 2023 18:43:41 +0000
Subject: [PATCH 068/175] [4.x] Fix SortableList not reacting to disabled prop
 changes (#8949)

---
 .../js/components/sortable/SortableList.vue   | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/resources/js/components/sortable/SortableList.vue b/resources/js/components/sortable/SortableList.vue
index 01ded5c62c..ce1cc588dc 100644
--- a/resources/js/components/sortable/SortableList.vue
+++ b/resources/js/components/sortable/SortableList.vue
@@ -60,6 +60,12 @@ export default {
         }
     },
 
+    data() {
+        return {
+            sortable: null,
+        }
+    },
+
     computed: {
 
         computedOptions() {
@@ -109,23 +115,39 @@ export default {
             return;
         }
 
-        const sortable = new Sortable(this.$el, this.computedOptions);
+        this.setupSortableList();
+    },
 
-        sortable.on('drag:start', () => this.$emit('dragstart'));
-        sortable.on('drag:stop', () => this.$emit('dragend'));
+    methods: {
+        setupSortableList() {
+            this.sortable = new Sortable(this.$el, this.computedOptions);
 
-        sortable.on('sortable:stop', ({ oldIndex, newIndex }) => {
-            this.$emit('input', move(this.value, oldIndex, newIndex))
-        })
+            this.sortable.on('drag:start', () => this.$emit('dragstart'));
+            this.sortable.on('drag:stop', () => this.$emit('dragend'));
 
-        this.$on('hook:destroyed', () => {
-            sortable.destroy()
-        })
+            this.sortable.on('sortable:stop', ({ oldIndex, newIndex }) => {
+                this.$emit('input', move(this.value, oldIndex, newIndex))
+            })
 
-        if (this.mirror === false) {
-            sortable.on('mirror:create', (e) => e.cancel());
-        }
-    }
+            this.$on('hook:destroyed', () => {
+                this.sortable.destroy()
+            })
+
+            if (this.mirror === false) {
+                this.sortable.on('mirror:create', (e) => e.cancel());
+            }
+        },
+
+        destroySortableList() {
+            this.sortable.destroy()
+        },
+    },
+
+    watch: {
+        disabled(disabled) {
+            disabled ? this.destroySortableList() : this.setupSortableList();
+        },
+    },
 
 }
 </script>

From 327a1ea7c518a0ab79a6c2564d5b72ddcb7cf6a1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 7 Nov 2023 13:44:13 -0500
Subject: [PATCH 069/175] [4.x] Fix duplicate entry action translation (#8946)

---
 src/Actions/DuplicateEntry.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Actions/DuplicateEntry.php b/src/Actions/DuplicateEntry.php
index 0737468330..c7e1a35f47 100644
--- a/src/Actions/DuplicateEntry.php
+++ b/src/Actions/DuplicateEntry.php
@@ -27,7 +27,8 @@ public function confirmationText()
             ->contains(fn ($entry) => $entry->descendants()->count());
 
         if ($hasDescendants) {
-            return 'duplicate_action_localizations_confirmation';
+            /** @translation */
+            return 'statamic::messages.duplicate_action_localizations_confirmation';
         }
 
         return parent::confirmationText();
@@ -36,9 +37,13 @@ public function confirmationText()
     public function warningText()
     {
         if ($this->items->contains(fn ($entry) => $entry->hasOrigin())) {
-            return $this->items->count() === 1
-                ? 'duplicate_action_warning_localization'
-                : 'duplicate_action_warning_localizations';
+            if ($this->items->count() === 1) {
+                /** @translation */
+                return 'statamic::messages.duplicate_action_warning_localization';
+            }
+
+            /** @translation */
+            return 'statamic::messages.duplicate_action_warning_localizations';
         }
     }
 

From a9b71e4e60b7f5ef786c05dc65459920a83d8f60 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 7 Nov 2023 21:14:43 +0000
Subject: [PATCH 070/175] [4.x] Entries Fieldtype: Use columns from preferences
 (#8900)

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

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 8738c3d1f7..6564bb7163 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Collection as SupportCollection;
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Entries\Entry as EntryContract;
+use Statamic\CP\Column;
 use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
@@ -375,6 +376,22 @@ public function toGqlType()
 
     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);
+
+            $columns->setPreferred("collections.{$this->getConfiguredCollections()[0]}.columns");
+
+            return $columns->rejectUnlisted()->values();
+        }
+
         return $this->getBlueprint()->columns()->values()->all();
     }
 

From 7c27413680a046e7ade3f4ff0510a698a39a65d3 Mon Sep 17 00:00:00 2001
From: Oliver Mesieh <olivermesieh@gmail.com>
Date: Wed, 8 Nov 2023 15:25:11 +0100
Subject: [PATCH 071/175] [4.x] Add cmd+k support for Bard (#8950)

---
 resources/js/components/Popover.vue                   |  2 +-
 resources/js/components/fieldtypes/bard/Link.js       |  6 ++++++
 .../components/fieldtypes/bard/LinkToolbarButton.vue  | 11 ++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/Popover.vue b/resources/js/components/Popover.vue
index f92caf87ec..75d64d2eb5 100644
--- a/resources/js/components/Popover.vue
+++ b/resources/js/components/Popover.vue
@@ -100,7 +100,7 @@ export default {
             if (this.disabled) return;
 
             this.isOpen = true;
-            this.escBinding = this.$keys.bind('esc', e => this.close());
+            this.escBinding = this.$keys.bindGlobal('esc', e => this.close());
             this.$nextTick(() => {
                 this.cleanupAutoUpdater = autoUpdate(this.$refs.trigger.firstChild, this.$refs.popover, this.computePosition);
 
diff --git a/resources/js/components/fieldtypes/bard/Link.js b/resources/js/components/fieldtypes/bard/Link.js
index 0351bea5df..1a003c6db9 100644
--- a/resources/js/components/fieldtypes/bard/Link.js
+++ b/resources/js/components/fieldtypes/bard/Link.js
@@ -64,6 +64,12 @@ export const Link = Mark.create({
         ]
     },
 
+    addKeyboardShortcuts() {
+        return {
+            'Mod-k': () => this.options.vm.$emit('link-toggle'),
+        }
+    },
+
     addProseMirrorPlugins() {
         const vm = this.options.vm;
         return [
diff --git a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
index 372e7478fe..dd5cfd0bb3 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
@@ -71,8 +71,17 @@ export default {
             this.close();
             this.editor.view.dom.focus();
         }
+    },
 
-    }
+    created() {
+        this.bard.$on('link-toggle', () => {
+            this.toggleLinkToolbar();
+            this.$refs.popover.toggle();
+        });
+    },
 
+    beforeDestroy() {
+        this.bard.$off('link-toggle');
+    }
 }
 </script>

From 8db1ad71ab1af571ffd33cd7f367c18982705f00 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 8 Nov 2023 14:35:42 +0000
Subject: [PATCH 072/175] [4.x] Add pint cli in require-dev (#8955)

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index f159eb262d..1bbf69cc6b 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
     "require-dev": {
         "fakerphp/faker": "~1.10",
         "google/cloud-translate": "^1.6",
+        "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^7.0 || ^8.0",
         "phpunit/phpunit": "^9.0"

From 072c73c01e8c71a1343322806e36747f203346ec Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 8 Nov 2023 14:36:24 +0000
Subject: [PATCH 073/175] [4.x] Bind `AssetContainerContents` to the service
 provider (#8954)

---
 src/Assets/AssetContainer.php               | 2 +-
 src/Assets/AssetContainerContents.php       | 4 +++-
 src/Providers/FilesystemServiceProvider.php | 5 +++++
 tests/Assets/AssetFolderTest.php            | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index a3228f6157..762a937bd5 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -282,7 +282,7 @@ public function listContents()
     public function contents()
     {
         return Blink::once('asset-listing-cache-'.$this->handle(), function () {
-            return new AssetContainerContents($this);
+            return app(AssetContainerContents::class)->container($this);
         });
     }
 
diff --git a/src/Assets/AssetContainerContents.php b/src/Assets/AssetContainerContents.php
index b4e24e8c5c..52fffd5317 100644
--- a/src/Assets/AssetContainerContents.php
+++ b/src/Assets/AssetContainerContents.php
@@ -16,9 +16,11 @@ class AssetContainerContents
     protected $filteredFiles;
     protected $filteredDirectories;
 
-    public function __construct($container)
+    public function container($container)
     {
         $this->container = $container;
+
+        return $this;
     }
 
     /**
diff --git a/src/Providers/FilesystemServiceProvider.php b/src/Providers/FilesystemServiceProvider.php
index 9ce6d8c3db..04e0f75865 100644
--- a/src/Providers/FilesystemServiceProvider.php
+++ b/src/Providers/FilesystemServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Statamic\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Statamic\Assets\AssetContainerContents;
 use Statamic\Filesystem\FilesystemAdapter;
 
 class FilesystemServiceProvider extends ServiceProvider
@@ -13,6 +14,10 @@ public function register()
             return new FilesystemAdapter($this->app->make('files'), base_path());
         });
 
+        $this->app->bind(AssetContainerContents::class, function () {
+            return new AssetContainerContents();
+        });
+
         $paths = [
             'standard' => base_path(),
             'content' => base_path('content'),
diff --git a/tests/Assets/AssetFolderTest.php b/tests/Assets/AssetFolderTest.php
index f964e5709a..a9b45e5eeb 100644
--- a/tests/Assets/AssetFolderTest.php
+++ b/tests/Assets/AssetFolderTest.php
@@ -192,7 +192,7 @@ public function it_creates_directory_when_saving()
         Storage::fake('local');
 
         $container = $this->mock(AssetContainer::class);
-        $container->shouldReceive('contents')->andReturn(new AssetContainerContents($container));
+        $container->shouldReceive('contents')->andReturn((new AssetContainerContents)->container($container));
         $container->shouldReceive('disk')->andReturn(new FlysystemAdapter($disk = Storage::disk('local')));
         $container->shouldReceive('foldersCacheKey')->andReturn('irrelevant for test');
         $container->shouldReceive('handle')->andReturn('local');
@@ -216,7 +216,7 @@ public function it_adds_a_gitkeep_file_when_saving()
         Storage::fake('local');
 
         $container = $this->mock(AssetContainer::class);
-        $container->shouldReceive('contents')->andReturn(new AssetContainerContents($container));
+        $container->shouldReceive('contents')->andReturn((new AssetContainerContents)->container($container));
         $container->shouldReceive('disk')->andReturn(new FlysystemAdapter($disk = Storage::disk('local')));
         $container->shouldReceive('foldersCacheKey')->andReturn('irrelevant for test');
         $container->shouldReceive('handle')->andReturn('local');

From 5e3c0defb73001bc5d9100c8565cdca270daa98e Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 8 Nov 2023 14:46:48 +0000
Subject: [PATCH 074/175] [4.x] Remove debounce when renaming assets & folders
 (#8953)

---
 .../js/components/assets/Browser/CreateFolder.vue  |  1 +
 .../js/components/fieldtypes/TextFieldtype.vue     | 14 ++++++++++++--
 src/Actions/RenameAsset.php                        |  1 +
 src/Actions/RenameAssetFolder.php                  |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/assets/Browser/CreateFolder.vue b/resources/js/components/assets/Browser/CreateFolder.vue
index a59043ce19..5a82d54af1 100644
--- a/resources/js/components/assets/Browser/CreateFolder.vue
+++ b/resources/js/components/assets/Browser/CreateFolder.vue
@@ -17,6 +17,7 @@
                 :instructions="__('messages.asset_folders_directory_instructions')"
                 :focus="true"
                 :required="true"
+                :config="{ debounce: false }"
                 v-model="directory"
             />
 
diff --git a/resources/js/components/fieldtypes/TextFieldtype.vue b/resources/js/components/fieldtypes/TextFieldtype.vue
index 16de06afe8..bf2cc91059 100644
--- a/resources/js/components/fieldtypes/TextFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextFieldtype.vue
@@ -13,7 +13,7 @@
         :placeholder="__(config.placeholder)"
         :name="name"
         :id="fieldId"
-        @input="updateDebounced"
+        @input="inputUpdated"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
     />
@@ -24,7 +24,17 @@ import Fieldtype from './Fieldtype.vue';
 
 export default {
 
-    mixins: [Fieldtype]
+    mixins: [Fieldtype],
+
+    methods: {
+        inputUpdated(value) {
+            if (! this.config.debounce) {
+                return this.update(value)
+            }
+
+            this.updateDebounced(value)
+        }
+    }
 
 }
 </script>
diff --git a/src/Actions/RenameAsset.php b/src/Actions/RenameAsset.php
index 89f3e3140b..5c6e4256fa 100644
--- a/src/Actions/RenameAsset.php
+++ b/src/Actions/RenameAsset.php
@@ -51,6 +51,7 @@ protected function fieldItems()
                 'classes' => 'mousetrap',
                 'focus' => true,
                 'placeholder' => $this->items->containsOneItem() ? $this->items->first()->filename() : null,
+                'debounce' => false,
             ],
         ];
     }
diff --git a/src/Actions/RenameAssetFolder.php b/src/Actions/RenameAssetFolder.php
index 79d29638a3..bbdefb70ea 100644
--- a/src/Actions/RenameAssetFolder.php
+++ b/src/Actions/RenameAssetFolder.php
@@ -46,6 +46,7 @@ protected function fieldItems()
                 'validate' => 'required|alpha_dash',
                 'classes' => 'mousetrap',
                 'focus' => true,
+                'debounce' => false,
             ],
         ];
     }

From e609fe08fc9ee4e6c0e88b46c7cf3d209c7051bb Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 8 Nov 2023 14:47:01 +0000
Subject: [PATCH 075/175] [4.x] Fix entries fieldtype not respecting collection
 sort column & direction (#8894)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 .../relationship/RelationshipFieldtype.vue     |  2 ++
 .../inputs/relationship/RelationshipInput.vue  | 12 ++++++++++--
 src/Fieldtypes/Entries.php                     | 18 ++++++++++++++----
 src/Fieldtypes/Relationship.php                | 12 ++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 63ba451597..90962a95b8 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -25,6 +25,8 @@
         :read-only="isReadOnly"
         :taggable="taggable"
         :tree="meta.tree"
+        :initial-sort-column="meta.initialSortColumn"
+        :initial-sort-direction="meta.initialSortDirection"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
         @input="update"
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index 5aac36bb21..3ba22ab8ee 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -70,8 +70,8 @@
                     :selections-url="selectionsUrl"
                     :site="site"
                     :initial-columns="columns"
-                    initial-sort-column="title"
-                    initial-sort-direction="asc"
+                    :initial-sort-column="initialSortColumn"
+                    :initial-sort-direction="initialSortDirection"
                     :initial-selections="value"
                     :max-selections="maxItems"
                     :search="search"
@@ -132,6 +132,14 @@ export default {
             default: () => []
         },
         tree: Object,
+        initialSortColumn: {
+            type: String,
+            default: 'title'
+        },
+        initialSortDirection: {
+            type: String,
+            default: 'asc'
+        }
     },
 
     components: {
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 6564bb7163..13786461ef 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -166,9 +166,9 @@ protected function getFirstCollectionFromRequest($request)
 
     public function getSortColumn($request)
     {
-        $column = $request->get('sort');
+        $column = $request->sort ?? 'title';
 
-        if (! $column && ! $request->search) {
+        if (! $request->sort && ! $request->search && count($this->getConfiguredCollections()) < 2) {
             $column = $this->getFirstCollectionFromRequest($request)->sortField();
         }
 
@@ -177,15 +177,25 @@ public function getSortColumn($request)
 
     public function getSortDirection($request)
     {
-        $order = $request->get('order', 'asc');
+        $order = $request->order ?? 'asc';
 
-        if (! $request->sort && ! $request->search) {
+        if (! $request->sort && ! $request->search && count($this->getConfiguredCollections()) < 2) {
             $order = $this->getFirstCollectionFromRequest($request)->sortDirection();
         }
 
         return $order;
     }
 
+    public function initialSortColumn()
+    {
+        return $this->getSortColumn(optional());
+    }
+
+    public function initialSortDirection()
+    {
+        return $this->getSortDirection(optional());
+    }
+
     protected function getIndexQuery($request)
     {
         $query = Entry::query();
diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index 3a1eef1c73..b318b55681 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -134,6 +134,8 @@ public function preload()
             'formComponent' => $this->getFormComponent(),
             'formComponentProps' => $this->getFormComponentProps(),
             'taggable' => $this->getTaggable(),
+            'initialSortColumn' => $this->initialSortColumn(),
+            'initialSortDirection' => $this->initialSortDirection(),
         ];
     }
 
@@ -296,6 +298,16 @@ public function getSortDirection($request)
         return $request->get('order', 'asc');
     }
 
+    public function initialSortColumn()
+    {
+        return 'title';
+    }
+
+    public function initialSortDirection()
+    {
+        return 'asc';
+    }
+
     protected function getTaggable()
     {
         return $this->taggable;

From f6c688154f6bdbd0b67039f8f11dcd98ba061e77 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 10 Nov 2023 10:11:25 -0500
Subject: [PATCH 076/175] [4.x] Front-end form asset field php file validation
 (#8968)

---
 src/Http/Controllers/FormController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 2d8391edb7..1fb0adc8e2 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -177,7 +177,11 @@ protected function extraRules($fields)
                 return $field->fieldtype()->handle() === 'assets';
             })
             ->mapWithKeys(function ($field) {
-                return [$field->handle().'.*' => 'file'];
+                return [$field->handle().'.*' => ['file', function ($attribute, $value, $fail) {
+                    if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'phtml'])) {
+                        $fail(__('validation.uploaded'));
+                    }
+                }]];
             })
             ->all();
 

From 1c708549b927ef213be43b4044fc2d3e45d8843f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 10 Nov 2023 10:15:14 -0500
Subject: [PATCH 077/175] changelog

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13883b1db5..7a214c0dc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Release Notes
 
+## 4.33.0 (2023-11-10)
+
+### What's new
+- Bard supports cmd+k for links. [#8950](https://github.com/statamic/cms/issues/8950) by @o1y
+- The Entries fieldtype use columns from preferences in the stack selector. [#8900](https://github.com/statamic/cms/issues/8900) by @duncanmcclean
+- Bind `AssetContainerContents` to the service provider. [#8954](https://github.com/statamic/cms/issues/8954) by @ryanmitchell
+- Require `pint` in dev. [#8955](https://github.com/statamic/cms/issues/8955) by @ryanmitchell
+
+### What's fixed
+- Front-end form asset field php file validation. [#8968](https://github.com/statamic/cms/issues/8968) by @jasonvarga
+- Fix entries fieldtype not respecting collection sort column & direction. [#8894](https://github.com/statamic/cms/issues/8894) by @duncanmcclean
+- Fix duplicate entry action translation. [#8946](https://github.com/statamic/cms/issues/8946) by @jasonvarga
+- Fix SortableList not reacting to disabled prop changes. [#8949](https://github.com/statamic/cms/issues/8949) by @duncanmcclean
+- Remove debounce when renaming assets & folders. [#8953](https://github.com/statamic/cms/issues/8953) by @duncanmcclean
+- Use translations from fallback locale when primary locale is missing translations. [#8940](https://github.com/statamic/cms/issues/8940) by @duncanmcclean
+
+
+
 ## 4.32.0 (2023-11-03)
 
 ### What's new

From f8367de8d108a0b746b2cdb87f01747e74775267 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 10 Nov 2023 10:47:33 -0500
Subject: [PATCH 078/175] changelog

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a214c0dc7..65653a398f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,14 @@
 - Bard supports cmd+k for links. [#8950](https://github.com/statamic/cms/issues/8950) by @o1y
 - The Entries fieldtype use columns from preferences in the stack selector. [#8900](https://github.com/statamic/cms/issues/8900) by @duncanmcclean
 - Bind `AssetContainerContents` to the service provider. [#8954](https://github.com/statamic/cms/issues/8954) by @ryanmitchell
+- Support arrays in wrap modifier [#8942](https://github.com/statamic/cms/issues/8942) by @jacksleight
+- Add `mount` to augmented collection. [#8928](https://github.com/statamic/cms/issues/8928) by @duncanmcclean
 - Require `pint` in dev. [#8955](https://github.com/statamic/cms/issues/8955) by @ryanmitchell
 
+### What's improved
+- French translations. [#8945](https://github.com/statamic/cms/issues/8945) [#8934](https://github.com/statamic/cms/issues/8934) by @ebeauchamps
+- German translations. [#8939](https://github.com/statamic/cms/issues/8939) by @doriengr
+
 ### What's fixed
 - Front-end form asset field php file validation. [#8968](https://github.com/statamic/cms/issues/8968) by @jasonvarga
 - Fix entries fieldtype not respecting collection sort column & direction. [#8894](https://github.com/statamic/cms/issues/8894) by @duncanmcclean
@@ -15,6 +21,12 @@
 - Fix SortableList not reacting to disabled prop changes. [#8949](https://github.com/statamic/cms/issues/8949) by @duncanmcclean
 - Remove debounce when renaming assets & folders. [#8953](https://github.com/statamic/cms/issues/8953) by @duncanmcclean
 - Use translations from fallback locale when primary locale is missing translations. [#8940](https://github.com/statamic/cms/issues/8940) by @duncanmcclean
+- Fix missing title on relationship fields in multi-site. [#8936](https://github.com/statamic/cms/issues/8936) by @duncanmcclean
+- Prevent ensuring fields on entries if they already exist. [#8926](https://github.com/statamic/cms/issues/8926) by @duncanmcclean
+- Fix `statamic.web` middleware not being merged. [#8935](https://github.com/statamic/cms/issues/8935) by @duncanmcclean
+- Fix infinite loop on listing table of mounted collection. [#8937](https://github.com/statamic/cms/issues/8937) by @duncanmcclean
+- Fix "Always Save" toggle not being saved when used on linked field. [#8927](https://github.com/statamic/cms/issues/8927) by @duncanmcclean
+- Fix slug field not targeting sibling fields inside a replicator. [#8929](https://github.com/statamic/cms/issues/8929) by @duncanmcclean
 
 
 

From b39a14509cbe97d6058b07b629dca2aeb4b8b624 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 10 Nov 2023 15:58:35 +0000
Subject: [PATCH 079/175] [4.x] Add global attribute support to bard's small
 mark (#8969)

---
 resources/js/components/fieldtypes/bard/Small.js | 12 +++++++++---
 src/Fieldtypes/Bard/Marks/Small.php              | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/Small.js b/resources/js/components/fieldtypes/bard/Small.js
index 9157b23d43..8198f9e025 100644
--- a/resources/js/components/fieldtypes/bard/Small.js
+++ b/resources/js/components/fieldtypes/bard/Small.js
@@ -1,9 +1,15 @@
-import { Mark } from '@tiptap/core';
+import { Mark, mergeAttributes } from '@tiptap/core';
 
 export const Small = Mark.create({
 
     name: 'small',
 
+    addOptions() {
+        return {
+            HTMLAttributes: {},
+        }
+    },
+
     parseHTML() {
         return [
             {
@@ -12,8 +18,8 @@ export const Small = Mark.create({
         ]
     },
 
-    renderHTML() {
-        return ['small', 0]
+    renderHTML({ HTMLAttributes }) {
+        return ['small', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0]
     },
 
     addCommands() {
diff --git a/src/Fieldtypes/Bard/Marks/Small.php b/src/Fieldtypes/Bard/Marks/Small.php
index 0b475a8dfe..33eb90d873 100644
--- a/src/Fieldtypes/Bard/Marks/Small.php
+++ b/src/Fieldtypes/Bard/Marks/Small.php
@@ -3,11 +3,19 @@
 namespace Statamic\Fieldtypes\Bard\Marks;
 
 use Tiptap\Core\Mark;
+use Tiptap\Utils\HTML;
 
 class Small extends Mark
 {
     public static $name = 'small';
 
+    public function addOptions()
+    {
+        return [
+            'HTMLAttributes' => [],
+        ];
+    }
+
     public function parseHTML()
     {
         return [
@@ -17,8 +25,12 @@ public function parseHTML()
         ];
     }
 
-    public function renderHTML($mark)
+    public function renderHTML($mark, $HTMLAttributes = [])
     {
-        return ['small', 0];
+        return [
+            'small',
+            HTML::mergeAttributes($this->options['HTMLAttributes'], $HTMLAttributes),
+            0,
+        ];
     }
 }

From 5e9d787552188efa4cfe7ddacaf7a600936314fc Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 10 Nov 2023 16:01:18 +0000
Subject: [PATCH 080/175] [4.x] Don't require current password when changing
 another user's password (#8966)

---
 resources/js/components/users/ChangePassword.vue     |  2 ++
 resources/js/components/users/PublishForm.vue        |  4 +++-
 resources/views/users/edit.blade.php                 |  1 +
 src/Http/Controllers/CP/Users/PasswordController.php | 11 ++++++++---
 src/Http/Controllers/CP/Users/UsersController.php    |  1 +
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/users/ChangePassword.vue b/resources/js/components/users/ChangePassword.vue
index b81fd8cf7a..b30eafb39e 100644
--- a/resources/js/components/users/ChangePassword.vue
+++ b/resources/js/components/users/ChangePassword.vue
@@ -10,6 +10,7 @@
         </div>
         <div class="publish-fields p-4 pb-0 w-96">
             <form-group
+                v-if="requiresCurrentPassword"
                 handle="password"
                 :display="__('Current Password')"
                 v-model="currentPassword"
@@ -49,6 +50,7 @@ export default {
 
     props: {
         saveUrl: String,
+        requiresCurrentPassword: Boolean,
     },
 
     data() {
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 6872259120..11e96b7997 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -13,6 +13,7 @@
                     <change-password
                         v-if="canEditPassword"
                         :save-url="actions.password"
+                        :requires-current-password="requiresCurrentPassword"
                         class="mr-4"
                     />
 
@@ -75,7 +76,8 @@ export default {
         actions: Object,
         method: String,
         canEditPassword: Boolean,
-        canEditBlueprint: Boolean
+        canEditBlueprint: Boolean,
+        requiresCurrentPassword: Boolean,
     },
 
     data() {
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 749cfe2355..856a61c8f0 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -14,6 +14,7 @@
         :initial-meta="{{ json_encode($meta) }}"
         :can-edit-password="{{ Statamic\Support\Str::bool($canEditPassword) }}"
         :can-edit-blueprint="{{ Statamic\Support\Str::bool($user->can('configure fields')) }}"
+        :requires-current-password="{{ Statamic\Support\Str::bool($requiresCurrentPassword) }}"
     ></user-publish-form>
 
 @endsection
diff --git a/src/Http/Controllers/CP/Users/PasswordController.php b/src/Http/Controllers/CP/Users/PasswordController.php
index da60a31448..53507394ff 100644
--- a/src/Http/Controllers/CP/Users/PasswordController.php
+++ b/src/Http/Controllers/CP/Users/PasswordController.php
@@ -16,10 +16,15 @@ public function update(Request $request, $user)
 
         $this->authorize('editPassword', $user);
 
-        $request->validate([
-            'current_password' => ['required', 'current_password'],
+        $rules = [
             'password' => ['required', 'confirmed', Password::default()],
-        ]);
+        ];
+
+        if ($request->user()->id === $user) {
+            $rules['current_password'] = ['required', 'current_password'];
+        }
+
+        $request->validate($rules);
 
         $user->password($request->password)->save();
 
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 247cc039a5..8324b53264 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -233,6 +233,7 @@ public function edit(Request $request, $user)
                 'editBlueprint' => cp_route('users.blueprint.edit'),
             ],
             'canEditPassword' => User::fromUser($request->user())->can('editPassword', $user),
+            'requiresCurrentPassword' => $request->user()->id === $user->id(),
         ];
 
         if ($request->wantsJson()) {

From b737cec150874abeb727d8df3b37110b86addb19 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 10 Nov 2023 11:48:58 -0500
Subject: [PATCH 081/175] [4.x] Antlers identifier finder (#8965)

---
 src/View/Antlers/Antlers.php                  |   6 +
 .../Language/Parser/IdentifierFinder.php      | 104 ++++++++++++++++++
 tests/Antlers/Parser/IdentifierFinderTest.php |  32 ++++++
 3 files changed, 142 insertions(+)
 create mode 100644 src/View/Antlers/Language/Parser/IdentifierFinder.php
 create mode 100644 tests/Antlers/Parser/IdentifierFinderTest.php

diff --git a/src/View/Antlers/Antlers.php b/src/View/Antlers/Antlers.php
index 33d1a1bfdf..b0fc4f9c43 100644
--- a/src/View/Antlers/Antlers.php
+++ b/src/View/Antlers/Antlers.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Statamic\Contracts\View\Antlers\Parser;
+use Statamic\View\Antlers\Language\Parser\IdentifierFinder;
 
 class Antlers
 {
@@ -43,4 +44,9 @@ public function parseLoop($content, $data, $supplement = true, $context = [])
     {
         return new AntlersLoop($this->parser(), $content, $data, $supplement, $context);
     }
+
+    public function identifiers(string $content): array
+    {
+        return (new IdentifierFinder)->getIdentifiers($content);
+    }
 }
diff --git a/src/View/Antlers/Language/Parser/IdentifierFinder.php b/src/View/Antlers/Language/Parser/IdentifierFinder.php
new file mode 100644
index 0000000000..c44ba03d4f
--- /dev/null
+++ b/src/View/Antlers/Language/Parser/IdentifierFinder.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Statamic\View\Antlers\Language\Parser;
+
+use Illuminate\Support\Str;
+use Statamic\View\Antlers\Language\Nodes\AntlersNode;
+use Statamic\View\Antlers\Language\Nodes\Paths\PathNode;
+use Statamic\View\Antlers\Language\Nodes\Paths\VariableReference;
+use Statamic\View\Antlers\Language\Nodes\VariableNode;
+
+class IdentifierFinder
+{
+    private DocumentParser $documentParser;
+
+    public function __construct()
+    {
+        $this->documentParser = new DocumentParser;
+    }
+
+    public function getIdentifiers(string $content): array
+    {
+        $this->documentParser->resetState();
+        $this->documentParser->parse($content);
+
+        // Get nodes will return a "flat" list of nodes.
+        // This will make things a bit easier on us.
+        $antlersNodes = collect($this->documentParser->getNodes())->filter(function ($node) {
+            return $node instanceof AntlersNode && ! $node->isComment && ! ($node->isClosingTag && ! $node->isSelfClosing);
+        })->values()->all();
+
+        $identifiers = [];
+
+        foreach ($antlersNodes as $node) {
+            $identifiers = array_merge($this->processNode($node, $identifiers));
+        }
+
+        return collect($identifiers)->filter(function ($identifier) {
+            // Quick and dirty check to see if we care about this identifier.
+            return ! Str::contains($identifier, ['.', ':', '[', ']', '(', ')', '{', '}']);
+        })->unique()->values()->all();
+    }
+
+    protected function processVarReference(AntlersNode $node, VariableReference $reference, array $identifiers): array
+    {
+        foreach ($reference->pathParts as $part) {
+            if ($part instanceof PathNode) {
+                if (! array_key_exists($part->name, $node->interpolationRegions)) {
+                    $identifiers[] = $part->name;
+                }
+            } elseif ($part instanceof VariableReference) {
+                $identifiers = array_merge($this->processVarReference($node, $part, $identifiers));
+            }
+        }
+
+        return $identifiers;
+    }
+
+    protected function processNode(AntlersNode $node, array $identifiers): array
+    {
+        if ($node->name != null) {
+            $identifiers[] = $node->name->name;
+
+            if ($node->name->methodPart && ! Str::contains($node->name->methodPart, ':')) {
+                $identifiers[] = $node->name->methodPart;
+            }
+
+            if ($node->pathReference != null) {
+                $identifiers = array_merge($this->processVarReference($node, $node->pathReference, $identifiers));
+            }
+
+            if (! empty($node->processedInterpolationRegions)) {
+                foreach ($node->processedInterpolationRegions as $region) {
+                    if (count($region) == 0 || ! $region[0] instanceof AntlersNode) {
+                        continue;
+                    }
+
+                    $identifiers = array_merge($this->processNode($region[0], $identifiers));
+                }
+            }
+
+            if ($node->hasParameters) {
+                foreach ($node->parameters as $parameter) {
+                    if ($parameter->isVariableReference) {
+                        $identifiers[] = $parameter->value;
+                    }
+                }
+            } else {
+                if (! empty($node->runtimeNodes)) {
+                    foreach ($node->runtimeNodes as $runtimeNode) {
+                        if (! $runtimeNode instanceof VariableNode) {
+                            continue;
+                        }
+
+                        if ($runtimeNode->variableReference == null) {
+                            $identifiers[] = $runtimeNode->name;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $identifiers;
+    }
+}
diff --git a/tests/Antlers/Parser/IdentifierFinderTest.php b/tests/Antlers/Parser/IdentifierFinderTest.php
new file mode 100644
index 0000000000..524625e564
--- /dev/null
+++ b/tests/Antlers/Parser/IdentifierFinderTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Antlers\Parser;
+
+use Statamic\View\Antlers\Language\Parser\IdentifierFinder;
+use Tests\Antlers\ParserTestCase;
+
+class IdentifierFinderTest extends ParserTestCase
+{
+    /** @test */
+    public function it_finds_identifiers()
+    {
+        $template = <<<'EOT'
+{{ foo }}
+{{ bar:baz }}
+{{ collection:blog :limit="the_limit" alfa="bravo" charlie="{delta} {echo}" }}
+  {{ title }}
+{{ /collection:blog }}
+EOT;
+        $this->assertEquals([
+            'foo',
+            'bar',
+            'baz',
+            'collection',
+            'blog',
+            'delta',
+            'echo',
+            'the_limit',
+            'title',
+        ], (new IdentifierFinder)->getIdentifiers($template));
+    }
+}

From ce60ef3a73712f538dc109bff480d3efb230a613 Mon Sep 17 00:00:00 2001
From: Steve Hurst | morphsites <steve.hurst@morphsites.com>
Date: Fri, 10 Nov 2023 18:26:49 +0000
Subject: [PATCH 082/175] [4.x] Fix error when getting alt on bard image when
 asset is missing (#8959)

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

diff --git a/src/Fieldtypes/Bard/ImageNode.php b/src/Fieldtypes/Bard/ImageNode.php
index 1210e1119c..cffbae4a8b 100644
--- a/src/Fieldtypes/Bard/ImageNode.php
+++ b/src/Fieldtypes/Bard/ImageNode.php
@@ -62,11 +62,11 @@ public function renderHTML($node, $HTMLAttributes = [])
 
     protected function getUrl($id)
     {
-        return optional(Asset::find($id))->url();
+        return Asset::find($id)?->url();
     }
 
     protected function getAlt($id)
     {
-        return optional(Asset::find($id))->data()->get('alt');
+        return Asset::find($id)?->data()->get('alt');
     }
 }

From 8ef3b8c7b058fa45710d29afedb6897ed70e7038 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 10 Nov 2023 15:30:36 -0500
Subject: [PATCH 083/175] [4.x] Fix impersonation redirect (#8973)

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

diff --git a/src/Actions/Impersonate.php b/src/Actions/Impersonate.php
index 8286f29f4a..ce3db84560 100644
--- a/src/Actions/Impersonate.php
+++ b/src/Actions/Impersonate.php
@@ -65,6 +65,6 @@ public function redirect($users, $values)
             return $url;
         }
 
-        return $users->first()->can('access cp') ? cp_route('dashboard') : '/';
+        return $users->first()->can('access cp') ? cp_route('index') : '/';
     }
 }

From 30db081326dd45db71698603c494e6f0db66d680 Mon Sep 17 00:00:00 2001
From: Arthur Perton <arthur@webenapp.nl>
Date: Fri, 10 Nov 2023 22:06:49 +0100
Subject: [PATCH 084/175] [4.x] Fix new child entries not propagating to
 appropriate position in other sites trees (#7302)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Entries/Entry.php                         | 31 +++++++++
 .../Collections/LocalizeEntryController.php   | 28 --------
 tests/Data/Entries/EntryTest.php              | 68 +++++++++++++++++++
 3 files changed, 99 insertions(+), 28 deletions(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 65e3b30ed9..d531638796 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -3,6 +3,7 @@
 namespace Statamic\Entries;
 
 use ArrayAccess;
+use Closure;
 use Facades\Statamic\Entries\InitiatorStack;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Responsable;
@@ -722,6 +723,10 @@ public function makeLocalization($site)
             ->published($this->published)
             ->slug($this->slug());
 
+        if ($callback = $this->addToStructure($site, $this->parent())) {
+            $localization->afterSave($callback);
+        }
+
         if ($this->collection()->dated()) {
             $localization->date($this->date());
         }
@@ -729,6 +734,32 @@ public function makeLocalization($site)
         return $localization;
     }
 
+    private function addToStructure($site, $parent = null): ?Closure
+    {
+        // If it's orderable (linear - a max depth of 1) then don't add it.
+        if ($this->collection()->orderable()) {
+            return null;
+        }
+
+        // Collection not structured? Don't add it.
+        if (! $structure = $this->collection()->structure()) {
+            return null;
+        }
+
+        $tree = $structure->in($site);
+        $parent = optional($parent)->in($site);
+
+        return function ($entry) use ($parent, $tree) {
+            if (! $parent || $parent->isRoot()) {
+                $tree->append($entry);
+            } else {
+                $tree->appendTo($parent->id(), $entry);
+            }
+
+            $tree->save();
+        };
+    }
+
     public function supplementTaxonomies()
     {
         // TODO: This is just here to make things work without rewriting a bunch of places.
diff --git a/src/Http/Controllers/CP/Collections/LocalizeEntryController.php b/src/Http/Controllers/CP/Collections/LocalizeEntryController.php
index 223f2cccde..a3bb7df97b 100644
--- a/src/Http/Controllers/CP/Collections/LocalizeEntryController.php
+++ b/src/Http/Controllers/CP/Collections/LocalizeEntryController.php
@@ -14,8 +14,6 @@ public function __invoke(Request $request, $collection, $entry)
 
         $localized = $entry->makeLocalization($site = $request->site);
 
-        $this->addToStructure($collection, $entry, $localized);
-
         $localized->store(['user' => User::fromUser($request->user())]);
 
         return [
@@ -23,30 +21,4 @@ public function __invoke(Request $request, $collection, $entry)
             'url' => $localized->editUrl(),
         ];
     }
-
-    private function addToStructure($collection, $entry, $localized)
-    {
-        // If it's orderable (linear - a max depth of 1) then don't add it.
-        if ($collection->orderable()) {
-            return;
-        }
-
-        // Collection not structured? Don't add it.
-        if (! $structure = $collection->structure()) {
-            return;
-        }
-
-        $tree = $structure->in($localized->locale());
-        $parent = optional($entry->parent())->in($localized->locale());
-
-        $localized->afterSave(function ($localized) use ($parent, $tree) {
-            if (! $parent || $parent->isRoot()) {
-                $tree->append($localized);
-            } else {
-                $tree->appendTo($parent->id(), $localized);
-            }
-
-            $tree->save();
-        });
-    }
 }
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index f0dcd3bc67..9b94cdbed1 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -1549,6 +1549,74 @@ public function it_does_not_propagate_existing_entries()
         $this->assertCount(1, Entry::all());
     }
 
+    /** @test */
+    public function it_adds_propagated_entry_to_structure()
+    {
+        Event::fake();
+
+        Facades\Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'es' => ['name' => 'Spanish', 'locale' => 'es_ES', 'url' => 'http://test.com/es/'],
+            ],
+        ]);
+
+        $collection = (new Collection)
+            ->handle('pages')
+            ->sites(['en', 'fr', 'es'])
+            ->propagate(false)
+            ->save();
+
+        (new Entry)->locale('en')->id('en-1')->collection($collection)->save();
+        (new Entry)->locale('en')->id('en-2')->collection($collection)->save();
+        (new Entry)->locale('en')->id('en-3')->collection($collection)->save();
+
+        (new Entry)->locale('fr')->id('fr-1')->collection($collection)->origin('en-1')->save();
+        (new Entry)->locale('fr')->id('fr-2')->collection($collection)->origin('en-2')->save();
+
+        (new Entry)->locale('es')->id('es-1')->collection($collection)->origin('en-1')->save();
+        (new Entry)->locale('es')->id('es-3')->collection($collection)->origin('en-3')->save();
+
+        $collection->structureContents(['expects_root' => false])->save();
+        $collection->structure()->in('en')->tree([['entry' => 'en-1'], ['entry' => 'en-2'], ['entry' => 'en-3']])->save();
+        $collection->structure()->in('fr')->tree([['entry' => 'fr-1'], ['entry' => 'fr-2']])->save();
+        $collection->structure()->in('es')->tree([['entry' => 'es-1'], ['entry' => 'es-3']])->save();
+
+        $collection->propagate(true);
+
+        $en = (new Entry)
+            ->id('en-2-1')
+            ->locale('en')
+            ->collection($collection)
+            ->afterSave(function ($entry) {
+                $entry->collection()->structure()->in('en')->appendTo('en-2', $entry)->save();
+            });
+
+        $en->save();
+
+        $this->assertIsObject($fr = $en->descendants()->get('fr'));
+        $this->assertIsObject($es = $en->descendants()->get('es'));
+
+        $this->assertEquals([
+            ['entry' => 'en-1'],
+            ['entry' => 'en-2', 'children' => [['entry' => $en->id()]]],
+            ['entry' => 'en-3'],
+        ], $collection->structure()->in('en')->tree());
+
+        $this->assertEquals([
+            ['entry' => 'fr-1'],
+            ['entry' => 'fr-2', 'children' => [['entry' => $fr->id()]]],
+        ], $collection->structure()->in('fr')->tree());
+
+        $this->assertEquals([
+            ['entry' => 'es-1'],
+            ['entry' => 'es-3'],
+            ['entry' => $es->id()],
+        ], $collection->structure()->in('es')->tree());
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_entry_doesnt_save()
     {

From 17b7ac79b4d0401860182c705b3710233cb579e1 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:50:58 +0000
Subject: [PATCH 085/175] [4.x] Add Bard support to read_time modifier (#8976)

Add Bard support to read_time modifier
---
 src/Modifiers/CoreModifiers.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 1e5da9a999..52d51d0498 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -1810,6 +1810,14 @@ public function ray($value)
      */
     public function readTime($value, $params)
     {
+        if (is_array($value)) {
+            $value = collect($value)
+                ->map(fn (Values $values) => $values->all())
+                ->where('type', 'text')
+                ->map(fn ($item) => $item['text']->raw())
+                ->implode(' ');
+        }
+
         $words = $this->wordCount(strip_tags($value));
 
         return ceil($words / Arr::get($params, 0, 200));

From 377ec1a416abdd789fe363c5afac0e2954d40028 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Sat, 11 Nov 2023 14:52:48 +0000
Subject: [PATCH 086/175] [4.x] Fix for edit form page saying edit collection
 (#8967)

Fix for edit form page saying edit collection
---
 resources/js/components/collections/EditForm.vue | 3 ++-
 resources/views/forms/edit.blade.php             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/collections/EditForm.vue b/resources/js/components/collections/EditForm.vue
index fe231fc7ce..0f76eaeab8 100644
--- a/resources/js/components/collections/EditForm.vue
+++ b/resources/js/components/collections/EditForm.vue
@@ -15,7 +15,7 @@
             <header class="mb-6">
                 <breadcrumb :url="url" :title="values.title" />
                 <div class="flex items-center">
-                    <h1 class="flex-1" v-text="__('Configure Collection')" />
+                    <h1 class="flex-1" v-text="__(editTitle ?? 'Configure Collection')" />
                     <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
                 </div>
             </header>
@@ -33,6 +33,7 @@ export default {
 
     props: {
         blueprint: Object,
+        editTitle: String,
         initialValues: Object,
         meta: Object,
         url: String
diff --git a/resources/views/forms/edit.blade.php b/resources/views/forms/edit.blade.php
index faf158b740..f063be49f6 100644
--- a/resources/views/forms/edit.blade.php
+++ b/resources/views/forms/edit.blade.php
@@ -5,6 +5,7 @@
 
     <collection-edit-form
         initial-title="{{ $form->title() }}"
+        edit-title="Edit Form"
         :blueprint="{{ json_encode($blueprint) }}"
         :initial-values="{{ json_encode($values) }}"
         :meta="{{ json_encode($meta) }}"

From 64de88b2eafd819b7efb1788d0576455157877b7 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Sat, 11 Nov 2023 17:32:30 +0100
Subject: [PATCH 087/175] [4.x] French translations (#8977)

Good for 4.33
---
 resources/lang/fr/messages.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index 9b48cccab5..841b3497f0 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -68,9 +68,9 @@
     'collections_route_instructions' => 'La route contrôle le modèle d’URL des entrées. Apprenez-en plus dans la [documentation](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'Le sens de tri par défaut.',
     'collections_taxonomies_instructions' => 'Reliez les entrées de cette collection à des taxonomies. Les champs seront automatiquement ajoutés aux formulaires.',
-    'duplicate_action_warning_localization' => 'Cette entrée est une traduction. L’entrée originale est dupliquée.',
-    'duplicate_action_warning_localizations' => 'Une ou plusieurs entrées sélectionnées sont des traductions. Au lieu de cela, l’entrée originale est dupliquée.',
-    'duplicate_action_localizations_confirmation' => 'Êtes-vous sûr de vouloir effectuer cette action ? Les traductions sont également dupliquées.',
+    'duplicate_action_localizations_confirmation' => 'Êtes-vous sûr de vouloir effectuer cette action ? Les traductions seront également dupliquées.',
+    'duplicate_action_warning_localization' => 'Cette entrée est une traduction. L’entrée originale sera dupliquée.',
+    'duplicate_action_warning_localizations' => 'Une ou plusieurs entrées sélectionnées sont des traductions. Dans un tel cas, l’entrée originale sera dupliquée à la place.',
     'email_utility_configuration_description' => 'Les paramètres de messagerie sont configurés dans <code>:path</code>',
     'email_utility_description' => 'Vérifiez les paramètres de messagerie et envoyez des e-mails de test.',
     'entry_origin_instructions' => 'La nouvelle traduction héritera des valeurs qu’a l’entrée dans le site sélectionné.',

From 0862875cf7b4cdfdfdaf255cef9e35a3dacbec27 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 13 Nov 2023 17:15:30 +0000
Subject: [PATCH 088/175] [4.x] Auto-populate Array Fieldtype Options (#8980)

---
 .../components/fieldtypes/ArrayFieldtype.vue   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue
index bc98ff0f6c..2b1e054a85 100644
--- a/resources/js/components/fieldtypes/ArrayFieldtype.vue
+++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue
@@ -61,7 +61,7 @@
                             <tr class="sortable-row" v-for="(element, index) in data" :key="element._id">
                                 <td class="sortable-handle table-drag-handle" v-if="!isReadOnly"></td>
                                 <td>
-                                    <input type="text" class="input-text font-bold" v-model="element.key" :readonly="isReadOnly" />
+                                    <input type="text" class="input-text font-bold" v-model="element.key" :readonly="isReadOnly" @blur="keyUpdated(element)" />
                                 </td>
                                 <td>
                                     <input type="text" class="input-text" v-model="element.value" :readonly="isReadOnly" />
@@ -210,7 +210,21 @@ export default {
 
         setKey(key) {
             this.selectedKey = key
-        }
+        },
+
+        keyUpdated(element) {
+            if (element.key === null || element.value !== null) {
+                return null;
+            }
+
+            let value = element.key.charAt(0).toUpperCase() + element.key.slice(1);
+
+            this.data.find((item, index) => {
+                if (item._id === element._id) {
+                    this.data[index].value = value;
+                }
+            })
+        },
     }
 
 }

From 48617626fbe110f5e288bb9d39a74bed7687459d Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 14 Nov 2023 13:45:57 +0000
Subject: [PATCH 089/175] [4.x] Only namespace asset validation attributes when
 on a CP route (#8987)

---
 src/Fieldtypes/Assets/DimensionsRule.php |  3 ++-
 src/Fieldtypes/Assets/ImageRule.php      |  3 ++-
 src/Fieldtypes/Assets/MaxRule.php        |  4 +++-
 src/Fieldtypes/Assets/MimesRule.php      |  3 ++-
 src/Fieldtypes/Assets/MimetypesRule.php  |  3 ++-
 src/Fieldtypes/Assets/MinRule.php        |  4 +++-
 tests/Fieldtypes/AssetsTest.php          | 14 ++++++++++++++
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index 8f980a2da0..11c682f7f0 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Validation\Rule;
 use Statamic\Facades\Asset;
+use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class DimensionsRule implements Rule
@@ -63,7 +64,7 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return __('statamic::validation.dimensions');
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.dimensions');
     }
 
     /**
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index ba3f6fb6e3..b32985ec0e 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Validation\Rule;
 use Statamic\Facades\Asset;
+use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRule implements Rule
@@ -46,6 +47,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return __('statamic::validation.image');
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image');
     }
 }
diff --git a/src/Fieldtypes/Assets/MaxRule.php b/src/Fieldtypes/Assets/MaxRule.php
index c9015a1441..8a5f04e86f 100644
--- a/src/Fieldtypes/Assets/MaxRule.php
+++ b/src/Fieldtypes/Assets/MaxRule.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
+use Statamic\Statamic;
+
 class MaxRule extends SizeBasedRule
 {
     /**
@@ -22,6 +24,6 @@ public function sizePasses($size)
      */
     public function message()
     {
-        return str_replace(':max', $this->parameters[0], __('statamic::validation.max.file'));
+        return str_replace(':max', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file'));
     }
 }
diff --git a/src/Fieldtypes/Assets/MimesRule.php b/src/Fieldtypes/Assets/MimesRule.php
index 68206a4af2..485ac393cf 100644
--- a/src/Fieldtypes/Assets/MimesRule.php
+++ b/src/Fieldtypes/Assets/MimesRule.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Validation\Rule;
 use Statamic\Facades\Asset;
+use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class MimesRule implements Rule
@@ -48,6 +49,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return str_replace(':values', implode(', ', $this->parameters), __('statamic::validation.mimes'));
+        return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes'));
     }
 }
diff --git a/src/Fieldtypes/Assets/MimetypesRule.php b/src/Fieldtypes/Assets/MimetypesRule.php
index fd4a971ff9..ad1c82acaa 100644
--- a/src/Fieldtypes/Assets/MimetypesRule.php
+++ b/src/Fieldtypes/Assets/MimetypesRule.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Validation\Rule;
 use Statamic\Facades\Asset;
+use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class MimetypesRule implements Rule
@@ -43,6 +44,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return str_replace(':values', implode(', ', $this->parameters), __('statamic::validation.mimetypes'));
+        return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes'));
     }
 }
diff --git a/src/Fieldtypes/Assets/MinRule.php b/src/Fieldtypes/Assets/MinRule.php
index fe35ec8a3b..b37bfaa587 100644
--- a/src/Fieldtypes/Assets/MinRule.php
+++ b/src/Fieldtypes/Assets/MinRule.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
+use Statamic\Statamic;
+
 class MinRule extends SizeBasedRule
 {
     /**
@@ -22,6 +24,6 @@ public function sizePasses($size)
      */
     public function message()
     {
-        return str_replace(':min', $this->parameters[0], __('statamic::validation.min.file'));
+        return str_replace(':min', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file'));
     }
 }
diff --git a/tests/Fieldtypes/AssetsTest.php b/tests/Fieldtypes/AssetsTest.php
index 636e63da38..1abd1d0548 100644
--- a/tests/Fieldtypes/AssetsTest.php
+++ b/tests/Fieldtypes/AssetsTest.php
@@ -106,6 +106,8 @@ public function it_shallow_augments_to_a_single_asset_when_max_files_is_one()
     /** @test */
     public function it_replaces_dimensions_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['dimensions:width=180,height=180']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -117,6 +119,8 @@ public function it_replaces_dimensions_rule()
     /** @test */
     public function it_replaces_image_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['image']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -128,6 +132,8 @@ public function it_replaces_image_rule()
     /** @test */
     public function it_replaces_mimes_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['mimes:jpg,png']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -139,6 +145,8 @@ public function it_replaces_mimes_rule()
     /** @test */
     public function it_replaces_mimestypes_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['mimetypes:image/jpg,image/png']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -150,6 +158,8 @@ public function it_replaces_mimestypes_rule()
     /** @test */
     public function it_replaces_min_filesize_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['min_filesize:100']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -161,6 +171,8 @@ public function it_replaces_min_filesize_rule()
     /** @test */
     public function it_replaces_max_filesize_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['max_filesize:100']])->fieldRules();
 
         $this->assertIsArray($replaced);
@@ -172,6 +184,8 @@ public function it_replaces_max_filesize_rule()
     /** @test */
     public function it_doesnt_replace_non_image_related_rule()
     {
+        config()->set('statamic.cp.route', '/');
+
         $replaced = $this->fieldtype(['validate' => ['file']])->fieldRules();
 
         $this->assertIsArray($replaced);

From 5f1509d9c976367037dab3907eb17bcb9014ebf9 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 14 Nov 2023 13:46:31 +0000
Subject: [PATCH 090/175] [4.x] Hide export submissions button when there are
 no valid exporters (#8985)

---
 resources/views/forms/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index 9c720c30e3..f7990842ff 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -30,7 +30,7 @@
                 @endcan
             </dropdown-list>
 
-            @if ($exporters = $form->exporters())
+            @if (($exporters = $form->exporters()) && $exporters->isNotEmpty())
             <dropdown-list>
                 <button class="btn" slot="trigger">{{ __('Export Submissions') }}</button>
                 @foreach ($exporters as $exporter)

From 4ef616921842a9e1939c5f178d336e44f09dd754 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 14 Nov 2023 12:01:50 -0500
Subject: [PATCH 091/175] [4.x] Nocache performance improvements (#8956)

---
 src/StaticCaching/NoCache/Session.php        | 21 ++++++--
 src/StaticCaching/NoCache/StringFragment.php | 16 +++---
 src/StaticCaching/NoCache/Tags.php           | 10 +++-
 src/StaticCaching/StaticCacheManager.php     |  4 +-
 tests/StaticCaching/ManagerTest.php          |  6 +++
 tests/StaticCaching/NoCacheSessionTest.php   | 22 +++++---
 tests/StaticCaching/NocacheTagsTest.php      | 54 ++++++++++++++++++++
 7 files changed, 113 insertions(+), 20 deletions(-)

diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
index d763ec9b31..f60f9c6b25 100644
--- a/src/StaticCaching/NoCache/Session.php
+++ b/src/StaticCaching/NoCache/Session.php
@@ -41,12 +41,12 @@ public function setUrl(string $url)
      */
     public function regions(): Collection
     {
-        return $this->regions;
+        return $this->regions->mapWithKeys(fn ($key) => [$key => $this->region($key)]);
     }
 
     public function region(string $key): Region
     {
-        if ($region = $this->regions[$key] ?? null) {
+        if ($this->regions->contains($key) && ($region = Cache::get('nocache::region.'.$key))) {
             return $region;
         }
 
@@ -57,14 +57,22 @@ public function pushRegion($contents, $context, $extension): StringRegion
     {
         $region = new StringRegion($this, trim($contents), $context, $extension);
 
-        return $this->regions[$region->key()] = $region;
+        $this->cacheRegion($region);
+
+        $this->regions[] = $region->key();
+
+        return $region;
     }
 
     public function pushView($view, $context): ViewRegion
     {
         $region = new ViewRegion($this, $view, $context);
 
-        return $this->regions[$region->key()] = $region;
+        $this->cacheRegion($region);
+
+        $this->regions[] = $region->key();
+
+        return $region;
     }
 
     public function cascade()
@@ -115,4 +123,9 @@ private function restoreCascade()
             ->hydrate()
             ->toArray();
     }
+
+    private function cacheRegion(Region $region)
+    {
+        Cache::forever('nocache::region.'.$region->key(), $region);
+    }
 }
diff --git a/src/StaticCaching/NoCache/StringFragment.php b/src/StaticCaching/NoCache/StringFragment.php
index 6de7ca5780..4dc3025863 100644
--- a/src/StaticCaching/NoCache/StringFragment.php
+++ b/src/StaticCaching/NoCache/StringFragment.php
@@ -27,14 +27,18 @@ public function render(): string
         view()->addNamespace('nocache', $this->directory);
         File::makeDirectory($this->directory);
 
-        $this->createTemporaryView();
+        $path = $this->createTemporaryView();
 
         $this->data['__frontmatter'] = Arr::pull($this->data, 'view', []);
 
-        return view('nocache::'.$this->region, $this->data)->render();
+        $rendered = view('nocache::'.$this->region, $this->data)->render();
+
+        File::delete($path);
+
+        return $rendered;
     }
 
-    private function createTemporaryView()
+    private function createTemporaryView(): string
     {
         $path = vsprintf('%s/%s.%s', [
             $this->directory,
@@ -42,10 +46,10 @@ private function createTemporaryView()
             $this->extension,
         ]);
 
-        if (File::exists($path)) {
-            return;
+        if (! File::exists($path)) {
+            File::put($path, $this->contents);
         }
 
-        File::put($path, $this->contents);
+        return $path;
     }
 }
diff --git a/src/StaticCaching/NoCache/Tags.php b/src/StaticCaching/NoCache/Tags.php
index 0f174626e9..c26dc2b860 100644
--- a/src/StaticCaching/NoCache/Tags.php
+++ b/src/StaticCaching/NoCache/Tags.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\StaticCaching\NoCache;
 
+use Statamic\Facades\Antlers;
+
 class Tags extends \Statamic\Tags\Tags
 {
     public static $handle = 'nocache';
@@ -19,9 +21,15 @@ public function __construct(Session $nocache)
 
     public function index()
     {
+        if ($this->params->has('select')) {
+            $fields = $this->params->explode('select');
+        } else {
+            $fields = Antlers::identifiers($this->content);
+        }
+
         return $this
             ->nocache
-            ->pushRegion($this->content, $this->context->all(), 'antlers.html')
+            ->pushRegion($this->content, $this->context->only($fields)->all(), 'antlers.html')
             ->placeholder();
     }
 }
diff --git a/src/StaticCaching/StaticCacheManager.php b/src/StaticCaching/StaticCacheManager.php
index 932adafb24..34bd5ae0c7 100644
--- a/src/StaticCaching/StaticCacheManager.php
+++ b/src/StaticCaching/StaticCacheManager.php
@@ -56,7 +56,9 @@ public function flush()
         $this->driver()->flush();
 
         collect(Cache::get('nocache::urls', []))->each(function ($url) {
-            Cache::forget('nocache::session.'.md5($url));
+            $session = Cache::get($sessionKey = 'nocache::session.'.md5($url));
+            collect($session['regions'] ?? [])->each(fn ($region) => Cache::forget('nocache::region.'.$region));
+            Cache::forget($sessionKey);
         });
 
         Cache::forget('nocache::urls');
diff --git a/tests/StaticCaching/ManagerTest.php b/tests/StaticCaching/ManagerTest.php
index db280f1997..be865df05e 100644
--- a/tests/StaticCaching/ManagerTest.php
+++ b/tests/StaticCaching/ManagerTest.php
@@ -22,6 +22,12 @@ public function it_flushes()
         StaticCache::extend('test', fn () => $mock);
 
         Cache::shouldReceive('get')->with('nocache::urls', [])->once()->andReturn(['/one', '/two']);
+        Cache::shouldReceive('get')->with('nocache::session.'.md5('/one'))->once()->andReturn(['regions' => ['r1', 'r2']]);
+        Cache::shouldReceive('get')->with('nocache::session.'.md5('/two'))->once()->andReturn(['regions' => ['r3', 'r4']]);
+        Cache::shouldReceive('forget')->with('nocache::region.r1')->once();
+        Cache::shouldReceive('forget')->with('nocache::region.r2')->once();
+        Cache::shouldReceive('forget')->with('nocache::region.r3')->once();
+        Cache::shouldReceive('forget')->with('nocache::region.r4')->once();
         Cache::shouldReceive('forget')->with('nocache::session.'.md5('/one'))->once();
         Cache::shouldReceive('forget')->with('nocache::session.'.md5('/two'))->once();
         Cache::shouldReceive('forget')->with('nocache::urls')->once();
diff --git a/tests/StaticCaching/NoCacheSessionTest.php b/tests/StaticCaching/NoCacheSessionTest.php
index 753c569aa4..d5022fc16f 100644
--- a/tests/StaticCaching/NoCacheSessionTest.php
+++ b/tests/StaticCaching/NoCacheSessionTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\StaticCaching;
 
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use Statamic\StaticCaching\NoCache\Session;
@@ -75,6 +76,8 @@ public function it_gets_the_fragment_data()
     /** @test */
     public function it_writes()
     {
+        Carbon::setTestNow('2014-02-15');
+
         // Testing that the cache key used is unique to the url.
         // The contents aren't really important.
 
@@ -101,6 +104,11 @@ public function it_writes()
             ->with('nocache::urls', ['/', '/foo'])
             ->once();
 
+        // When pushing regions, they will get written too...
+        Cache::shouldReceive('forever')
+            ->withArgs(fn ($arg) => str_starts_with($arg, 'nocache::region.'))
+            ->twice();
+
         tap(new Session('/'), function ($session) {
             $session->pushRegion('test', [], '.html');
         })->write();
@@ -113,11 +121,10 @@ public function it_writes()
     /** @test */
     public function it_restores_from_cache()
     {
+        Cache::forever('nocache::region.abc', $regionOne = Mockery::mock(StringRegion::class));
+        Cache::forever('nocache::region.def', $regionTwo = Mockery::mock(StringRegion::class));
         Cache::forever('nocache::session.'.md5('http://localhost/test'), [
-            'regions' => [
-                $regionOne = Mockery::mock(StringRegion::class),
-                $regionTwo = Mockery::mock(StringRegion::class),
-            ],
+            'regions' => ['abc', 'def'],
         ]);
 
         $this->createPage('/test', [
@@ -130,7 +137,7 @@ public function it_restores_from_cache()
 
         $session->restore();
 
-        $this->assertEquals([$regionOne, $regionTwo], $session->regions()->all());
+        $this->assertEquals(['abc' => $regionOne, 'def' => $regionTwo], $session->regions()->all());
         $this->assertNotEquals([], $cascade = $session->cascade());
         $this->assertEquals('/test', $cascade['url']);
         $this->assertEquals('Test page', $cascade['title']);
@@ -202,10 +209,9 @@ public function it_restores_session_if_theres_a_nocache_placeholder_in_the_respo
         $this->viewShouldReturnRendered('default', 'Hello <span class="nocache" data-nocache="abc">NOCACHE_PLACEHOLDER</span>');
         $this->createPage('test');
 
+        Cache::forever('nocache::region.abc', $region = Mockery::mock(StringRegion::class));
         Cache::put('nocache::session.'.md5('http://localhost/test'), [
-            'regions' => [
-                'abc' => $region = Mockery::mock(StringRegion::class),
-            ],
+            'regions' => ['abc'],
         ]);
 
         $region->shouldReceive('render')->andReturn('world');
diff --git a/tests/StaticCaching/NocacheTagsTest.php b/tests/StaticCaching/NocacheTagsTest.php
index 0272940d0f..f33f0314e8 100644
--- a/tests/StaticCaching/NocacheTagsTest.php
+++ b/tests/StaticCaching/NocacheTagsTest.php
@@ -2,7 +2,10 @@
 
 namespace Tests\StaticCaching;
 
+use Mockery;
+use Statamic\Facades\Parse;
 use Statamic\StaticCaching\NoCache\Session;
+use Statamic\StaticCaching\NoCache\StringRegion;
 use Tests\FakesContent;
 use Tests\FakesViews;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -99,4 +102,55 @@ public function it_can_keep_nested_nocache_tags_dynamic_inside_cache_tags()
             ->assertOk()
             ->assertSeeInOrder(['Updated', 'Updated', 'Existing', 'Updated']);
     }
+
+    /** @test */
+    public function it_only_adds_appropriate_fields_of_context_to_session()
+    {
+        // We will not add `baz` to the session because it is not used in the template.
+        // We will not add `nope` to the session because it is not in the context.
+        $expectedFields = ['foo', 'bar'];
+        $template = '{{ nocache }}{{ foo }}{{ bar }}{{ nope }}{{ /nocache }}';
+        $context = [
+            'foo' => 'alfa',
+            'bar' => 'bravo',
+            'baz' => 'charlie',
+        ];
+
+        $region = Mockery::mock(StringRegion::class)->shouldReceive('placeholder')->andReturn('the placeholder')->getMock();
+
+        $this->mock(Session::class, fn ($mock) => $mock
+            ->shouldReceive('pushRegion')
+            ->withArgs(fn ($arg1, $arg2, $arg3) => array_keys($arg2) === $expectedFields)
+            ->once()->andReturn($region));
+
+        $this->assertEquals('the placeholder', $this->tag($template, $context));
+    }
+
+    /** @test */
+    public function it_only_adds_explicitly_defined_fields_of_context_to_session()
+    {
+        // We will not add `bar` to the session because it is not explicitly defined.
+        // We will not add `nope` to the session because it is not in the context.
+        $expectedFields = ['foo', 'baz'];
+        $template = '{{ nocache select="foo|baz|nope" }}{{ foo }}{{ bar }}{{ nope }}{{ /nocache }}';
+        $context = [
+            'foo' => 'alfa',
+            'bar' => 'bravo',
+            'baz' => 'charlie',
+        ];
+
+        $region = Mockery::mock(StringRegion::class)->shouldReceive('placeholder')->andReturn('the placeholder')->getMock();
+
+        $this->mock(Session::class, fn ($mock) => $mock
+            ->shouldReceive('pushRegion')
+            ->withArgs(fn ($arg1, $arg2, $arg3) => array_keys($arg2) === $expectedFields)
+            ->once()->andReturn($region));
+
+        $this->assertEquals('the placeholder', $this->tag($template, $context));
+    }
+
+    private function tag($tag, $data = [])
+    {
+        return (string) Parse::template($tag, $data);
+    }
 }

From 334ebc1810b2e25c20d1cd47f058caf06f1b0ae2 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 14 Nov 2023 19:22:38 +0000
Subject: [PATCH 092/175] [4.x] Fix super not saving on eloquent users (#8979)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Auth/Eloquent/User.php               |  4 ++++
 tests/Auth/Eloquent/EloquentUserTest.php | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Auth/Eloquent/User.php b/src/Auth/Eloquent/User.php
index 416ef4a83c..605c0886eb 100644
--- a/src/Auth/Eloquent/User.php
+++ b/src/Auth/Eloquent/User.php
@@ -358,6 +358,10 @@ public function __set($key, $value)
             return $this->model()->timestamps = $value;
         }
 
+        if ($key === 'super') {
+            return $this->model()->super = $value;
+        }
+
         return $this->$key = $value;
     }
 }
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index c21f5c391c..d1fab7abb0 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -139,4 +139,24 @@ public function it_gets_the_timestamps_property_from_the_model()
 
         $this->assertFalse($user->timestamps);
     }
+
+    /** @test */
+    public function it_gets_super_correctly_on_the_model()
+    {
+        $user = $this->makeUser();
+
+        $this->assertNull($user->super);
+
+        $user->super = true;
+        $user->save();
+
+        $this->assertTrue($user->super);
+        $this->assertTrue($user->model()->super);
+
+        $user->super = false;
+        $user->save();
+
+        $this->assertFalse($user->super);
+        $this->assertFalse($user->model()->super);
+    }
 }

From 4c6fe041e2203a8033e5949ce4a5d9d6c0ad2411 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 14 Nov 2023 14:32:15 -0500
Subject: [PATCH 093/175] [4.x] More php file validation (#8991)

---
 src/Http/Controllers/CP/Assets/AssetsController.php             | 2 +-
 src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php | 2 +-
 src/Http/Controllers/FormController.php                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index 2a1d5f7854..14b51f62c6 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -69,7 +69,7 @@ public function store(Request $request)
             'container' => 'required',
             'folder' => 'required',
             'file' => ['file', function ($attribute, $value, $fail) {
-                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'phtml'])) {
+                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
                     $fail(__('validation.uploaded'));
                 }
             }],
diff --git a/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php b/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
index 44fec25302..4709f602da 100644
--- a/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
+++ b/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
@@ -12,7 +12,7 @@ public function upload(Request $request)
     {
         $request->validate([
             'file' => ['file', function ($attribute, $value, $fail) {
-                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'phtml'])) {
+                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
                     $fail(__('validation.uploaded'));
                 }
             }],
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 1fb0adc8e2..2f228ae254 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -178,7 +178,7 @@ protected function extraRules($fields)
             })
             ->mapWithKeys(function ($field) {
                 return [$field->handle().'.*' => ['file', function ($attribute, $value, $fail) {
-                    if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'phtml'])) {
+                    if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
                         $fail(__('validation.uploaded'));
                     }
                 }]];

From 24b73ab9a6965e60b7c335b76f95fe57c9dbea67 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 14 Nov 2023 14:44:01 -0500
Subject: [PATCH 094/175] changelog

---
 CHANGELOG.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65653a398f..8c690a1083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Release Notes
 
+## 4.34.0 (2023-11-14)
+
+### What's new
+- Auto-populate `array` fieldtype options. [#8980](https://github.com/statamic/cms/issues/8980) by @duncanmcclean
+- Add Bard support to `read_time` modifier. [#8976](https://github.com/statamic/cms/issues/8976) by @duncanmcclean
+- Antlers identifier finder. [#8965](https://github.com/statamic/cms/issues/8965) by @jasonvarga
+
+### What's improved
+- Nocache performance improvements. [#8956](https://github.com/statamic/cms/issues/8956) by @jasonvarga
+- French translations. [#8977](https://github.com/statamic/cms/issues/8977) by @ebeauchamps
+
+### What's fixed
+- More php file validation. [#8991](https://github.com/statamic/cms/issues/8991) by @jasonvarga
+- Fix super not saving on eloquent users. [#8979](https://github.com/statamic/cms/issues/8979) by @ryanmitchell
+- Hide export submissions button when there are no valid exporters. [#8985](https://github.com/statamic/cms/issues/8985) by @ryanmitchell
+- Only namespace asset validation attributes when on a CP route. [#8987](https://github.com/statamic/cms/issues/8987) by @ryanmitchell
+- Fix for edit form page saying edit collection. [#8967](https://github.com/statamic/cms/issues/8967) by @ryanmitchell
+- Fix new child entries not propagating to appropriate position in other sites trees. [#7302](https://github.com/statamic/cms/issues/7302) by @arthurperton
+- Fix impersonation redirect. [#8973](https://github.com/statamic/cms/issues/8973) by @jasonvarga
+- Fix error when getting alt on bard image when asset is missing. [#8959](https://github.com/statamic/cms/issues/8959) by @morphsteve
+- Prevent requiring current password when changing another user's password. [#8966](https://github.com/statamic/cms/issues/8966) by @duncanmcclean
+- Fix global attribute support on bard's small mark. [#8969](https://github.com/statamic/cms/issues/8969) by @jacksleight
+
+
+
 ## 4.33.0 (2023-11-10)
 
 ### What's new

From ed4080f7d9bce6c1844b97a8c8ba39b5d3488cbe Mon Sep 17 00:00:00 2001
From: Jeroen Peters <mail@jeroenpeters.com>
Date: Tue, 14 Nov 2023 22:12:11 +0100
Subject: [PATCH 095/175] [4.x] Dutch translations (#8993)

Co-authored-by: Jeroen Peters <jeroenpeters@impres.nl>
---
 resources/lang/nl.json            | 3 +--
 resources/lang/nl/fieldtypes.php  | 1 +
 resources/lang/nl/messages.php    | 3 +++
 resources/lang/nl/permissions.php | 2 ++
 resources/lang/nl/validation.php  | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl.json b/resources/lang/nl.json
index c879e36212..c88108b41a 100644
--- a/resources/lang/nl.json
+++ b/resources/lang/nl.json
@@ -394,8 +394,6 @@
     "Expand\/Collapse Sets": "Set in-\/uitklappen",
     "Expect a root page": "Verwacht een root-pagina",
     "Expired": "Verlopen",
-    "Export as CSV": "Als CSV exporteren",
-    "Export as JSON": "Als JSON exporteren",
     "Export Submissions": "Inzendingen exporteren",
     "External link": "Externe link",
     "False": "Niet waar",
@@ -780,6 +778,7 @@
     "Scaffold Views": "Views genereren",
     "Scheduled": "Gepland",
     "Search": "Zoeken",
+    "Search Index": "Zoekindex",
     "Search Indexes": "Zoekindexen",
     "Search Sets": "Sets zoeken",
     "Search...": "Zoek ...",
diff --git a/resources/lang/nl/fieldtypes.php b/resources/lang/nl/fieldtypes.php
index 4bed4bdc2b..da35c32e71 100644
--- a/resources/lang/nl/fieldtypes.php
+++ b/resources/lang/nl/fieldtypes.php
@@ -74,6 +74,7 @@
     'entries.config.collections' => 'Kies welke collecties gekozen kunnen worden door gebruikers.',
     'entries.config.create' => 'Het aanmaken van nieuwe entries toestaan.',
     'entries.config.query_scopes' => 'Kies welke query scopes toegepast worden bij het ophalen van entries.',
+    'entries.config.search_index' => 'Zoekindex',
     'entries.title' => 'Entries',
     'float.title' => 'Float',
     'form.config.max_items' => 'Het maximum aantal selecteerbare formulieren.',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
index f452290eea..3af0a25232 100644
--- a/resources/lang/nl/messages.php
+++ b/resources/lang/nl/messages.php
@@ -68,6 +68,9 @@
     'collections_route_instructions' => 'De route definieert het URL-patroon. Lees meer in de [documentatie](https://statamic.dev/collections#routing).',
     'collections_sort_direction_instructions' => 'De standaard sorteervolgorde.',
     'collections_taxonomies_instructions' => 'Koppel entries in deze collectie aan taxonomieën. Velden worden automatisch toegevoegd aan publiceerformulieren.',
+    'duplicate_action_localizations_confirmation' => 'Weet je zeker dat je deze actie wilt uitvoeren? Alle lokalisaties worden dan ook gedupliceerd.',
+    'duplicate_action_warning_localization' => 'Deze entry is een lokalisatie. De originele entry zal worden gedupliceerd.',
+    'duplicate_action_warning_localizations' => 'Één of meer van deze entries zijn lokalisaties. In die gevallen zal het origineel gedupliceerd worden.',
     'email_utility_configuration_description' => 'E-mailsettings worden geconfigureerd in <code>:path</code>',
     'email_utility_description' => 'Bekijk e-mailconfiguratiesettings and verstuur testmails.',
     'entry_origin_instructions' => 'De nieuwe lokalisatie neemt waarden over van het item op de geselecteerde site.',
diff --git a/resources/lang/nl/permissions.php b/resources/lang/nl/permissions.php
index 26eba89e23..1e1746ee06 100644
--- a/resources/lang/nl/permissions.php
+++ b/resources/lang/nl/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Toegang tot addons, met de mogelijkheid om addons te installeren en te verwijderen.',
     'manage_preferences' => 'Beheer Instellingen',
     'manage_preferences_desc' => 'Mogelijkheid om globale en rol specifieke voorkeuren aan te passen.',
+    'group_sites' => 'Sites',
+    'access_{site}_site' => 'Toegang tot site :site',
     'group_collections' => 'Collecties',
     'configure_collections' => 'Configureer collecties',
     'configure_collections_desc' => 'Geeft toegang tot alle collectiegerelateerde rechten',
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index 80d05e4594..0f662dd79b 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -153,6 +153,7 @@
     'date_fieldtype_end_date_required' => 'Einddatum is verplicht.',
     'date_fieldtype_end_date_invalid' => 'Dit is geen geldige einddatum.',
     'code_fieldtype_rulers' => 'Dit is ongeldig.',
+    'options_require_keys' => 'Voor elke optie is een key verplicht. ',
     'custom.attribute-name.rule-name' => 'aangepast-bericht',
     'attributes' => [],
 ];

From 0ef15f0cd28b99c82ae773eaaeb0194a5fb97071 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 15 Nov 2023 09:59:31 -0500
Subject: [PATCH 096/175] [4.x] Add ability to customize bard/replicator set
 icons directory (#8931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Show default icon directory and folder settings usin placeholders.

* Wip.

* Use provider implementation instead.

* Use user’s config in set / set group icon selectors.

* Allow use of named arguments, if they just want to pass `$folder`.

* Rework `<svg-icon>` tp support custom icons.

* Revert "Rework `<svg-icon>` tp support custom icons."

This reverts commit ca573debbcdb74c4302ff57b8c5b049524a92ea0.

* Flesh out custom icons static method, on `Sets` instead of `Bard`.

* Use svg html passed from server in set picker.

* Reference more generic keys in blueprint icon selectors.

* Backend handles this now.

* Rename setter method.

* No comment

* Cleanup fallback handling.

* Camel case like other provided json vars.

* Ensure we provide default icon directory and folder to script.

* Get icon html here as well.

* Render using v-html.

* Set default icon.

* Docblock.

* Fix issue with custom `$folder` not being respected.

* Prepare custom SVG icon contents for script.

* Provide custom SVG icon contents to script.

* Revert this icon html functionality, since we’re providing that to script for <svg-icon> component now.

* We’re in a Vue component, so just use methods instead of vanilla JS funcs.

* Render using `<svg-icon>` again, but pass custom directory.

* If custom icon is available, render that instead.

* Clean up naming.

* Update set picker as well.

* Fix fallback.

* Always show icon components.

* Show custom icon, or fallback to Statamic when not available.

* Pass failing tests.

* Test that user can provide custom icon base dir and/or sub-folder to script.

* We shouldn’t need to provide default directory to script.

* Mounted is cleaner than created + nextTick.

* Fix rendering of icons in blueprint builder.

* Fix fallback icon handling.

* Fix more fallback icon handling.

* Fix custom icon handling when configuring custom directory AND sub-folder.

* Update tests.
---
 resources/js/components/SvgIcon.vue           | 66 ++++++++++++++-----
 .../js/components/blueprints/Section.vue      | 26 ++++++--
 resources/js/components/blueprints/Tab.vue    | 22 ++++++-
 .../fieldtypes/replicator/SetPicker.vue       | 47 ++++++++++---
 src/Fieldtypes/Icon.php                       | 34 ++++++++++
 src/Fieldtypes/Sets.php                       | 53 +++++++++++++--
 .../View/Composers/JavascriptComposer.php     |  2 +
 src/Providers/CpServiceProvider.php           |  3 +
 tests/Fieldtypes/SetsTest.php                 | 44 +++++++++++++
 9 files changed, 260 insertions(+), 37 deletions(-)

diff --git a/resources/js/components/SvgIcon.vue b/resources/js/components/SvgIcon.vue
index 62ed20620b..a84addd2e2 100644
--- a/resources/js/components/SvgIcon.vue
+++ b/resources/js/components/SvgIcon.vue
@@ -4,33 +4,57 @@
 
 <script>
 import { defineAsyncComponent } from 'vue';
-
-const splitIcon = function(icon) {
-    if (! icon.includes('/')) icon = 'regular/' + icon;
-    return icon.split('/');
-}
-
-const fallbackIconImport = function() {
-    return import('./../../svg/icons/regular/image.svg');
-}
+import { data_get } from  '../bootstrap/globals.js'
 
 export default {
+
     props: {
         name: String,
         default: String,
+        directory: String,
     },
+
     data() {
         return {
-            icon: this.evaluateIcon(),
+            icon: null,
         }
     },
+
+    mounted() {
+        this.icon = this.evaluateIcon();
+    },
+
     watch: {
         name() {
             this.icon = this.evaluateIcon();
         }
     },
+
+    computed: {
+        customIcon() {
+            if (! this.directory) return;
+
+            let directory = this.directory;
+            let folder = null;
+            let file = this.name;
+
+            if (this.name.includes('/')) {
+                [folder, file] = this.name.split('/');
+                directory = directory+'/'+folder;
+            }
+
+            return data_get(this.$config.get('customSvgIcons') || {}, `${directory}.${file}`);
+        },
+    },
+
     methods: {
         evaluateIcon() {
+            if (this.customIcon) {
+                return defineAsyncComponent(() => {
+                    return new Promise(resolve => resolve({ template: this.customIcon }));
+                });
+            }
+
             if (this.name.startsWith('<svg')) {
                 return defineAsyncComponent(() => {
                     return new Promise(resolve => resolve({ template: this.name }));
@@ -38,15 +62,27 @@ export default {
             }
 
             return defineAsyncComponent(() => {
-                const [set, file] = splitIcon(this.name);
+                const [set, file] = this.splitIcon(this.name);
+
                 return import(`./../../svg/icons/${set}/${file}.svg`)
                     .catch(e => {
-                        if (! this.default) return fallbackIconImport();
-                        const [set, file] = splitIcon(this.default);
-                        return import(`./../../svg/icons/${set}/${file}.svg`).catch(e => fallbackIconImport());
+                        if (! this.default) return this.fallbackIconImport();
+                        const [set, file] = this.splitIcon(this.default);
+                        return import(`./../../svg/icons/${set}/${file}.svg`).catch(e => this.fallbackIconImport());
                     });
             });
-        }
+        },
+
+        splitIcon(icon) {
+            if (! icon.includes('/')) icon = 'regular/' + icon;
+
+            return icon.split('/');
+        },
+
+        fallbackIconImport() {
+            return import('./../../svg/icons/regular/image.svg');
+        },
+
     }
 }
 </script>
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Section.vue
index efe071af78..55a0dcd878 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Section.vue
@@ -7,7 +7,7 @@
                 <div class="blueprint-drag-handle blueprint-section-drag-handle w-4 border-r"></div>
                 <div class="p-2 flex-1 flex items-center">
                     <a class="flex items-center flex-1 group" @click="edit">
-                        <svg-icon class="h-4 w-4 mr-2 text-gray-700 group-hover:text-blue-500" :name="section.icon ? `plump/${section.icon}` : 'folder-generic'" />
+                        <svg-icon :name="iconName(section.icon)" :directory="iconBaseDirectory" class="h-4 w-4 mr-2 text-gray-700 group-hover:text-blue-500" />
                         <div class="mr-2" v-text="section.display" />
                     </a>
                     <button class="flex items-center text-gray-700 hover:text-gray-950 mr-3" @click="edit">
@@ -42,7 +42,7 @@
                     <div class="form-group w-full" v-if="showHandleField">
                         <label v-text="__('Icon')" />
                         <publish-field-meta
-                            :config="{ handle: 'icon', type: 'icon', folder: 'plump' }"
+                            :config="{ handle: 'icon', type: 'icon', directory: this.iconBaseDirectory, folder: this.iconSubFolder }"
                             :initial-value="editingSection.icon"
                             v-slot="{ meta, value, loading }"
                         >
@@ -122,9 +122,19 @@ export default {
     },
 
     computed: {
+
         suggestableConditionFields() {
             return this.suggestableConditionFieldsProvider?.suggestableFields || [];
-        }
+        },
+
+        iconBaseDirectory() {
+            return this.$config.get('setIconsDirectory');
+        },
+
+        iconSubFolder() {
+            return this.$config.get('setIconsFolder');
+        },
+
     },
 
     watch: {
@@ -191,7 +201,15 @@ export default {
 
         editCancelled() {
             this.editingSection = false;
-        }
+        },
+
+        iconName(name) {
+            if (! name) return 'folder-generic';
+
+            return this.iconSubFolder
+                ? this.iconSubFolder+'/'+name
+                : name;
+        },
 
     }
 
diff --git a/resources/js/components/blueprints/Tab.vue b/resources/js/components/blueprints/Tab.vue
index 11da513835..2662c7df4e 100644
--- a/resources/js/components/blueprints/Tab.vue
+++ b/resources/js/components/blueprints/Tab.vue
@@ -11,7 +11,7 @@
         @click="$emit('selected')"
         @mouseenter="$emit('mouseenter')"
     >
-        <svg-icon v-if="tab.icon" :name="`plump/${tab.icon}`" class="w-4 h-4 mr-1" />
+        <svg-icon v-if="tab.icon" :name="iconName(tab.icon)" :directory="iconBaseDirectory" class="w-4 h-4 mr-1" />
 
         {{ tab.display }}
 
@@ -58,7 +58,7 @@
                 <div class="form-group w-full" v-if="showInstructions">
                     <label v-text="__('Icon')" />
                     <publish-field-meta
-                        :config="{ handle: 'icon', type: 'icon', folder: 'plump' }"
+                        :config="{ handle: 'icon', type: 'icon', directory: this.iconBaseDirectory, folder: this.iconSubFolder }"
                         :initial-value="icon"
                         v-slot="{ meta, value, loading }"
                     >
@@ -117,6 +117,14 @@ export default {
             return this.currentTab === this.tab._id;
         },
 
+        iconBaseDirectory() {
+            return this.$config.get('setIconsDirectory');
+        },
+
+        iconSubFolder() {
+            return this.$config.get('setIconsFolder');
+        },
+
     },
 
     methods: {
@@ -156,7 +164,15 @@ export default {
 
         remove() {
             this.$emit('removed');
-        }
+        },
+
+        iconName(name) {
+            if (! name) return null;
+
+            return this.iconSubFolder
+                ? this.iconSubFolder+'/'+name
+                : name;
+        },
 
     }
 
diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue
index a949e8582a..c0e00007b2 100644
--- a/resources/js/components/fieldtypes/replicator/SetPicker.vue
+++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue
@@ -27,9 +27,7 @@
             <div class="p-1 max-h-[21rem] overflow-auto">
                 <div v-for="(item, i) in items" :key="item.handle" class="cursor-pointer rounded" :class="{ 'bg-gray-200': selectionIndex === i }" @mouseover="selectionIndex = i">
                     <div v-if="item.type === 'group'" @click="selectGroup(item.handle)" class="flex items-center group px-2 py-1.5 rounded-md">
-                        <div class="h-9 w-9 rounded bg-white border border-gray-600 mr-2 p-2">
-                            <svg-icon :name="item.icon ? `plump/${item.icon}` : 'folder-generic'" class="text-gray-800" />
-                        </div>
+                        <svg-icon :name="groupIconName(item.icon)" :directory="iconBaseDirectory" class="h-9 w-9 rounded bg-white border border-gray-600 mr-2 p-2 text-gray-800" />
                         <div class="flex-1">
                             <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
                             <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
@@ -37,9 +35,7 @@
                         <svg-icon name="micro/chevron-right-thin" class="text-gray-600 group-hover:text-gray-800" />
                     </div>
                     <div v-if="item.type === 'set'" @click="addSet(item.handle)" class="flex items-center group px-2 py-1.5 rounded-md">
-                        <div class="h-9 w-9 rounded bg-white border border-gray-600 mr-2 p-2">
-                            <svg-icon :name="item.icon ? `plump/${item.icon}` : 'light/add'" class="text-gray-800" />
-                        </div>
+                        <svg-icon :name="setIconName(item.icon)" :directory="iconBaseDirectory" class="h-9 w-9 rounded bg-white border border-gray-600 mr-2 p-2 text-gray-800" />
                         <div class="flex-1">
                             <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
                             <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
@@ -139,7 +135,26 @@ export default {
 
         noSearchResults() {
             return this.search && this.visibleSets.length === 0;
-        }
+        },
+
+        iconBaseDirectory() {
+            return this.$config.get('setIconsDirectory');
+        },
+
+        iconSubFolder() {
+            return this.$config.get('setIconsFolder');
+        },
+
+        iconDirectory() {
+            let iconDirectory = this.$config.get('setIconsDirectory');
+            let iconFolder = this.$config.get('setIconsFolder');
+
+            if (iconFolder) {
+                iconDirectory = iconDirectory+'/'+iconFolder;
+            }
+
+            return iconDirectory;
+        },
 
     },
 
@@ -221,7 +236,23 @@ export default {
             if (! this.hasMultipleSets) {
                 this.addSet(this.sets[0].sets[0].handle);
             }
-        }
+        },
+
+        groupIconName(name) {
+            if (! name) return 'folder-generic';
+
+            return this.iconSubFolder
+                ? this.iconSubFolder+'/'+name
+                : name;
+        },
+
+        setIconName(name) {
+            if (! name) return 'light/add';
+
+            return this.iconSubFolder
+                ? this.iconSubFolder+'/'+name
+                : name;
+        },
 
     }
 
diff --git a/src/Fieldtypes/Icon.php b/src/Fieldtypes/Icon.php
index 33ab650204..1c9e5332c0 100644
--- a/src/Fieldtypes/Icon.php
+++ b/src/Fieldtypes/Icon.php
@@ -2,10 +2,12 @@
 
 namespace Statamic\Fieldtypes;
 
+use Illuminate\Filesystem\Filesystem;
 use Statamic\Facades\File;
 use Statamic\Facades\Folder;
 use Statamic\Facades\Path;
 use Statamic\Fields\Fieldtype;
+use Statamic\Support\Str;
 
 class Icon extends Fieldtype
 {
@@ -14,6 +16,8 @@ class Icon extends Fieldtype
     protected $categories = ['media'];
     protected $icon = 'icon_picker';
 
+    protected static $customSvgIcons = [];
+
     public function preload(): array
     {
         [$path, $directory, $folder, $hasConfiguredDirectory] = $this->resolveParts();
@@ -39,11 +43,13 @@ protected function configFieldItems(): array
                         'display' => __('Directory'),
                         'instructions' => __('statamic::fieldtypes.icon.config.directory'),
                         'type' => 'text',
+                        'placeholder' => 'vendor/statamic/cms/resources/svg/icons',
                     ],
                     'folder' => [
                         'display' => __('Folder'),
                         'instructions' => __('statamic::fieldtypes.icon.config.folder'),
                         'type' => 'text',
+                        'placeholder' => static::DEFAULT_FOLDER,
                     ],
                     'default' => [
                         'display' => __('Default Value'),
@@ -85,4 +91,32 @@ private function resolveParts()
             $hasConfiguredDirectory,
         ];
     }
+
+    /**
+     * Provide custom SVG icons to script.
+     *
+     * @param  string  $directory
+     * @param  string|null  $folder
+     */
+    public static function provideCustomSvgIconsToScript($directory, $folder = null)
+    {
+        $path = Str::removeRight(Path::tidy($directory.'/'.$folder), '/');
+
+        static::$customSvgIcons[$path] = collect(app(Filesystem::class)->files($path))
+            ->filter(fn ($file) => strtolower($file->getExtension()) === 'svg')
+            ->keyBy(fn ($file) => pathinfo($file->getBasename(), PATHINFO_FILENAME))
+            ->map
+            ->getContents()
+            ->all();
+    }
+
+    /**
+     * Get custom SVG icons for script.
+     *
+     * @return array
+     */
+    public static function getCustomSvgIcons()
+    {
+        return static::$customSvgIcons;
+    }
 }
diff --git a/src/Fieldtypes/Sets.php b/src/Fieldtypes/Sets.php
index bac456f7f6..6b04779fbd 100644
--- a/src/Fieldtypes/Sets.php
+++ b/src/Fieldtypes/Sets.php
@@ -2,15 +2,20 @@
 
 namespace Statamic\Fieldtypes;
 
+use Statamic\Facades\File;
 use Statamic\Fields\Fieldset;
 use Statamic\Fields\FieldTransformer;
 use Statamic\Fields\Fieldtype;
+use Statamic\Statamic;
 use Statamic\Support\Arr;
 
 class Sets extends Fieldtype
 {
     protected $selectable = false;
 
+    protected static $iconsDirectory = null;
+    protected static $iconsFolder = 'plump';
+
     /**
      * Converts the "sets" array of a Replicator (or Bard) field into what the
      * <sets-fieldtype> Vue component is expecting, within either the Blueprint
@@ -83,13 +88,14 @@ public function preProcessConfig($sets)
         return collect($sets)->map(function ($group, $groupHandle) {
             return array_merge($group, [
                 'handle' => $groupHandle,
-                'sets' => collect($group['sets'])->map(function ($config, $name) {
-                    return array_merge($config, [
-                        'handle' => $name,
-                        'id' => $name,
-                        'fields' => (new NestedFields)->preProcessConfig(array_get($config, 'fields', [])),
-                    ]);
-                })
+                'sets' => collect($group['sets'])
+                    ->map(function ($config, $name) {
+                        return array_merge($config, [
+                            'handle' => $name,
+                            'id' => $name,
+                            'fields' => (new NestedFields)->preProcessConfig(array_get($config, 'fields', [])),
+                        ]);
+                    })
                     ->values()
                     ->all(),
             ]);
@@ -126,4 +132,37 @@ public function process($tabs)
         })
             ->all();
     }
+
+    /**
+     * Allow the user to set custom icon directory and/or folder for SVG set icons.
+     *
+     * @param  string|null  $directory
+     * @param  string|null  $folder
+     */
+    public static function setIconsDirectory($directory = null, $folder = null)
+    {
+        // If they are specifying new base directory, ensure we do not assume sub-folder
+        if ($directory) {
+            static::$iconsDirectory = $directory;
+            static::$iconsFolder = $folder;
+        }
+
+        // Of if they are specifying just a sub-folder, use that with original base directory
+        elseif ($folder) {
+            static::$iconsFolder = $folder;
+        }
+
+        // Then provide to script for <icon-fieldtype> selector components in blueprint config
+        Statamic::provideToScript([
+            'setIconsDirectory' => static::$iconsDirectory,
+            'setIconsFolder' => static::$iconsFolder,
+        ]);
+
+        // And finally, provide the file contents of all custom svg icons to script,
+        // but only if custom directory because our <svg-icon> component cannot
+        // reference custom paths at runtime without a full Vite re-build
+        if ($directory) {
+            Icon::provideCustomSvgIconsToScript($directory, $folder);
+        }
+    }
 }
diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index 7d6c177cd3..665559a4d1 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -9,6 +9,7 @@
 use Statamic\Facades\Preference;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
+use Statamic\Fieldtypes\Icon;
 use Statamic\Statamic;
 use Statamic\Support\Str;
 use voku\helper\ASCII;
@@ -67,6 +68,7 @@ private function protectedVariables()
             'livePreview' => config('statamic.live_preview'),
             'permissions' => $this->permissions($user),
             'hasLicenseBanner' => $licenses->invalid() || $licenses->requestFailed(),
+            'customSvgIcons' => Icon::getCustomSvgIcons(),
         ];
     }
 
diff --git a/src/Providers/CpServiceProvider.php b/src/Providers/CpServiceProvider.php
index f526f9e738..d6950870b9 100644
--- a/src/Providers/CpServiceProvider.php
+++ b/src/Providers/CpServiceProvider.php
@@ -10,6 +10,7 @@
 use Statamic\Extensions\Translation\Loader;
 use Statamic\Extensions\Translation\Translator;
 use Statamic\Facades\User;
+use Statamic\Fieldtypes\Sets;
 use Statamic\Http\View\Composers\CustomLogoComposer;
 use Statamic\Http\View\Composers\FieldComposer;
 use Statamic\Http\View\Composers\JavascriptComposer;
@@ -36,6 +37,8 @@ public function boot()
             return "<?php echo Statamic::svg({$expression}) ?>";
         });
 
+        Sets::setIconsDirectory();
+
         $this->registerMiddlewareGroups();
     }
 
diff --git a/tests/Fieldtypes/SetsTest.php b/tests/Fieldtypes/SetsTest.php
index 834fe9ce5b..dcdf84eccb 100644
--- a/tests/Fieldtypes/SetsTest.php
+++ b/tests/Fieldtypes/SetsTest.php
@@ -4,6 +4,8 @@
 
 use Statamic\Fields\ConfigField;
 use Statamic\Fields\Field;
+use Statamic\Fieldtypes\Sets;
+use Statamic\Statamic;
 use Tests\TestCase;
 
 class SetsTest extends TestCase
@@ -390,4 +392,46 @@ public function it_processes()
             ],
         ], $field->process()->value());
     }
+
+    /** @test */
+    public function it_provides_statamic_plump_icons_to_script_by_default()
+    {
+        $jsonVariables = Statamic::jsonVariables(request());
+
+        $this->assertNull($jsonVariables['setIconsDirectory']);
+        $this->assertEquals('plump', $jsonVariables['setIconsFolder']);
+    }
+
+    /** @test */
+    public function it_can_provide_custom_user_icons_subfolder()
+    {
+        Sets::setIconsDirectory(folder: 'light');
+
+        $jsonVariables = Statamic::jsonVariables(request());
+
+        $this->assertNull($jsonVariables['setIconsDirectory']);
+        $this->assertEquals('light', $jsonVariables['setIconsFolder']);
+    }
+
+    /** @test */
+    public function it_can_provide_custom_user_icons_directory()
+    {
+        Sets::setIconsDirectory($customDir = resource_path());
+
+        $jsonVariables = Statamic::jsonVariables(request());
+
+        $this->assertEquals($customDir, $jsonVariables['setIconsDirectory']);
+        $this->assertEquals(null, $jsonVariables['setIconsFolder']);
+    }
+
+    /** @test */
+    public function it_can_provide_custom_user_icons_directory_and_sub_folder()
+    {
+        Sets::setIconsDirectory($customDir = base_path(), $customSubFolder = 'resources');
+
+        $jsonVariables = Statamic::jsonVariables(request());
+
+        $this->assertEquals($customDir, $jsonVariables['setIconsDirectory']);
+        $this->assertEquals($customSubFolder, $jsonVariables['setIconsFolder']);
+    }
 }

From 28950ca14ad73d6b6181fa38c6541ef8ede24b7d Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 15 Nov 2023 16:20:32 +0000
Subject: [PATCH 097/175] [4.x] Prevent concurrent requests to the Outpost
 (#9000)

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Licensing/Outpost.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Licensing/Outpost.php b/src/Licensing/Outpost.php
index aeabfad96f..64dd0d30c2 100644
--- a/src/Licensing/Outpost.php
+++ b/src/Licensing/Outpost.php
@@ -6,6 +6,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
+use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use InvalidArgumentException;
@@ -18,6 +19,7 @@ class Outpost
     const ENDPOINT = 'https://outpost.statamic.com/v3/query';
     const REQUEST_TIMEOUT = 5;
     const CACHE_KEY = 'statamic.outpost.response';
+    const LOCK_KEY = 'statamic.outpost.lock';
 
     private $response;
     private $client;
@@ -40,16 +42,24 @@ public function response()
 
     private function request()
     {
-        if ($this->hasCachedResponse()) {
-            return $this->getCachedResponse();
-        }
+        $lock = $this->cache()->lock(static::LOCK_KEY, 10);
 
         try {
+            $lock->block(static::REQUEST_TIMEOUT);
+
+            if ($this->hasCachedResponse()) {
+                return $this->getCachedResponse();
+            }
+
             return $this->performAndCacheRequest();
         } catch (ConnectException $e) {
             return $this->cacheAndReturnErrorResponse($e);
         } catch (RequestException $e) {
             return $this->handleRequestException($e);
+        } catch (LockTimeoutException $e) {
+            return $this->cacheAndReturnErrorResponse($e);
+        } finally {
+            $lock->release();
         }
     }
 

From f21bdfd5bb62cbd71c0a6cd383fff83e2e570d93 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 15 Nov 2023 11:25:19 -0500
Subject: [PATCH 098/175] [4.x] Add ability to set settings on Algolia index
 (#8830)

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
---
 src/Search/Algolia/Index.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Search/Algolia/Index.php b/src/Search/Algolia/Index.php
index be5c219d9e..9e18054b54 100644
--- a/src/Search/Algolia/Index.php
+++ b/src/Search/Algolia/Index.php
@@ -54,7 +54,12 @@ public function deleteIndex()
 
     public function update()
     {
-        $this->getIndex()->clearObjects();
+        $index = $this->getIndex();
+        $index->clearObjects();
+
+        if (isset($this->config['settings'])) {
+            $index->setSettings($this->config['settings']);
+        }
 
         $this->insertMultiple($this->searchables()->all());
 
@@ -63,7 +68,14 @@ public function update()
 
     public function getIndex()
     {
-        return $this->client->initIndex($this->name);
+        $indexExisted = $this->exists();
+        $index = $this->client->initIndex($this->name);
+
+        if (! $indexExisted && isset($this->config['settings'])) {
+            $index->setSettings($this->config['settings']);
+        }
+
+        return $index;
     }
 
     public function searchUsingApi($query, $fields = null)

From 586eb7b95781f997cd165c151e3237670b8dd683 Mon Sep 17 00:00:00 2001
From: Martin Dub <49438284+martinoak@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:35:40 +0100
Subject: [PATCH 099/175] [4.x] Resolve dynamically declared properties (#8999)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Console/Commands/GeneratorCommand.php                   | 1 +
 src/Fieldtypes/Entries.php                                  | 1 +
 src/Http/Resources/CP/Entries/Entries.php                   | 1 +
 src/Http/Resources/CP/Submissions/Submissions.php           | 1 +
 src/Http/Resources/CP/Taxonomies/Terms.php                  | 1 +
 src/Ignition/SolutionProviders/UsingOldClass.php            | 1 +
 tests/Stache/Repositories/GlobalVariablesRepositoryTest.php | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/Console/Commands/GeneratorCommand.php b/src/Console/Commands/GeneratorCommand.php
index b2e2fe2f5a..9de87901c9 100644
--- a/src/Console/Commands/GeneratorCommand.php
+++ b/src/Console/Commands/GeneratorCommand.php
@@ -13,6 +13,7 @@
 abstract class GeneratorCommand extends IlluminateGeneratorCommand
 {
     protected $package;
+    protected $shownAddonPathError;
 
     /**
      * Execute the console command.
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index 13786461ef..f29272c518 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -34,6 +34,7 @@ class Entries extends Relationship
     protected $canSearch = true;
     protected $statusIcons = true;
     protected $formComponent = 'entry-publish-form';
+    protected $activeFilterBadges;
 
     protected $formComponentProps = [
         'initialActions' => 'actions',
diff --git a/src/Http/Resources/CP/Entries/Entries.php b/src/Http/Resources/CP/Entries/Entries.php
index 6674ed200d..b9172f8676 100644
--- a/src/Http/Resources/CP/Entries/Entries.php
+++ b/src/Http/Resources/CP/Entries/Entries.php
@@ -12,6 +12,7 @@ class Entries extends ResourceCollection
 
     public $collects = ListedEntry::class;
     protected $blueprint;
+    protected $columns;
     protected $columnPreferenceKey;
 
     public function blueprint($blueprint)
diff --git a/src/Http/Resources/CP/Submissions/Submissions.php b/src/Http/Resources/CP/Submissions/Submissions.php
index 152848e358..3b51ff3106 100644
--- a/src/Http/Resources/CP/Submissions/Submissions.php
+++ b/src/Http/Resources/CP/Submissions/Submissions.php
@@ -12,6 +12,7 @@ class Submissions extends ResourceCollection
 
     public $collects = ListedSubmission::class;
     protected $blueprint;
+    protected $columnPreferenceKey;
     protected $columns;
 
     public function blueprint($blueprint)
diff --git a/src/Http/Resources/CP/Taxonomies/Terms.php b/src/Http/Resources/CP/Taxonomies/Terms.php
index 3d9dc96e30..99b349ab2c 100644
--- a/src/Http/Resources/CP/Taxonomies/Terms.php
+++ b/src/Http/Resources/CP/Taxonomies/Terms.php
@@ -13,6 +13,7 @@ class Terms extends ResourceCollection
     public $collects = ListedTerm::class;
     protected $blueprint;
     protected $columnPreferenceKey;
+    protected $columns;
 
     public function blueprint($blueprint)
     {
diff --git a/src/Ignition/SolutionProviders/UsingOldClass.php b/src/Ignition/SolutionProviders/UsingOldClass.php
index 322a775b40..731d20b73b 100644
--- a/src/Ignition/SolutionProviders/UsingOldClass.php
+++ b/src/Ignition/SolutionProviders/UsingOldClass.php
@@ -10,6 +10,7 @@
 
 class UsingOldClass implements HasSolutionsForThrowable
 {
+    protected $oldClass;
     protected $class;
 
     public function canSolve(Throwable $throwable): bool
diff --git a/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php b/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php
index 722e326b10..b8c5aeceed 100644
--- a/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php
+++ b/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php
@@ -17,6 +17,7 @@ class GlobalVariablesRepositoryTest extends TestCase
 {
     private $directory;
     private $repo;
+    private $globalRepo;
 
     private function setUpSingleSite()
     {

From c1372b8c3a3b1610172a9f9120dd41b4a71568db Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 16:45:14 +0000
Subject: [PATCH 100/175] [4.x] Adding a fieldset with the same name should
 throw an error (#8994)

---
 routes/cp.php                                         | 2 +-
 src/Http/Controllers/CP/Fields/FieldsetController.php | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/routes/cp.php b/routes/cp.php
index b770215574..7f3f48a51e 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -237,7 +237,7 @@
         Route::post('edit', [FieldsController::class, 'edit'])->name('fields.edit');
         Route::post('update', [FieldsController::class, 'update'])->name('fields.update');
         Route::get('field-meta', [MetaController::class, 'show']);
-        Route::resource('fieldsets', FieldsetController::class);
+        Route::resource('fieldsets', FieldsetController::class)->except(['show']);
         Route::get('blueprints', [BlueprintController::class, 'index'])->name('blueprints.index');
         Route::get('fieldtypes', [FieldtypesController::class, 'index']);
     });
diff --git a/src/Http/Controllers/CP/Fields/FieldsetController.php b/src/Http/Controllers/CP/Fields/FieldsetController.php
index 17853341d9..bae8519839 100644
--- a/src/Http/Controllers/CP/Fields/FieldsetController.php
+++ b/src/Http/Controllers/CP/Fields/FieldsetController.php
@@ -92,7 +92,13 @@ public function store(Request $request)
         ]);
 
         if (Facades\Fieldset::find($request->handle)) {
-            return back()->withInput()->with('error', __('A fieldset with that name already exists.'));
+            $error = __('A fieldset with that name already exists.');
+
+            if ($request->wantsJson()) {
+                throw new \Exception($error);
+            }
+
+            return back()->withInput()->with('error', $error);
         }
 
         $fieldset = (new Fieldset)

From e8ec1a8a4fe4fe9f5cdac20e73c29c60a0cea1d5 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Wed, 15 Nov 2023 16:47:41 +0000
Subject: [PATCH 101/175] [4.x] Improve Bard invalid content error reporting
 (#8580)

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
---
 resources/css/components/fieldtypes/bard.css  |  2 +-
 .../fieldtypes/bard/BardFieldtype.vue         | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/resources/css/components/fieldtypes/bard.css b/resources/css/components/fieldtypes/bard.css
index 035e01efa9..556c11d09f 100644
--- a/resources/css/components/fieldtypes/bard.css
+++ b/resources/css/components/fieldtypes/bard.css
@@ -17,7 +17,7 @@
     }
 }
 
-.bard-editor .bard-invalid {
+.bard-editor .bard-error {
     @apply p-2 @lg:px-4 bg-red-100 text-red-500 text-xs whitespace-nowrap;
 }
 
diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index bfeae26145..e9873150dd 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -83,7 +83,7 @@
                 </set-picker>
             </floating-menu>
 
-            <div class="bard-invalid" v-if="invalid" v-html="__('Invalid content')"></div>
+            <div class="bard-error" v-if="initError" v-html="initError"></div>
             <editor-content :editor="editor" v-show="!showSource" :id="fieldId" />
             <bard-source :html="htmlWithReplacedLinks" v-if="showSource" />
         </div>
@@ -173,7 +173,7 @@ export default {
             collapsed: this.meta.collapsed,
             previews: this.meta.previews,
             mounted: false,
-            invalid: false,
+            initError: null,
             pageHeader: null,
             escBinding: null,
             showAddSetButton: false,
@@ -631,13 +631,39 @@ export default {
                         try {
                             state.schema.nodeFromJSON(content);
                         } catch (error) {
-                            this.invalid = true;
+                            const invalidError = this.invalidError(error);
+                            if (invalidError) {
+                                this.initError = invalidError;
+                            } else {
+                                this.initError = __('Something went wrong');
+                                console.error(error);
+                            }
                         }
                     }
                 }
             });
         },
 
+        invalidError(error) {
+            const messages = {
+                'Invalid text node in JSON': 'Invalid content, text values must be strings',
+                'Empty text nodes are not allowed': 'Invalid content, text values cannot be empty',
+            };
+
+            if (messages[error.message]) {
+                return __(messages[error.message]);
+            }
+
+            let match;
+            if (match = error.message.match(/^(?:There is no|Unknown) (?:node|mark) type:? (\w*)(?: in this schema)?$/)) {
+                if (match[1]) {
+                    return __('Invalid content, :type button/extension is not enabled', { type: match[1] });
+                } else {
+                    return __('Invalid content, nodes and marks must have a type');
+                }
+            }
+        },
+
         valueToContent(value) {
             // A json string is passed from PHP since that's what's submitted.
             value = JSON.parse(value);

From 70fded3c84ec3010d27231c4446d4f656315cf21 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 16:50:03 +0000
Subject: [PATCH 102/175] [4.x] Check if a globalset exists before adding one
 with the same handle (#8996)

---
 src/Http/Controllers/CP/Globals/GlobalsController.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Http/Controllers/CP/Globals/GlobalsController.php b/src/Http/Controllers/CP/Globals/GlobalsController.php
index 6e9481b17a..ce43e6ca79 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsController.php
@@ -149,6 +149,16 @@ public function store(Request $request)
 
         $handle = $data['handle'] ?? Str::snake($data['title']);
 
+        if (GlobalSet::find($handle)) {
+            $error = __('A Global Set with that handle already exists.');
+
+            if ($request->wantsJson()) {
+                throw new \Exception($error);
+            }
+
+            return back()->withInput()->with('error', $error);
+        }
+
         $global = GlobalSet::make($handle)->title($data['title']);
 
         $global->addLocalization($global->makeLocalization(Site::default()->handle()));

From 112bae1571cb02a022e9a8105654fb95f0f19329 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 16:51:27 +0000
Subject: [PATCH 103/175] [4.x] Show error when there is a duplicate taxonomy
 blueprint name (#8997)

---
 resources/views/taxonomies/blueprints/create.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/taxonomies/blueprints/create.blade.php b/resources/views/taxonomies/blueprints/create.blade.php
index 7b59f50daf..f499ec074d 100644
--- a/resources/views/taxonomies/blueprints/create.blade.php
+++ b/resources/views/taxonomies/blueprints/create.blade.php
@@ -16,6 +16,9 @@
                 <div class="text-2xs text-gray-600 mt-2 flex items-center">
                     {{ __('statamic::messages.blueprints_title_instructions') }}
                 </div>
+                @if ($errors->has('title'))
+                    <div class="text-red-500 text-xs mt-2">{{ $errors->first('title') }}</div>
+                @endif
             </div>
         </div>
 

From 07d06678da417662ee4a6837664b8bb287294602 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 16:52:59 +0000
Subject: [PATCH 104/175] [4.x] Check if a navigation exists before adding one
 with the same handle (#8995)

---
 .../Controllers/CP/Navigation/NavigationController.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Http/Controllers/CP/Navigation/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
index 4acb58ad74..0854b2b095 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -150,6 +150,16 @@ public function store(Request $request)
             'handle' => 'required|alpha_dash',
         ]);
 
+        if (Nav::find($values['handle'])) {
+            $error = __('A navigation with that handle already exists.');
+
+            if ($request->wantsJson()) {
+                throw new \Exception($error);
+            }
+
+            return back()->withInput()->with('error', $error);
+        }
+
         $structure = Nav::make()
             ->title($values['title'])
             ->handle($values['handle']);

From 10be7f1e771b88659beb4f3fc6809d5f24ff1b03 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 16:55:57 +0000
Subject: [PATCH 105/175] [4.x] Check if user roles and groups exist before
 creating them (#8998)

---
 src/Http/Controllers/CP/Users/RolesController.php  | 14 +++++++++++++-
 .../Controllers/CP/Users/UserGroupsController.php  | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Users/RolesController.php b/src/Http/Controllers/CP/Users/RolesController.php
index ddbdfe646c..0fa5588e29 100644
--- a/src/Http/Controllers/CP/Users/RolesController.php
+++ b/src/Http/Controllers/CP/Users/RolesController.php
@@ -66,9 +66,21 @@ public function store(Request $request)
             'permissions' => 'array',
         ]);
 
+        $handle = $request->handle ?: snake_case($request->title);
+
+        if (Role::find($handle)) {
+            $error = __('A Role with that handle already exists.');
+
+            if ($request->wantsJson()) {
+                return response()->json(['message' => $error], 422);
+            }
+
+            return back()->withInput()->with('error', $error);
+        }
+
         $role = Role::make()
             ->title($request->title)
-            ->handle($request->handle ?: snake_case($request->title));
+            ->handle($handle);
 
         if ($request->super && User::current()->isSuper()) {
             $role->permissions(['super']);
diff --git a/src/Http/Controllers/CP/Users/UserGroupsController.php b/src/Http/Controllers/CP/Users/UserGroupsController.php
index 67ae51d246..b4109b5414 100644
--- a/src/Http/Controllers/CP/Users/UserGroupsController.php
+++ b/src/Http/Controllers/CP/Users/UserGroupsController.php
@@ -167,10 +167,22 @@ public function store(Request $request)
 
         $values = $fields->process()->values()->except(['title', 'handle', 'roles']);
 
+        $handle = $request->handle ?: snake_case($request->title);
+
+        if (UserGroup::find($handle)) {
+            $error = __('A User Group with that handle already exists.');
+
+            if ($request->wantsJson()) {
+                return response()->json(['message' => $error], 422);
+            }
+
+            return back()->withInput()->with('error', $error);
+        }
+
         $group = UserGroup::make()
             ->title($request->title)
             ->data($values)
-            ->handle($request->handle ?: snake_case($request->title));
+            ->handle($handle);
 
         if (User::current()->can('assign roles')) {
             $group->roles($request->roles);

From 216275dc1b412057773abc0dff4663fb5a803f34 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 15 Nov 2023 18:15:13 +0000
Subject: [PATCH 106/175] [4.x] Update revision values on save (#8961)

---
 resources/js/components/entries/PublishForm.vue           | 1 +
 src/Http/Controllers/CP/Collections/EntriesController.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 54956e890a..dd1a4ca0a7 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -558,6 +558,7 @@ export default {
                 .then(() => {
                     // If revisions are enabled, just emit event.
                     if (this.revisionsEnabled) {
+                        this.values = this.resetValuesFromResponse(response.data.data.values);
                         this.$nextTick(() => this.$emit('saved', response));
                         return;
                     }
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 1a2057f65d..dbd605ed91 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -245,6 +245,9 @@ public function update(Request $request, $collection, $entry)
                 ->makeWorkingCopy()
                 ->user(User::current())
                 ->save();
+
+            // catch any changes through RevisionSaving event
+            $entry = $entry->fromWorkingCopy();
         } else {
             if (! $entry->revisionsEnabled() && User::current()->can('publish', $entry)) {
                 $entry->published($request->published);

From ac354ed4d67b81f9c43c7cc6c4c1c9b1923b54d2 Mon Sep 17 00:00:00 2001
From: Oliver Mesieh <olivermesieh@gmail.com>
Date: Wed, 15 Nov 2023 19:19:33 +0100
Subject: [PATCH 107/175] [4.x] Fix missing cursor when editing inline code in
 Bard (#9002)

---
 resources/css/components/fieldtypes/bard.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/components/fieldtypes/bard.css b/resources/css/components/fieldtypes/bard.css
index 556c11d09f..b3886b5d60 100644
--- a/resources/css/components/fieldtypes/bard.css
+++ b/resources/css/components/fieldtypes/bard.css
@@ -465,7 +465,7 @@
     }
 
     p > code {
-        @apply font-mono bg-gray-400 rounded-sm text-xs relative;
+        @apply font-mono bg-gray-400 rounded-sm text-xs;
         padding: 2px 4px;
         top: -1px;
     }

From a1d53769b78183e8e6ad5aa78fd8ae105d38a549 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:48:53 +0000
Subject: [PATCH 108/175] [4.x] Prevent registering the Users Stache Store when
 users are stored in a database (#9006)

---
 src/Console/Commands/ImportUsers.php | 5 +++++
 src/Stache/ServiceProvider.php       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/Console/Commands/ImportUsers.php b/src/Console/Commands/ImportUsers.php
index e164e07b11..de0acacea7 100644
--- a/src/Console/Commands/ImportUsers.php
+++ b/src/Console/Commands/ImportUsers.php
@@ -10,8 +10,10 @@
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Contracts\Auth\UserRepository as UserRepositoryContract;
+use Statamic\Facades\Stache;
 use Statamic\Facades\User;
 use Statamic\Stache\Repositories\UserRepository as FileRepository;
+use Statamic\Stache\Stores\UsersStore;
 
 class ImportUsers extends Command
 {
@@ -61,6 +63,9 @@ private function importUsers()
             return;
         }
 
+        $store = app(UsersStore::class)->directory(config('statamic.stache.stores.users.directory', base_path('users')));
+        Stache::registerStore($store);
+
         app()->bind(UserContract::class, FileUser::class);
         app()->bind(UserRepositoryContract::class, FileRepository::class);
 
diff --git a/src/Stache/ServiceProvider.php b/src/Stache/ServiceProvider.php
index 0179270977..fdb4c8cf77 100644
--- a/src/Stache/ServiceProvider.php
+++ b/src/Stache/ServiceProvider.php
@@ -50,6 +50,7 @@ private function registerStores($stache)
         $published = config('statamic.stache.stores');
 
         $nativeStores = collect($config['stores'])
+            ->reject(fn ($config, $key) => $key === 'users' && config('statamic.users.repository') !== 'file')
             ->map(function ($config, $key) use ($published) {
                 return array_merge($config, $published[$key] ?? []);
             });

From 4ad1af1b94a4283b80362156ca68f4844ef9ea55 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Nov 2023 11:49:55 -0500
Subject: [PATCH 109/175] [4.x] Fix nocache tag when using the regex antlers
 parser (#9009)

---
 src/StaticCaching/NoCache/Tags.php | 4 ++--
 src/View/Antlers/Antlers.php       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/StaticCaching/NoCache/Tags.php b/src/StaticCaching/NoCache/Tags.php
index c26dc2b860..90c0a8c721 100644
--- a/src/StaticCaching/NoCache/Tags.php
+++ b/src/StaticCaching/NoCache/Tags.php
@@ -23,13 +23,13 @@ public function index()
     {
         if ($this->params->has('select')) {
             $fields = $this->params->explode('select');
-        } else {
+        } elseif (config('statamic.antlers.version') === 'runtime') {
             $fields = Antlers::identifiers($this->content);
         }
 
         return $this
             ->nocache
-            ->pushRegion($this->content, $this->context->only($fields)->all(), 'antlers.html')
+            ->pushRegion($this->content, $this->context->only($fields ?? null)->all(), 'antlers.html')
             ->placeholder();
     }
 }
diff --git a/src/View/Antlers/Antlers.php b/src/View/Antlers/Antlers.php
index b0fc4f9c43..5b7e62aa09 100644
--- a/src/View/Antlers/Antlers.php
+++ b/src/View/Antlers/Antlers.php
@@ -47,6 +47,10 @@ public function parseLoop($content, $data, $supplement = true, $context = [])
 
     public function identifiers(string $content): array
     {
+        if (config('statamic.antlers.version') !== 'runtime') {
+            throw new \Exception('Antlers identifiers can only be retrieved when using the runtime parser.');
+        }
+
         return (new IdentifierFinder)->getIdentifiers($content);
     }
 }

From ce8e80987e29c8929364dc8387cd0f2399128202 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Nov 2023 21:55:26 -0500
Subject: [PATCH 110/175] changelog

---
 CHANGELOG.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c690a1083..b61d7ef860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Release Notes
 
+## 4.35.0 (2023-11-16)
+
+### What's new
+- Ability to set settings on Algolia indexes. [#8830](https://github.com/statamic/cms/issues/8830) by @godismyjudge95
+- Ability to customize Bard/Replicator set icons directory. [#8931](https://github.com/statamic/cms/issues/8931) by @jesseleite
+
+### What's improved
+- Improve Bard invalid content error reporting. [#8580](https://github.com/statamic/cms/issues/8580) by @jacksleight
+- Dutch translations. [#8993](https://github.com/statamic/cms/issues/8993) by @jeroenpeters1986
+
+### What's fixed
+- Fix nocache tag error when using the regex antlers parser. [#9009](https://github.com/statamic/cms/issues/9009) by @jasonvarga
+- Fix error when using Eloquent users but you still have user files. [#9006](https://github.com/statamic/cms/issues/9006) by @duncanmcclean
+- Fix missing cursor when editing inline code in Bard. [#9002](https://github.com/statamic/cms/issues/9002) by @o1y
+- Fix modified revision values not being shown on save. [#8961](https://github.com/statamic/cms/issues/8961) by @ryanmitchell
+- Check if user roles and groups exist before creating. [#8998](https://github.com/statamic/cms/issues/8998) by @ryanmitchell
+- Check if navigation exists before creating. [#8995](https://github.com/statamic/cms/issues/8995) by @ryanmitchell
+- Check if global exists before creating. [#8996](https://github.com/statamic/cms/issues/8996) by @ryanmitchell
+- Check if fieldset exists before creating. [#8994](https://github.com/statamic/cms/issues/8994) by @ryanmitchell
+- Show error when there is a duplicate taxonomy blueprint name. [#8997](https://github.com/statamic/cms/issues/8997) by @ryanmitchell
+- Prevent concurrent requests to the Outpost. [#9000](https://github.com/statamic/cms/issues/9000) by @duncanmcclean
+- Resolve dynamically declared properties. [#8999](https://github.com/statamic/cms/issues/8999) by @martinoak
+
+
+
 ## 4.34.0 (2023-11-14)
 
 ### What's new

From d31d1539eff5494b3af1da5484ee7f61e3064bf7 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 20 Nov 2023 17:08:45 +0000
Subject: [PATCH 111/175] [4.x] Add `href` attribute to relationship item links
 (#9030)

---
 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 e2ea653673..8e589ca437 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -14,7 +14,7 @@
                 v-text="item.title" />
 
 
-            <a v-if="!item.invalid && editable" @click="edit" v-text="item.title" class="truncate" v-tooltip="item.title" />
+            <a v-if="!item.invalid && editable" @click.prevent="edit" v-text="item.title" class="truncate" v-tooltip="item.title" :href="item.edit_url" />
 
             <div v-if="!item.invalid && !editable" v-text="item.title" />
 

From 88c3cf7d0ec0e1f136ec8e6dafda08bbaed60196 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:10:01 +0000
Subject: [PATCH 112/175] [4.x] Fix error in `HasRequestedColumns` trait on
 Laravel Vapor (#9028)

---
 src/Http/Resources/CP/Concerns/HasRequestedColumns.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
index 60c9bf1612..43b0c3f703 100644
--- a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
+++ b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
@@ -36,6 +36,8 @@ protected function requestedColumnKeys()
             return [];
         }
 
-        return explode(',', $columns);
+        return is_array($columns)
+            ? $columns
+            : explode(',', $columns);
     }
 }

From 27133d6ef27f8115cd747e9facae3340179150e0 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 20 Nov 2023 17:16:14 +0000
Subject: [PATCH 113/175] [4.x] Prevent `{{ range times="0" }}` from outputting
 (#9022)

---
 src/Tags/Range.php       |  4 ++++
 tests/Tags/RangeTest.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 tests/Tags/RangeTest.php

diff --git a/src/Tags/Range.php b/src/Tags/Range.php
index f335e022c2..dd6ca26ff5 100644
--- a/src/Tags/Range.php
+++ b/src/Tags/Range.php
@@ -12,6 +12,10 @@ public function index()
         $to = $this->params->int(['to', 'times']);
         $vars = [];
 
+        if ($to === 0 && ! $this->params->has('from')) {
+            return [];
+        }
+
         foreach (range($from, $to) as $i) {
             $vars[] = [
                 'value' => $i,
diff --git a/tests/Tags/RangeTest.php b/tests/Tags/RangeTest.php
new file mode 100644
index 0000000000..a557626f87
--- /dev/null
+++ b/tests/Tags/RangeTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Tags;
+
+use Statamic\Facades\Parse;
+use Tests\TestCase;
+
+class RangeTest extends TestCase
+{
+    private function tag($tag, $data = [])
+    {
+        return (string) Parse::template($tag, $data);
+    }
+
+    /** @test */
+    public function it_outputs_range()
+    {
+        $this->assertEquals('123', $this->tag('{{ range to="3" }}{{ value }}{{ /range }}'));
+        $this->assertEquals('23', $this->tag('{{ range from="2" to="3" }}{{ value }}{{ /range }}'));
+        $this->assertEquals('543210', $this->tag('{{ range from="5" to="0" }}{{ value }}{{ /range }}'));
+    }
+
+    /** @test */
+    public function it_outputs_nothing_if_from_is_not_set_and_times_is_zero()
+    {
+        $this->assertEquals('', $this->tag('{{ range to="0" }}{{ value }}{{ /range }}'));
+    }
+}

From 8812a1393a5d1ff9f0c6853fa141c77a6599cbf9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:52:39 +0000
Subject: [PATCH 114/175] [4.x] Don't prompt user to select search index when
 there's only 1 configured (#9036)

---
 src/Search/Commands/Update.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Search/Commands/Update.php b/src/Search/Commands/Update.php
index ebb7aece01..12561b4038 100644
--- a/src/Search/Commands/Update.php
+++ b/src/Search/Commands/Update.php
@@ -37,6 +37,10 @@ private function getIndexes()
             return $this->indexes();
         }
 
+        if ($this->indexes()->count() === 1) {
+            return $this->indexes();
+        }
+
         $selection = $this->choice(
             'Select an index to update',
             collect(['all'])->merge($this->indexes()->keys())->all(),

From 97abe8bba16ee380e4bce1b79e74883abfb5976f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Nov 2023 17:32:37 -0500
Subject: [PATCH 115/175] [4.x] Only allow uploading certain file extensions
 (#9037)

---
 config/assets.php                             |  12 ++
 .../CP/Assets/AssetsController.php            |   7 +-
 .../Fieldtypes/FilesFieldtypeController.php   |   7 +-
 src/Http/Controllers/FormController.php       |   7 +-
 src/Validation/AllowedFile.php                | 124 ++++++++++++++++++
 5 files changed, 142 insertions(+), 15 deletions(-)
 create mode 100644 src/Validation/AllowedFile.php

diff --git a/config/assets.php b/config/assets.php
index aaf28a4707..b4df361ce0 100644
--- a/config/assets.php
+++ b/config/assets.php
@@ -198,4 +198,16 @@
 
     'lowercase' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Additional Uploadable Extensions
+    |--------------------------------------------------------------------------
+    |
+    | Statamic will only allow uploads of certain approved file extensions.
+    | If you need to allow more file extensions, you may add them here.
+    |
+    */
+
+    'additional_uploadable_extensions' => [],
+
 ];
diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index 14b51f62c6..e371abac6c 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -11,6 +11,7 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Resources\CP\Assets\Asset as AssetResource;
+use Statamic\Validation\AllowedFile;
 
 class AssetsController extends CpController
 {
@@ -68,11 +69,7 @@ public function store(Request $request)
         $request->validate([
             'container' => 'required',
             'folder' => 'required',
-            'file' => ['file', function ($attribute, $value, $fail) {
-                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
-                    $fail(__('validation.uploaded'));
-                }
-            }],
+            'file' => ['file', new AllowedFile],
         ]);
 
         $container = AssetContainer::find($request->container);
diff --git a/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php b/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
index 4709f602da..e34e9cbc1b 100644
--- a/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
+++ b/src/Http/Controllers/CP/Fieldtypes/FilesFieldtypeController.php
@@ -5,17 +5,14 @@
 use Illuminate\Http\Request;
 use Statamic\Assets\FileUploader as Uploader;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Validation\AllowedFile;
 
 class FilesFieldtypeController extends CpController
 {
     public function upload(Request $request)
     {
         $request->validate([
-            'file' => ['file', function ($attribute, $value, $fail) {
-                if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
-                    $fail(__('validation.uploaded'));
-                }
-            }],
+            'file' => ['file', new AllowedFile],
         ]);
 
         $file = $request->file('file');
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 2f228ae254..f5e1a5bb05 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -19,6 +19,7 @@
 use Statamic\Forms\SendEmails;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
+use Statamic\Validation\AllowedFile;
 
 class FormController extends Controller
 {
@@ -177,11 +178,7 @@ protected function extraRules($fields)
                 return $field->fieldtype()->handle() === 'assets';
             })
             ->mapWithKeys(function ($field) {
-                return [$field->handle().'.*' => ['file', function ($attribute, $value, $fail) {
-                    if (in_array(trim(strtolower($value->getClientOriginalExtension())), ['php', 'php3', 'php4', 'php5', 'php7', 'php8', 'phtml', 'phar'])) {
-                        $fail(__('validation.uploaded'));
-                    }
-                }]];
+                return [$field->handle().'.*' => ['file', new AllowedFile]];
             })
             ->all();
 
diff --git a/src/Validation/AllowedFile.php b/src/Validation/AllowedFile.php
new file mode 100644
index 0000000000..5621466bfa
--- /dev/null
+++ b/src/Validation/AllowedFile.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Statamic\Validation;
+
+use Illuminate\Contracts\Validation\InvokableRule;
+use Illuminate\Http\UploadedFile;
+
+class AllowedFile implements InvokableRule
+{
+    private array $extensions = [
+        '7z',
+        'aiff',
+        'asc',
+        'asf',
+        'avi',
+        'avif',
+        'bmp',
+        'cap',
+        'cin',
+        'csv',
+        'dfxp',
+        'doc',
+        'docx',
+        'dotm',
+        'dotx',
+        'fla',
+        'flv',
+        'gif',
+        'gz',
+        'gzip',
+        'heic',
+        'heif',
+        'hevc',
+        'itt',
+        'jp2',
+        'jpeg',
+        'jpg',
+        'jpx',
+        'js',
+        'json',
+        'lrc',
+        'm2t',
+        'm4a',
+        'm4v',
+        'mcc',
+        'md',
+        'mid',
+        'mov',
+        'mp3',
+        'mp4',
+        'mpc',
+        'mpeg',
+        'mpg',
+        'mpsub',
+        'ods',
+        'odt',
+        'ogg',
+        'ogv',
+        'pdf',
+        'png',
+        'potx',
+        'pps',
+        'ppsm',
+        'ppsx',
+        'ppt',
+        'pptm',
+        'pptx',
+        'ppz',
+        'pxd',
+        'qt',
+        'ram',
+        'rar',
+        'rm',
+        'rmi',
+        'rmvb',
+        'rt',
+        'rtf',
+        'sami',
+        'sbv',
+        'scc',
+        'sdc',
+        'sitd',
+        'smi',
+        'srt',
+        'stl',
+        'sub',
+        'svg',
+        'swf',
+        'sxc',
+        'sxw',
+        'tar',
+        'tds',
+        'tgz',
+        'tif',
+        'tiff',
+        'ttml',
+        'txt',
+        'vob',
+        'vsd',
+        'vtt',
+        'wav',
+        'webm',
+        'webp',
+        'wma',
+        'wmv',
+        'xls',
+        'xlsx',
+        'zip',
+    ];
+
+    public function __invoke($attribute, $value, $fail): void
+    {
+        if (! $this->isAllowed($value)) {
+            $fail(__('validation.uploaded'));
+        }
+    }
+
+    private function isAllowed(UploadedFile $file): bool
+    {
+        $extensions = array_merge($this->extensions, config('statamic.assets.additional_uploadable_extensions', []));
+
+        return in_array(trim(strtolower($file->getClientOriginalExtension())), $extensions);
+    }
+}

From 9aa4a4f077474506487c53170e765eca3ac72917 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Nov 2023 17:44:13 -0500
Subject: [PATCH 116/175] [4.x] Apply appropriate file extension when uploading
 (#9033)

---
 src/Assets/AssetUploader.php | 13 ++++++++++++-
 src/Assets/FileUploader.php  |  4 +++-
 tests/Assets/AssetTest.php   | 17 ++++++++---------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index f13c2e4ac5..2b69451e7c 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -26,7 +26,7 @@ public static function asset(Asset $asset)
 
     protected function uploadPath(UploadedFile $file)
     {
-        $ext = $this->getNewExtension() ?? $file->getClientOriginalExtension();
+        $ext = $this->getNewExtension() ?? $this->getFileExtension($file);
 
         if (config('statamic.assets.lowercase')) {
             $ext = strtolower($ext);
@@ -71,6 +71,17 @@ protected function getNewExtension()
         return $ext;
     }
 
+    private function getFileExtension(UploadedFile $file)
+    {
+        $extension = $file->getClientOriginalExtension();
+        $guessed = $file->guessExtension();
+
+        // Only use the guessed extension if it's different than the original.
+        // This allows us to maintain the casing of the original extension
+        // if the the "lowercase filenames" config option is disabled.
+        return strtolower($extension) === strtolower($guessed) ? $extension : $guessed;
+    }
+
     public static function getSafeFilename($string)
     {
         $replacements = [
diff --git a/src/Assets/FileUploader.php b/src/Assets/FileUploader.php
index 03fe601692..ac7bc71370 100644
--- a/src/Assets/FileUploader.php
+++ b/src/Assets/FileUploader.php
@@ -22,7 +22,9 @@ public static function container(string $container = null)
 
     protected function uploadPath(UploadedFile $file)
     {
-        return now()->timestamp.'/'.$file->getClientOriginalName();
+        $filename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);
+
+        return now()->timestamp.'/'.$filename.'.'.$file->guessExtension();
     }
 
     protected function uploadPathPrefix()
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index b26d6bfdf2..cefd28aa64 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -1706,7 +1706,6 @@ public function nonGlideableFileExtensions()
             ['md'],  // not an image
             ['svg'], // doesn't work with imagick without extra server config
             ['pdf'], // doesn't work with imagick without extra server config
-            ['eps'], // doesn't work with imagick without extra server config
         ];
     }
 
@@ -1757,21 +1756,21 @@ public function it_can_process_a_custom_image_format()
             'h' => '15',
         ]]);
 
-        // Normally eps files (for example) are not supported by gd or imagick. However, imagick does
+        // Normally pdf files (for example) are not supported by gd or imagick. However, imagick does
         // does actually support over 100 formats with extra configuration (eg. via ghostscript).
         // Thus, we allow the user to configure additional extensions in their assets config.
         config(['statamic.assets.image_manipulation.additional_extensions' => [
-            'eps',
+            'pdf',
         ]]);
 
         $this->container->sourcePreset('small');
 
-        $asset = (new Asset)->container($this->container)->path('path/to/asset.eps')->syncOriginal();
+        $asset = (new Asset)->container($this->container)->path('path/to/asset.pdf')->syncOriginal();
 
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
-        Storage::disk('test')->assertMissing('path/to/asset.eps');
+        Storage::disk('test')->assertMissing('path/to/asset.pdf');
 
-        $file = UploadedFile::fake()->image('asset.eps', 20, 30);
+        $file = UploadedFile::fake()->image('asset.pdf', 20, 30);
 
         // Ensure a glide server is instantiated and `makeImage()` is called...
         Facades\Glide::partialMock()
@@ -1793,8 +1792,8 @@ public function it_can_process_a_custom_image_format()
         $this->assertEquals($asset, $return);
         $this->assertDirectoryExists($glideDir = storage_path('statamic/glide/tmp'));
         $this->assertEmpty(app('files')->allFiles($glideDir)); // no temp files
-        Storage::disk('test')->assertExists('path/to/asset.eps');
-        $this->assertEquals('path/to/asset.eps', $asset->path());
+        Storage::disk('test')->assertExists('path/to/asset.pdf');
+        $this->assertEquals('path/to/asset.pdf', $asset->path());
         Event::assertDispatched(AssetUploaded::class, function ($event) use ($asset) {
             return $event->asset = $asset;
         });
@@ -1802,7 +1801,7 @@ public function it_can_process_a_custom_image_format()
         $meta = $asset->meta();
 
         // Normally we assert changes to the meta, but we cannot in this test because we can't guarantee
-        // the test suite has imagick with ghostscript installed (required for eps files, for example).
+        // the test suite has imagick with ghostscript installed (required for pdf files, for example).
         // $this->assertEquals(10, $meta['width']);
         // $this->assertEquals(15, $meta['height']);
     }

From 2fa34f6a82644a05de69e6aef23d67841cca56b5 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:46:01 +0000
Subject: [PATCH 117/175] [4.x] Ensure field handles are in snake case (#9039)

---
 src/Http/Controllers/CP/Fields/FieldsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Fields/FieldsController.php b/src/Http/Controllers/CP/Fields/FieldsController.php
index 6e6087e2b5..2b788541ac 100644
--- a/src/Http/Controllers/CP/Fields/FieldsController.php
+++ b/src/Http/Controllers/CP/Fields/FieldsController.php
@@ -99,7 +99,7 @@ protected function blueprint($blueprint)
                 'type' => 'slug',
                 'from' => 'display',
                 'separator' => '_',
-                'validate' => 'required|not_in:'.implode(',', $reserved),
+                'validate' => 'required|regex:/^[a-zA-Z][a-zA-Z0-9_]*$/|not_in:'.implode(',', $reserved),
                 'show_regenerate' => true,
             ],
             'instructions' => [

From c3ecd3e6bb0bedde9e99d2cdd64ff25281db49c9 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 20 Nov 2023 22:47:55 +0000
Subject: [PATCH 118/175] [4.x] Translate global titles in listing and asset
 tiles on show page (#9024)

---
 resources/js/components/assets/AssetManager.vue | 4 ++--
 resources/js/components/globals/Listing.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/assets/AssetManager.vue b/resources/js/components/assets/AssetManager.vue
index fcde42891c..a272e26519 100644
--- a/resources/js/components/assets/AssetManager.vue
+++ b/resources/js/components/assets/AssetManager.vue
@@ -3,7 +3,7 @@
     <div class="asset-manager">
 
         <div class="flex items-center mb-6">
-            <h1 class="flex-1">{{ container.title }}</h1>
+            <h1 class="flex-1">{{ __(container.title) }}</h1>
 
             <dropdown-list v-if="container.can_edit || container.can_delete" class="ml-4">
                 <dropdown-item
@@ -23,7 +23,7 @@
                 >
                     <resource-deleter
                         ref="deleter"
-                        :resource-title="container.title"
+                        :resource-title="__(container.title)"
                         :route="container.delete_url">
                     </resource-deleter>
                 </dropdown-item>
diff --git a/resources/js/components/globals/Listing.vue b/resources/js/components/globals/Listing.vue
index e146c21c9d..cf2a1f0652 100644
--- a/resources/js/components/globals/Listing.vue
+++ b/resources/js/components/globals/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table>
                 <template slot="cell-title" slot-scope="{ row: global }">
-                    <a :href="global.edit_url">{{ global.title }}</a>
+                    <a :href="global.edit_url">{{ __(global.title) }}</a>
                 </template>
                 <template slot="cell-handle" slot-scope="{ value: handle }">
                     <span class="font-mono text-2xs">{{ handle }}</span>

From 233d610586381aafa600d60c288e8d5e42039e55 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:48:58 +0000
Subject: [PATCH 119/175] [4.x] Fix nocache tag when URL ends in `?` (#9016)

---
 src/StaticCaching/NoCache/Controller.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/StaticCaching/NoCache/Controller.php b/src/StaticCaching/NoCache/Controller.php
index 7eadc4f59f..f3e4e51a95 100644
--- a/src/StaticCaching/NoCache/Controller.php
+++ b/src/StaticCaching/NoCache/Controller.php
@@ -16,6 +16,10 @@ public function __invoke(Request $request, Session $session)
             $url = explode('?', $url)[0];
         }
 
+        if (Str::endsWith($url, '?')) {
+            $url = Str::replaceLast('?', '', $url);
+        }
+
         if (Str::contains($url, '?')) {
             $url = Str::before($url, '?').'?'.Request::normalizeQueryString(Str::after($url, '?'));
         }

From 2dbbb0f87cda409c794516d2bbbf80841fb92c95 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Nov 2023 22:57:19 -0500
Subject: [PATCH 120/175] changelog

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b61d7ef860..e873887ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Release Notes
 
+## 4.36.0 (2023-11-20)
+
+### What's new
+- Add `href` attribute to relationship item links. [#9030](https://github.com/statamic/cms/issues/9030) by @jacksleight
+- Only allow uploading certain file extensions, with an option to add more. [#9037](https://github.com/statamic/cms/issues/9037) by @jasonvarga
+
+### What's fixed
+- Fix nocache tag when URL ends with a question mark. [#9016](https://github.com/statamic/cms/issues/9016) by @duncanmcclean
+- Fix missing globals and asset container translations. [#9024](https://github.com/statamic/cms/issues/9024) by @ryanmitchell
+- Validate that field handles are in snake case. [#9039](https://github.com/statamic/cms/issues/9039) by @duncanmcclean
+- Appropriate file extension are applied when uploading. [#9033](https://github.com/statamic/cms/issues/9033) by @jasonvarga
+- Don't prompt user to select search index when there's only 1 configured. [#9036](https://github.com/statamic/cms/issues/9036) by @duncanmcclean
+- Fix `range` tag with `times="0"` parameter outputting incorrectly. [#9022](https://github.com/statamic/cms/issues/9022) by @ryanmitchell
+- Fix error in collection entry listing that occurs on certain server setups (i.e Vapor and AWS function URLs). [#9028](https://github.com/statamic/cms/issues/9028) by @duncanmcclean
+
+
+
 ## 4.35.0 (2023-11-16)
 
 ### What's new

From 8fb17018d0bf5fecc54f3293ddbcd1e2a22c96fb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 21 Nov 2023 12:20:43 -0500
Subject: [PATCH 121/175] [4.x] Improve sanitization of Replicator set preview
 text (#9047)

---
 resources/js/bootstrap/globals.js                      |  5 +++++
 resources/js/components/fieldtypes/CodeFieldtype.vue   |  2 +-
 .../components/fieldtypes/assets/AssetsFieldtype.vue   |  4 ++--
 .../fieldtypes/replicator/ManagesPreviewText.js        | 10 +++++++---
 .../js/components/fieldtypes/replicator/PreviewHtml.js |  5 +++++
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 resources/js/components/fieldtypes/replicator/PreviewHtml.js

diff --git a/resources/js/bootstrap/globals.js b/resources/js/bootstrap/globals.js
index b35b6c9257..3285c41f21 100644
--- a/resources/js/bootstrap/globals.js
+++ b/resources/js/bootstrap/globals.js
@@ -1,6 +1,7 @@
 import { marked } from 'marked';
 import { translate, translateChoice } from '../translations/translator';
 import uid from 'uniqid';
+import PreviewHtml from '../components/fieldtypes/replicator/PreviewHtml';
 
 export function cp_url(url) {
     url = Statamic.$config.get('cpUrl') + '/' + url;
@@ -103,3 +104,7 @@ export function escapeHtml(string) {
         .replaceAll('"', '&quot;')
         .replaceAll("'", '&#039;');
 }
+
+export function replicatorPreviewHtml(html) {
+    return new PreviewHtml(html);
+}
diff --git a/resources/js/components/fieldtypes/CodeFieldtype.vue b/resources/js/components/fieldtypes/CodeFieldtype.vue
index 2d7c8165c3..6fd083ccb3 100644
--- a/resources/js/components/fieldtypes/CodeFieldtype.vue
+++ b/resources/js/components/fieldtypes/CodeFieldtype.vue
@@ -105,7 +105,7 @@ export default {
             return 'theme-' + this.config.theme;
         },
         replicatorPreview() {
-            return this.value.code ? truncate(escapeHtml(this.value.code), 60) : '';
+            return this.value.code ? truncate(this.value.code, 60) : '';
         },
         readOnlyOption() {
             return this.isReadOnly ? 'nocursor' : false;
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 557248a89f..d67e005297 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -328,11 +328,11 @@ export default {
         },
 
         replicatorPreview() {
-            return _.map(this.assets, (asset) => {
+            return replicatorPreviewHtml(_.map(this.assets, (asset) => {
                 return (asset.isImage || asset.isSvg) ?
                     `<img src="${asset.thumbnail}" width="20" height="20" title="${asset.basename}" />`
                     : asset.basename;
-            }).join(', ');
+            }).join(', '));
         },
 
         showPicker() {
diff --git a/resources/js/components/fieldtypes/replicator/ManagesPreviewText.js b/resources/js/components/fieldtypes/replicator/ManagesPreviewText.js
index 36b525a5fb..5cca94bad5 100644
--- a/resources/js/components/fieldtypes/replicator/ManagesPreviewText.js
+++ b/resources/js/components/fieldtypes/replicator/ManagesPreviewText.js
@@ -1,3 +1,5 @@
+import PreviewHtml from "./PreviewHtml";
+
 export default {
 
     computed: {
@@ -13,13 +15,15 @@ export default {
                     return value;
                 })
                 .map(value => {
-                    if (typeof value === 'string') return value;
+                    if (value instanceof PreviewHtml) return value.html;
+
+                    if (typeof value === 'string') return escapeHtml(value);
 
                     if (Array.isArray(value) && typeof value[0] === 'string') {
-                        return value.join(', ');
+                        return escapeHtml(value.join(', '));
                     }
 
-                    return JSON.stringify(value);
+                    return escapeHtml(JSON.stringify(value));
                 })
                 .join(' / ');
         }
diff --git a/resources/js/components/fieldtypes/replicator/PreviewHtml.js b/resources/js/components/fieldtypes/replicator/PreviewHtml.js
new file mode 100644
index 0000000000..e553801993
--- /dev/null
+++ b/resources/js/components/fieldtypes/replicator/PreviewHtml.js
@@ -0,0 +1,5 @@
+export default class PreviewHtml {
+    constructor(html) {
+        this.html = html;
+    }
+}

From d4bbe9ca12a6cc46ebf7603bc2ada6d37879804e Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 21 Nov 2023 17:22:24 +0000
Subject: [PATCH 122/175] [4.x] Fix entries tag not filtering by taxonomy when
 terms field is `max_items: 1` (#9045)

---
 src/Tags/Collection/Entries.php       | 4 ++++
 tests/Tags/Collection/EntriesTest.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index 27699513b2..d18a9f55aa 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -357,6 +357,10 @@ protected function queryTaxonomies($query)
                 return;
             }
 
+            if (! is_iterable($values)) {
+                $values = [$values];
+            }
+
             $values = collect($values)->map(function ($term) use ($taxonomy) {
                 if ($term instanceof Term) {
                     return $term->id();
diff --git a/tests/Tags/Collection/EntriesTest.php b/tests/Tags/Collection/EntriesTest.php
index 8c5ef0591b..db58307bef 100644
--- a/tests/Tags/Collection/EntriesTest.php
+++ b/tests/Tags/Collection/EntriesTest.php
@@ -504,6 +504,10 @@ public function it_filters_by_taxonomy_terms()
         $this->assertEquals([1, 3, 4], $this->getEntryIds(['taxonomy' => 'tags::rad|tags::meh|categories::news']));
         $this->assertEquals([1], $this->getEntryIds(['taxonomy::all' => 'tags::rad|categories::news'])); // modifier still expected to be 3rd segment
         $this->assertEquals([1], $this->getEntryIds(['taxonomy' => 'tags::rad|tags::meh', 'taxonomy:categories' => 'news'])); // mix and match
+
+        // Ensure it works when passing terms (eg from a term fieldtype)
+        $this->assertEquals([1, 3, 4], $this->getEntryIds(['taxonomy:tags:in' => Term::query()->whereIn('slug', ['rad', 'meh'])->get()]));
+        $this->assertEquals([1, 3], $this->getEntryIds(['taxonomy:tags:in' => Term::find('tags::rad')]));
     }
 
     /** @test */

From 8de9d2362263b76b0e758a811d7f223748f0a404 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 21 Nov 2023 19:26:30 +0000
Subject: [PATCH 123/175] [4.x] Fix missing `nestedListing` method on `Html`
 class (#9034)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Support/Html.php       | 19 +++++++++++++++++++
 tests/Support/HtmlTest.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/Support/Html.php b/src/Support/Html.php
index 0a0f8733be..41d6a03310 100644
--- a/src/Support/Html.php
+++ b/src/Support/Html.php
@@ -190,6 +190,25 @@ protected static function listingElement($key, $type, $value)
         }
     }
 
+    /**
+     * Create the HTML for a nested listing attribute.
+     *
+     * @param  mixed  $key
+     * @param  string  $type
+     * @param  mixed  $value
+     * @return string
+     */
+    protected static function nestedListing($key, $type, $value)
+    {
+        $html = '<li>';
+
+        if (! is_int($key)) {
+            $html .= $key;
+        }
+
+        return $html.static::listing($type, $value).'</li>';
+    }
+
     /**
      * Obfuscate a string to prevent spam-bots from sniffing it.
      *
diff --git a/tests/Support/HtmlTest.php b/tests/Support/HtmlTest.php
index ae2fe48766..a09f14a151 100644
--- a/tests/Support/HtmlTest.php
+++ b/tests/Support/HtmlTest.php
@@ -32,6 +32,34 @@ public function testOl()
         $this->assertEquals('<ol class="example"><li>foo</li><li>bar</li><li>&amp;</li></ol>', $ol);
     }
 
+    /** @test */
+    public function nested_listing_with_keyed_sub_array()
+    {
+        $list = [
+            'foo',
+            'bar' => ['alfa', 'bravo'],
+            'baz',
+        ];
+
+        $ol = Html::ol($list);
+
+        $this->assertEquals('<ol><li>foo</li><li>bar<ol><li>alfa</li><li>bravo</li></ol></li><li>baz</li></ol>', $ol);
+    }
+
+    /** @test */
+    public function nested_listing_with_unkeyed_sub_array()
+    {
+        $list = [
+            'foo',
+            ['alfa', 'bravo'],
+            'bar',
+        ];
+
+        $ol = Html::ol($list);
+
+        $this->assertEquals('<ol><li>foo</li><li><ol><li>alfa</li><li>bravo</li></ol></li><li>bar</li></ol>', $ol);
+    }
+
     /**
      * @test
      */

From 7b0aeee9db7f81bdece563f6b9746f6c6b29739b Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 21 Nov 2023 22:31:48 +0000
Subject: [PATCH 124/175] [4.x] Fix Outpost locking code for cache drivers
 without locking support (#9029)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Licensing/Outpost.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Licensing/Outpost.php b/src/Licensing/Outpost.php
index 64dd0d30c2..1576f3da9b 100644
--- a/src/Licensing/Outpost.php
+++ b/src/Licensing/Outpost.php
@@ -6,6 +6,8 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
+use Illuminate\Cache\NoLock;
+use Illuminate\Contracts\Cache\LockProvider;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
@@ -42,7 +44,7 @@ public function response()
 
     private function request()
     {
-        $lock = $this->cache()->lock(static::LOCK_KEY, 10);
+        $lock = $this->lock(static::LOCK_KEY, 10);
 
         try {
             $lock->block(static::REQUEST_TIMEOUT);
@@ -192,4 +194,11 @@ private function cache()
 
         return $this->store = $store;
     }
+
+    private function lock(string $key, int $seconds)
+    {
+        return $this->cache()->getStore() instanceof LockProvider
+            ? $this->cache()->lock($key, $seconds)
+            : new NoLock($key, $seconds);
+    }
 }

From 4350f94204c2e22301f52acc874d933f6aee05c7 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Tue, 21 Nov 2023 22:33:51 +0000
Subject: [PATCH 125/175] [4.x] Fix URI validation error when collection route
 uses entry IDs (#9035)

---
 src/Http/Controllers/CP/Collections/EntriesController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index dbd605ed91..df818c4a87 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -10,6 +10,7 @@
 use Statamic\Facades\Asset;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
+use Statamic\Facades\Stache;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Requests\FilteredRequest;
@@ -531,7 +532,12 @@ private function entryUri($entry, $tree, $parent)
         }
 
         if (! $tree) {
-            return $entry->uri();
+            return app(\Statamic\Contracts\Routing\UrlBuilder::class)
+                ->content($entry)
+                ->merge([
+                    'id' => $entry->id() ?? Stache::generateId(),
+                ])
+                ->build($entry->route());
         }
 
         $parent = $parent ? $tree->find($parent) : null;

From 39e9fa2a6d763857c2dbbbb6fd2778732e461538 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 22 Nov 2023 13:35:47 +0000
Subject: [PATCH 126/175] [4.x] Select Fieldtype: Fallback to key when option
 label is missing (#9038)

Select Fieldtype: Fallback to value when label is missing
---
 src/Fieldtypes/HasSelectOptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fieldtypes/HasSelectOptions.php b/src/Fieldtypes/HasSelectOptions.php
index cc2aa3aa88..c006fc5ef3 100644
--- a/src/Fieldtypes/HasSelectOptions.php
+++ b/src/Fieldtypes/HasSelectOptions.php
@@ -104,7 +104,7 @@ private function getLabel($actualValue)
             $value = $this->castFromBoolean($value);
         }
 
-        return $this->isOption($value)
+        return $this->isOption($value) && Arr::get($this->config('options'), $value)
             ? Arr::get($this->config('options'), $value, $value)
             : $actualValue;
     }

From b379717a604c74f0824422bc769a0c02952d65d3 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 13:36:19 +0000
Subject: [PATCH 127/175] [4.x] Allow revision actions to be translated (#9023)

Allow revision actions to be translated
---
 resources/js/components/revision-history/Revision.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/revision-history/Revision.vue b/resources/js/components/revision-history/Revision.vue
index 76cad99e1d..01f1e52850 100644
--- a/resources/js/components/revision-history/Revision.vue
+++ b/resources/js/components/revision-history/Revision.vue
@@ -21,7 +21,7 @@
                 </div>
 
                 <span class="badge" v-if="revision.working" v-text="__('Working Copy')" />
-                <span class="badge" :class="revision.action" v-else v-text="revision.action" />
+                <span class="badge" :class="revision.action" v-else v-text="__(revision.action)" />
                 <span class="badge bg-orange" v-if="revision.attributes.current" v-text="__('Current')" />
 
                 <revision-preview

From ddbbad483aa48201c08dfcd9a37f3f90d80d58a9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 22 Nov 2023 13:39:40 +0000
Subject: [PATCH 128/175] [4.x] Glide: Output absolute URL when external image
 has invalid extension (#9031)

* Glide: Output absolute URL when external URL is invalid

* Reference PR in test
---
 src/Tags/Glide.php       |  8 ++++++--
 tests/Tags/GlideTest.php | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Tags/Glide.php b/src/Tags/Glide.php
index a06c9d9b05..7fae863889 100644
--- a/src/Tags/Glide.php
+++ b/src/Tags/Glide.php
@@ -199,7 +199,7 @@ private function generateGlideUrl($item)
             return;
         }
 
-        $url = ($this->params->bool('absolute', $this->useAbsoluteUrls())) ? URL::makeAbsolute($url) : URL::makeRelative($url);
+        $url = ($this->params->bool('absolute', $this->useAbsoluteUrls($url))) ? URL::makeAbsolute($url) : URL::makeRelative($url);
 
         return $url;
     }
@@ -340,8 +340,12 @@ private function isValidExtension($item)
         return ImageValidator::isValidExtension(Path::extension($item));
     }
 
-    private function useAbsoluteUrls()
+    private function useAbsoluteUrls(string $url): bool
     {
+        if (! $this->isValidExtension($url) && Str::startsWith($url, ['http://', 'https://'])) {
+            return true;
+        }
+
         return Str::startsWith(GlideManager::url(), ['http://', 'https://']);
     }
 }
diff --git a/tests/Tags/GlideTest.php b/tests/Tags/GlideTest.php
index ae4dff1b7b..a298948754 100644
--- a/tests/Tags/GlideTest.php
+++ b/tests/Tags/GlideTest.php
@@ -51,6 +51,17 @@ public function it_outputs_an_absolute_url_by_default_when_the_glide_route_is_ab
         $this->assertEquals('https://localhost/glide/paths/bar.jpg/689e9cd88cc1d852c9a4d3a1e27d68c2.jpg', $this->absoluteTestTag(true));
     }
 
+    /**
+     * @test
+     * https://github.com/statamic/cms/pull/9031
+     */
+    public function it_outputs_an_absolute_url_when_the_url_does_not_have_a_valid_extension()
+    {
+        $parse = (string) Parse::template('{{ glide src="https://statamic.com/foo" }}');
+
+        $this->assertSame('https://statamic.com/foo', $parse);
+    }
+
     /**
      * @test
      */

From 58cdd011702cfcd9b99f814cc3ee106e935002e1 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 13:40:58 +0000
Subject: [PATCH 129/175] [4.x] Pass autocomplete config param to CP text
 inputs (#9013)

Pass autocomplete config param to CP text inputs
---
 resources/js/components/fieldtypes/TextFieldtype.vue | 1 +
 resources/js/components/inputs/Text.vue              | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/resources/js/components/fieldtypes/TextFieldtype.vue b/resources/js/components/fieldtypes/TextFieldtype.vue
index bf2cc91059..16c7b4e0a8 100644
--- a/resources/js/components/fieldtypes/TextFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextFieldtype.vue
@@ -4,6 +4,7 @@
         :value="value"
         :classes="config.classes"
         :focus="config.focus || name === 'title' || name === 'alt'"
+        :autocomplete="config.autocomplete"
         :autoselect="config.autoselect"
         :type="config.input_type"
         :isReadOnly="isReadOnly"
diff --git a/resources/js/components/inputs/Text.vue b/resources/js/components/inputs/Text.vue
index 72d3f17aad..c92ce63814 100644
--- a/resources/js/components/inputs/Text.vue
+++ b/resources/js/components/inputs/Text.vue
@@ -18,6 +18,7 @@
                 :disabled="disabled"
                 :readonly="isReadOnly"
                 :placeholder="placeholder"
+                :autocomplete="autocomplete"
                 :autofocus="focus"
                 :min="min"
                 @input="$emit('input', $event.target.value)"
@@ -55,6 +56,7 @@ export default {
         prepend: { default: null },
         append: { default: null },
         focus: { type: Boolean },
+        autocomplete: { default: null },
         autoselect: { type: Boolean },
         min: { type: Number, default: undefined }
     },

From 30413a0db835ed3835cbe26744967ecdf752bd05 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 13:47:28 +0000
Subject: [PATCH 130/175] [4.x] Add option to append original filename to Glide
 URLs (#8661)

* Add option to append original filename to Glide URLS

* Prepend filename

* typehits and comments

* Add test

* :beer:

* Change format of image path

* Change true to a boolean

---------

Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
---
 src/Imaging/GlideManager.php          | 25 ++++++++++++++++++++++++-
 src/Imaging/GlideUrlBuilder.php       | 24 ++++++++++++++++++++++++
 tests/Imaging/GlideUrlBuilderTest.php | 17 +++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/Imaging/GlideManager.php b/src/Imaging/GlideManager.php
index e8bc1d84c8..4600044c2e 100644
--- a/src/Imaging/GlideManager.php
+++ b/src/Imaging/GlideManager.php
@@ -20,7 +20,7 @@ class GlideManager
      */
     public function server(array $config = [])
     {
-        return ServerFactory::create(array_merge([
+        $server = ServerFactory::create(array_merge([
             'source' => base_path(), // this gets overridden on the fly by the image generator
             'cache' => $this->cacheDisk()->getDriver(),
             'response' => new LaravelResponseFactory(app('request')),
@@ -29,6 +29,29 @@ public function server(array $config = [])
             'presets' => Image::manipulationPresets(),
             'watermarks' => public_path(),
         ], $config));
+
+        if (config('statamic.assets.image_manipulation.append_original_filename', false)) {
+            $server
+                ->setCachePathCallable(function ($path, $params) {
+                    // to avoid having to recreate the getCachePath method from glide server
+                    // we run getCachePath again without this callback function
+                    $customCallable = $this->getCachePathCallable();
+
+                    $this->setCachePathCallable(null);
+                    $cachePath = $this->getCachePath($path, $params);
+                    $this->setCachePathCallable($customCallable);
+
+                    // then we append our original filename to the end
+                    $filename = Str::afterLast($cachePath, '/');
+                    $cachePath = Str::beforeLast($cachePath, '/');
+
+                    $cachePath .= '/'.Str::beforeLast($filename, '.').'/'.Str::of($path)->after('/');
+
+                    return $cachePath;
+                });
+        }
+
+        return $server;
     }
 
     public function cacheDisk()
diff --git a/src/Imaging/GlideUrlBuilder.php b/src/Imaging/GlideUrlBuilder.php
index 4f65693cc6..4b22442003 100644
--- a/src/Imaging/GlideUrlBuilder.php
+++ b/src/Imaging/GlideUrlBuilder.php
@@ -37,9 +37,19 @@ public function build($item, $params, $filename = null)
         switch ($this->itemType()) {
             case 'url':
                 $path = 'http/'.base64_encode($item);
+
+                if (! $filename) {
+                    $filename = $this->optionallySetFilename(Str::afterLast($item, '/'));
+                }
+
                 break;
             case 'asset':
                 $path = 'asset/'.base64_encode($this->item->containerId().'/'.$this->item->path());
+
+                if (! $filename) {
+                    $filename = $this->optionallySetFilename(Str::afterLast($this->item->path(), '/'));
+                }
+
                 break;
             case 'id':
                 $path = 'asset/'.base64_encode(str_replace('::', '/', $this->item));
@@ -64,4 +74,18 @@ public function build($item, $params, $filename = null)
 
         return URL::prependSiteRoot($builder->getUrl($path, $params));
     }
+
+    /**
+     * Should the filename be set based on the config setting
+     *
+     * @return bool|string
+     */
+    private function optionallySetFilename(string $filename)
+    {
+        if (! config('statamic.assets.image_manipulation.append_original_filename', false)) {
+            return false;
+        }
+
+        return $filename;
+    }
 }
diff --git a/tests/Imaging/GlideUrlBuilderTest.php b/tests/Imaging/GlideUrlBuilderTest.php
index 7d04d2a6ed..c60955cde8 100644
--- a/tests/Imaging/GlideUrlBuilderTest.php
+++ b/tests/Imaging/GlideUrlBuilderTest.php
@@ -4,6 +4,7 @@
 
 use Statamic\Assets\Asset;
 use Statamic\Assets\AssetContainer;
+use Statamic\Facades\Config;
 use Statamic\Imaging\GlideUrlBuilder;
 use Tests\TestCase;
 
@@ -80,6 +81,22 @@ public function testFilename()
         );
     }
 
+    public function testConfigAddsFilename()
+    {
+        Config::set('statamic.assets.image_manipulation.append_original_filename', true);
+
+        $asset = new Asset;
+        $asset->container((new AssetContainer)->handle('main'));
+        $asset->path('img/foo.jpg');
+
+        $encoded = base64_encode('main/img/foo.jpg');
+
+        $this->assertEquals(
+            "/img/asset/$encoded/foo.jpg?w=100",
+            $this->builder->build($asset, ['w' => '100'])
+        );
+    }
+
     public function testMarkWithAsset()
     {
         $asset = new Asset;

From 446cfbaa81b878cb1debcf7f398159b633da5d8f Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Wed, 22 Nov 2023 09:20:52 -0500
Subject: [PATCH 131/175] [4.x] Fix section header padding in the sidebar
 (#9051)

Fix section header padding in the sidebar

Closes #9050
---
 resources/css/components/publish.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css
index 5aae6fccb0..06a1a83f4e 100644
--- a/resources/css/components/publish.css
+++ b/resources/css/components/publish.css
@@ -89,7 +89,8 @@ code.parent-url {
 }
 
 .publish-section-header-inner {
-    @apply px-3 @sm:px-4 @lg:px-6 pt-4 pb-3;
+    @apply px-4 @lg:px-6 pt-4 pb-3;
+
 }
 
 .publish-sidebar {

From e2d1d04abe1968ce9deff123ba960c5ab39d70d9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:33:27 +0000
Subject: [PATCH 132/175] [4.x] Add validation to limit characters in slugs
 (#9046)

---
 src/Entries/Collection.php                                   | 2 +-
 src/Taxonomies/Taxonomy.php                                  | 2 +-
 tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php | 3 +++
 tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php  | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index ccff5aafd4..30e6cf7e32 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -344,7 +344,7 @@ public function ensureEntryBlueprintFields($blueprint)
         }
 
         if ($this->requiresSlugs() && ! $blueprint->hasField('slug')) {
-            $blueprint->ensureField('slug', ['type' => 'slug', 'localizable' => true], 'sidebar');
+            $blueprint->ensureField('slug', ['type' => 'slug', 'localizable' => true, 'validate' => 'max:200'], 'sidebar');
         }
 
         if ($this->dated() && ! $blueprint->hasField('date')) {
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index fb46601e20..0b0d9c3d81 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -143,7 +143,7 @@ public function ensureTermBlueprintFields($blueprint)
     {
         $blueprint
             ->ensureFieldPrepended('title', ['type' => 'text', 'required' => true])
-            ->ensureField('slug', ['type' => 'slug', 'required' => true], 'sidebar');
+            ->ensureField('slug', ['type' => 'slug', 'required' => true, 'validate' => 'max:200'], 'sidebar');
 
         return $blueprint;
     }
diff --git a/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
index b8871ed8ac..e7b51fb59c 100644
--- a/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
+++ b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
@@ -151,6 +151,7 @@ public function blueprint_gets_saved()
                                     'field' => [
                                         'type' => 'slug',
                                         'localizable' => true,
+                                        'validate' => 'max:200',
                                     ],
                                 ],
                             ],
@@ -339,6 +340,7 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
                                     'field' => [
                                         'type' => 'slug',
                                         'localizable' => true,
+                                        'validate' => 'max:200',
                                     ],
                                 ],
                             ],
@@ -468,6 +470,7 @@ public function localizable_of_false_gets_stripped_out_for_inline_fields_but_lef
                                     'field' => [
                                         'type' => 'slug',
                                         'localizable' => true,
+                                        'validate' => 'max:200',
                                     ],
                                 ],
                             ],
diff --git a/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
index 4557eedf52..94380fea86 100644
--- a/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
+++ b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
@@ -153,6 +153,7 @@ public function blueprint_gets_saved()
                                     'field' => [
                                         'type' => 'slug',
                                         'required' => true,
+                                        'validate' => 'max:200',
                                     ],
                                 ],
                             ],
@@ -340,6 +341,7 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
                                     'field' => [
                                         'type' => 'slug',
                                         'required' => true,
+                                        'validate' => 'max:200',
                                     ],
                                 ],
                             ],

From 03bc3b4ce9592bbf373354bcc9da70290ca5916f Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:39:16 +0000
Subject: [PATCH 133/175] [4.x] Assets Fieldtype: Download asset when no URL is
 available (#9018)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/fieldtypes/assets/Asset.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/js/components/fieldtypes/assets/Asset.js b/resources/js/components/fieldtypes/assets/Asset.js
index 1038a36dc5..c823cd57d0 100644
--- a/resources/js/components/fieldtypes/assets/Asset.js
+++ b/resources/js/components/fieldtypes/assets/Asset.js
@@ -77,6 +77,10 @@ export default {
         },
 
         open() {
+            if (! this.asset.url) {
+                return this.download();
+            }
+
             window.open(this.asset.url, '_blank');
         },
 

From 335fe7163c1384f8a0533d14b90d0a26eed775f1 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 16:40:48 +0000
Subject: [PATCH 134/175] [4.x] Add `Creating` events (#7377)

Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
---
 src/Assets/AssetContainer.php          |  5 ++
 src/Auth/User.php                      |  5 ++
 src/Entries/Collection.php             | 10 ++++
 src/Entries/Entry.php                  |  5 ++
 src/Events/AssetContainerCreating.php  | 23 +++++++++
 src/Events/BlueprintCreating.php       | 23 +++++++++
 src/Events/CollectionCreating.php      | 23 +++++++++
 src/Events/CollectionSaving.php        | 23 +++++++++
 src/Events/EntryCreating.php           | 23 +++++++++
 src/Events/FieldsetCreating.php        | 23 +++++++++
 src/Events/FormCreating.php            | 23 +++++++++
 src/Events/GlobalSetCreating.php       | 23 +++++++++
 src/Events/GlobalVariablesCreating.php | 23 +++++++++
 src/Events/SubmissionCreating.php      | 23 +++++++++
 src/Events/TaxonomyCreating.php        | 23 +++++++++
 src/Events/TermCreating.php            | 23 +++++++++
 src/Events/UserCreating.php            | 23 +++++++++
 src/Fields/Blueprint.php               |  5 ++
 src/Fields/Fieldset.php                |  5 ++
 src/Forms/Form.php                     |  5 ++
 src/Forms/Submission.php               |  5 ++
 src/Globals/GlobalSet.php              |  5 ++
 src/Globals/Variables.php              |  5 ++
 src/Taxonomies/Taxonomy.php            |  5 ++
 src/Taxonomies/Term.php                |  5 ++
 tests/Assets/AssetContainerTest.php    | 25 ++++++++++
 tests/Data/Entries/CollectionTest.php  | 64 ++++++++++++++++++++++++++
 tests/Data/Entries/EntryTest.php       | 25 ++++++++++
 tests/Data/Globals/GlobalSetTest.php   | 39 ++++++++++++++++
 tests/Data/Taxonomies/TaxonomyTest.php | 24 ++++++++++
 tests/Data/Taxonomies/TermTest.php     | 25 ++++++++++
 tests/Fields/BlueprintTest.php         | 23 +++++++++
 tests/Fields/FieldsetTest.php          | 23 +++++++++
 tests/Forms/FormTest.php               | 25 ++++++++++
 tests/Forms/SubmissionTest.php         | 25 ++++++++++
 35 files changed, 662 insertions(+)
 create mode 100644 src/Events/AssetContainerCreating.php
 create mode 100644 src/Events/BlueprintCreating.php
 create mode 100644 src/Events/CollectionCreating.php
 create mode 100644 src/Events/CollectionSaving.php
 create mode 100644 src/Events/EntryCreating.php
 create mode 100644 src/Events/FieldsetCreating.php
 create mode 100644 src/Events/FormCreating.php
 create mode 100644 src/Events/GlobalSetCreating.php
 create mode 100644 src/Events/GlobalVariablesCreating.php
 create mode 100644 src/Events/SubmissionCreating.php
 create mode 100644 src/Events/TaxonomyCreating.php
 create mode 100644 src/Events/TermCreating.php
 create mode 100644 src/Events/UserCreating.php

diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index 762a937bd5..7b03d1db8f 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -11,6 +11,7 @@
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Events\AssetContainerBlueprintFound;
 use Statamic\Events\AssetContainerCreated;
+use Statamic\Events\AssetContainerCreating;
 use Statamic\Events\AssetContainerDeleted;
 use Statamic\Events\AssetContainerSaved;
 use Statamic\Events\AssetContainerSaving;
@@ -223,6 +224,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && AssetContainerCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (AssetContainerSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Auth/User.php b/src/Auth/User.php
index 572b2ecac6..b368da86a5 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -24,6 +24,7 @@
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\UserCreated;
+use Statamic\Events\UserCreating;
 use Statamic\Events\UserDeleted;
 use Statamic\Events\UserSaved;
 use Statamic\Events\UserSaving;
@@ -168,6 +169,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && UserCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (UserSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 30e6cf7e32..d4fcc08ba3 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -11,8 +11,10 @@
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\CollectionCreated;
+use Statamic\Events\CollectionCreating;
 use Statamic\Events\CollectionDeleted;
 use Statamic\Events\CollectionSaved;
+use Statamic\Events\CollectionSaving;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
@@ -438,6 +440,14 @@ public function save()
     {
         $isNew = ! Facades\Collection::handleExists($this->handle);
 
+        if ($isNew && CollectionCreating::dispatch($this) === false) {
+            return false;
+        }
+
+        if (CollectionSaving::dispatch($this) === false) {
+            return false;
+        }
+
         Facades\Collection::save($this);
 
         Blink::forget('collection-handles');
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index d531638796..c330345cc4 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -29,6 +29,7 @@
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
+use Statamic\Events\EntryCreating;
 use Statamic\Events\EntryDeleted;
 use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
@@ -317,6 +318,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && EntryCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (EntrySaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Events/AssetContainerCreating.php b/src/Events/AssetContainerCreating.php
new file mode 100644
index 0000000000..661015a402
--- /dev/null
+++ b/src/Events/AssetContainerCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class AssetContainerCreating extends Event
+{
+    public $container;
+
+    public function __construct($container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/BlueprintCreating.php b/src/Events/BlueprintCreating.php
new file mode 100644
index 0000000000..51b630bc9d
--- /dev/null
+++ b/src/Events/BlueprintCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class BlueprintCreating extends Event
+{
+    public $blueprint;
+
+    public function __construct($blueprint)
+    {
+        $this->blueprint = $blueprint;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/CollectionCreating.php b/src/Events/CollectionCreating.php
new file mode 100644
index 0000000000..ab46413926
--- /dev/null
+++ b/src/Events/CollectionCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class CollectionCreating extends Event
+{
+    public $collection;
+
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/CollectionSaving.php b/src/Events/CollectionSaving.php
new file mode 100644
index 0000000000..b27e185d48
--- /dev/null
+++ b/src/Events/CollectionSaving.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class CollectionSaving extends Event
+{
+    public $collection;
+
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/EntryCreating.php b/src/Events/EntryCreating.php
new file mode 100644
index 0000000000..68b558b5bb
--- /dev/null
+++ b/src/Events/EntryCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class EntryCreating extends Event
+{
+    public $entry;
+
+    public function __construct($entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/FieldsetCreating.php b/src/Events/FieldsetCreating.php
new file mode 100644
index 0000000000..6685185a13
--- /dev/null
+++ b/src/Events/FieldsetCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class FieldsetCreating extends Event
+{
+    public $fieldset;
+
+    public function __construct($fieldset)
+    {
+        $this->fieldset = $fieldset;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/FormCreating.php b/src/Events/FormCreating.php
new file mode 100644
index 0000000000..e952b17847
--- /dev/null
+++ b/src/Events/FormCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class FormCreating extends Event
+{
+    public $form;
+
+    public function __construct($form)
+    {
+        $this->form = $form;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/GlobalSetCreating.php b/src/Events/GlobalSetCreating.php
new file mode 100644
index 0000000000..2d8600c38d
--- /dev/null
+++ b/src/Events/GlobalSetCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalSetCreating extends Event
+{
+    public $globals;
+
+    public function __construct($globals)
+    {
+        $this->globals = $globals;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/GlobalVariablesCreating.php b/src/Events/GlobalVariablesCreating.php
new file mode 100644
index 0000000000..3d224042c4
--- /dev/null
+++ b/src/Events/GlobalVariablesCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreating extends Event
+{
+    public $variables;
+
+    public function __construct($variables)
+    {
+        $this->variables = $variables;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/SubmissionCreating.php b/src/Events/SubmissionCreating.php
new file mode 100644
index 0000000000..a2e1dc6a12
--- /dev/null
+++ b/src/Events/SubmissionCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class SubmissionCreating extends Event
+{
+    public $submission;
+
+    public function __construct($submission)
+    {
+        $this->submission = $submission;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/TaxonomyCreating.php b/src/Events/TaxonomyCreating.php
new file mode 100644
index 0000000000..e21175a831
--- /dev/null
+++ b/src/Events/TaxonomyCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class TaxonomyCreating extends Event
+{
+    public $taxonomy;
+
+    public function __construct($taxonomy)
+    {
+        $this->taxonomy = $taxonomy;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/TermCreating.php b/src/Events/TermCreating.php
new file mode 100644
index 0000000000..788c0ef8c3
--- /dev/null
+++ b/src/Events/TermCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class TermCreating extends Event
+{
+    public $term;
+
+    public function __construct($term)
+    {
+        $this->term = $term;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Events/UserCreating.php b/src/Events/UserCreating.php
new file mode 100644
index 0000000000..69365b5612
--- /dev/null
+++ b/src/Events/UserCreating.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class UserCreating extends Event
+{
+    public $user;
+
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 66272c2a7a..12fa154021 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -14,6 +14,7 @@
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\BlueprintCreated;
+use Statamic\Events\BlueprintCreating;
 use Statamic\Events\BlueprintDeleted;
 use Statamic\Events\BlueprintSaved;
 use Statamic\Events\BlueprintSaving;
@@ -429,6 +430,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && BlueprintCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (BlueprintSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Fields/Fieldset.php b/src/Fields/Fieldset.php
index 812928043b..6b31cf4a14 100644
--- a/src/Fields/Fieldset.php
+++ b/src/Fields/Fieldset.php
@@ -3,6 +3,7 @@
 namespace Statamic\Fields;
 
 use Statamic\Events\FieldsetCreated;
+use Statamic\Events\FieldsetCreating;
 use Statamic\Events\FieldsetDeleted;
 use Statamic\Events\FieldsetSaved;
 use Statamic\Events\FieldsetSaving;
@@ -140,6 +141,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && FieldsetCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (FieldsetSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 277b07aa49..268eec1091 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -10,6 +10,7 @@
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Events\FormBlueprintFound;
 use Statamic\Events\FormCreated;
+use Statamic\Events\FormCreating;
 use Statamic\Events\FormDeleted;
 use Statamic\Events\FormSaved;
 use Statamic\Events\FormSaving;
@@ -174,6 +175,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && FormCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (FormSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Forms/Submission.php b/src/Forms/Submission.php
index b12fa194d2..a4f1378ec2 100644
--- a/src/Forms/Submission.php
+++ b/src/Forms/Submission.php
@@ -8,6 +8,7 @@
 use Statamic\Data\ContainsData;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\SubmissionCreated;
+use Statamic\Events\SubmissionCreating;
 use Statamic\Events\SubmissionDeleted;
 use Statamic\Events\SubmissionSaved;
 use Statamic\Events\SubmissionSaving;
@@ -151,6 +152,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && SubmissionCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (SubmissionSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Globals/GlobalSet.php b/src/Globals/GlobalSet.php
index f22a55eae1..851a977e4e 100644
--- a/src/Globals/GlobalSet.php
+++ b/src/Globals/GlobalSet.php
@@ -6,6 +6,7 @@
 use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
+use Statamic\Events\GlobalSetCreating;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
@@ -86,6 +87,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && GlobalSetCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (GlobalSetSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Globals/Variables.php b/src/Globals/Variables.php
index 3fa45e05a3..546254e0c1 100644
--- a/src/Globals/Variables.php
+++ b/src/Globals/Variables.php
@@ -17,6 +17,7 @@
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
 use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesCreating;
 use Statamic\Events\GlobalVariablesDeleted;
 use Statamic\Events\GlobalVariablesSaved;
 use Statamic\Events\GlobalVariablesSaving;
@@ -127,6 +128,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && GlobalVariablesCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (GlobalVariablesSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index 0b0d9c3d81..cc0be55e22 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -12,6 +12,7 @@
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\TaxonomyCreated;
+use Statamic\Events\TaxonomyCreating;
 use Statamic\Events\TaxonomyDeleted;
 use Statamic\Events\TaxonomySaved;
 use Statamic\Events\TaxonomySaving;
@@ -207,6 +208,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && TaxonomyCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (TaxonomySaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index fc9684219c..84ca6bea55 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -7,6 +7,7 @@
 use Statamic\Data\SyncsOriginalState;
 use Statamic\Events\TermBlueprintFound;
 use Statamic\Events\TermCreated;
+use Statamic\Events\TermCreating;
 use Statamic\Events\TermDeleted;
 use Statamic\Events\TermSaved;
 use Statamic\Events\TermSaving;
@@ -211,6 +212,10 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
+            if ($isNew && TermCreating::dispatch($this) === false) {
+                return false;
+            }
+
             if (TermSaving::dispatch($this) === false) {
                 return false;
             }
diff --git a/tests/Assets/AssetContainerTest.php b/tests/Assets/AssetContainerTest.php
index 780bc8c4df..358b966b4a 100644
--- a/tests/Assets/AssetContainerTest.php
+++ b/tests/Assets/AssetContainerTest.php
@@ -19,6 +19,7 @@
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Contracts\Assets\AssetFolder;
 use Statamic\Events\AssetContainerCreated;
+use Statamic\Events\AssetContainerCreating;
 use Statamic\Events\AssetContainerSaved;
 use Statamic\Events\AssetContainerSaving;
 use Statamic\Facades;
@@ -286,6 +287,10 @@ public function it_saves_the_container_through_the_api()
 
         $this->assertEquals($container, $return);
 
+        Event::assertDispatched(AssetContainerCreating::class, function ($event) use ($container) {
+            return $event->container === $container;
+        });
+
         Event::assertDispatched(AssetContainerSaving::class, function ($event) use ($container) {
             return $event->container === $container;
         });
@@ -330,11 +335,31 @@ public function it_saves_quietly()
 
         $this->assertEquals($container, $return);
 
+        Event::assertNotDispatched(AssetContainerCreating::class);
         Event::assertNotDispatched(AssetContainerSaving::class);
         Event::assertNotDispatched(AssetContainerSaved::class);
         Event::assertNotDispatched(AssetContainerCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_asset_container_doesnt_save()
+    {
+        Event::fake([AssetContainerCreated::class]);
+        Facades\AssetContainer::spy();
+
+        Event::listen(AssetContainerCreating::class, function () {
+            return false;
+        });
+
+        $container = new AssetContainer;
+
+        $return = $container->save();
+
+        $this->assertFalse($return);
+
+        Event::assertNotDispatched(AssetContainerCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_asset_container_doesnt_save()
     {
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index fc9a649e0b..8ea8d618b3 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -10,7 +10,9 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Entries\Collection;
 use Statamic\Events\CollectionCreated;
+use Statamic\Events\CollectionCreating;
 use Statamic\Events\CollectionSaved;
+use Statamic\Events\CollectionSaving;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades;
@@ -493,6 +495,32 @@ public function it_dispatches_collection_saved()
         });
     }
 
+    /** @test */
+    public function it_dispatches_collection_saving()
+    {
+        Event::fake();
+
+        $collection = (new Collection)->handle('test');
+        $collection->save();
+
+        Event::assertDispatched(CollectionSaving::class, function ($event) use ($collection) {
+            return $event->collection === $collection;
+        });
+    }
+
+    /** @test */
+    public function it_dispatches_collection_creating()
+    {
+        Event::fake();
+
+        $collection = (new Collection)->handle('test');
+        $collection->save();
+
+        Event::assertDispatched(CollectionCreating::class, function ($event) use ($collection) {
+            return $event->collection === $collection;
+        });
+    }
+
     /** @test */
     public function it_dispatches_collection_created_only_once()
     {
@@ -509,6 +537,42 @@ public function it_dispatches_collection_created_only_once()
         Event::assertDispatched(CollectionCreated::class, 1);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_collection_doesnt_save()
+    {
+        Event::fake([CollectionCreated::class]);
+        Facades\Collection::spy();
+
+        Event::listen(CollectionCreating::class, function () {
+            return false;
+        });
+
+        $container = (new Collection)->handle('test');
+        $return = $container->save();
+
+        $this->assertFalse($return);
+
+        Event::assertNotDispatched(CollectionCreated::class);
+    }
+
+    /** @test */
+    public function if_saving_event_returns_false_the_collection_doesnt_save()
+    {
+        Event::fake([CollectionSaved::class]);
+        Facades\Collection::spy();
+
+        Event::listen(CollectionSaving::class, function () {
+            return false;
+        });
+
+        $container = (new Collection)->handle('test');
+        $return = $container->save();
+
+        $this->assertFalse($return);
+
+        Event::assertNotDispatched(CollectionSaved::class);
+    }
+
     /** @test */
     public function it_sets_future_date_behavior()
     {
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 9b94cdbed1..2e38b0ad3c 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -21,6 +21,7 @@
 use Statamic\Entries\Entry;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
+use Statamic\Events\EntryCreating;
 use Statamic\Events\EntryDeleted;
 use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
@@ -1267,6 +1268,9 @@ public function it_saves_through_the_api()
         $return = $entry->save();
 
         $this->assertTrue($return);
+        Event::assertDispatched(EntryCreating::class, function ($event) use ($entry) {
+            return $event->entry === $entry;
+        });
         Event::assertDispatched(EntrySaving::class, function ($event) use ($entry) {
             return $event->entry === $entry;
         });
@@ -1313,6 +1317,7 @@ public function it_saves_quietly()
         $return = $entry->saveQuietly();
 
         $this->assertTrue($return);
+        Event::assertNotDispatched(EntryCreating::class);
         Event::assertNotDispatched(EntrySaving::class);
         Event::assertNotDispatched(EntrySaved::class);
         Event::assertNotDispatched(EntryCreated::class);
@@ -1549,6 +1554,26 @@ public function it_does_not_propagate_existing_entries()
         $this->assertCount(1, Entry::all());
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_entry_doesnt_save()
+    {
+        Facades\Entry::spy();
+        Event::fake([EntryCreated::class]);
+
+        Event::listen(EntryCreating::class, function () {
+            return false;
+        });
+
+        $collection = tap(Collection::make('test'))->save();
+        $entry = (new Entry)->collection($collection);
+
+        $return = $entry->save();
+
+        $this->assertFalse($return);
+        Facades\Entry::shouldNotHaveReceived('save');
+        Event::assertNotDispatched(EntryCreated::class);
+    }
+
     /** @test */
     public function it_adds_propagated_entry_to_structure()
     {
diff --git a/tests/Data/Globals/GlobalSetTest.php b/tests/Data/Globals/GlobalSetTest.php
index 0cae525973..408d4ad2b1 100644
--- a/tests/Data/Globals/GlobalSetTest.php
+++ b/tests/Data/Globals/GlobalSetTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
 use Statamic\Events\GlobalSetCreated;
+use Statamic\Events\GlobalSetCreating;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades\GlobalSet as GlobalSetFacade;
@@ -113,6 +114,10 @@ public function it_saves_through_the_api()
 
         $set->save();
 
+        Event::assertDispatched(GlobalSetCreating::class, function ($event) use ($set) {
+            return $event->globals === $set;
+        });
+
         Event::assertDispatched(GlobalSetSaving::class, function ($event) use ($set) {
             return $event->globals === $set;
         });
@@ -259,11 +264,45 @@ public function it_saves_quietly()
 
         $set->saveQuietly();
 
+        Event::assertNotDispatched(GlobalSetCreating::class);
         Event::assertNotDispatched(GlobalSetSaving::class);
         Event::assertNotDispatched(GlobalSetSaved::class);
         Event::assertNotDispatched(GlobalSetCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_global_set_doesnt_save()
+    {
+        Event::fake([GlobalSetCreated::class]);
+
+        Event::listen(GlobalSetCreating::class, function () {
+            return false;
+        });
+
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $set = (new GlobalSet)->title('SEO Settings');
+
+        $set->in('en', function ($loc) {
+            $loc->data([
+                'array' => ['first one', 'second one'],
+                'string' => 'The string',
+            ]);
+        });
+
+        $return = $set->save();
+
+        $this->assertFalse($return);
+        Event::assertNotDispatched(GlobalSetCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_global_set_doesnt_save()
     {
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
index 063403c8fe..6e58b63b70 100644
--- a/tests/Data/Taxonomies/TaxonomyTest.php
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Event;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Events\TaxonomyCreated;
+use Statamic\Events\TaxonomyCreating;
 use Statamic\Events\TaxonomySaved;
 use Statamic\Events\TaxonomySaving;
 use Statamic\Events\TermBlueprintFound;
@@ -302,6 +303,10 @@ public function it_saves_through_the_api()
 
         $this->assertTrue($return);
 
+        Event::assertDispatched(TaxonomyCreating::class, function ($event) use ($taxonomy) {
+            return $event->taxonomy = $taxonomy;
+        });
+
         Event::assertDispatched(TaxonomySaving::class, function ($event) use ($taxonomy) {
             return $event->taxonomy = $taxonomy;
         });
@@ -344,11 +349,30 @@ public function it_saves_quietly()
 
         $this->assertTrue($return);
 
+        Event::assertNotDispatched(TaxonomyCreating::class);
         Event::assertNotDispatched(TaxonomySaving::class);
         Event::assertNotDispatched(TaxonomySaved::class);
         Event::assertNotDispatched(TaxonomyCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_taxonomy_doesnt_save()
+    {
+        Event::fake([TaxonomyCreated::class]);
+
+        Event::listen(TaxonomyCreating::class, function () {
+            return false;
+        });
+
+        $taxonomy = (new Taxonomy)->handle('tags');
+
+        $return = $taxonomy->save();
+
+        $this->assertFalse($return);
+
+        Event::assertNotDispatched(TaxonomyCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_taxonomy_doesnt_save()
     {
diff --git a/tests/Data/Taxonomies/TermTest.php b/tests/Data/Taxonomies/TermTest.php
index f54331f40f..26e98b068f 100644
--- a/tests/Data/Taxonomies/TermTest.php
+++ b/tests/Data/Taxonomies/TermTest.php
@@ -7,6 +7,7 @@
 use Mockery;
 use Statamic\Events\TermBlueprintFound;
 use Statamic\Events\TermCreated;
+use Statamic\Events\TermCreating;
 use Statamic\Events\TermSaved;
 use Statamic\Events\TermSaving;
 use Statamic\Facades;
@@ -128,6 +129,10 @@ public function it_saves_through_the_api()
 
         $this->assertTrue($return);
 
+        Event::assertDispatched(TermCreating::class, function ($event) use ($term) {
+            return $event->term === $term;
+        });
+
         Event::assertDispatched(TermSaving::class, function ($event) use ($term) {
             return $event->term === $term;
         });
@@ -172,11 +177,31 @@ public function it_saves_quietly()
 
         $this->assertTrue($return);
 
+        Event::assertNotDispatched(TermCreating::class);
         Event::assertNotDispatched(TermSaving::class);
         Event::assertNotDispatched(TermSaved::class);
         Event::assertNotDispatched(TermCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_term_doesnt_save()
+    {
+        Event::fake([TermCreated::class]);
+
+        Event::listen(TermCreating::class, function () {
+            return false;
+        });
+
+        $taxonomy = (new TaxonomiesTaxonomy)->handle('tags')->save();
+        $term = (new Term)->taxonomy('tags')->slug('foo')->data(['foo' => 'bar']);
+
+        $return = $term->save();
+
+        $this->assertFalse($return);
+
+        Event::assertNotDispatched(TermCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_term_doesnt_save()
     {
diff --git a/tests/Fields/BlueprintTest.php b/tests/Fields/BlueprintTest.php
index fd87e5c812..d9433de4a5 100644
--- a/tests/Fields/BlueprintTest.php
+++ b/tests/Fields/BlueprintTest.php
@@ -12,6 +12,7 @@
 use Statamic\CP\Column;
 use Statamic\CP\Columns;
 use Statamic\Events\BlueprintCreated;
+use Statamic\Events\BlueprintCreating;
 use Statamic\Events\BlueprintSaved;
 use Statamic\Events\BlueprintSaving;
 use Statamic\Facades;
@@ -598,6 +599,10 @@ public function it_saves_through_the_repository()
 
         $this->assertEquals($blueprint, $return);
 
+        Event::assertDispatched(BlueprintCreating::class, function ($event) use ($blueprint) {
+            return $event->blueprint === $blueprint;
+        });
+
         Event::assertDispatched(BlueprintSaving::class, function ($event) use ($blueprint) {
             return $event->blueprint === $blueprint;
         });
@@ -643,11 +648,29 @@ public function it_saves_quietly()
 
         $this->assertEquals($blueprint, $return);
 
+        Event::assertNotDispatched(BlueprintCreating::class);
         Event::assertNotDispatched(BlueprintSaving::class);
         Event::assertNotDispatched(BlueprintSaved::class);
         Event::assertNotDispatched(BlueprintCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_blueprint_doesnt_save()
+    {
+        Event::fake([BlueprintCreated::class]);
+
+        Event::listen(BlueprintCreating::class, function () {
+            return false;
+        });
+
+        $blueprint = new Blueprint;
+
+        $return = $blueprint->save();
+
+        $this->assertFalse($return);
+        Event::assertNotDispatched(BlueprintCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_blueprint_doesnt_save()
     {
diff --git a/tests/Fields/FieldsetTest.php b/tests/Fields/FieldsetTest.php
index d4ebf3c8cb..b36f30ab64 100644
--- a/tests/Fields/FieldsetTest.php
+++ b/tests/Fields/FieldsetTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Event;
 use Statamic\Events\FieldsetCreated;
+use Statamic\Events\FieldsetCreating;
 use Statamic\Events\FieldsetSaved;
 use Statamic\Events\FieldsetSaving;
 use Statamic\Facades\Fieldset as FieldsetRepository;
@@ -158,6 +159,10 @@ public function it_saves_through_the_repository()
 
         $this->assertEquals($fieldset, $return);
 
+        Event::assertDispatched(FieldsetCreating::class, function ($event) use ($fieldset) {
+            return $event->fieldset === $fieldset;
+        });
+
         Event::assertDispatched(FieldsetSaving::class, function ($event) use ($fieldset) {
             return $event->fieldset === $fieldset;
         });
@@ -203,11 +208,29 @@ public function it_saves_quietly()
 
         $this->assertEquals($fieldset, $return);
 
+        Event::assertNotDispatched(FieldsetCreating::class);
         Event::assertNotDispatched(FieldsetSaving::class);
         Event::assertNotDispatched(FieldsetSaved::class);
         Event::assertNotDispatched(FieldsetCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_fieldset_doesnt_save()
+    {
+        Event::fake([FieldsetCreated::class]);
+
+        Event::listen(FieldsetCreating::class, function () {
+            return false;
+        });
+
+        $fieldset = (new Fieldset)->setHandle('seo');
+
+        $return = $fieldset->save();
+
+        $this->assertFalse($return);
+        Event::assertNotDispatched(FieldsetCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_fieldset_doesnt_save()
     {
diff --git a/tests/Forms/FormTest.php b/tests/Forms/FormTest.php
index b8eff5b2a4..9dfd7493f4 100644
--- a/tests/Forms/FormTest.php
+++ b/tests/Forms/FormTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Event;
 use Statamic\Events\FormCreated;
+use Statamic\Events\FormCreating;
 use Statamic\Events\FormSaved;
 use Statamic\Events\FormSaving;
 use Statamic\Facades\Form;
@@ -37,6 +38,10 @@ public function it_saves_a_form()
         $this->assertEquals('Contact Us', $form->title());
         $this->assertEquals('winnie', $form->honeypot());
 
+        Event::assertDispatched(FormCreating::class, function ($event) use ($form) {
+            return $event->form === $form;
+        });
+
         Event::assertDispatched(FormSaving::class, function ($event) use ($form) {
             return $event->form === $form;
         });
@@ -84,11 +89,31 @@ public function it_saves_quietly()
             ->honeypot('winnie')
             ->saveQuietly();
 
+        Event::assertNotDispatched(FormCreating::class);
         Event::assertNotDispatched(FormSaving::class);
         Event::assertNotDispatched(FormSaved::class);
         Event::assertNotDispatched(FormCreated::class);
     }
 
+    /** @test */
+    public function if_creating_event_returns_false_the_form_doesnt_save()
+    {
+        Event::fake([FormCreated::class]);
+
+        Event::listen(FormCreating::class, function () {
+            return false;
+        });
+
+        $blueprint = (new Blueprint)->setHandle('post')->save();
+
+        $form = Form::make('contact_us')
+            ->title('Contact Us')
+            ->honeypot('winnie')
+            ->save();
+
+        Event::assertNotDispatched(FormCreated::class);
+    }
+
     /** @test */
     public function if_saving_event_returns_false_the_form_doesnt_save()
     {
diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index cb0a38e5b7..70a5279d3b 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
 use Statamic\Events\SubmissionCreated;
+use Statamic\Events\SubmissionCreating;
 use Statamic\Events\SubmissionSaved;
 use Statamic\Events\SubmissionSaving;
 use Statamic\Facades\Blueprint;
@@ -102,6 +103,10 @@ public function it_saves_a_submission()
             return $event->submission === $submission;
         });
 
+        Event::assertDispatched(SubmissionCreating::class, function ($event) use ($submission) {
+            return $event->submission === $submission;
+        });
+
         Event::assertDispatched(SubmissionCreated::class, function ($event) use ($submission) {
             return $event->submission === $submission;
         });
@@ -143,6 +148,26 @@ public function it_saves_quietly()
         Event::assertNotDispatched(SubmissionSaving::class);
         Event::assertNotDispatched(SubmissionSaved::class);
         Event::assertNotDispatched(SubmissionCreated::class);
+        Event::assertNotDispatched(SubmissionCreating::class);
+    }
+
+    /** @test */
+    public function if_creating_event_returns_false_the_submission_doesnt_save()
+    {
+        Event::fake([SubmissionCreated::class]);
+
+        Event::listen(SubmissionCreating::class, function () {
+            return false;
+        });
+
+        $form = Form::make('contact_us');
+        $form->save();
+
+        $submission = $form->makeSubmission();
+        $return = $submission->save();
+
+        $this->assertFalse($return);
+        Event::assertNotDispatched(SubmissionCreated::class);
     }
 
     /** @test */

From 0af41aa54de5b165937cbb2ee74e1cf5ad216d17 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 16:41:25 +0000
Subject: [PATCH 135/175] [4.x] Add `UrlInvalidated` event to fire after a url
 has been invalidated (#8902)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Events/UrlInvalidated.php                 | 17 +++++++++
 .../Cachers/ApplicationCacher.php             |  3 ++
 src/StaticCaching/Cachers/FileCacher.php      |  3 ++
 src/StaticCaching/Cachers/NullCacher.php      |  5 +++
 tests/StaticCaching/ApplicationCacherTest.php | 34 ++++++++++++++++++
 tests/StaticCaching/FileCacherTest.php        | 35 +++++++++++++++++++
 6 files changed, 97 insertions(+)
 create mode 100644 src/Events/UrlInvalidated.php

diff --git a/src/Events/UrlInvalidated.php b/src/Events/UrlInvalidated.php
new file mode 100644
index 0000000000..d7b9ad698b
--- /dev/null
+++ b/src/Events/UrlInvalidated.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Statamic\Events;
+
+use Statamic\StaticCaching\Cacher;
+
+class UrlInvalidated extends Event
+{
+    public $url;
+
+    public function __construct($url, $domain = null)
+    {
+        $domain ??= app(Cacher::class)->getBaseUrl();
+
+        $this->url = $domain.$url;
+    }
+}
diff --git a/src/StaticCaching/Cachers/ApplicationCacher.php b/src/StaticCaching/Cachers/ApplicationCacher.php
index 8bae8dd027..8502961179 100644
--- a/src/StaticCaching/Cachers/ApplicationCacher.php
+++ b/src/StaticCaching/Cachers/ApplicationCacher.php
@@ -3,6 +3,7 @@
 namespace Statamic\StaticCaching\Cachers;
 
 use Illuminate\Http\Request;
+use Statamic\Events\UrlInvalidated;
 
 class ApplicationCacher extends AbstractCacher
 {
@@ -108,5 +109,7 @@ public function invalidateUrl($url, $domain = null)
                 $this->cache->forget($this->normalizeKey('responses:'.$key));
                 $this->forgetUrl($key);
             });
+
+        UrlInvalidated::dispatch($url, $domain);
     }
 }
diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php
index 603fca634d..ea5efc0c04 100644
--- a/src/StaticCaching/Cachers/FileCacher.php
+++ b/src/StaticCaching/Cachers/FileCacher.php
@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Statamic\Events\UrlInvalidated;
 use Statamic\Facades\File;
 use Statamic\Facades\Site;
 use Statamic\StaticCaching\Replacers\CsrfTokenReplacer;
@@ -122,6 +123,8 @@ public function invalidateUrl($url, $domain = null)
                 $this->writer->delete($this->getFilePath($value, $site));
                 $this->forgetUrl($key, $domain);
             });
+
+        UrlInvalidated::dispatch($url, $domain);
     }
 
     public function getCachePaths()
diff --git a/src/StaticCaching/Cachers/NullCacher.php b/src/StaticCaching/Cachers/NullCacher.php
index 34a0a95c3c..e92da3fa42 100644
--- a/src/StaticCaching/Cachers/NullCacher.php
+++ b/src/StaticCaching/Cachers/NullCacher.php
@@ -41,4 +41,9 @@ public function getUrls($domain = null)
     {
         return collect();
     }
+
+    public function getBaseUrl()
+    {
+        //
+    }
 }
diff --git a/tests/StaticCaching/ApplicationCacherTest.php b/tests/StaticCaching/ApplicationCacherTest.php
index 40d68d68ab..3804cb3338 100644
--- a/tests/StaticCaching/ApplicationCacherTest.php
+++ b/tests/StaticCaching/ApplicationCacherTest.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Event;
+use Statamic\Events\UrlInvalidated;
+use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\Cachers\ApplicationCacher;
 use Tests\TestCase;
 
@@ -105,6 +108,37 @@ public function invalidating_a_url_will_invalidate_all_query_string_versions_too
         $this->assertNotNull($cache->get('static-cache:responses:two'));
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider invalidateEventProvider
+     */
+    public function invalidating_a_url_dispatches_event($domain, $expectedUrl)
+    {
+        Event::fake();
+
+        $cache = app(Repository::class);
+        $cacher = new ApplicationCacher($cache, ['base_url' => 'http://base.com']);
+
+        // Put it in the container so that the event can resolve it.
+        $this->instance(Cacher::class, $cacher);
+
+        $cacher->invalidateUrl('/foo', $domain);
+
+        Event::assertDispatched(UrlInvalidated::class, function ($event) use ($expectedUrl) {
+            return $event->url === $expectedUrl;
+        });
+    }
+
+    public function invalidateEventProvider()
+    {
+        return [
+            'no domain' => [null, 'http://base.com/foo'],
+            'configured base domain' => ['http://base.com', 'http://base.com/foo'],
+            'another domain' => ['http://another.com', 'http://another.com/foo'],
+        ];
+    }
+
     /** @test */
     public function it_flushes()
     {
diff --git a/tests/StaticCaching/FileCacherTest.php b/tests/StaticCaching/FileCacherTest.php
index e09049d4e8..dbbafa0fd0 100644
--- a/tests/StaticCaching/FileCacherTest.php
+++ b/tests/StaticCaching/FileCacherTest.php
@@ -3,7 +3,10 @@
 namespace Tests\StaticCaching;
 
 use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Support\Facades\Event;
+use Statamic\Events\UrlInvalidated;
 use Statamic\Facades\Site;
+use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\Cachers\FileCacher;
 use Statamic\StaticCaching\Cachers\Writer;
 use Tests\TestCase;
@@ -292,6 +295,38 @@ public function invalidating_a_url_deletes_the_file_and_removes_the_url_when_usi
         $this->assertEquals(['one' => '/one'], $cacher->getUrls('http://domain.de')->all());
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider invalidateEventProvider
+     */
+    public function invalidating_a_url_dispatches_event($domain, $expectedUrl)
+    {
+        Event::fake();
+
+        $writer = \Mockery::spy(Writer::class);
+        $cache = app(Repository::class);
+        $cacher = $this->fileCacher(['base_url' => 'http://base.com'], $writer, $cache);
+
+        // Put it in the container so that the event can resolve it.
+        $this->instance(Cacher::class, $cacher);
+
+        $cacher->invalidateUrl('/foo', $domain);
+
+        Event::assertDispatched(UrlInvalidated::class, function ($event) use ($expectedUrl) {
+            return $event->url === $expectedUrl;
+        });
+    }
+
+    public function invalidateEventProvider()
+    {
+        return [
+            'no domain' => [null, 'http://base.com/foo'],
+            'configured base domain' => ['http://base.com', 'http://base.com/foo'],
+            'another domain' => ['http://another.com', 'http://another.com/foo'],
+        ];
+    }
+
     private function cacheKey($domain)
     {
         return 'static-cache:'.md5($domain).'.urls';

From fbd53fb8d7224de7716954fa0710be8cb1d9c2ec Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 22 Nov 2023 16:48:39 +0000
Subject: [PATCH 136/175] [4.x] Fix checkbox selection in listing tables
 'jumping' on Safari (#9052)

---
 resources/js/components/data-list/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/data-list/Table.vue b/resources/js/components/data-list/Table.vue
index 7f5872c46f..2cb66f0bf1 100644
--- a/resources/js/components/data-list/Table.vue
+++ b/resources/js/components/data-list/Table.vue
@@ -263,8 +263,8 @@ export default {
         },
 
         checkboxClicked(row, index, $event) {
-            this.$refs.table.focus();
             if ($event.shiftKey && this.lastItemClicked !== null) {
+                this.$refs.table.focus();
                 this.selectRange(
                     Math.min(this.lastItemClicked, index),
                     Math.max(this.lastItemClicked, index)

From 791d157e99b20ca061453a9d62d600a235dd6331 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:49:12 +0000
Subject: [PATCH 137/175] [4.x] Revert "[4.x] Auto-populate Array Fieldtype
 Options (#8980)" (#9066)

Revert "[4.x] Auto-populate Array Fieldtype Options (#8980)"

This reverts commit 0862875cf7b4cdfdfdaf255cef9e35a3dacbec27.
---
 .../components/fieldtypes/ArrayFieldtype.vue   | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue
index 2b1e054a85..bc98ff0f6c 100644
--- a/resources/js/components/fieldtypes/ArrayFieldtype.vue
+++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue
@@ -61,7 +61,7 @@
                             <tr class="sortable-row" v-for="(element, index) in data" :key="element._id">
                                 <td class="sortable-handle table-drag-handle" v-if="!isReadOnly"></td>
                                 <td>
-                                    <input type="text" class="input-text font-bold" v-model="element.key" :readonly="isReadOnly" @blur="keyUpdated(element)" />
+                                    <input type="text" class="input-text font-bold" v-model="element.key" :readonly="isReadOnly" />
                                 </td>
                                 <td>
                                     <input type="text" class="input-text" v-model="element.value" :readonly="isReadOnly" />
@@ -210,21 +210,7 @@ export default {
 
         setKey(key) {
             this.selectedKey = key
-        },
-
-        keyUpdated(element) {
-            if (element.key === null || element.value !== null) {
-                return null;
-            }
-
-            let value = element.key.charAt(0).toUpperCase() + element.key.slice(1);
-
-            this.data.find((item, index) => {
-                if (item._id === element._id) {
-                    this.data[index].value = value;
-                }
-            })
-        },
+        }
     }
 
 }

From b33e27a7a81ae00732f042595d1c737d4d67746a Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:49:32 +0000
Subject: [PATCH 138/175] [4.x] Fix utility permissions not showing when using
 route caching (#9059)

---
 src/Auth/CorePermissions.php           |  2 +-
 src/CP/Utilities/UtilityRepository.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
index af37326194..9637e1f20b 100644
--- a/src/Auth/CorePermissions.php
+++ b/src/Auth/CorePermissions.php
@@ -214,7 +214,7 @@ protected function registerForms()
 
     protected function registerUtilities()
     {
-        Utility::all()->each(function ($utility) {
+        Utility::boot()->all()->each(function ($utility) {
             Permission::register("access {$utility->handle()} utility", function ($perm) use ($utility) {
                 return $perm
                     ->label(__('statamic::permissions.access_utility', ['title' => $utility->title()]))
diff --git a/src/CP/Utilities/UtilityRepository.php b/src/CP/Utilities/UtilityRepository.php
index c87676179d..103cbfef75 100644
--- a/src/CP/Utilities/UtilityRepository.php
+++ b/src/CP/Utilities/UtilityRepository.php
@@ -23,6 +23,8 @@ public function boot()
         foreach ($this->extensions as $callback) {
             $callback($this);
         }
+
+        return $this;
     }
 
     public function extend($callback)
@@ -60,20 +62,18 @@ public function authorized()
 
     public function find($handle)
     {
-        return $this->utilities->get($handle);
+        return $this->all()->get($handle);
     }
 
     public function findBySlug($slug)
     {
-        return $this->utilities->first(fn ($utility) => $utility->slug() === $slug);
+        return $this->all()->first(fn ($utility) => $utility->slug() === $slug);
     }
 
     public function routes()
     {
-        $this->boot();
-
         Route::namespace('\\')->prefix('utilities')->name('utilities.')->group(function () {
-            $this->all()->each(function ($utility) {
+            $this->boot()->all()->each(function ($utility) {
                 if ($utility->action()) {
                     Route::get($utility->slug(), $utility->action())
                         ->middleware("can:access {$utility->handle()} utility")

From 04dd8c6e60abffb939e643e4d4fcd3accd054785 Mon Sep 17 00:00:00 2001
From: Johannes Schuba <hi@joschuba.digital>
Date: Mon, 27 Nov 2023 17:53:40 +0100
Subject: [PATCH 139/175] [4.x] Extend Ray modifier for use of the color helper
 function (#9073)

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

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 52d51d0498..66e5180c8b 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -1794,11 +1794,11 @@ public function rawurlencode($value)
      *
      * @return void
      */
-    public function ray($value)
+    public function ray($value, $params)
     {
         throw_unless(function_exists('ray'), new \Exception('Ray is not installed. Run `composer require spatie/laravel-ray --dev`'));
 
-        ray($value);
+        ray($value)->color(Arr::get($params, 0, 'gray'));
 
         return $value;
     }

From c54dbfe68a92907bd918a930a5838487ab8ee3ee Mon Sep 17 00:00:00 2001
From: Balazs Mocsai <mbale@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:53:56 +0100
Subject: [PATCH 140/175] [4.x] Fix missing config pass to mount manager
 (#9065)

Co-authored-by: bale <bale@neatlifl.io>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Imaging/Attributes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Imaging/Attributes.php b/src/Imaging/Attributes.php
index ce3cc000d5..5c19c5a7f8 100644
--- a/src/Imaging/Attributes.php
+++ b/src/Imaging/Attributes.php
@@ -23,7 +23,7 @@ public function from(FilesystemAdapter $source, string $path)
                 $manager->delete($destination);
             }
 
-            $manager->copy("source://{$path}", $destination);
+            $manager->copy("source://{$path}", $destination, ['visibility' => 'private']);
         }
 
         $svg = Str::endsWith($path, '.svg');

From f5888a881e1ad54c7abbe5dd4016eaf675db2ab9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:05:20 +0000
Subject: [PATCH 141/175] [4.x] Make whole tree branches clickable in Entries
 Fieldtype in Tree Mode (#9074)

---
 resources/js/components/inputs/relationship/Selector.vue | 2 ++
 resources/js/components/structures/Branch.vue            | 2 +-
 resources/js/components/structures/PageTree.vue          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index 752a826fe6..ff541ccb77 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -131,10 +131,12 @@
                                 :site="site"
                                 :preferences-prefix="`selector-field.${name}`"
                                 :editable="false"
+                                @branch-clicked="$refs[`tree-branch-${$event.id}`].click()"
                             >
                                 <template #branch-action="{ branch, index }">
                                     <div>
                                         <input
+                                            :ref="`tree-branch-${branch.id}`"
                                             type="checkbox"
                                             class="mt-3 ml-3"
                                             :value="branch.id"
diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 5f577a71c9..ccbfad49e3 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -5,7 +5,7 @@
             <div class="page-move w-6" />
         </slot>
         <div class="flex items-center flex-1 p-2 ml-2 text-xs leading-normal">
-            <div class="flex items-center flex-1">
+            <div class="flex items-center flex-1" @click="$emit('branch-clicked', page)">
                 <div class="little-dot mr-2" :class="getStatusClass()" v-tooltip="getStatusTooltip()" />
                 <svg-icon name="home-page" class="mr-2 h-4 w-4 text-gray-800" v-if="isRoot" v-tooltip="__('This is the root page')" />
                 <a
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 289bb062f9..5c5c952673 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -47,6 +47,7 @@
                     @toggle-open="store.toggleOpen(page)"
                     @removed="pageRemoved"
                     @children-orphaned="childrenOrphaned"
+                    @branch-clicked="$emit('branch-clicked', page)"
                 >
                     <template #branch-action="props">
                         <slot name="branch-action" v-bind="{ ...props, vm }" />

From ae0d541a346c701692ef1435103f48ddd4ce169b Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:18:44 +0000
Subject: [PATCH 142/175] [4.x] Fix pagination in Relationship Fieldtype
 causing page to scroll to the top (#9060)

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

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index ff541ccb77..10772c78ac 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -75,6 +75,7 @@
                             class="border-t shadow-lg"
                             :resource-meta="meta"
                             :inline="true"
+                            :scroll-to-top="false"
                             @page-selected="setPage" />
 
                         <div class="p-4 border-t flex items-center justify-between bg-gray-200">

From 1d141553ac7c41d87adf433f0217d08710c4af84 Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Mon, 27 Nov 2023 20:56:06 +0100
Subject: [PATCH 143/175] [4.x] Allow focus on textarea fieldtypes (#9055)

---
 resources/js/components/fieldtypes/TextareaFieldtype.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/fieldtypes/TextareaFieldtype.vue b/resources/js/components/fieldtypes/TextareaFieldtype.vue
index b3b8a0c2b8..954176909a 100644
--- a/resources/js/components/fieldtypes/TextareaFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextareaFieldtype.vue
@@ -1,5 +1,6 @@
 <template>
     <textarea-input
+        :focus="config.focus"
         :name="name"
         :isReadOnly="isReadOnly"
         :limit="config.character_limit || null"

From 952dacb21c440a080bb650d5872d7bd54b706cfd Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 27 Nov 2023 21:06:34 +0000
Subject: [PATCH 144/175] [4.x] Use RedirectIfAuthorized middleware on password
 reset & activate pages (#9053)

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Http/Controllers/ActivateAccountController.php |  6 ++++++
 src/Http/Controllers/ResetPasswordController.php   |  4 ++--
 src/Http/Middleware/CP/RedirectIfAuthorized.php    | 11 ++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Http/Controllers/ActivateAccountController.php b/src/Http/Controllers/ActivateAccountController.php
index 41e5481fb4..b53c7dc069 100644
--- a/src/Http/Controllers/ActivateAccountController.php
+++ b/src/Http/Controllers/ActivateAccountController.php
@@ -4,9 +4,15 @@
 
 use Illuminate\Support\Facades\Password;
 use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
 
 class ActivateAccountController extends ResetPasswordController
 {
+    public function __construct()
+    {
+        $this->middleware(RedirectIfAuthorized::class);
+    }
+
     protected function resetFormAction()
     {
         return route('statamic.account.activate.action');
diff --git a/src/Http/Controllers/ResetPasswordController.php b/src/Http/Controllers/ResetPasswordController.php
index 605dff9016..e2e63ca7e1 100644
--- a/src/Http/Controllers/ResetPasswordController.php
+++ b/src/Http/Controllers/ResetPasswordController.php
@@ -8,7 +8,7 @@
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Auth\ResetsPasswords;
 use Statamic\Contracts\Auth\User;
-use Statamic\Http\Middleware\RedirectIfAuthenticated;
+use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
 
 class ResetPasswordController extends Controller
 {
@@ -16,7 +16,7 @@ class ResetPasswordController extends Controller
 
     public function __construct()
     {
-        $this->middleware(RedirectIfAuthenticated::class);
+        $this->middleware(RedirectIfAuthorized::class);
     }
 
     public function showResetForm(Request $request, $token = null)
diff --git a/src/Http/Middleware/CP/RedirectIfAuthorized.php b/src/Http/Middleware/CP/RedirectIfAuthorized.php
index 4c13190864..3058ec7791 100644
--- a/src/Http/Middleware/CP/RedirectIfAuthorized.php
+++ b/src/Http/Middleware/CP/RedirectIfAuthorized.php
@@ -3,6 +3,7 @@
 namespace Statamic\Http\Middleware\CP;
 
 use Closure;
+use Illuminate\Support\Facades\Auth;
 use Statamic\Facades\User;
 
 class RedirectIfAuthorized
@@ -16,10 +17,14 @@ class RedirectIfAuthorized
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (User::current()) {
-            return redirect(cp_route('index'));
+        if (! Auth::guard($guard)->check()) {
+            return $next($request);
         }
 
-        return $next($request);
+        $user = User::current();
+
+        $url = $user->can('access cp') ? cp_route('index') : '/';
+
+        return redirect($url)->withError(__("You can't do this while logged in"));
     }
 }

From 0fdf4a13972df197065adf5df273b8ef8c16bff1 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:06:48 +0000
Subject: [PATCH 145/175] [4.x] Improve replicator preview for Date Fieldtype
 (#9057)

---
 resources/js/components/fieldtypes/DateFieldtype.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 06c8e0e1f0..8e0b779a38 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -158,6 +158,12 @@ export default {
             return this.meta.displayFormat;
         },
 
+        replicatorPreview() {
+            return this.hasTime
+                ? `${this.value.date} ${this.value.time}`
+                : this.value.date;
+        },
+
     },
 
     created() {

From aa978734aa64a59a6ebef2403d551b56de487043 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:07:33 +0000
Subject: [PATCH 146/175] [4.x] Pass site parameter from Entry Publish Form to
 Tree Listing (#9075)

---
 resources/js/components/entries/PublishForm.vue | 6 +++++-
 resources/views/entries/create.blade.php        | 2 +-
 resources/views/entries/edit.blade.php          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index dd1a4ca0a7..99974d22d9 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -337,7 +337,7 @@ export default {
         canEditBlueprint: Boolean,
         canManagePublishState: Boolean,
         createAnotherUrl: String,
-        listingUrl: String,
+        initialListingUrl: String,
         collectionHasRoutes: Boolean,
         previewTargets: Array,
         autosaveInterval: Number,
@@ -414,6 +414,10 @@ export default {
             return this.values.published;
         },
 
+        listingUrl() {
+            return `${this.initialListingUrl}?site=${this.site}`;
+        },
+
         livePreviewUrl() {
             return _.findWhere(this.localizations, { active: true }).livePreviewUrl;
         },
diff --git a/resources/views/entries/create.blade.php b/resources/views/entries/create.blade.php
index 580ea377a2..c01e270971 100644
--- a/resources/views/entries/create.blade.php
+++ b/resources/views/entries/create.blade.php
@@ -17,7 +17,7 @@
         :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         site="{{ $locale }}"
         create-another-url="{{ cp_route('collections.entries.create', [$collection, $locale, 'blueprint' => $blueprint['handle'], 'parent' => $values['parent'] ?? null]) }}"
-        listing-url="{{ cp_route('collections.show', $collection) }}"
+        initial-listing-url="{{ cp_route('collections.show', $collection) }}"
         :can-manage-publish-state="{{ Statamic\Support\Str::bool($canManagePublishState) }}"
         :preview-targets="{{ json_encode($previewTargets) }}"
     ></base-entry-create-form>
diff --git a/resources/views/entries/edit.blade.php b/resources/views/entries/edit.blade.php
index 54e79ca04d..96adf175cc 100644
--- a/resources/views/entries/edit.blade.php
+++ b/resources/views/entries/edit.blade.php
@@ -33,7 +33,7 @@
         :can-edit-blueprint="{{ $str::bool($user->can('configure fields')) }}"
         :can-manage-publish-state="{{ $str::bool($canManagePublishState) }}"
         create-another-url="{{ cp_route('collections.entries.create', [$collection, $locale]) }}"
-        listing-url="{{ cp_route('collections.show', $collection) }}"
+        initial-listing-url="{{ cp_route('collections.show', $collection) }}"
         :preview-targets="{{ json_encode($previewTargets) }}"
         :autosave-interval="{{ json_encode($autosaveInterval) }}"
     ></entry-publish-form>

From 5ca436a475ada0696324502efed628b5ffc232bd Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 27 Nov 2023 21:07:50 +0000
Subject: [PATCH 147/175] [4.x] Fix redirect actions showing a toast error
 (#9054)

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

diff --git a/resources/js/components/Listing.vue b/resources/js/components/Listing.vue
index 7150d42817..7aa322a712 100644
--- a/resources/js/components/Listing.vue
+++ b/resources/js/components/Listing.vue
@@ -135,6 +135,7 @@ export default {
                 if (this.$axios.isCancel(e)) return;
                 this.loading = false;
                 this.initializing = false;
+                if (e.request && ! e.response) return;
                 this.$toast.error(e.response ? e.response.data.message : __('Something went wrong'), { duration: null });
             })
         },

From 58a74613cd06a8ffed5da002f0ff481659bb88e7 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 28 Nov 2023 16:01:47 +0000
Subject: [PATCH 148/175] [4.x] Translate widget header and collection widget
 title (#9077)

---
 resources/views/widgets/collection.blade.php | 2 +-
 resources/views/widgets/header.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/widgets/collection.blade.php b/resources/views/widgets/collection.blade.php
index 9cc7d2da50..1518b01395 100644
--- a/resources/views/widgets/collection.blade.php
+++ b/resources/views/widgets/collection.blade.php
@@ -5,7 +5,7 @@
                 <div class="h-6 w-6 mr-2 text-gray-800">
                     @cp_svg('icons/light/content-writing')
                 </div>
-                <span>{{ $title }}</span>
+                <span>{{ __($title) }}</span>
             </a>
         </h2>
         @can('create', ['Statamic\Contracts\Entries\Entry', $collection])
diff --git a/resources/views/widgets/header.blade.php b/resources/views/widgets/header.blade.php
index c0b734067c..3b5408a943 100644
--- a/resources/views/widgets/header.blade.php
+++ b/resources/views/widgets/header.blade.php
@@ -1 +1 @@
-<h2 class="{{ $classes }}">{{ $text }}</h2>
+<h2 class="{{ $classes }}">{{ __($text) }}</h2>

From 612ba324b3ff5610d48ef9c7c5c9214f73883212 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 28 Nov 2023 18:59:19 +0000
Subject: [PATCH 149/175] [4.x] Provide searchables()->lazy and insertLazily
 methods to search indexes (#9072)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Search/Algolia/Index.php |  2 +-
 src/Search/Index.php         |  2 +-
 src/Search/Searchables.php   | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Search/Algolia/Index.php b/src/Search/Algolia/Index.php
index 9e18054b54..0efa46589d 100644
--- a/src/Search/Algolia/Index.php
+++ b/src/Search/Algolia/Index.php
@@ -61,7 +61,7 @@ public function update()
             $index->setSettings($this->config['settings']);
         }
 
-        $this->insertMultiple($this->searchables()->all());
+        $this->searchables()->lazy()->each(fn ($searchables) => $this->insertMultiple($searchables));
 
         return $this;
     }
diff --git a/src/Search/Index.php b/src/Search/Index.php
index b0d8317d8e..a57bab55c3 100644
--- a/src/Search/Index.php
+++ b/src/Search/Index.php
@@ -57,7 +57,7 @@ public function update()
     {
         $this->deleteIndex();
 
-        $this->insertMultiple($this->searchables()->all());
+        $this->searchables()->lazy()->each(fn ($searchables) => $this->insertMultiple($searchables));
 
         return $this;
     }
diff --git a/src/Search/Searchables.php b/src/Search/Searchables.php
index d0562b0223..8bdb1d6e0c 100644
--- a/src/Search/Searchables.php
+++ b/src/Search/Searchables.php
@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Statamic\Contracts\Search\Searchable;
 use Statamic\Search\Searchables\Providers;
 use Statamic\Support\Arr;
@@ -43,6 +44,15 @@ public function all(): Collection
         return $this->providers->flatMap->provide();
     }
 
+    public function lazy(): LazyCollection
+    {
+        return LazyCollection::make(function () {
+            foreach ($this->providers as $provider) {
+                yield $provider->provide();
+            }
+        });
+    }
+
     public function contains($searchable)
     {
         foreach ($this->providers as $provider) {

From f7d78a223ae061566ae06319ce75a5e44619ab0c Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 28 Nov 2023 19:10:36 +0000
Subject: [PATCH 150/175] [4.x] Prevent existing term data being overwritten in
 terms fieldtype (#9076)

---
 src/Fieldtypes/Terms.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index 0b75a98421..6bb20c0ea4 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -184,7 +184,9 @@ public function process($data)
                 }
 
                 return explode('::', $id, 2)[1];
-            })->all();
+            })
+                ->unique()
+                ->all();
 
             if ($this->field->get('max_items') === 1) {
                 return $data[0] ?? null;
@@ -410,12 +412,16 @@ protected function createTermFromString($string, $taxonomy)
             ? Site::get($parent->locale())->lang()
             : Site::default()->lang();
 
-        $term = Facades\Term::make()
-            ->slug(Str::slug($string, '-', $lang))
-            ->taxonomy(Facades\Taxonomy::findByHandle($taxonomy))
-            ->set('title', $string);
+        $slug = Str::slug($string, '-', $lang);
+
+        if (! $term = Facades\Term::find("{$taxonomy}::{$slug}")) {
+            $term = Facades\Term::make()
+                ->slug($slug)
+                ->taxonomy(Facades\Taxonomy::findByHandle($taxonomy))
+                ->set('title', $string);
 
-        $term->save();
+            $term->save();
+        }
 
         return $term->id();
     }

From f6a895f2985137906d4a82b5e23bfcdf4fbaee63 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 28 Nov 2023 20:05:36 +0000
Subject: [PATCH 151/175] [4.x] Fix `redirect: @child` redirecting to `@child`
 when not a link fieldtype (#9062)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Http/Responses/DataResponse.php | 10 ++++
 tests/FrontendTest.php              | 72 ++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/Http/Responses/DataResponse.php b/src/Http/Responses/DataResponse.php
index 46b958ec23..21479cab49 100644
--- a/src/Http/Responses/DataResponse.php
+++ b/src/Http/Responses/DataResponse.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Http\Responses;
 
+use Facades\Statamic\Routing\ResolveRedirect;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Support\Str;
 use Statamic\Auth\Protect\Protection;
@@ -76,6 +77,15 @@ protected function getRedirect()
             throw new NotFoundHttpException;
         }
 
+        // If there is a redirect value but no corresponding blueprint field, (e.g. someone
+        // manually set a redirect in the YAML), we'll need to resolve it manually since
+        // they might have set one of the magic values like @child or entry::some-id.
+        $redirect = ResolveRedirect::resolve($redirect, $this->data);
+
+        if ($redirect === 404) {
+            throw new NotFoundHttpException;
+        }
+
         return redirect($redirect);
     }
 
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index fa68359c76..3378c4e5d6 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -3,6 +3,7 @@
 namespace Tests;
 
 use Facades\Statamic\CP\LivePreview;
+use Facades\Statamic\Routing\ResolveRedirect;
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Http\Response;
 use Illuminate\Support\Carbon;
@@ -820,7 +821,7 @@ public function redirectProvider()
         return [
             'valid redirect' => [
                 '/shouldnt-be-used',   // its got a value
-                '/target',             // the fieldtype will augmented to this
+                '/target',             // the fieldtype will augment to this
                 302,                   // its a redirect
                 '/target',             // to here
             ],
@@ -839,6 +840,75 @@ public function redirectProvider()
         ];
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider redirectProviderNoBlueprint
+     */
+    public function redirect_is_followed_when_no_field_is_present_in_blueprint(
+        $dataValue,
+        $shouldResolve,
+        $resolvedValue,
+        $expectedStatus,
+        $expectedLocation
+    ) {
+        $entry = tap($this->createPage('about', [
+            'with' => [
+                'title' => 'About',
+                'redirect' => $dataValue,
+            ],
+        ]))->save();
+
+        $mock = ResolveRedirect::shouldReceive('resolve');
+
+        if ($shouldResolve) {
+            $mock->with($dataValue, $entry)->andReturn($resolvedValue)->once();
+        } else {
+            $mock->never();
+        }
+
+        $response = $this->get('/about');
+
+        if ($expectedStatus === 302) {
+            $response->assertRedirect($expectedLocation);
+        } elseif ($expectedStatus === 200) {
+            $response->assertOk();
+        } elseif ($expectedStatus === 404) {
+            $response->assertNotFound();
+        } else {
+            throw new \Exception('Test not set up to handle status code: '.$expectedStatus);
+        }
+    }
+
+    public function redirectProviderNoBlueprint()
+    {
+        return [
+            'valid redirect' => [
+                // A valid redirect could be a literal URL, "@child", "entry::id", etc.
+                // It's irrelevant for this test since we're mocking the resolver.
+                'something',           // the value
+                true,                  // the resolver will run, getting the above value
+                '/target',             // and return this.
+                302,                   // its a redirect
+                '/target',             // to here.
+            ],
+            'missing redirect' => [
+                null,                  // its got no value
+                false,                 // so the resolver will not be called at all.
+                null,                  // irrelevant since it won't be called.
+                200,                   // since there's no redirect, its a successful response
+                null,                  // and not a redirect
+            ],
+            'intentional 404' => [
+                '404',                 // its got a value
+                true,                  // the resolver will run, getting the above value,
+                404,                   // and return this
+                404,                   // so it should 404
+                null,                  // and not redirect
+            ],
+        ];
+    }
+
     /** @test */
     public function it_protects_404_pages()
     {

From 2b494c1db96ec5fe45b9f8784f5c8dd4436e2971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Ko=C5=A1t=C3=AD=C5=99?=
 <miloslav.kostir@gmail.com>
Date: Wed, 29 Nov 2023 21:13:13 +0100
Subject: [PATCH 152/175] [4.x] Fix deprecated: passing null to parameter of
 type string (#9042)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Koštíř Miloslav <miloslav.kostir@dek-cz.com>
---
 src/Query/Builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Query/Builder.php b/src/Query/Builder.php
index 7951112284..bbed286cf8 100644
--- a/src/Query/Builder.php
+++ b/src/Query/Builder.php
@@ -156,7 +156,7 @@ protected function addArrayOfWheres($column, $boolean, $method = 'where')
 
     public function prepareValueAndOperator($value, $operator, $useDefault = false)
     {
-        $loweredOperator = strtolower($operator);
+        $loweredOperator = strtolower((string) $operator);
 
         if ($useDefault) {
             return [$operator, '='];

From 901150405273163a052e8128da8f3c4c90176f3b Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 29 Nov 2023 20:16:11 +0000
Subject: [PATCH 153/175] [4.x] Allow tag conditions to support querying on sub
 fields using dot notation (#9069)

---
 src/Tags/Concerns/QueriesConditions.php       |  2 ++
 tests/Tags/Concerns/QueriesConditionsTest.php | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/Tags/Concerns/QueriesConditions.php b/src/Tags/Concerns/QueriesConditions.php
index 019160c822..df755389a8 100644
--- a/src/Tags/Concerns/QueriesConditions.php
+++ b/src/Tags/Concerns/QueriesConditions.php
@@ -45,6 +45,8 @@ protected function queryCondition($query, $field, $condition, $value)
     {
         $regexOperator = $value ? 'regexp' : 'not regexp';
 
+        $field = str_replace('.', '->', $field);
+
         switch ($condition) {
             case 'is':
             case 'equals':
diff --git a/tests/Tags/Concerns/QueriesConditionsTest.php b/tests/Tags/Concerns/QueriesConditionsTest.php
index 4abcc92fc3..46cbcded2b 100644
--- a/tests/Tags/Concerns/QueriesConditionsTest.php
+++ b/tests/Tags/Concerns/QueriesConditionsTest.php
@@ -397,6 +397,39 @@ public function it_filters_by_is_after_or_before_date_conditions()
         $this->assertCount(1, $this->getEntries(['show_future' => true, 'date:is_after' => $time]));
     }
 
+    /** @test */
+    public function it_filters_by_is_after_or_before_date_range_conditions()
+    {
+        $this->collection->save();
+        $blueprint = Blueprint::makeFromFields(['date' => ['type' => 'date', 'mode' => 'range', 'time_enabled' => true, 'time_seconds_enabled' => true]])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('collections/test')->once()->andReturn(collect([$blueprint]));
+
+        Carbon::setTestNow(Carbon::parse('2019-03-10 13:00'));
+
+        $this->makeEntry('a')->data(['date_field' => ['start' => '2019-03-09', 'end' => '2019-03-10']])->save(); // definitely in past
+        $this->makeEntry('b')->data(['date_field' => ['start' => '2019-03-10', 'end' => '2019-03-11']])->save(); // today
+        $this->makeEntry('c')->data(['date_field' => ['start' => '2019-03-11', 'end' => '2019-03-18']])->save(); // today, but before "now"
+        $this->makeEntry('e')->data(['date_field' => ['start' => '2019-03-11', 'end' => '2019-03-16']])->save(); // today, and also "now"
+        $this->makeEntry('f')->data(['date_field' => ['start' => '2019-03-12', 'end' => '2019-03-14']])->save(); // today, but after "now"
+        $this->makeEntry('g')->data(['date_field' => ['start' => '2019-03-11', 'end' => '2019-03-12']])->save(); // definitely in future
+
+        $this->assertCount(6, $this->getEntries([]));
+
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_before' => true]));
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_past' => true]));
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_before' => 'today']));
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_past' => 'today']));
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_before' => false]));
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_past' => false]));
+
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_after' => true]));
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_future' => true]));
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_after' => 'today']));
+        $this->assertCount(4, $this->getEntries(['date_field.start:is_future' => 'today']));
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_after' => false]));
+        $this->assertCount(2, $this->getEntries(['date_field.start:is_future' => false]));
+    }
+
     /** @test */
     public function it_filters_by_is_alpha_condition()
     {

From 5c6a9b9fc66b6db219342ead746d52804bde11d0 Mon Sep 17 00:00:00 2001
From: Jonas Siewertsen <mail@jonassiewertsen.com>
Date: Wed, 29 Nov 2023 21:29:17 +0100
Subject: [PATCH 154/175] [4.x] Scope filters can return null (#9058)

---
 src/Query/Scopes/Filters/Concerns/QueriesFilters.php | 1 +
 src/Query/Scopes/ScopeRepository.php                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Query/Scopes/Filters/Concerns/QueriesFilters.php b/src/Query/Scopes/Filters/Concerns/QueriesFilters.php
index ca52c11ce7..6a4eefc290 100644
--- a/src/Query/Scopes/Filters/Concerns/QueriesFilters.php
+++ b/src/Query/Scopes/Filters/Concerns/QueriesFilters.php
@@ -23,6 +23,7 @@ public function queryFilters($query, $filters, $context = [])
                     'values' => $values,
                 ];
             })
+            ->filter(fn ($filter) => $filter->filterInstance != null)
             ->each(function ($filter) use ($query) {
                 $filter->filterInstance->apply($query, $filter->values);
             })
diff --git a/src/Query/Scopes/ScopeRepository.php b/src/Query/Scopes/ScopeRepository.php
index 2887caa2f9..16bacacc9f 100644
--- a/src/Query/Scopes/ScopeRepository.php
+++ b/src/Query/Scopes/ScopeRepository.php
@@ -15,7 +15,7 @@ public function all()
     public function find($key, $context = [])
     {
         if ($scope = app('statamic.scopes')->get($key)) {
-            return app($scope)->context($context);
+            return app($scope)?->context($context);
         }
     }
 

From c5006b23e99e88ea054b2f341c6e7df5b459280e Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 29 Nov 2023 20:39:18 +0000
Subject: [PATCH 155/175] [4.x] Add additional user blueprints fields to user
 create wizard (#9003)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/users/Wizard.vue      | 165 +++++++++++-------
 resources/views/users/create.blade.php        |   4 +
 .../Controllers/CP/Users/UsersController.php  |  22 ++-
 3 files changed, 122 insertions(+), 69 deletions(-)

diff --git a/resources/js/components/users/Wizard.vue b/resources/js/components/users/Wizard.vue
index df3757ab7f..9c1caf498d 100644
--- a/resources/js/components/users/Wizard.vue
+++ b/resources/js/components/users/Wizard.vue
@@ -16,46 +16,25 @@
                 <p class="text-gray" v-text="__('messages.user_wizard_intro')" />
             </div>
 
-            <!-- Email Address -->
-            <div class="max-w-md mx-auto px-4 pb-10">
-                <label class="font-bold text-base mb-1" for="email">{{ __('Email Address') }}*</label>
-                <input type="email" v-model="user.email" id="email" class="input-text" required autofocus tabindex="1">
-
-                <div class="text-2xs text-red-500 mt-2 flex items-center" v-if="userExists">
-                    <svg-icon name="info-circle" class="h-4 w-4 mr-1 flex items-center mb-px"></svg-icon>
-                    {{ __('This user already exists.') }}
-                </div>
-                <div class="text-2xs text-gray-600 mt-2 flex items-center" v-else>
-                    <svg-icon name="info-circle" class="h-4 w-4 mr-1 flex items-center mb-px"></svg-icon>
-                    {{ __('messages.user_wizard_email_instructions') }}
-                </div>
-            </div>
-
-            <!-- Name -->
-            <div v-if="! separateNameFields" class="max-w-md mx-auto px-4 pb-20">
-                <label class="font-bold text-base mb-1" for="name">{{ __('Name') }}</label>
-                <input type="text" v-model="user.name" id="name" class="input-text" tabindex="2">
-                <div class="text-2xs text-gray-600 mt-2 flex items-center">
-                    <svg-icon name="info-circle" class="h-4 w-4 mr-1 flex items-center mb-px"></svg-icon>
-                    {{ __('messages.user_wizard_name_instructions') }}
-                </div>
-            </div>
-
-            <div v-else class="max-w-md mx-auto px-4 pb-20 flex space-x-4">
-                <div class="flex-1">
-                    <label class="font-bold text-base mb-1" for="first_name">{{ __('First Name') }}</label>
-                    <input type="text" v-model="user.first_name" id="first_name" class="input-text" tabindex="2">
-                    <div class="text-2xs text-gray-600 mt-2 flex items-center">
-                        <svg-icon name="info-circle" class="h-4 w-4 mr-1 flex items-center mb-px"></svg-icon>
-                        {{ __('messages.user_wizard_name_instructions') }}
+            <publish-container
+                :name="storeName"
+                :blueprint="blueprint"
+                :values="values"
+                :meta="meta"
+                :track-dirty-state="false"
+                class="max-w-md mx-auto -mt-6 py-0 px-4 pb-20"
+                @updated="values = $event"
+            >
+                <div slot-scope="{ setFieldValue, setFieldMeta }">
+                    <div class="-mx-6">
+                        <publish-fields
+                            :fields="fields"
+                            @updated="setFieldValue"
+                            @meta-updated="setFieldMeta"
+                        />
                     </div>
                 </div>
-
-                <div class="flex-1">
-                    <label class="font-bold text-base mb-1" for="last_name">{{ __('Last Name') }}</label>
-                    <input type="text" v-model="user.last_name" id="last_name" class="input-text" tabindex="2">
-                </div>
-            </div>
+            </publish-container>
         </div>
 
         <!-- Step: Roles & Groups -->
@@ -147,7 +126,7 @@
 
             <!-- Copy Pasta -->
             <div class="max-w-md mx-auto px-4 pb-20" v-else>
-                <p class="mb-2" v-html="__('messages.user_wizard_invitation_share_before', { email: user.email })" />
+                <p class="mb-2" v-html="__('messages.user_wizard_invitation_share_before', { email: values.email })" />
             </div>
         </div>
 
@@ -160,7 +139,7 @@
 
             <!-- Copy Pasta -->
             <div class="max-w-md mx-auto px-4 pb-10">
-                <p class="mb-2" v-html="__('messages.user_wizard_invitation_share', { email: user.email })" />
+                <p class="mb-2" v-html="__('messages.user_wizard_invitation_share', { email: values.email })" />
             </div>
             <div class="max-w-md mx-auto px-4 pb-10">
                 <label class="font-bold text-base mb-1" for="email">{{ __('Activation URL') }}</label>
@@ -168,7 +147,7 @@
             </div>
             <div class="max-w-md mx-auto px-4 pb-20">
                 <label class="font-bold text-base mb-1" for="email">{{ __('Email Address') }}</label>
-                <input type="text" readonly class="input-text" onclick="this.select()" :value="user.email" />
+                <input type="text" readonly class="input-text" onclick="this.select()" :value="values.email" />
             </div>
         </div>
 
@@ -177,7 +156,10 @@
                 <button tabindex="3" class="btn mx-4 w-32" @click="previous" v-if="! completed && ! onFirstStep">
                     &larr; {{ __('Previous')}}
                 </button>
-                <button tabindex="4" class="btn mx-4 w-32" :disabled="! canContinue" @click="next" v-if="! completed && ! onLastStep">
+                <button tabindex="4" class="btn mx-4 w-32" @click="nextStep" v-if="onUserInfoStep">
+                    {{ __('Next')}} &rarr;
+                </button>
+                <button tabindex="4" class="btn mx-4 w-32" :disabled="! canContinue" @click="nextStep" v-if="!onUserInfoStep && ! completed && ! onLastStep">
                     {{ __('Next')}} &rarr;
                 </button>
                 <button tabindex="4" class="btn-primary mx-4" @click="submit" v-if="! completed && onLastStep">
@@ -194,11 +176,19 @@
     </div>
 </template>
 
+<style>
+.publish-fields .form-group .field-inner > label {
+    @apply text-base font-bold mb-1 !important;
+    & + .help-block { @apply -mt-1 !important; }
+}
+</style>
+
 <script>
 // Yer a wizard Harry
 
 import isEmail from 'validator/lib/isEmail';
 import HasWizardSteps from '../HasWizardSteps.js';
+import uniq from 'underscore/modules/uniq.js';
 
 export default {
 
@@ -214,12 +204,15 @@ export default {
         activationExpiry: { type: Number },
         separateNameFields: { type: Boolean },
         canSendInvitation: { type: Boolean },
+        blueprint: { type: Object },
+        initialValues: { type: Object },
+        fields: { type: Array },
+        meta: { type: Object }
     },
 
     data() {
         return {
             user: {
-                email: null,
                 super: this.canCreateSupers,
                 roles: [],
                 groups: []
@@ -233,6 +226,10 @@ export default {
             completed: false,
             activationUrl: null,
             editUrl: null,
+            errors: {},
+            error: null,
+            storeName: 'userwizard',
+            values: this.initialValues,
         }
     },
 
@@ -258,33 +255,50 @@ export default {
         },
         finishButtonText() {
             return this.invitation.send ? __('Create and Send Email') : __('Create User');
-        },
-        isValidEmail() {
-            return this.user.email && isEmail(this.user.email)
         }
     },
 
     methods: {
         canGoToStep(step) {
+            // If we've created the user, you shouldn't be allowed to go back anywhere.
             if (this.completed) return false;
 
-            if (step >= 1) {
-                return this.isValidEmail && ! this.userExists;
-            }
+            // You can go back to the first step from anywhere.
+            if (step === 0) return true;
 
-            return true;
+            // Otherwise, you can only go to a step if the first one is complete/valid.
+            return this.valid;
         },
-        checkIfUserExists() {
-            this.$axios.post(cp_url('user-exists'), {email: this.user.email}).then(response => {
+        checkIfUserExists(email) {
+            this.$axios.post(cp_url('user-exists'), { email }).then(response => {
                 this.userExists = response.data.exists
             }).catch(error => {
                 this.$toast.error(error.response.data.message);
             });
         },
-        submit() {
-            let payload = {...this.user, invitation: this.invitation};
+        nextStep() {
+            if (this.onUserInfoStep) {
+                return this.submit(true).then(this.next).catch(() => {})
+            }
+
+            this.next();
+        },
+        submit(validateOnly) {
+            let payload = {...this.user, ...this.values, invitation: this.invitation};
+
+            if (validateOnly === true) {
+                payload._validate_only = true;
+            }
+
+            this.clearErrors();
+
+            return this.$axios.post(this.route, payload).then(response => {
+                this.valid = true;
+
+                if (payload._validate_only) {
+                    return;
+                }
 
-            this.$axios.post(this.route, payload).then(response => {
                 if (this.invitation.send) {
                     window.location = response.data.redirect;
                 } else {
@@ -292,17 +306,46 @@ export default {
                     this.editUrl = response.data.redirect;
                     this.activationUrl = response.data.activationUrl;
                 }
-            }).catch(error => {
-                this.$toast.error(error.response.data.message);
+            }).catch(e => {
+                this.handleAxiosError(e);
+                throw e;
             });
-        }
+        },
+        handleAxiosError(e) {
+            if (e.response && e.response.status === 422) {
+                const { message, errors } = e.response.data;
+                this.error = message;
+                this.errors = errors;
+                this.valid = false;
+                this.$toast.error(message);
+            } else {
+                this.$toast.error(__(e.response.data.message));
+            }
+        },
+        clearErrors() {
+            this.error = null;
+            this.errors = {};
+        },
     },
 
     watch: {
-        'user.email': function(email) {
-            if (this.isValidEmail) {
-                this.checkIfUserExists()
+        'values.email': function(email) {
+            if (email && isEmail(email)) this.checkIfUserExists(email);
+        },
+
+        userExists(exists) {
+            let emailErrors = this.errors.email || [];
+            const error = __('statamic::validation.unique');
+            if (exists) {
+                emailErrors.push(error);
+            } else {
+                emailErrors = emailErrors.filter(error => error !== error);
             }
+            this.errors = { ...this.errors, email: uniq(emailErrors) };
+        },
+
+        'errors': function (errors) {
+            if (this.onUserInfoStep) this.$store.commit(`publish/${this.storeName}/setErrors`, errors);
         }
     },
 
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 76b24dea7f..085e4dd97d 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -13,6 +13,10 @@
         :activation-expiry="{{ $expiry }}"
         :separate-name-fields="{{ $str::bool($separateNameFields) }}"
         :can-send-invitation="{{ $str::bool($canSendInvitation) }}"
+        :blueprint="{{ json_encode($blueprint) }}"
+        :fields="{{ json_encode($fields) }}"
+        :meta="{{ json_encode($meta) }}"
+        :initial-values="{{ json_encode($values) }}"
     >
     </user-wizard>
 @stop
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 8324b53264..2a08436828 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -116,20 +116,22 @@ public function create(Request $request)
         $this->authorize('create', UserContract::class);
 
         $blueprint = User::blueprint();
+        $blueprint->ensureFieldHasConfig('email', ['validate' => 'required']);
 
         $fields = $blueprint->fields()->preProcess();
 
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_ACTIVATIONS);
         $expiry = config("auth.passwords.{$broker}.expire") / 60;
 
+        $additional = $fields->all()
+            ->reject(fn ($field) => in_array($field->handle(), ['roles', 'groups']))
+            ->keys();
+
         $viewData = [
-            'title' => __('Create'),
-            'values' => $fields->values()->all(),
-            'meta' => $fields->meta(),
+            'values' => (object) $fields->values()->only($additional)->all(),
+            'meta' => (object) $fields->meta()->only($additional)->all(),
+            'fields' => collect($fields->toPublishArray())->filter(fn ($field) => $additional->contains($field['handle']))->values()->all(),
             'blueprint' => $blueprint->toPublishArray(),
-            'actions' => [
-                'save' => cp_route('users.store'),
-            ],
             'expiry' => $expiry,
             'separateNameFields' => $blueprint->hasField('first_name'),
             'canSendInvitation' => config('statamic.users.wizard_invitation'),
@@ -149,11 +151,15 @@ public function store(Request $request)
 
         $blueprint = User::blueprint();
 
-        $fields = $blueprint->fields()->only(['email', 'name', 'first_name', 'last_name'])->addValues($request->all());
+        $fields = $blueprint->fields()->except(['roles', 'groups'])->addValues($request->all());
 
         $fields->validate(['email' => 'required|email|unique_user_value']);
 
-        $values = $fields->process()->values()->except(['email', 'groups', 'roles']);
+        if ($request->input('_validate_only')) {
+            return [];
+        }
+
+        $values = $fields->process()->values()->except(['email']);
 
         $user = User::make()
             ->email($request->email)

From ce50b50353587b03810c5bdcf351e76922928e5e Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 29 Nov 2023 17:14:36 -0500
Subject: [PATCH 156/175] [4.x] Add group field type (#8836)

* Adding group field type

* Code style

* Fixing null values to be empty arrays

* Remove console log

* Remove grid field instructions from group field

* Fixing meta error with nested Replicators and Grids

* Fixing field meta bug and import paths

* Fixing field meta preload

* Fixing nested conditions

* Fix imports

* Change namespace

* Register fieldtype in `ExtensionServiceProvider`

* Add icon

* Restyle the fullscreen icon

* All configs need instructions

* Fixing group field error when nested in grid

* Fixing nested validation

* Code style

* Fix some small breakpoint and replicator alignment issues

---------

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
Co-authored-by: Jack McDade <jack@jackmcdade.com>
---
 resources/js/bootstrap/fieldtypes.js          |   2 +
 .../components/fieldtypes/GroupFieldtype.vue  | 166 ++++++++++++++++--
 resources/lang/en/fieldtypes.php              |   1 +
 resources/svg/icons/light/group.svg           |   1 +
 src/Fieldtypes/Group.php                      | 125 +++++++++++++
 src/Providers/ExtensionServiceProvider.php    |   1 +
 6 files changed, 284 insertions(+), 12 deletions(-)
 create mode 100644 resources/svg/icons/light/group.svg
 create mode 100644 src/Fieldtypes/Group.php

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index 619d8ef9d5..d65917d3ef 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -30,6 +30,7 @@ import FloatFieldtype from '../components/fieldtypes/FloatFieldtype.vue';
 import Sites from '../components/globals/Sites.vue';
 import Grid from '../components/fieldtypes/grid/Grid.vue';
 import GridIndex from '../components/fieldtypes/grid/GridIndex.vue';
+import GroupFieldtype from '../components/fieldtypes/GroupFieldtype.vue';
 import HiddenFieldtype from '../components/fieldtypes/HiddenFieldtype.vue';
 import HtmlFieldtype from '../components/fieldtypes/HtmlFieldtype.vue';
 import IconFieldtype from '../components/fieldtypes/IconFieldtype.vue';
@@ -88,6 +89,7 @@ Vue.component('float-fieldtype', FloatFieldtype);
 Vue.component('global_set_sites-fieldtype', Sites);
 Vue.component('grid-fieldtype', Grid);
 Vue.component('grid-fieldtype-index', GridIndex);
+Vue.component('group-fieldtype', GroupFieldtype);
 Vue.component('hidden-fieldtype', HiddenFieldtype);
 Vue.component('html-fieldtype', HtmlFieldtype);
 Vue.component('icon-fieldtype', IconFieldtype);
diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
index d91b7313fc..599f85aa0b 100644
--- a/resources/js/components/fieldtypes/GroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -1,30 +1,172 @@
 <template>
+    <portal
+        name="group-fullscreen"
+        :disabled="!fullScreenMode"
+        :provide="provide"
+    >
+        <element-container @resized="containerWidth = $event.width">
+            <div
+                class="group-fieldtype-container"
+                :class="{ 'grid-fullscreen bg-white': fullScreenMode }"
+            >
+                <header
+                    v-if="fullScreenMode"
+                    class="relative flex items-center justify-between py-3 pl-3 bg-gray-200 border-b"
+                >
+                    <h2 v-text="__(config.display)" />
+                    <button
+                        @click="fullScreenMode = false"
+                        class="absolute btn-close top-2 right-5"
+                        :aria-label="__('Exit Fullscreen Mode')"
+                    >&times;</button>
+                </header>
+                <section :class="{ 'p-4': fullScreenMode }">
+                    <div
+                        v-if="!fullScreenMode"
+                        class="group-fieldtype-button-wrapper"
+                    >
+                        <button
+                            v-if="config.fullscreen"
+                            @click="toggleFullScreen"
+                            v-tooltip="__('Toggle Fullscreen Mode')"
+                            class="flex items-center group"
+                        >
+                            <svg-icon
+                                name="expand-bold"
+                                class="h-3.5 px-0.5 text-gray-750 group-hover:text-black"
+                            />
+                        </button>
+                    </div>
+                    <div class="mb-4 border rounded shadow-sm replicator-set">
+                        <div class="replicator-set-body publish-fields @container">
+                            <set-field
+                                v-for="field in fields"
+                                :key="field.handle"
+                                v-show="showField(field, fieldPath(field.handle))"
+                                :field="field"
+                                :meta="meta[field.handle]"
+                                :value="value[field.handle]"
+                                :parent-name="name"
+                                :set-index="0"
+                                :errors="errors(field.handle)"
+                                :field-path="fieldPath(field.handle)"
+                                :read-only="isReadOnly"
+                                @updated="updated(field.handle, $event)"
+                                @meta-updated="updateMeta(field.handle, $event)"
+                                @focus="$emit('focus')"
+                                @blur="$emit('blur')"
+                                class="p-4"
+                            />
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </element-container>
+    </portal>
+</template>
 
-    <div>
-        Group Fieldtype
-    </div>
+<style>
+    .group-fieldtype-button-wrapper {
+        @apply flex justify-end absolute top-5 sm:top-7 right-0 @md:right-4 @lg:right-6;
+    }
 
-</template>
+    .replicator-set .group-fieldtype-button-wrapper {
+        @apply top-5 right-4;
+    }
+</style>
 
 <script>
+import Fieldtype from './Fieldtype.vue';
+import SetField from './replicator/Field.vue';
+import { ValidatesFieldConditions } from '../field-conditions/FieldConditions.js';
 
 export default {
-
-    mixins: [Fieldtype],
-
+    mixins: [
+        Fieldtype,
+        ValidatesFieldConditions,
+    ],
+    components: { SetField },
     data() {
         return {
-
+            containerWidth: null,
+            focused: false,
+            fullScreenMode: false,
+            provide: {
+                group: this.makeGroupProvide(),
+                storeName: this.storeName,
+            },
+        };
+    },
+    inject: ['storeName'],
+    computed: {
+        values() {
+            return this.value;
+        },
+        fields() {
+            return this.config.fields;
+        },
+        replicatorPreview() {
+            return Object.values(this.value).join(', ');
         }
     },
+    methods: {
+        blurred() {
+            setTimeout(() => {
+                if (!this.$el.contains(document.activeElement)) {
+                    this.focused = false;
+                }
+            }, 1);
+        },
 
-    computed: {
+        toggleFullScreen() {
+            this.fullScreenMode = !this.fullScreenMode;
+        },
 
+        makeGroupProvide() {
+            const group = {};
+            Object.defineProperties(group, {
+                config: { get: () => this.config },
+                isReadOnly: { get: () => this.isReadOnly },
+                handle: { get: () => this.handle },
+                fieldPathPrefix: { get: () => this.fieldPathPrefix || this.handle },
+                fullScreenMode: { get: () => this.fullScreenMode },
+                toggleFullScreen: { get: () => this.toggleFullScreen },
+            });
+            return group;
+        },
 
-    },
+        focused(focused, oldFocused) {
+            if (focused === oldFocused) return;
 
-    methods: {
+            if (focused) return this.$emit('focus');
+
+            setTimeout(() => {
+                if (!this.$el.contains(document.activeElement)) {
+                    this.$emit('blur');
+                }
+            }, 1);
+        },
+
+        updated(handle, value) {
+            this.update({
+                ...this.value,
+                [handle]: value,
+            });
+        },
+
+        updateMeta(handle, value) {
+            this.$emit('meta-updated', { ...this.meta, [handle]: value });
+        },
+
+        fieldPath(handle) {
+            return (this.fieldPathPrefix || this.handle) + '.' + handle;
+        },
 
+        errors(handle) {
+            const state = this.$store.state.publish[this.storeName];
+            if (!state) return [];
+            return state.errors[this.fieldPath(handle)] || [];
+        },
     },
-}
+};
 </script>
diff --git a/resources/lang/en/fieldtypes.php b/resources/lang/en/fieldtypes.php
index b501d28d33..6fc4aef5bc 100644
--- a/resources/lang/en/fieldtypes.php
+++ b/resources/lang/en/fieldtypes.php
@@ -88,6 +88,7 @@
     'grid.config.mode' => 'Choose your preferred layout style.',
     'grid.config.reorderable' => 'Enable the ability to reorder rows.',
     'grid.title' => 'Grid',
+    'group.config.fields' => 'Configure fields to be nested inside this group.',
     'hidden.title' => 'Hidden',
     'html.title' => 'HTML',
     'html.config.html_instruct' => 'Manage the HTML to be displayed in the publish form.',
diff --git a/resources/svg/icons/light/group.svg b/resources/svg/icons/light/group.svg
new file mode 100644
index 0000000000..77d7d81b1b
--- /dev/null
+++ b/resources/svg/icons/light/group.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -0.5 24 24"><path d="M1.438.477h20.125s.958 0 .958.959V21.56s0 .958-.959.958H1.438s-.958 0-.958-.958V1.436s0-.959.959-.959M12.938 6.227h6.708M10.063 10.06h9.583M10.063 13.894h9.583M10.063 17.727h6.708" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/><path d="M3.833 4.31h2.875s.48 0 .48.48v2.875s0 .479-.48.479H3.833s-.479 0-.479-.48V4.79s0-.48.48-.48M3.833 10.06h2.875s.48 0 .48.48v2.875s0 .479-.48.479H3.833s-.479 0-.479-.48V10.54s0-.48.48-.48M3.833 15.81h2.875s.48 0 .48.48v2.875s0 .479-.48.479H3.833s-.479 0-.479-.48V16.29s0-.48.48-.48" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/src/Fieldtypes/Group.php b/src/Fieldtypes/Group.php
new file mode 100644
index 0000000000..33a997e8a7
--- /dev/null
+++ b/src/Fieldtypes/Group.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fields;
+use Statamic\Fields\Fieldtype;
+
+class Group extends Fieldtype
+{
+    protected $categories = ['structured'];
+    protected $defaultable = false;
+    protected $defaultValue = [];
+
+    protected function configFieldItems(): array
+    {
+        return [
+            [
+                'display' => __('Fields'),
+                'fields' => [
+                    'fields' => [
+                        'display' => __('Fields'),
+                        'instructions' => __('statamic::fieldtypes.group.config.fields'),
+                        'type' => 'fields',
+                        'full_width_setting' => true,
+                    ],
+                ],
+            ],
+            [
+                'display' => __('Appearance & Behavior'),
+                'fields' => [
+                    'fullscreen' => [
+                        'display' => __('Allow Fullscreen Mode'),
+                        'instructions' => __('statamic::fieldtypes.grid.config.fullscreen'),
+                        'type' => 'toggle',
+                        'default' => true,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    public function process($data)
+    {
+        return $this->fields()->addValues($data ?? [])->process()->values()->all();
+    }
+
+    public function preProcess($data)
+    {
+        return $this->fields()->addValues($data ?? [])->preProcess()->values()->all();
+    }
+
+    public function fields()
+    {
+        return new Fields($this->config('fields'), $this->field()->parent(), $this->field());
+    }
+
+    public function rules(): array
+    {
+        return ['array'];
+    }
+
+    public function extraRules(): array
+    {
+        $rules = $this
+            ->fields()
+            ->addValues((array) $this->field->value())
+            ->validator()
+            ->withContext([
+                'prefix' => $this->field->handle().'.',
+            ])
+            ->rules();
+
+        return collect($rules)->mapWithKeys(function ($rules, $handle) {
+            return [$this->field->handle().'.'.$handle => $rules];
+        })->all();
+    }
+
+    public function extraValidationAttributes(): array
+    {
+        return collect($this->fields()->validator()->attributes())->mapWithKeys(function ($attribute, $handle) {
+            return [$this->field->handle().'.'.$handle => $attribute];
+        })->all();
+    }
+
+    public function preload()
+    {
+        return $this->fields()->addValues($this->field->value() ?? $this->defaultGroupData())->meta()->toArray();
+    }
+
+    protected function defaultGroupData()
+    {
+        return $this->fields()->all()->map(function ($field) {
+            return $field->fieldtype()->preProcess($field->defaultValue());
+        })->all();
+    }
+
+    public function augment($value)
+    {
+        return $this->performAugmentation($value, false);
+    }
+
+    public function shallowAugment($value)
+    {
+        return $this->performAugmentation($value, true);
+    }
+
+    private function performAugmentation($value, $shallow)
+    {
+        $method = $shallow ? 'shallowAugment' : 'augment';
+
+        return $this->fields()->addValues($value ?? [])->{$method}()->values()->all();
+    }
+
+    public function preProcessValidatable($value)
+    {
+        return array_merge(
+            $value ?? [],
+            $this->fields()
+                ->addValues($value ?? [])
+                ->preProcessValidatables()
+                ->values()
+                ->all(),
+        );
+    }
+}
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 725147a87e..1f7e9a2f86 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -69,6 +69,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\Floatval::class,
         Fieldtypes\GlobalSetSites::class,
         Fieldtypes\Grid::class,
+        Fieldtypes\Group::class,
         Fieldtypes\Hidden::class,
         Fieldtypes\Html::class,
         Fieldtypes\Icon::class,

From 5c1ec4709839429f7a072e706937035416212553 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Wed, 29 Nov 2023 22:52:36 +0000
Subject: [PATCH 157/175] [4.x] Pass target field handle to custom conditions
 (#9083)

---
 resources/js/components/field-conditions/Validator.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/field-conditions/Validator.js b/resources/js/components/field-conditions/Validator.js
index 3492158eb7..b393e3856c 100644
--- a/resources/js/components/field-conditions/Validator.js
+++ b/resources/js/components/field-conditions/Validator.js
@@ -184,8 +184,9 @@ export default class {
         let target = condition.field
             ? this.getFieldValue(condition.field)
             : null;
+        let targetHandle = condition.field;
 
-        return {functionName, params, target};
+        return {functionName, params, target, targetHandle};
     }
 
     prepareFunctionName(condition) {
@@ -258,6 +259,7 @@ export default class {
         let passes = customFunction({
             params: condition.params,
             target: condition.target,
+            targetHandle: condition.targetHandle,
             values: this.values,
             root: this.rootValues,
             store: this.store,

From ed5283727cdf9315fef21132a374cb91943eb4ac Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 29 Nov 2023 17:52:55 -0500
Subject: [PATCH 158/175] [4.x] Fix user wizard styles (#9086)

---
 resources/js/components/users/Wizard.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/users/Wizard.vue b/resources/js/components/users/Wizard.vue
index 9c1caf498d..1c94ba9122 100644
--- a/resources/js/components/users/Wizard.vue
+++ b/resources/js/components/users/Wizard.vue
@@ -176,9 +176,9 @@
     </div>
 </template>
 
-<style>
-.publish-fields .form-group .field-inner > label {
-    @apply text-base font-bold mb-1 !important;
+<style scoped>
+>>> .publish-fields .form-group .field-inner > label {
+    @apply text-base font-bold mb-1;
     & + .help-block { @apply -mt-1 !important; }
 }
 </style>

From 7a58ba30fcfb9f94f6237964b66fd27cf4f42547 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 29 Nov 2023 19:16:42 -0500
Subject: [PATCH 159/175] [4.x] Fix select fieldtype fallback differently
 (#9087)

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

diff --git a/src/Fieldtypes/HasSelectOptions.php b/src/Fieldtypes/HasSelectOptions.php
index c006fc5ef3..8a07a0907f 100644
--- a/src/Fieldtypes/HasSelectOptions.php
+++ b/src/Fieldtypes/HasSelectOptions.php
@@ -104,8 +104,8 @@ private function getLabel($actualValue)
             $value = $this->castFromBoolean($value);
         }
 
-        return $this->isOption($value) && Arr::get($this->config('options'), $value)
-            ? Arr::get($this->config('options'), $value, $value)
+        return $this->isOption($value)
+            ? Arr::get($this->config('options'), $value) ?? $value
             : $actualValue;
     }
 

From 263368a018eca51b88ad4c7e58aaa5ad006b660b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 29 Nov 2023 19:27:13 -0500
Subject: [PATCH 160/175] changelog

---
 CHANGELOG.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e873887ba3..e4d69da7a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,51 @@
 # Release Notes
 
+## 4.37.0 (2023-11-29)
+
+### What's new
+- Add `group` field type. [#8836](https://github.com/statamic/cms/issues/8836) by @godismyjudge95
+- User creation wizard now shows all fields from the blueprint with validation. [#9003](https://github.com/statamic/cms/issues/9003) by @ryanmitchell
+- Tag conditions can query on sub-fields using dot notation. [#9069](https://github.com/statamic/cms/issues/9069) by @ryanmitchell
+- Search indexes are updated with better memory efficiency using lazy collections. [#9072](https://github.com/statamic/cms/issues/9072) by @ryanmitchell
+- The `ray` modifier can specify color. [#9073](https://github.com/statamic/cms/issues/9073) by @joschuba
+- Add `UrlInvalidated` event for when a URL is invalidated from the static cache. [#8902](https://github.com/statamic/cms/issues/8902) by @ryanmitchell
+- Add `Creating` events. [#7377](https://github.com/statamic/cms/issues/7377) by @ryanmitchell
+- Add option to append original filename to Glide URLs. [#8661](https://github.com/statamic/cms/issues/8661) by @ryanmitchell
+
+### What's improved
+- Improve replicator preview for Date Fieldtype. [#9057](https://github.com/statamic/cms/issues/9057) by @duncanmcclean
+- Make whole branches clickable in Entries fieldtype in tree view. [#9074](https://github.com/statamic/cms/issues/9074) by @duncanmcclean
+- Add validation to limit characters in slugs. [#9046](https://github.com/statamic/cms/issues/9046) by @duncanmcclean
+- Improve sanitization of Replicator set preview text. [#9047](https://github.com/statamic/cms/issues/9047) by @jasonvarga
+
+### What's fixed
+- Scope filters can return null. [#9058](https://github.com/statamic/cms/issues/9058) by @jonassiewertsen
+- Fix passing null to strtolower. [#9042](https://github.com/statamic/cms/issues/9042) by @miloslavkostir
+- Fix `redirect: @child` redirecting to `@child` when not a link fieldtype. [#9062](https://github.com/statamic/cms/issues/9062) by @ryanmitchell
+- Prevent existing term data being overwritten in terms fieldtype. [#9076](https://github.com/statamic/cms/issues/9076) by @ryanmitchell
+- Translate widget header and collection widget title. [#9077](https://github.com/statamic/cms/issues/9077) by @ryanmitchell
+- Fix redirect actions showing a toast error. [#9054](https://github.com/statamic/cms/issues/9054) by @ryanmitchell
+- Fix appropriate site not being used in the listing when redirecting from an entry. [#9075](https://github.com/statamic/cms/issues/9075) by @duncanmcclean
+- Use `RedirectIfAuthorized` middleware on password reset & activate pages. [#9053](https://github.com/statamic/cms/issues/9053) by @ryanmitchell
+- Allow focus on textarea fieldtypes. [#9055](https://github.com/statamic/cms/issues/9055) by @robdekort
+- Fix pagination in relationship fieldtype causing page to scroll to the top. [#9060](https://github.com/statamic/cms/issues/9060) by @duncanmcclean
+- Fix error when copying assets across filesystems. [#9065](https://github.com/statamic/cms/issues/9065) by @mbale
+- Fix utility permissions not showing when using route caching. [#9059](https://github.com/statamic/cms/issues/9059) by @duncanmcclean
+- Revert auto-population of array fieldtype options. [#9066](https://github.com/statamic/cms/issues/9066) by @duncanmcclean
+- Fix checkbox selection in listing tables jumping on Safari. [#9052](https://github.com/statamic/cms/issues/9052) by @ryanmitchell
+- Assets get downloaded when no URL is available. [#9018](https://github.com/statamic/cms/issues/9018) by @duncanmcclean
+- Fix section header padding in the sidebar. [#9051](https://github.com/statamic/cms/issues/9051) by @jackmcdade
+- Pass autocomplete config param to CP text inputs. [#9013](https://github.com/statamic/cms/issues/9013) by @ryanmitchell
+- Fix Glide tag stripping domain when using unsupported extension. [#9031](https://github.com/statamic/cms/issues/9031) by @duncanmcclean
+- Allow revision actions to be translated. [#9023](https://github.com/statamic/cms/issues/9023) by @ryanmitchell
+- Fix URI validation error when collection route uses entry IDs. [#9035](https://github.com/statamic/cms/issues/9035) by @duncanmcclean
+- Fix Outpost locking code for cache drivers without locking support. [#9029](https://github.com/statamic/cms/issues/9029) by @duncanmcclean
+- Fix missing `nestedListing` method on `Html` class. [#9034](https://github.com/statamic/cms/issues/9034) by @duncanmcclean
+- Fix entries tag not filtering by taxonomy when terms field is `max_items: 1`. [#9045](https://github.com/statamic/cms/issues/9045) by @ryanmitchell
+- Fix select field value not being shown in listings when option label is missing. [#9038](https://github.com/statamic/cms/issues/9038) by @duncanmcclean
+
+
+
 ## 4.36.0 (2023-11-20)
 
 ### What's new

From 072aa0bf0b7abc2ae34a9f1a6c2245f0c4d452a8 Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Thu, 30 Nov 2023 16:11:52 +0100
Subject: [PATCH 161/175] [4.x] Actually make sure autofocus works on textareas
 (#9089)

---
 resources/js/components/inputs/Textarea.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/inputs/Textarea.vue b/resources/js/components/inputs/Textarea.vue
index 437d64a902..9d45d769a9 100644
--- a/resources/js/components/inputs/Textarea.vue
+++ b/resources/js/components/inputs/Textarea.vue
@@ -39,12 +39,16 @@ export default {
     mounted() {
         autosize(this.$refs.textarea);
 
+        if (this.focus) {
+            this.$refs.textarea.focus();
+        }
+
         setTimeout(() => {
             this.updateSize();
         }, 1);
         this.$events.$on('tab-switched', this.updateSize);
     },
-    
+
     beforeDestroy() {
         autosize.destroy(this.$refs.textarea);
     },

From 132502538e22c8626722f50af4220ed31caf4aea Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 30 Nov 2023 10:39:54 -0500
Subject: [PATCH 162/175] [4.x] Fix date replicator preview in more
 configurations (#9093)

---
 .../js/components/fieldtypes/DateFieldtype.vue   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 8e0b779a38..3d3685418e 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -159,9 +159,19 @@ export default {
         },
 
         replicatorPreview() {
-            return this.hasTime
-                ? `${this.value.date} ${this.value.time}`
-                : this.value.date;
+            if (! this.value.date) return;
+
+            if (this.isRange) {
+                return Vue.moment(this.value.date.start).format(this.displayFormat) + ' – ' + Vue.moment(this.value.date.end).format(this.displayFormat);
+            }
+
+            let preview = Vue.moment(this.value.date).format(this.displayFormat);
+
+            if (this.hasTime) {
+                preview += ` ${this.value.time}`;
+            }
+
+            return preview;
         },
 
     },

From 375720187f165048e2f01bfa8f1af62583e30bc1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 30 Nov 2023 11:26:14 -0500
Subject: [PATCH 163/175] [4.x] Fix date field not populating with current
 date, revert prevention of ensuring fields if they already exist (#9094)

---
 src/Entries/Collection.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index d4fcc08ba3..0d60ffd400 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -338,22 +338,20 @@ public function fallbackEntryBlueprint()
 
     public function ensureEntryBlueprintFields($blueprint)
     {
-        if (! $blueprint->hasField('title')) {
-            $blueprint->ensureFieldPrepended('title', [
-                'type' => ($auto = $this->autoGeneratesTitles()) ? 'hidden' : 'text',
-                'required' => ! $auto,
-            ]);
-        }
+        $blueprint->ensureFieldPrepended('title', [
+            'type' => ($auto = $this->autoGeneratesTitles()) ? 'hidden' : 'text',
+            'required' => ! $auto,
+        ]);
 
-        if ($this->requiresSlugs() && ! $blueprint->hasField('slug')) {
+        if ($this->requiresSlugs()) {
             $blueprint->ensureField('slug', ['type' => 'slug', 'localizable' => true, 'validate' => 'max:200'], 'sidebar');
         }
 
-        if ($this->dated() && ! $blueprint->hasField('date')) {
+        if ($this->dated()) {
             $blueprint->ensureField('date', ['type' => 'date', 'required' => true, 'default' => 'now'], 'sidebar');
         }
 
-        if ($this->hasStructure() && ! $this->orderable() && ! $blueprint->hasField('parent')) {
+        if ($this->hasStructure() && ! $this->orderable()) {
             $blueprint->ensureField('parent', [
                 'type' => 'entries',
                 'collections' => [$this->handle()],

From 211305960a9feaa49f72d30878c2b351557a97ec Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 30 Nov 2023 12:14:32 -0500
Subject: [PATCH 164/175] [4.x] Fix 404 redirect after creating entry (#9095)

---
 resources/js/components/entries/BaseCreateForm.vue | 2 +-
 resources/views/entries/create.blade.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/entries/BaseCreateForm.vue b/resources/js/components/entries/BaseCreateForm.vue
index 20cb8b7f0c..d2594cca09 100644
--- a/resources/js/components/entries/BaseCreateForm.vue
+++ b/resources/js/components/entries/BaseCreateForm.vue
@@ -20,7 +20,7 @@
         :initial-site="site"
         :can-manage-publish-state="canManagePublishState"
         :create-another-url="createAnotherUrl"
-        :listing-url="listingUrl"
+        :initial-listing-url="listingUrl"
         :preview-targets="previewTargets"
         @saved="saved"
     ></entry-publish-form>
diff --git a/resources/views/entries/create.blade.php b/resources/views/entries/create.blade.php
index c01e270971..580ea377a2 100644
--- a/resources/views/entries/create.blade.php
+++ b/resources/views/entries/create.blade.php
@@ -17,7 +17,7 @@
         :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         site="{{ $locale }}"
         create-another-url="{{ cp_route('collections.entries.create', [$collection, $locale, 'blueprint' => $blueprint['handle'], 'parent' => $values['parent'] ?? null]) }}"
-        initial-listing-url="{{ cp_route('collections.show', $collection) }}"
+        listing-url="{{ cp_route('collections.show', $collection) }}"
         :can-manage-publish-state="{{ Statamic\Support\Str::bool($canManagePublishState) }}"
         :preview-targets="{{ json_encode($previewTargets) }}"
     ></base-entry-create-form>

From 61b7ee5ced79f968ea6da8e2fe7d91e917c7e134 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 30 Nov 2023 21:56:08 +0000
Subject: [PATCH 165/175] [4.x] Support Laravel Precognition on front end forms
 (#8886)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 routes/web.php                            |   3 +-
 src/Fields/Validator.php                  |  27 ++++-
 src/Http/Controllers/FormController.php   |  72 +------------
 src/Http/Requests/FrontendFormRequest.php | 123 ++++++++++++++++++++++
 tests/Tags/Form/FormCreateTest.php        |   1 -
 5 files changed, 152 insertions(+), 74 deletions(-)
 create mode 100644 src/Http/Requests/FrontendFormRequest.php

diff --git a/routes/web.php b/routes/web.php
index a93cf08110..4cfaf5af8c 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;
 use Illuminate\Support\Facades\Route;
 use Statamic\Auth\Protect\Protectors\Password\Controller as PasswordProtectController;
 use Statamic\Facades\OAuth;
@@ -17,7 +18,7 @@
 
 Route::name('statamic.')->group(function () {
     Route::group(['prefix' => config('statamic.routes.action')], function () {
-        Route::post('forms/{form}', [FormController::class, 'submit'])->name('forms.submit');
+        Route::post('forms/{form}', [FormController::class, 'submit'])->middleware([HandlePrecognitiveRequests::class])->name('forms.submit');
 
         Route::get('protect/password', [PasswordProtectController::class, 'show'])->name('protect.password.show');
         Route::post('protect/password', [PasswordProtectController::class, 'store'])->name('protect.password.store');
diff --git a/src/Fields/Validator.php b/src/Fields/Validator.php
index 2e4a4f6e5f..51e6fb5cd5 100644
--- a/src/Fields/Validator.php
+++ b/src/Fields/Validator.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Fields;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator as LaravelValidator;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -49,13 +50,15 @@ public function withContext($context)
 
     public function rules()
     {
-        return $this
+        $rules = $this
             ->merge($this->fieldRules(), $this->extraRules)
             ->map(function ($rules) {
                 return collect($rules)->map(function ($rule) {
                     return $this->parse($rule);
                 })->all();
             })->all();
+
+        return $this->filterPrecognitiveRules($rules);
     }
 
     private function fieldRules()
@@ -93,9 +96,9 @@ public function withReplacements($replacements)
         return $this;
     }
 
-    public function validate()
+    public function validator()
     {
-        return LaravelValidator::validate(
+        return LaravelValidator::make(
             $this->fields->preProcessValidatables()->values()->all(),
             $this->rules(),
             $this->customMessages,
@@ -103,6 +106,11 @@ public function validate()
         );
     }
 
+    public function validate()
+    {
+        return $this->validator()->validate();
+    }
+
     public function attributes()
     {
         return $this->fields->preProcessValidatables()->all()->reduce(function ($carry, $field) {
@@ -139,4 +147,17 @@ public static function explodeRules($rules)
 
         return $rules;
     }
+
+    public function filterPrecognitiveRules($rules)
+    {
+        $request = request();
+
+        if (! $request->headers->has('Precognition-Validate-Only')) {
+            return $rules;
+        }
+
+        return Collection::make($rules)
+            ->only(explode(',', $request->header('Precognition-Validate-Only')))
+            ->all();
+    }
 }
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index f5e1a5bb05..b7ab366f73 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -2,13 +2,8 @@
 
 namespace Statamic\Http\Controllers;
 
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\URL;
-use Illuminate\Support\MessageBag;
-use Illuminate\Support\Traits\Localizable;
-use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Events\FormSubmitted;
 use Statamic\Events\SubmissionCreated;
@@ -17,25 +12,23 @@
 use Statamic\Facades\Site;
 use Statamic\Forms\Exceptions\FileContentTypeRequiredException;
 use Statamic\Forms\SendEmails;
+use Statamic\Http\Requests\FrontendFormRequest;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
-use Statamic\Validation\AllowedFile;
 
 class FormController extends Controller
 {
-    use Localizable;
-
     /**
      * Handle a form submission request.
      *
      * @return mixed
      */
-    public function submit(Request $request, $form)
+    public function submit(FrontendFormRequest $request, $form)
     {
         $site = Site::findByUrl(URL::previous()) ?? Site::default();
         $fields = $form->blueprint()->fields();
         $this->validateContentType($request, $form);
-        $values = array_merge($request->all(), $assets = $this->normalizeAssetsValues($fields, $request));
+        $values = array_merge($request->all(), $assets = $request->assets());
         $params = collect($request->all())->filter(function ($value, $key) {
             return Str::startsWith($key, '_');
         })->all();
@@ -45,10 +38,6 @@ public function submit(Request $request, $form)
         $submission = $form->makeSubmission();
 
         try {
-            $this->withLocale($site->lang(), function () use ($fields) {
-                $fields->validate($this->extraRules($fields));
-            });
-
             throw_if(Arr::get($values, $form->honeypot()), new SilentFormFailureException);
 
             $values = array_merge($values, $submission->uploadFiles($assets));
@@ -60,8 +49,6 @@ public function submit(Request $request, $form)
             // If any event listeners return false, we'll do a silent failure.
             // If they want to add validation errors, they can throw an exception.
             throw_if(FormSubmitted::dispatch($submission) === false, new SilentFormFailureException);
-        } catch (ValidationException $e) {
-            return $this->formFailure($params, $e->errors(), $form->handle());
         } catch (SilentFormFailureException $e) {
             return $this->formSuccess($params, $submission, true);
         }
@@ -131,57 +118,4 @@ private function formSuccessRedirect($params, $submission)
 
         return $redirect;
     }
-
-    /**
-     * The steps for a failed form submission.
-     *
-     * @param  array  $params
-     * @param  array  $submission
-     * @param  string  $form
-     * @return Response|RedirectResponse
-     */
-    private function formFailure($params, $errors, $form)
-    {
-        if (request()->ajax()) {
-            return response([
-                'errors' => (new MessageBag($errors))->all(),
-                'error' => collect($errors)->map(function ($errors, $field) {
-                    return $errors[0];
-                })->all(),
-            ], 400);
-        }
-
-        $redirect = Arr::get($params, '_error_redirect');
-
-        $response = $redirect ? redirect($redirect) : back();
-
-        return $response->withInput()->withErrors($errors, 'form.'.$form);
-    }
-
-    protected function normalizeAssetsValues($fields, $request)
-    {
-        // The assets fieldtype is expecting an array, even for `max_files: 1`, but we don't want to force that on the front end.
-        return $fields->all()
-            ->filter(function ($field) {
-                return $field->fieldtype()->handle() === 'assets' && request()->hasFile($field->handle());
-            })
-            ->map(function ($field) use ($request) {
-                return Arr::wrap($request->file($field->handle()));
-            })
-            ->all();
-    }
-
-    protected function extraRules($fields)
-    {
-        $assetFieldRules = $fields->all()
-            ->filter(function ($field) {
-                return $field->fieldtype()->handle() === 'assets';
-            })
-            ->mapWithKeys(function ($field) {
-                return [$field->handle().'.*' => ['file', new AllowedFile]];
-            })
-            ->all();
-
-        return $assetFieldRules;
-    }
 }
diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
new file mode 100644
index 0000000000..19df613aaf
--- /dev/null
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Statamic\Http\Requests;
+
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Traits\Localizable;
+use Illuminate\Validation\ValidationException;
+use Statamic\Facades\Site;
+use Statamic\Support\Arr;
+use Statamic\Validation\AllowedFile;
+
+class FrontendFormRequest extends FormRequest
+{
+    use Localizable;
+
+    private $assets = [];
+    private $cachedFields;
+
+    /**
+     * Get any assets in the request
+     */
+    public function assets(): array
+    {
+        return $this->assets;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Optionally override the redirect url based on the presence of _error_redirect
+     */
+    protected function getRedirectUrl()
+    {
+        $url = $this->redirector->getUrlGenerator();
+
+        if ($redirect = $this->input('_error_redirect')) {
+            return $url->to($redirect);
+        }
+
+        return $url->previous();
+    }
+
+    public function validator()
+    {
+        $fields = $this->getFormFields();
+
+        return $fields
+            ->validator()
+            ->withRules($this->extraRules($fields))
+            ->validator();
+    }
+
+    protected function failedValidation(Validator $validator)
+    {
+        if ($this->ajax()) {
+            $errors = $validator->errors();
+
+            $response = response([
+                'errors' => $errors->all(),
+                'error' => collect($errors->messages())->map(function ($errors, $field) {
+                    return $errors[0];
+                })->all(),
+            ], 400);
+
+            throw (new ValidationException($validator, $response));
+        }
+
+        return parent::failedValidation($validator);
+    }
+
+    private function extraRules($fields)
+    {
+        return $fields->all()
+            ->filter(fn ($field) => $field->fieldtype()->handle() === 'assets')
+            ->mapWithKeys(function ($field) {
+                return [$field->handle().'.*' => ['file', new AllowedFile]];
+            })
+            ->all();
+    }
+
+    private function getFormFields()
+    {
+        if ($this->cachedFields) {
+            return $this->cachedFields;
+        }
+
+        $form = $this->route()->parameter('form');
+
+        $this->errorBag = 'form.'.$form->handle();
+
+        $fields = $form->blueprint()->fields();
+
+        $this->assets = $this->normalizeAssetsValues($fields);
+
+        $values = array_merge($this->all(), $this->assets);
+
+        return $this->cachedFields = $fields->addValues($values);
+    }
+
+    private function normalizeAssetsValues($fields)
+    {
+        // The assets fieldtype is expecting an array, even for `max_files: 1`, but we don't want to force that on the front end.
+        return $fields->all()
+            ->filter(fn ($field) => $field->fieldtype()->handle() === 'assets' && $this->hasFile($field->handle()))
+            ->map(fn ($field) => Arr::wrap($this->file($field->handle())))
+            ->all();
+    }
+
+    public function validateResolved()
+    {
+        $site = Site::findByUrl(URL::previous()) ?? Site::default();
+
+        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+    }
+}
diff --git a/tests/Tags/Form/FormCreateTest.php b/tests/Tags/Form/FormCreateTest.php
index a55b6ffcac..557a6314a7 100644
--- a/tests/Tags/Form/FormCreateTest.php
+++ b/tests/Tags/Form/FormCreateTest.php
@@ -757,7 +757,6 @@ public function it_will_use_redirect_query_param_off_url()
     /** @test */
     public function it_can_render_an_inline_error_when_multiple_rules_fail()
     {
-        $this->withoutExceptionHandling();
         $this->assertEmpty(Form::find('contact')->submissions());
 
         $this

From 8a60959d2277fd5e097840c52d10418023da6b73 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 30 Nov 2023 17:00:29 -0500
Subject: [PATCH 166/175] changelog

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4d69da7a1..282f9d1a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Release Notes
 
+## 4.38.0 (2023-11-30)
+
+### What's new
+- Support Laravel Precognition on front end forms. [#8886](https://github.com/statamic/cms/issues/8886) by @ryanmitchell
+
+### What's fixed
+- Fix 404 redirect after creating entry. [#9095](https://github.com/statamic/cms/issues/9095) by @jasonvarga
+- Fix date field not populating with current date, revert prevention of ensuring fields if they already exist. [#9094](https://github.com/statamic/cms/issues/9094) by @jasonvarga
+- Fix date replicator preview in more configurations. [#9093](https://github.com/statamic/cms/issues/9093) by @jasonvarga
+- Fix autofocus on textareas [#9089](https://github.com/statamic/cms/issues/9089) by @robdekort
+
+
+
 ## 4.37.0 (2023-11-29)
 
 ### What's new

From fbbe89f55de030d5b0a6896b851420717d0d0b8a Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 1 Dec 2023 20:35:21 +0000
Subject: [PATCH 167/175] [4.x] Improve comb search driver performance (#9102)

Improve comb search driver performance
---
 src/Search/Comb/Comb.php | 86 ++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/Search/Comb/Comb.php b/src/Search/Comb/Comb.php
index e85afcdf42..1839844de3 100644
--- a/src/Search/Comb/Comb.php
+++ b/src/Search/Comb/Comb.php
@@ -515,6 +515,9 @@ private function searchOverData($params, $raw_query)
         // loop over records
         foreach ($this->haystack as $key => $item) {
             $data = $item['pruned'];
+            $data = array_map(function ($property) {
+                return $this->flattenArray($property);
+            }, $data);
 
             // counters
             $found = [
@@ -534,76 +537,75 @@ private function searchOverData($params, $raw_query)
             // loop over each query chunk
             foreach ($params['chunks'] as $j => $chunk) {
                 $escaped_chunk = preg_quote($chunk, '#');
+                $chunk_is_word = ! preg_match('#\s#', $chunk);
                 $regex = [
-                    'whole' => '#^'.$escaped_chunk.'$#i',
-                    'partial' => '#'.$escaped_chunk.'#i',
+                    'partial_anywhere' => '#'.$escaped_chunk.'#i',
+                    'partial_from_start_anywhere' => '#(^|\s)'.$escaped_chunk.'#i',
+                    'whole_anywhere' => '#(^|\s)'.$escaped_chunk.'($|\s)#i',
                     'partial_from_start' => '#^'.$escaped_chunk.'#i',
+                    'whole' => '#^'.$escaped_chunk.'$#i',
                 ];
 
                 // loop over each data property
                 foreach ($data as $name => $property) {
-                    $property = $this->flattenArray($property);
-
                     if (! is_string($property)) {
                         continue;
                     }
 
-                    $words = preg_split("#\s#i", $property);
+                    preg_match('#^[^\s]+#', $property, $first_word);
+                    $first_word = $first_word[0] ?? '';
                     $strength = (! isset($this->property_weights[$name])) ? 1 : $this->property_weights[$name];
 
-                    // reset iterator
-                    $i = 0;
-
-                    // whole matching
-                    $result = preg_match_all($regex['whole'], $property, $matches);
-                    if ($result) {
-                        $found['whole'] += $strength * $result;
-                    }
+                    $matched = false;
 
-                    $result = preg_match_all($regex['partial'], $property, $matches);
+                    $result = preg_match_all($regex['partial_anywhere'], $property);
                     if ($result) {
+                        $matched = true;
                         $found['partial_whole'] += $strength * $result;
-                    }
-
-                    $result = preg_match_all($regex['partial_from_start'], $property, $matches);
-                    if ($result) {
-                        $found['partial_whole_start'] += $strength * $result;
-                    }
-
-                    // word matching
-                    foreach ($words as $word) {
-                        $result = preg_match_all($regex['whole'], $word, $matches);
-                        if ($result) {
-                            $found['whole_word'] += $strength * $result;
-
-                            if ($i === 0) {
-                                $found['whole_first_word'] += $strength * $result;
+                        if ($chunk_is_word) {
+                            $found['partial_word'] += $strength * $result;
+                            if (preg_match_all($regex['partial_anywhere'], $first_word)) {
+                                $found['partial_first_word'] += $strength * $result;
                             }
                         }
 
-                        $result = preg_match_all($regex['partial'], $word, $matches);
+                        $result = preg_match_all($regex['partial_from_start_anywhere'], $property);
                         if ($result) {
-                            $found['partial_word'] += $strength * $result;
+                            $matched = true;
+                            if ($chunk_is_word) {
+                                $found['partial_word_start'] += $strength * $result;
+                                if (preg_match_all($regex['partial_from_start_anywhere'], $first_word)) {
+                                    $found['partial_first_word_start'] += $strength * $result;
+                                }
+                            }
 
-                            if ($i === 0) {
-                                $found['partial_first_word'] += $strength * $result;
+                            $result = preg_match_all($regex['whole_anywhere'], $property);
+                            if ($result) {
+                                $matched = true;
+                                if ($chunk_is_word) {
+                                    $found['whole_word'] += $strength * $result;
+                                    if (preg_match_all($regex['whole_anywhere'], $first_word)) {
+                                        $found['whole_first_word'] += $strength * $result;
+                                    }
+                                }
                             }
-                        }
 
-                        $result = preg_match_all($regex['partial_from_start'], $word, $matches);
-                        if ($result) {
-                            $found['partial_word_start'] += $strength * $result;
+                            $result = preg_match_all($regex['partial_from_start'], $property);
+                            if ($result) {
+                                $matched = true;
+                                $found['partial_whole_start'] += $strength * $result;
 
-                            if ($i === 0) {
-                                $found['partial_first_word_start'] += $strength * $result;
+                                $result = preg_match_all($regex['whole'], $property);
+                                if ($result) {
+                                    $matched = true;
+                                    $found['whole'] += $strength * $result;
+                                }
                             }
                         }
-
-                        $i++;
                     }
 
                     // snippet extraction (only needs to run during one chunk)
-                    if ($j === 0) {
+                    if ($matched && $j === 0) {
                         $snippets[$name] = $this->extractSnippets($property, $params['chunks']);
                     }
                 }

From 5574549a09a9b53c57079f8a1bd9e4023dd58fb3 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 1 Dec 2023 21:18:12 +0000
Subject: [PATCH 168/175] [4.x] Bard: Fix adding sets with horizontal cursor
 (#9064)

Bard: Fix adding sets with horizontal cursor
---
 resources/js/components/fieldtypes/bard/Set.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/bard/Set.js b/resources/js/components/fieldtypes/bard/Set.js
index 126f7e214c..d9eb491f93 100644
--- a/resources/js/components/fieldtypes/bard/Set.js
+++ b/resources/js/components/fieldtypes/bard/Set.js
@@ -1,6 +1,7 @@
 import { Node } from '@tiptap/core';
 import { VueNodeViewRenderer } from '@tiptap/vue-2'
 import SetComponent from './Set.vue';
+import { TextSelection } from '@tiptap/pm/state';
 
 export const Set = Node.create({
 
@@ -54,7 +55,10 @@ export const Set = Node.create({
                 const { selection } = tr;
                 const node = this.type.create(attrs);
                 if (dispatch) {
-                    const transaction = tr.insert(selection.$cursor.pos - 1, node);
+                    const transaction = selection instanceof TextSelection
+                        ? tr.insert(selection.$cursor.pos - 1, node)
+                        : tr.insert(selection.$head.pos, node);
+
                     dispatch(transaction);
                 }
             },

From f2c7b51309d6aa0f4319b672090354ba8bb2a469 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 1 Dec 2023 21:19:23 +0000
Subject: [PATCH 169/175] [4.x] Prevent showing "Saved" toast message when
 listener cancels save (#9040)

* Prevent showing "Saved" toast message when listener prevents saving

* Apply the same fix to taxonomy terms

* Change approach: Pass saved state in the response, then toast from the JS

* Do the same for terms

* Support `RevisionSaving`

* Support `GlobalSetSaving`

* Support `UserSaving`
---
 resources/js/components/entries/PublishForm.vue      |  3 +++
 resources/js/components/globals/PublishForm.vue      |  3 +++
 resources/js/components/terms/PublishForm.vue        |  3 +++
 resources/js/components/users/PublishForm.vue        |  3 +++
 .../Controllers/CP/Collections/EntriesController.php | 12 +++++++-----
 .../CP/Globals/GlobalVariablesController.php         |  6 ++++--
 .../Controllers/CP/Taxonomies/TermsController.php    | 10 ++++++----
 src/Http/Controllers/CP/Users/UsersController.php    |  7 +++++--
 src/Revisions/Revisable.php                          |  2 +-
 src/Revisions/Revision.php                           |  2 ++
 10 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 99974d22d9..5935c01264 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -538,6 +538,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (! response.data.saved) {
+                    return this.$toast.error(__(`Couldn't save entry`));
+                }
                 this.title = response.data.data.title;
                 this.isWorkingCopy = true;
                 if (this.isBase) {
diff --git a/resources/js/components/globals/PublishForm.vue b/resources/js/components/globals/PublishForm.vue
index 635acde25b..990cf32927 100644
--- a/resources/js/components/globals/PublishForm.vue
+++ b/resources/js/components/globals/PublishForm.vue
@@ -222,6 +222,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (!response.data.saved) {
+                    return this.$toast.error(`Couldn't save global set`)
+                }
                 if (!this.isCreating) this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
                 this.runAfterSaveHook(response);
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index d773251b66..b2989274a2 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -445,6 +445,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (! response.data.saved) {
+                    return this.$toast.error(__(`Couldn't save term`));
+                }
                 this.title = response.data.data.title;
                 this.permalink = response.data.data.permalink;
                 this.isWorkingCopy = true;
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 11e96b7997..5f8e1f629d 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -111,6 +111,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, this.visibleValues).then(response => {
                 this.title = response.data.title;
+                if (!response.data.saved) {
+                    return this.$toast.error(`Couldn't save user`)
+                }
                 if (!this.isCreating) this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
                 this.$nextTick(() => this.$emit('saved', response));
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index df818c4a87..823f79cef5 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -242,7 +242,7 @@ public function update(Request $request, $collection, $entry)
         $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
 
         if ($entry->revisionsEnabled() && $entry->published()) {
-            $entry
+            $saved = $entry
                 ->makeWorkingCopy()
                 ->user(User::current())
                 ->save();
@@ -254,13 +254,14 @@ public function update(Request $request, $collection, $entry)
                 $entry->published($request->published);
             }
 
-            $entry->updateLastModified(User::current())->save();
+            $saved = $entry->updateLastModified(User::current())->save();
         }
 
         [$values] = $this->extractFromFields($entry, $blueprint);
 
         return (new EntryResource($entry->fresh()))
             ->additional([
+                'saved' => $saved,
                 'data' => [
                     'values' => $values,
                 ],
@@ -394,15 +395,16 @@ public function store(Request $request, $collection, $site)
         $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
 
         if ($entry->revisionsEnabled()) {
-            $entry->store([
+            $saved = $entry->store([
                 'message' => $request->message,
                 'user' => User::current(),
             ]);
         } else {
-            $entry->updateLastModified(User::current())->save();
+            $saved = $entry->updateLastModified(User::current())->save();
         }
 
-        return new EntryResource($entry);
+        return (new EntryResource($entry))
+            ->additional(['saved' => $saved]);
     }
 
     private function resolveSlug($request)
diff --git a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
index b3925432a8..dcb90b6c8f 100644
--- a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
@@ -104,9 +104,11 @@ public function update(Request $request, $handle)
 
         $set->data($values);
 
-        $set->globalSet()->addLocalization($set)->save();
+        $save = $set->globalSet()->addLocalization($set)->save();
 
-        return response('', 204);
+        return response()->json([
+            'saved' => is_bool($save) ? $save : true,
+        ]);
     }
 
     protected function extractFromFields($set, $blueprint)
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index fd11217810..9881c1832a 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -195,10 +195,11 @@ public function update(Request $request, $taxonomy, $term, $site)
                 $term->published($request->published);
             }
 
-            $term->updateLastModified(User::current())->save();
+            $saved = $term->updateLastModified(User::current())->save();
         }
 
-        return new TermResource($term);
+        return (new TermResource($term))
+            ->additional(['saved' => $saved]);
     }
 
     public function create(Request $request, $taxonomy, $site)
@@ -299,10 +300,11 @@ public function store(Request $request, $taxonomy, $site)
                 'user' => User::current(),
             ]);
         } else {
-            $term->updateLastModified(User::current())->save();
+            $saved = $term->updateLastModified(User::current())->save();
         }
 
-        return new TermResource($term);
+        return (new TermResource($term))
+            ->additional(['saved' => $saved]);
     }
 
     protected function extractFromFields($term, $blueprint)
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 2a08436828..0691688f8f 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -283,9 +283,12 @@ public function update(Request $request, $user)
             $user->groups($request->groups);
         }
 
-        $user->save();
+        $save = $user->save();
 
-        return ['title' => $user->title()];
+        return [
+            'title' => $user->title(),
+            'saved' => is_bool($save) ? $save : true,
+        ];
     }
 
     public function destroy($user)
diff --git a/src/Revisions/Revisable.php b/src/Revisions/Revisable.php
index 6606e8b6ee..c6008672f8 100644
--- a/src/Revisions/Revisable.php
+++ b/src/Revisions/Revisable.php
@@ -116,7 +116,7 @@ public function store($options = [])
             ->updateLastModified($user = $options['user'] ?? false)
             ->save();
 
-        $this
+        return $this
             ->makeRevision()
             ->user($user)
             ->message($options['message'] ?? false)
diff --git a/src/Revisions/Revision.php b/src/Revisions/Revision.php
index d82a032cf9..171c1ca52e 100644
--- a/src/Revisions/Revision.php
+++ b/src/Revisions/Revision.php
@@ -138,6 +138,8 @@ public function save()
         Revisions::save($this);
 
         RevisionSaved::dispatch($this);
+
+        return true;
     }
 
     public function delete()

From 45590cef0d70f80150db5f3789dd6e25cb1d95eb Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 1 Dec 2023 21:20:16 +0000
Subject: [PATCH 170/175] [4.x] Prevent terms fieldtype in typehead mode
 showing results until a search is entered (#9082)

Prevent terms fieldtype in typehead mode showing results until a search is entered
---
 src/Fieldtypes/Terms.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index 6bb20c0ea4..4a9bef98a5 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -216,6 +216,10 @@ public function preProcess($data)
 
     public function getIndexItems($request)
     {
+        if ($this->config('mode') == 'typeahead' && ! $request->search) {
+            return collect();
+        }
+
         $query = $this->getIndexQuery($request);
 
         if ($sort = $this->getSortColumn($request)) {

From fce823abcc719280f61fbc0efef6de7655a4de3b Mon Sep 17 00:00:00 2001
From: Neo Lejondahl <64473191+NeoIsRecursive@users.noreply.github.com>
Date: Mon, 4 Dec 2023 21:16:31 +0100
Subject: [PATCH 171/175] [4.x] Make url and uri available in preview targets
 (#9104)

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
---
 src/Entries/Entry.php            |  2 ++
 tests/Data/Entries/EntryTest.php | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index c330345cc4..43db0382e1 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -947,6 +947,8 @@ private function resolvePreviewTargetUrl($format)
 
         return (string) Antlers::parse($format, array_merge($this->routeData(), [
             'site' => $this->site(),
+            'uri' => $this->uri(),
+            'url' => $this->url(),
             'permalink' => $this->absoluteUrl(),
             'locale' => $this->locale(),
         ]));
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 2e38b0ad3c..2f00200244 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -2192,6 +2192,7 @@ public function it_gets_preview_targets()
             'fr' => 'le-blog/{slug}',
             'de' => 'das-blog/{slug}',
         ]);
+
         $collection->save();
 
         $entryEn = (new Entry)->collection($collection)->locale('en')->slug('foo')->date('2014-01-01');
@@ -2229,6 +2230,27 @@ public function it_gets_preview_targets()
             ['label' => 'Index', 'format' => 'http://preview.com/{locale}/{year}/blog?preview=true', 'url' => 'http://preview.com/de/2016/blog?preview=true'],
             ['label' => 'Show', 'format' => 'http://preview.com/{locale}/{year}/blog/{slug}?preview=true', 'url' => 'http://preview.com/de/2016/blog/das-foo?preview=true'],
         ], $entryDe->previewTargets()->all());
+
+        $collection->previewTargets([
+            ['label' => 'url', 'format' => 'http://preview.domain.com/preview?url={url}', 'refresh' => false],
+            ['label' => 'uri', 'format' => 'http://preview.domain.com/preview?uri={uri}', 'refresh' => false],
+        ]);
+        $collection->save();
+
+        $this->assertEquals([
+            ['label' => 'url', 'format' => 'http://preview.domain.com/preview?url={url}', 'url' => 'http://preview.domain.com/preview?url=/blog/foo'],
+            ['label' => 'uri', 'format' => 'http://preview.domain.com/preview?uri={uri}', 'url' => 'http://preview.domain.com/preview?uri=/blog/foo'],
+        ], $entryEn->previewTargets()->all());
+
+        $this->assertEquals([
+            ['label' => 'url', 'format' => 'http://preview.domain.com/preview?url={url}', 'url' => 'http://preview.domain.com/preview?url=/fr/le-blog/le-foo'],
+            ['label' => 'uri', 'format' => 'http://preview.domain.com/preview?uri={uri}', 'url' => 'http://preview.domain.com/preview?uri=/le-blog/le-foo'],
+        ], $entryFr->previewTargets()->all());
+
+        $this->assertEquals([
+            ['label' => 'url', 'format' => 'http://preview.domain.com/preview?url={url}', 'url' => 'http://preview.domain.com/preview?url=/das-blog/das-foo'],
+            ['label' => 'uri', 'format' => 'http://preview.domain.com/preview?uri={uri}', 'url' => 'http://preview.domain.com/preview?uri=/das-blog/das-foo'],
+        ], $entryDe->previewTargets()->all());
     }
 
     /** @test */

From 14667208867fa5aaee32bdd2aa75ee196b610147 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 4 Dec 2023 20:17:19 +0000
Subject: [PATCH 172/175] [4.x] Harden collection handle check in
 Taxonomy::findByUri to prevent partial matches (#9108)

---
 src/Stache/Repositories/TaxonomyRepository.php | 2 +-
 src/Stache/Repositories/TermRepository.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Stache/Repositories/TaxonomyRepository.php b/src/Stache/Repositories/TaxonomyRepository.php
index 2ac3c7a613..d24e010576 100644
--- a/src/Stache/Repositories/TaxonomyRepository.php
+++ b/src/Stache/Repositories/TaxonomyRepository.php
@@ -67,7 +67,7 @@ public function findByUri(string $uri, string $site = null): ?Taxonomy
                     return true;
                 }
 
-                return Str::startsWith($uri, '/'.$collection->handle());
+                return Str::startsWith($uri.'/', '/'.$collection->handle().'/');
             });
 
         if ($collection) {
diff --git a/src/Stache/Repositories/TermRepository.php b/src/Stache/Repositories/TermRepository.php
index c91c379ac1..e29acfc6d8 100644
--- a/src/Stache/Repositories/TermRepository.php
+++ b/src/Stache/Repositories/TermRepository.php
@@ -59,7 +59,7 @@ public function findByUri(string $uri, string $site = null): ?Term
                     return true;
                 }
 
-                return Str::startsWith($uri, '/'.$collection->handle());
+                return Str::startsWith($uri.'/', '/'.$collection->handle().'/');
             });
 
         if ($collection) {

From 1cca34f4a9a4e2ed4af5219886709ff79fc563de Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:21:12 +0000
Subject: [PATCH 173/175] [4.x] Fix "Hide Display" setting not being persisted
 on reference field (#9111)

---
 .../components/fieldtypes/FieldDisplayFieldtype.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/FieldDisplayFieldtype.vue b/resources/js/components/fieldtypes/FieldDisplayFieldtype.vue
index 60e31e2227..f127ebcd50 100644
--- a/resources/js/components/fieldtypes/FieldDisplayFieldtype.vue
+++ b/resources/js/components/fieldtypes/FieldDisplayFieldtype.vue
@@ -47,8 +47,17 @@ export default {
             return parent;
         },
 
+        nearestFieldSettings() {
+            let parent = this;
+            while (parent.$options._componentTag !== 'field-settings') {
+                parent = parent.$parent;
+                if (parent === this.$root) return null;
+            }
+            return parent;
+        },
+
         hidden() {
-            return this.$store.state.publish[this.storeName].values.hide_display;
+            return this.nearestFieldSettings.values.hide_display;
         }
 
     },
@@ -60,7 +69,7 @@ export default {
     methods: {
 
         toggleHidden() {
-            this.nearestPublishContainer.setFieldValue('hide_display', ! this.hidden);
+            this.nearestFieldSettings.updateField('hide_display', ! this.hidden)
         }
 
     }

From d978f44b0f9cf13e99406c7c3f698e4dd48e78d7 Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Mon, 4 Dec 2023 15:09:45 -0600
Subject: [PATCH 174/175] [4.x] Antlers: corrects a subtle bug with conditions
 resolving variables (#9106)

---
 .../Language/Parser/AntlersNodeParser.php     | 10 ++++-
 tests/Antlers/Parser/ConditionalNodesTest.php |  3 +-
 tests/Antlers/Runtime/ConditionLogicTest.php  | 42 +++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/View/Antlers/Language/Parser/AntlersNodeParser.php b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
index 6709b7ba4f..b7e83abefe 100644
--- a/src/View/Antlers/Language/Parser/AntlersNodeParser.php
+++ b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
@@ -243,8 +243,16 @@ public function parseNode(AntlersNode $node)
 
         $node->isClosingTag = $this->canBeClosingTag($node);
 
+        $lexerContent = $node->getContent();
+
+        if ($node->name->name == 'if' || $node->name->name == 'unless' || $node->name->name == 'elseif') {
+            if (mb_strlen(trim($lexerContent)) > 0) {
+                $lexerContent = '('.$lexerContent.')';
+            }
+        }
+
         // Need to run node type analysis here before the runtime node step.
-        $runtimeNodes = $this->lexer->tokenize($node, $node->getContent());
+        $runtimeNodes = $this->lexer->tokenize($node, $lexerContent);
 
         $node->runtimeNodes = $runtimeNodes;
 
diff --git a/tests/Antlers/Parser/ConditionalNodesTest.php b/tests/Antlers/Parser/ConditionalNodesTest.php
index 607c777156..2065cab5ca 100644
--- a/tests/Antlers/Parser/ConditionalNodesTest.php
+++ b/tests/Antlers/Parser/ConditionalNodesTest.php
@@ -149,7 +149,8 @@ public function test_conditions_do_not_get_parsed_as_modifiers()
 
         /** @var AntlersNode $firstNode */
         $firstNode = $nodes[0];
-        $this->assertCount(7, $firstNode->runtimeNodes);
+        // The () are added automatically.
+        $this->assertCount(9, $firstNode->runtimeNodes);
 
         // Parse the text that would produce the 7 runtime nodes above.
         $runtimeNodes = $this->getParsedRuntimeNodes("{{ is_small_article || collection:handle == 'vacancies' }}");
diff --git a/tests/Antlers/Runtime/ConditionLogicTest.php b/tests/Antlers/Runtime/ConditionLogicTest.php
index e4089b94a1..a0834d7247 100644
--- a/tests/Antlers/Runtime/ConditionLogicTest.php
+++ b/tests/Antlers/Runtime/ConditionLogicTest.php
@@ -3,8 +3,10 @@
 namespace Tests\Antlers\Runtime;
 
 use Facades\Tests\Factories\EntryFactory;
+use Statamic\Fields\Field;
 use Statamic\Fields\LabeledValue;
 use Statamic\Fields\Value;
+use Statamic\Fieldtypes\Code;
 use Statamic\Fieldtypes\Select;
 use Statamic\Support\Arr;
 use Statamic\Tags\Tags;
@@ -13,9 +15,12 @@
 use Statamic\View\Cascade;
 use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
 use Tests\Antlers\ParserTestCase;
+use Tests\FakesViews;
 
 class ConditionLogicTest extends ParserTestCase
 {
+    use FakesViews;
+
     public function test_negation_following_or_is_evaluated()
     {
         $template = '{{ if !first && first_row_headers || !first_row_headers }}yes{{ else }}no{{ /if }}';
@@ -769,4 +774,41 @@ public function test_uppercase_logical_keywords_in_conditions()
 
         $this->assertSame('No', $this->renderString($template));
     }
+
+    public function test_arrayable_strings_inside_conditions_used_with_modifiers()
+    {
+        $code = new Code();
+        $field = new Field('code_field', [
+            'type' => 'code',
+            'antlers' => false,
+        ]);
+
+        $code->setField($field);
+        $value = new Value('Oh hai, mark.', 'code_field', $code);
+
+        $template = <<<'EOT'
+{{ partial:test :code="code_field" }}
+EOT;
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('test', <<<'EOT'
+{{ if code | starts_with('<div>') }}
+Yes{{ else }}
+No{{ /if }}
+EOT
+
+        );
+
+        $this->assertSame('No', trim($this->renderString($template, ['code_field' => $value], true)));
+
+        $this->viewShouldReturnRaw('test', <<<'EOT'
+{{ if code | starts_with('Oh hai, mark.') }}
+Yes{{ else }}
+No{{ /if }}
+EOT
+
+        );
+
+        $this->assertSame('Yes', trim($this->renderString($template, ['code_field' => $value], true)));
+    }
 }

From af45cab48e50454a5fe9cf0c93a9dcea3e1b024d Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 4 Dec 2023 21:11:18 +0000
Subject: [PATCH 175/175] [4.x] When appending glide filename consider that the
 extension may have changed (#9097)

---
 src/Imaging/GlideManager.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Imaging/GlideManager.php b/src/Imaging/GlideManager.php
index 4600044c2e..ad329c6eb4 100644
--- a/src/Imaging/GlideManager.php
+++ b/src/Imaging/GlideManager.php
@@ -47,6 +47,10 @@ public function server(array $config = [])
 
                     $cachePath .= '/'.Str::beforeLast($filename, '.').'/'.Str::of($path)->after('/');
 
+                    if ($extension = ($params['fm'] ?? false)) {
+                        $cachePath = Str::beforeLast($cachePath, '.').'.'.$extension;
+                    }
+
                     return $cachePath;
                 });
         }