From 82377fb7845cd77a9dcb1a3d8d8c688e14b82a63 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 17 Jan 2020 16:02:59 -0500
Subject: [PATCH] Move fields into blueprint ...

- Because I added the listable field to the blueprint for processing, I hadn't noticed it was also being output in the loop.
- Might as well move the rest. Cleans up the vue.
---
 resources/js/components/fields/Settings.vue   | 47 ++-----------------
 .../CP/Fields/FieldsController.php            | 34 +++++++++++++-
 2 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/resources/js/components/fields/Settings.vue b/resources/js/components/fields/Settings.vue
index b33709b7e3..68c23c45d2 100644
--- a/resources/js/components/fields/Settings.vue
+++ b/resources/js/components/fields/Settings.vue
@@ -53,53 +53,14 @@
             >
                 <div class="publish-fields" v-show="activeTab === 'settings'" slot-scope="{ setFieldValue }">
 
-                    <form-group
-                        handle="display"
-                        :display="__('Display')"
-                        :instructions="__('messages.fields_display_instructions')"
-                        width="50"
-                        autoselect
-                        :value="values.display"
-                        @input="updateField('display', $event, setFieldValue)"
-                    />
-
-                    <form-group
-                        handle="handle"
-                        :display="__('Handle')"
-                        :instructions="__('messages.fields_handle_instructions')"
-                        width="50"
-                        :value="values.handle"
-                        @input="updateField('handle', $event, setFieldValue); isHandleModified = true"
-                    />
-
-                    <form-group
-                        fieldtype="text"
-                        handle="instructions"
-                        :display="__('Instructions')"
-                        :instructions="__('messages.fields_instructions_instructions')"
-                        :value="values.instructions"
-                        @input="updateField('instructions', $event, setFieldValue)"
-                    />
-
-                    <form-group
-                        fieldtype="select"
-                        handle="listable"
-                        :display="__('Listable')"
-                        :instructions="__('messages.fields_listable_instructions')"
-                        :config="{ options: {
-                            hidden: __('Hidden by default'),
-                            true: __('Yes'),
-                            false: __('No')
-                        }}"
-                        :value="values.listable"
-                        @input="updateField('listable', $event, setFieldValue)"
-                    />
-
                     <publish-fields
                         v-if="blueprint.sections.length"
                         class="w-full"
                         :fields="blueprint.sections[0].fields"
-                        @updated="(handle, value) => updateField(handle, value, setFieldValue)"
+                        @updated="(handle, value) => {
+                            updateField(handle, value, setFieldValue);
+                            if (handle === 'handle') isHandleModified = true
+                        }"
                     />
 
                 </div>
diff --git a/src/Http/Controllers/CP/Fields/FieldsController.php b/src/Http/Controllers/CP/Fields/FieldsController.php
index fd21391aef..503201e42a 100644
--- a/src/Http/Controllers/CP/Fields/FieldsController.php
+++ b/src/Http/Controllers/CP/Fields/FieldsController.php
@@ -70,6 +70,38 @@ public function update(Request $request)
 
     protected function blueprint($blueprint)
     {
-        return $blueprint->ensureField('listable', ['type' => 'select', 'cast_booleans' => true]);
+        $prepends = collect([
+            'display' => [
+                'type' => 'text',
+                'instructions' => __('statamic::messages.fields_display_instructions'),
+                'width' => 50,
+            ],
+            'handle' => [
+                'type' => 'text',
+                'instructions' => __('statamic::messages.fields_handle_instructions'),
+                'width' => 50,
+            ],
+            'instructions' => [
+                'type' => 'text',
+                'instructions' => __('statamic::messages.fields_instructions_instructions'),
+            ],
+            'listable' => [
+                'type' => 'select',
+                'instructions' => __('statamic::messages.fields_listable_instructions'),
+                'cast_booleans' => true,
+                'width' => 50,
+                'options' => [
+                    'hidden' => __('Hidden by default'),
+                    'true' => __('Yes'),
+                    'false' => __('No'),
+                ],
+            ]
+        ]);
+
+        foreach ($prepends->reverse() as $handle => $prepend) {
+            $blueprint->ensureFieldPrepended($handle, $prepend);
+        }
+
+        return $blueprint;
     }
 }