WIP

src/Controller/Backend/ContentEditController.php

@@ -10,6 +10,7 @@ use Bolt\Controller\CsrfTrait;
 use Bolt\Controller\TwigAwareController;
 use Bolt\Entity\Content;
 use Bolt\Entity\Field;
+use Bolt\Entity\Field\SetField;
 use Bolt\Entity\Relation;
 use Bolt\Entity\Taxonomy;
 use Bolt\Entity\User;
@@ -288,17 +289,31 @@ class ContentEditController extends TwigAwareController implements BackendZone
         }
 
         if (isset($formData['sets'])) {
-            foreach ($formData['sets'] as $setName => $set) {
-                foreach ($set as $hash => $setFields) {
-                    $setDefinition = $content->getDefinition()->get('fields')->get($setName);
-                    $this->updateSetItems($content, $setDefinition, $hash, $setFields, $locale);
-                    if ($content->hasField($setName)) {
-                        $field = $content->getField($setName);
-                        $field->setValue($hash);
-                    } else {
-                        $field = Field::factory($setDefinition, $setName);
-                        $field->setValue($hash);
+            foreach ($formData['sets'] as $setName => $setItems) {
+                $setDefinition = $content->getDefinition()->get('fields')->get($setName);
+
+                if ($content->hasField($setName)) {
+                    $set = $content->getField($setName);
+                } else {
+                    $set = Field::factory($setDefinition, $setName);
+                    $set->setLocale($locale);
+                    $content->addField($set);
+                }
+
+                foreach($setItems as $name => $value)
+                {
+                    $dbName = SetField::getItemDbName($setName, $name);
+
+                    if ($content->hasField($dbName))
+                    {
+                        $field = $content->getField($dbName);
                         $field->setLocale($locale);
+                        $field->setValue($value);
+                    } else {
+                        $field = Field::factory($setDefinition->get('fields')->get($name), $dbName);
+                        $field->setValue($value);
+                        $field->setLocale($locale);
+                        $field->setParent($set);
                         $content->addField($field);
                     }
                 }
@@ -379,7 +394,6 @@ class ContentEditController extends TwigAwareController implements BackendZone
     private function updateSetItems(?Content $content, ContentType $setDefinition, string $hash, array $setFields, ?string $locale): void
     {
         foreach ($setFields as $setFieldChildName => $setFieldChildValue) {
-            $setFieldChildDBName = $hash . '::' . $setFieldChildName;
             if ($content->hasField($setFieldChildDBName)) {
                 $setFieldChildField = $content->getField($setFieldChildDBName);
             } else {

src/Entity/Content.php

@@ -404,7 +404,7 @@ class Content
         // If $matchTypes is `false`, we can state that we do have the field
         if (! $matchTypes) {
             // Only if the field is standalone (has no parent), we can say we have it.
-            return !$this->fields[$fieldName]->hasParent();
+            return true;
         }
 
         // Otherwise, we need to ensure the types are the same

src/Entity/Field/SetField.php

@@ -29,8 +29,34 @@ class SetField extends Field implements FieldInterface
 
     public function getValue(): array
     {
+        $result = [];
 
-        $children = $this->getContent()->getFieldsByParent($this);
-        return $children->toArray();
+        $fieldDefinitions = $this->getDefinition()->get('fields');
+
+        // If there's no current $fieldDefinitions, we can return early
+        if (! is_iterable($fieldDefinitions)) {
+            return $result;
+        }
+
+        foreach ($fieldDefinitions as $name => $definition) {
+            $itemDbName = $this::getItemDbName($this->getName(), $name);
+
+            if ($this->getContent() && $this->getContent()->hasField($itemDbName)) {
+                $field = $this->getContent()->getField($itemDbName);
+                $field->setDefinition($name, $definition);
+            } else {
+                $field = parent::factory($definition);
+            }
+
+            $field->setName($name);
+            $result[] = $field;
+        }
+
+        return $result;
+    }
+
+    public static function getItemDbName($setName, $itemName)
+    {
+        return $setName . '::' . $itemName;
     }
 }