Fix errors not showing on field edit page

Fixes CMS-2009

Author: riasvdv

resources/templates/settings/fields/_edit.twig

@@ -12,10 +12,10 @@
   instructions: "What this field will be called in the control panel."|t('app'),
   id: 'name',
   name: 'name',
-  value: field.name,
+  value: old('name', field.name),
   required: true,
   autofocus: true,
-  errors: field.errors.get('name'),
+  errors: errors.get('name'),
   data: {'error-key': 'name'},
   disabled: readOnly,
 }) }}
@@ -29,9 +29,9 @@
   autocorrect: false,
   autocapitalize: false,
   maxlength: 64,
-  value: field.handle,
+  value: old('handle', field.handle),
   required: true,
-  errors: field.errors.get('handle'),
+  errors: errors.get('handle'),
   data: {'error-key': 'handle'},
   disabled: readOnly,
 }) }}
@@ -42,8 +42,8 @@
   id: 'instructions',
   class: 'nicetext',
   name: 'instructions',
-  value: field.instructions,
-  errors: field.errors.get('instructions'),
+  value: old('instructions', field.instructions),
+  errors: errors.get('instructions'),
   data: {
     'error-key': 'instructions',
   },
@@ -54,19 +54,19 @@
   label: 'Use this field’s values as search keywords'|t('app'),
   id: 'searchable',
   name: 'searchable',
-  on: field.searchable,
+  on: old('searchable', field.searchable),
   disabled: readOnly,
 }) }}
 
 {{ forms.customSelectField({
   label: "Field Type"|t('app'),
   instructions: "What type of field is this?"|t('app'),
-  warning: (fieldId is not empty and not field.errors.has('type') ? "Changing this may result in data loss."|t('app')),
+  warning: (fieldId is not empty and not errors.has('type') ? "Changing this may result in data loss."|t('app')),
   id: 'type',
   name: 'type',
   options: fieldTypeOptions,
-  value: field is missing ? field.expectedType : className(field),
-  errors: field.errors.get('type'),
+  value: old('type', field is missing ? field.expectedType : className(field)),
+  errors: errors.get('type'),
   data: {
     'error-key': 'type',
   },
@@ -91,7 +91,7 @@
           'language' in translationMethods ? { value: 'language', label: "Translate for each language"|t('app') },
           'custom' in translationMethods ? { value: 'custom', label: "Custom…"|t('app') }
         ]|filter,
-        value: field.translationMethodValue,
+        value: old('translationMethod', field.translationMethodValue),
         toggle: true,
         targetPrefix: 'translation-method-',
         disabled: readOnly,
@@ -108,8 +108,8 @@
             id: 'translation-key-format',
             class: 'code',
             name: 'translationKeyFormat',
-            value: field.translationKeyFormat,
-            errors: field.errors.get('translationKeyFormat'),
+            value: old('translationKeyFormat', field.translationKeyFormat),
+            errors: errors.get('translationKeyFormat'),
             data: {'error-key': 'translationKeyFormat'},
             disabled: readOnly,
           }) }}

src/Http/Controllers/FieldsController.php

@@ -43,6 +43,7 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use ReflectionException;
 use ReflectionProperty;
 use Symfony\Component\HttpFoundation\Response;
@@ -184,7 +185,7 @@ public function store(Request $request): Response|CpScreenResponse
         if (! $this->fieldsService->saveField($field)) {
             Flash::error(t('Couldn’t save field.'));
 
-            return $this->edit($request, $field);
+            throw ValidationException::withMessages($field->errors()->getMessages());
         }
 
         if ($request->input('addAnother')) {