Fix repeaters inside blocks

area17 · Feb 28, 2024 · 3002eb5 · 3002eb5
1 parent a809d42
commit 3002eb5
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 15 deletions.
diff --git a/frontend/js/utils/getFormData.js b/frontend/js/utils/getFormData.js
@@ -74,16 +74,17 @@ export const buildBlock = (block, rootState, isRepeater = false, childKey) => {
 
   const base = {
     id: block.id,
-    editor_name: block.name,
+    type: block.type,
     medias: gatherSelected(rootState.mediaLibrary.selected, block),
     browsers: gatherSelected(rootState.browser.selected, block),
+    content,
     // gather repeater blocks from the repeater store module
     blocks,
     repeaters,
   }
   return isRepeater
-    ? { ...content, ...base, is_repeater: true, repeater_target_id: block.repeater_target_id}
-    : { ...base, type: block.type, content, child_key: childKey }
+    ? { ...base, is_repeater: true, repeater_target_id: block.repeater_target_id}
+    : { ...base, editor_name: block.name, child_key: childKey }
 }
 
 export const isBlockEmpty = (blockData) => {

diff --git a/src/Repositories/Behaviors/HandleBlocks.php b/src/Repositories/Behaviors/HandleBlocks.php
@@ -273,22 +273,29 @@ private function getChildBlocks($object, $parentBlockFields)
     {
         $childBlocksList = Collection::make();
 
-        if (empty($parentBlockFields['blocks'])) {
-            return $childBlocksList;
+        if (!empty($parentBlockFields['blocks'])) {
+            // Fallback if frontend or revision is still on the old schema
+            if (is_int(key(current($parentBlockFields['blocks'])))) {
+                foreach ($parentBlockFields['blocks'] as $childKey => $childBlocks) {
+                    foreach ($childBlocks as $childBlock) {
+                        $childBlock['child_key'] = $childKey;
+                        $parentBlockFields['blocks'][] = $childBlock;
+                    }
+                    unset($parentBlockFields['blocks'][$childKey]);
+                }
+            }
         }
 
-        // Fallback if frontend or revision is still on the old schema
-        if (is_int(key(current($parentBlockFields['blocks'])))) {
-            foreach ($parentBlockFields['blocks'] as $childKey => $childBlocks) {
+        if (!empty($parentBlockFields['repeaters'])) {
+            foreach ($parentBlockFields['repeaters'] as $childKey => $childBlocks) {
                 foreach ($childBlocks as $childBlock) {
                     $childBlock['child_key'] = $childKey;
                     $parentBlockFields['blocks'][] = $childBlock;
                 }
-                unset($parentBlockFields['blocks'][$childKey]);
             }
         }
 
-        foreach ($parentBlockFields['blocks'] as $index => $childBlock) {
+        foreach ($parentBlockFields['blocks'] ?? [] as $index => $childBlock) {
             $childBlock = $this->buildBlock($childBlock, $object, $childBlock['is_repeater'] ?? false);
             $this->validateBlockArray($childBlock, $childBlock['instance'], true);
             $childBlock['child_key'] = $childBlock['child_key'] ?? Str::afterLast($childBlock['editor_name'] ?? $index, '|');
@@ -434,8 +441,8 @@ function ($files, $role) use ($locale, $block) {
 
 
             foreach (['Fields', 'Medias', 'Files', 'Browsers'] as $fieldKey) {
-                if ($fields['blocks'.$fieldKey] ?? false) {
-                    $fields['blocks'.$fieldKey] = call_user_func_array('array_merge', $fields['blocks'.$fieldKey] ?? []);
+                if ($fields['blocks' . $fieldKey] ?? false) {
+                    $fields['blocks' . $fieldKey] = call_user_func_array('array_merge', $fields['blocks' . $fieldKey] ?? []);
                 }
             }
         }

diff --git a/src/Repositories/Behaviors/HandleRepeaters.php b/src/Repositories/Behaviors/HandleRepeaters.php
@@ -131,6 +131,12 @@ public function updateRepeaterMorphMany(
             $relationField[$morphFieldId] = $object->id;
             $relationField[$morphFieldType] = $object->getMorphClass();
 
+            if (is_array($relationField['content'] ?? null)) {
+                $content = $relationField['content'];
+                unset($relationField['content']);
+                $relationField = array_merge($content, $relationField);
+            }
+
             if (isset($relationField['id']) && Str::startsWith($relationField['id'], $relation)) {
                 // row already exists, let's update
                 $id = str_replace($relation . '-', '', $relationField['id']);
@@ -210,6 +216,12 @@ public function updateRepeaterWithPivot(
                 }
             }
 
+            if (is_array($relationField['content'] ?? null)) {
+                $content = $relationField['content'];
+                unset($relationField['content']);
+                $relationField = array_merge($content, $relationField);
+            }
+
             if (isset($relationField['id']) && Str::startsWith($relationField['id'], $relation)) {
                 // row already exists, let's update, the $id is the id in the pivot table.
                 $pivotRowId = str_replace($relation . '-', '', $relationField['id']);
@@ -307,6 +319,7 @@ public function updateRepeater(
 
         foreach ($relationFields as $index => $relationField) {
             $relationField['position'] = $index + 1;
+
             // If the relation is not an "existing" one try to match it with our session.
             if (
                 ! Str::startsWith($relationField['id'], $relation) &&
@@ -315,6 +328,12 @@ public function updateRepeater(
                 $relationField['id'] = $relation . '-' . $id;
             }
 
+            if (is_array($relationField['content'] ?? null)) {
+                $content = $relationField['content'];
+                unset($relationField['content']);
+                $relationField = array_merge($content, $relationField);
+            }
+
             // Set the active data based on the parent.
             if (! isset($relationField['languages']) && isset($relationField['active'])) {
                 foreach (array_keys($relationField['active']) as $langCode) {
@@ -495,9 +514,9 @@ function ($files, $role) use ($locale, $relation, $relationItem) {
             foreach ($relatedItemFormFields['blocks'] ?? [] as $key => $block) {
                 $fields['blocks'][str_contains($key, '|') ? $key : "blocks-$relation-{$relationItem->id}|$key"] = $block;
             }
-            foreach (['Fields', 'Medias', 'Files', 'Browsers'] as $fieldKey) {
-                if (!empty($relatedItemFormFields['blocks'.$fieldKey])) {
-                    $fields['blocks'.$fieldKey] = array_merge($fields['blocks'.$fieldKey] ?? [], $relatedItemFormFields['blocks'.$fieldKey]);
+            foreach (['Fields', 'Medias', 'Files', 'Browsers', 'Repeaters'] as $fieldKey) {
+                if (!empty($relatedItemFormFields['blocks' . $fieldKey])) {
+                    $fields['blocks' . $fieldKey] = array_merge($fields['blocks' . $fieldKey] ?? [], $relatedItemFormFields['blocks' . $fieldKey]);
                 }
             }