[4.x] Add validation to prevent duplicate field handles

resources/js/components/blueprints/Field.vue

@@ -10,6 +10,9 @@ export default {
  type: Boolean,
  default: true
  },
+ fields: {
+ type: Array,
+ },
  isEditing: Boolean
  }
 

resources/js/components/blueprints/Fields.vue

@@ -14,6 +14,7 @@
  :is="fieldComponent(field)"
  :key="field._id"
  :field="field"
+ :fields="fields"
  :is-editing="editingField === field._id"
  :suggestable-condition-fields="suggestableConditionFields"
  :can-define-localizable="canDefineLocalizable"
@@ -55,6 +56,7 @@
  ref="settings"
  :type="pendingCreatedField.config.type"
  :root="true"
+ :fields="fields"
  :config="pendingCreatedField.config"
  :suggestable-condition-fields="suggestableConditionFields"
  @committed="fieldCreated"

resources/js/components/blueprints/ImportField.vue

@@ -16,7 +16,9 @@
  <stack name="field-settings" v-if="isEditing" @closed="editorClosed">
  <field-settings
  ref="settings"
+ :id="field._id"
  :root="isRoot"
+ :fields="fields"
  :config="fieldConfig"
  @committed="settingsUpdated"
  @closed="editorClosed"

resources/js/components/blueprints/RegularField.vue

@@ -33,8 +33,10 @@
  <stack name="field-settings" v-if="isEditing" @closed="editorClosed">
  <field-settings
  ref="settings"
+ :id="field._id"
  :type="field.fieldtype"
  :root="isRoot"
+ :fields="fields"
  :config="fieldConfig"
  :overrides="field.config_overrides || []"
  :suggestable-condition-fields="suggestableConditionFields"

resources/js/components/fields/Settings.vue

@@ -111,10 +111,12 @@ export default {
  ],
 
  props: {
+ id: String,
  config: Object,
  overrides: { type: Array, default: () => [] },
  type: String,
  root: Boolean,
+ fields: Array,
  suggestableConditionFields: Array,
  },
 
@@ -240,8 +242,10 @@ export default {
  this.clearErrors();
 
  this.$axios.post(cp_url('fields/update'), {
+ id: this.id,
  type: this.type,
- values: this.values
+ values: this.values,
+ fields: this.fields
  }).then(response => {
  this.$emit('committed', response.data, this.editedFields);
  this.close();

resources/js/components/fieldsets/EditForm.vue

@@ -34,7 +34,7 @@
 
  <div class="card @container" :class="{ 'pt-2': !fields.length }">
  <fields
- :fields="fieldset.fields"
+ :fields="fields"
  :editing-field="editingField"
  :exclude-fieldset="fieldset.handle"
  :suggestable-condition-fields="suggestableConditionFields(this)"

resources/lang/en/validation.php

@@ -165,6 +165,7 @@
  'duplicate_uri' => 'Duplicate URI :value',
  'reserved' => 'This is a reserved word.',
  'reserved_field_handle' => 'Field with a handle of :handle is a reserved word.',
+ 'duplicate_field_handle' => 'A field with a handle of :handle already exists.',
  'parent_causes_root_children' => 'This would cause the root page to have children.',
  'parent_cannot_be_itself' => 'Cannot be its own parent.',
  'time' => 'Not a valid time.',

src/Http/Controllers/CP/Fields/FieldsController.php

@@ -5,6 +5,7 @@
 use Facades\Statamic\Fields\FieldtypeRepository;
 use Illuminate\Http\Request;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\Fieldset;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Middleware\CP\CanManageBlueprints;
 
@@ -49,8 +50,10 @@ public function edit(Request $request)
  public function update(Request $request)
  {
  $request->validate([
+ 'id' => 'nullable',
  'type' => 'required',
  'values' => 'required|array',
+ 'fields' => 'sometimes|array',
  ]);
 
  $fieldtype = FieldtypeRepository::find($request->type);
@@ -61,7 +64,27 @@ public function update(Request $request)
  ->fields()
  ->addValues($request->values);
 
- $extraRules = [];
+ $extraRules = [
+ 'handle' => [
+ function ($attribute, $value, $fail) use ($request) {
+ $existingFieldWithHandle = collect($request->fields ?? [])
+ ->when($request->id, fn ($collection) => $collection->reject(fn ($field) => $field['_id'] === $request->id))
+ ->flatMap(function (array $field) {
+ if ($field['type'] === 'import') {
+ return Fieldset::find($field['fieldset'])->fields()->all()->map->handle()->toArray();
+ }
+
+ return [$field['handle']];
+ })
+ ->values()
+ ->contains($request->values['handle']);
+
+ if ($existingFieldWithHandle) {
+ $fail(__('statamic::validation.duplicate_field_handle', ['handle' => $value]));
+ }
+ },
+ ],
+ ];
  $customMessages = [
  'handle.not_in' => __('statamic::validation.reserved'),
  ];