[5.x] Prevent certain blueprint config keys getting stripped out

src/Fields/ConfigField.php

@@ -12,4 +12,9 @@ public function preProcess()
 
         return $this->newInstance()->setValue($value);
     }
+
+    public function mustRemainInConfig(): bool
+    {
+        return $this->get('force_in_config') === true;
+    }
 }

src/Fields/Field.php

@@ -477,6 +477,10 @@ public static function commonFieldOptions(): Fields
                 'instructions' => __('statamic::messages.fields_display_instructions'),
                 'type' => 'field_display',
             ],
+            'hide_display' => [
+                'type' => 'toggle',
+                'visibility' => 'hidden',
+            ],
             'handle' => [
                 'display' => __('Handle'),
                 'instructions' => __('statamic::messages.fields_handle_instructions'),
@@ -551,6 +555,6 @@ public static function commonFieldOptions(): Fields
             ],
         ])->map(fn ($field, $handle) => compact('handle', 'field'))->values()->all();
 
-        return new Fields($fields);
+        return new ConfigFields($fields);
     }
 }

src/Fields/FieldTransformer.php

@@ -28,13 +28,12 @@ private static function inlineTabField(array $submitted)
     {
         $fieldtype = FieldtypeRepository::find($submitted['fieldtype'] ?? $submitted['config']['type']);
 
-        $defaultConfig = Field::commonFieldOptions()->all()
-            ->merge($fieldtype->configFields()->all())
-            ->map->defaultValue()->filter();
+        $fields = Field::commonFieldOptions()->all()
+            ->merge($fieldtype->configFields()->all());
 
         $field = collect($submitted['config'])
-            ->reject(function ($value, $key) use ($defaultConfig) {
-                if (in_array($key, ['isNew', 'icon', 'duplicate'])) {
+            ->reject(function ($value, $key) use ($fields) {
+                if (in_array($key, ['isNew', 'icon'])) {
                     return true;
                 }
 
@@ -46,7 +45,15 @@ private static function inlineTabField(array $submitted)
                     return true;
                 }
 
-                return $defaultConfig->has($key) && $defaultConfig->get($key) === $value;
+                if (! $field = $fields->get($key)) {
+                    return false;
+                }
+
+                if ($field->mustRemainInConfig()) {
+                    return false;
+                }
+
+                return $field->defaultValue() === $value;
             })
             ->map(function ($value, $key) {
                 if ($key === 'sets') {
@@ -84,7 +91,6 @@ private static function inlineTabField(array $submitted)
 
                 return $value;
             })
-            ->filter()
             ->sortBy(function ($value, $key) {
                 // Push sets & fields to the end of the config.
                 if ($key === 'sets' || $key === 'fields') {
@@ -97,7 +103,7 @@ private static function inlineTabField(array $submitted)
 
         return array_filter([
             'handle' => $submitted['handle'],
-            'field' => $field,
+            'field' => Arr::removeNullValues($field),
         ]);
     }
 

src/Fieldtypes/Assets/Assets.php

@@ -56,6 +56,7 @@ protected function configFieldItems(): array
                         'mode' => 'select',
                         'required' => true,
                         'default' => AssetContainer::all()->count() == 1 ? AssetContainer::all()->first()->handle() : null,
+                        'force_in_config' => true,
                     ],
                     'folder' => [
                         'display' => __('Folder'),

src/Forms/Fieldtype.php

@@ -31,6 +31,7 @@ protected function configFieldItems(): array
                 'display' => __('Max Items'),
                 'default' => 1,
                 'instructions' => __('statamic::fieldtypes.form.config.max_items'),
+                'force_in_config' => true,
             ],
             'mode' => [
                 'display' => __('UI Mode'),

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

@@ -32,9 +32,7 @@ public function edit(Request $request)
 
         $fieldtype = FieldtypeRepository::find($request->type);
 
-        $blueprint = $this
-            ->blueprint($fieldtype->configBlueprint())
-            ->ensureField('hide_display', ['type' => 'toggle', 'visibility' => 'hidden']);
+        $blueprint = $this->blueprint($fieldtype->configBlueprint());
 
         $fields = $blueprint
             ->fields()

tests/Fields/FieldTransformerTest.php

@@ -2,11 +2,16 @@
 
 namespace Tests\Fields;
 
+use Statamic\Facades\AssetContainer;
 use Statamic\Fields\FieldTransformer;
+use Statamic\Fields\Fieldtype;
+use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class FieldTransformerTest extends TestCase
 {
+    use PreventSavingStacheItemsToDisk;
+
     protected function configToVue($config)
     {
         return FieldTransformer::toVue(['handle' => 'test', 'field' => $config])['config'];
@@ -68,15 +73,30 @@ public function it_normalizes_required_validation()
     /** @test */
     public function it_removes_redundant_config_options()
     {
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'test';
+
+            public function configFieldItems(): array
+            {
+                return [
+                    'input_type' => ['type' => 'text', 'default' => 'text'],
+                    'character_limit' => ['type' => 'integer', 'default' => null],
+                    'max_items' => ['type' => 'integer', 'default' => 1, 'force_in_config' => true],
+                ];
+            }
+        };
+        $fieldtype::register();
+
         $fromVue = FieldTransformer::fromVue([
-            'fieldtype' => 'text',
+            'fieldtype' => 'test',
             'handle' => 'test',
             'type' => 'inline',
             'config' => [
                 // Fieldtype config options
                 'input_type' => 'text', // The default.
-                'icon' => 'text', // The default.
                 'character_limit' => 100, // This one has been changed.
+                'max_items' => 1, // Even though it matches the default, it has been flagged to be explicitly kept.
                 'foo' => 'bar', // Manually added by user.
 
                 // Common field options
@@ -88,6 +108,7 @@ public function it_removes_redundant_config_options()
         $this->assertEquals([
             'character_limit' => 100,
             'listable' => true,
+            'max_items' => 1,
             'foo' => 'bar',
         ], $fromVue['field']);
     }
@@ -274,4 +295,75 @@ public function blank_instructions_and_icon_are_removed_from_set_groups()
             ],
         ], $fromVue);
     }
+
+    /**
+     * @test
+     *
+     * @see https://github.com/statamic/cms/issues/10056
+     */
+    public function it_doesnt_remove_max_items_from_form_fieldtype()
+    {
+        $fromVue = FieldTransformer::fromVue([
+            'fieldtype' => 'form',
+            'handle' => 'test',
+            'type' => 'inline',
+            'config' => [
+                'foo' => 'bar',
+                'max_items' => 1,
+            ],
+        ]);
+
+        $this->assertEquals([
+            'foo' => 'bar',
+            'max_items' => 1,
+        ], $fromVue['field']);
+    }
+
+    /**
+     * @test
+     *
+     * @see https://github.com/statamic/cms/issues/10050
+     */
+    public function it_ensures_the_asset_container_is_saved_on_the_assets_fieldtype()
+    {
+        AssetContainer::make('test')->save();
+
+        $fromVue = FieldTransformer::fromVue([
+            'fieldtype' => 'assets',
+            'handle' => 'test',
+            'type' => 'inline',
+            'config' => [
+                'foo' => 'bar',
+                'container' => 'test',
+            ],
+        ]);
+
+        $this->assertEquals([
+            'foo' => 'bar',
+            'container' => 'test',
+        ], $fromVue['field']);
+    }
+
+    /**
+     * @test
+     *
+     * @see https://github.com/statamic/cms/issues/10040
+     */
+    public function it_saves_a_toggle_as_false_where_the_default_is_true()
+    {
+        $fromVue = FieldTransformer::fromVue([
+            'fieldtype' => 'text',
+            'handle' => 'test',
+            'type' => 'inline',
+            'config' => [
+                'replicator_preview' => false,
+                'duplicate' => false,
+            ],
+        ]);
+
+        $this->assertEquals([
+            'replicator_preview' => false,
+            'duplicate' => false,
+        ], $fromVue['field']);
+    }
 }