Simplify fieldset ensuring logic.

Requires: statamic/cms#11097.
statamic · Nov 12, 2024 · 479077b · 479077b
1 parent 1af9ac9
commit 479077b
Showing 1 changed file with 4 additions and 34 deletions.
diff --git a/src/Support/FieldUpdater.php b/src/Support/FieldUpdater.php
@@ -68,23 +68,7 @@ private function updateImportedField(array $importedField, array $config): void
         $fieldHandle = Str::after($importedField['field'], '.');
         $fieldset = Fieldset::find(Str::before($importedField['field'], '.'));
 
-        $fieldset->setContents([
-            ...$fieldset->contents(),
-            'fields' => collect($fieldset->contents()['fields'])
-                ->map(function (array $field) use ($config, $fieldHandle) {
-                    if ($field['handle'] === $fieldHandle) {
-                        return [
-                            'handle' => $field['handle'],
-                            'field' => $config,
-                        ];
-                    }
-
-                    return $field;
-                })
-                ->all(),
-        ]);
-
-        $fieldset->save();
+        $fieldset->ensureFieldHasConfig($fieldHandle, $config)->save();
 
         $this->clearBlinkCaches();
     }
@@ -98,6 +82,8 @@ private function updateImportedField(array $importedField, array $config): void
      */
     private function updatePrefixedField(string $prefix, array $config): void
     {
+        $fieldHandle = Str::after($this->field->handle(), $prefix);
+
         /** @var \Statamic\Fields\Fieldset $fieldset */
         $fieldset = $this->blueprint->fields()->items()
             ->filter(fn (array $field) => isset($field['import']))
@@ -109,23 +95,7 @@ private function updatePrefixedField(string $prefix, array $config): void
             })
             ->first();
 
-        $fieldset->setContents([
-            ...$fieldset->contents(),
-            'fields' => collect($fieldset->contents()['fields'])
-                ->map(function (array $field) use ($config, $prefix) {
-                    if ($field['handle'] === Str::after($this->field->handle(), $prefix)) {
-                        return [
-                            'handle' => $field['handle'],
-                            'field' => $config,
-                        ];
-                    }
-
-                    return $field;
-                })
-                ->all(),
-        ]);
-
-        $fieldset->save();
+        $fieldset->ensureFieldHasConfig($fieldHandle, $config)->save();
 
         $this->clearBlinkCaches();
     }