Fix: save of nested repeaters

Author: Tofandel

src/Repositories/Behaviors/HandleRepeaters.php

@@ -9,6 +9,9 @@
 use A17\Twill\Repositories\ModuleRepository;
 use Carbon\Carbon;
 use Exception;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -124,13 +127,15 @@ public function updateRepeaterMorphMany(
 
         // @todo: This needs refactoring in 3.x
         foreach ($relationFields as $index => $relationField) {
+            $this->extractRepeaters($repeaterName, $fields, $relationField);
             $relationField['position'] = $index + 1;
             $relationField[$morphFieldId] = $object->id;
             $relationField[$morphFieldType] = $object->getMorphClass();
 
             if (isset($relationField['id']) && Str::startsWith($relationField['id'], $relation)) {
                 // row already exists, let's update
                 $id = str_replace($relation . '-', '', $relationField['id']);
+
                 $relationRepository->update($id, $relationField);
                 $currentIdList[] = (int)$id;
             } else {
@@ -175,6 +180,7 @@ public function updateRepeaterWithPivot(
             $object->{$relation}()->detach();
         }
 
+
         // Add the position to the pivot fields.
         $pivotFields[] = 'position';
 
@@ -186,6 +192,7 @@ public function updateRepeaterWithPivot(
         $currentRelations = $object->{$relation}()->withPivot('id')->get();
 
         foreach ($relationFields as $index => $relationField) {
+            $this->extractRepeaters($repeaterName, $fields, $relationField);
             $relationField['position'] = $index + 1;
 
             // If the relation is not an "existing" one try to match it with our session.
@@ -280,20 +287,31 @@ public function updateRepeater(
 
         $relationRepository = $this->getModelRepository($relation, $modelOrRepository);
 
+
+        if (method_exists($this->model, $relation)) {
+            /** @var Relation $relationInstance */
+            $relationInstance = $this->model->$relation();
+            if ($relationInstance instanceof BelongsTo || $relationInstance instanceof HasOneOrMany) {
+                $fk = $relationInstance->getForeignKeyName();
+            }
+        }
+        $fk ??= $this->model->getForeignKey();
+
         // If no relation field submitted, soft deletes all associated rows.
         // We only do this when the model is already existing.
         if (! $relationFields && ! $object->wasRecentlyCreated) {
             $relationRepository->updateBasic(null, [
                 'deleted_at' => Carbon::now(),
             ], [
-                $this->model->getForeignKey() => $object->id,
+                $fk => $object->id,
             ]);
         }
 
         // keep a list of updated and new rows to delete (soft delete?) old rows that were deleted from the frontend
         $currentIdList = [];
 
         foreach ($relationFields as $index => $relationField) {
+            $this->extractRepeaters($repeaterName, $fields, $relationField);
             $relationField['position'] = $index + 1;
             // If the relation is not an "existing" one try to match it with our session.
             if (
@@ -317,12 +335,13 @@ public function updateRepeater(
             if (isset($relationField['id']) && Str::startsWith($relationField['id'], $relation)) {
                 // row already exists, let's update
                 $id = str_replace($relation . '-', '', $relationField['id']);
+
                 $relationRepository->update($id, $relationField);
 
                 $currentIdList[] = (int)$id;
             } else {
                 // new row, let's attach to our object and create
-                $relationField[$this->model->getForeignKey()] = $object->id;
+                $relationField[$fk] = $object->id;
                 $frontEndId = $relationField['id'];
                 unset($relationField['id']);
                 $newRelation = $relationRepository->create($relationField);
@@ -344,6 +363,21 @@ public function updateRepeater(
         }
     }
 
+    private function extractRepeaters(string $repeaterName, array $fields, ?array &$relationField): void
+    {
+        if (!isset($relationField) || empty($fields['repeaters'])) {
+            return;
+        }
+
+        $prefix = $repeaterName . '|blocks-' . $relationField['id'] . '|';
+        foreach ($fields['repeaters'] as $key => $repeater) {
+            if (str_starts_with($key, $prefix)) {
+                unset($fields['repeaters'][$key]);
+                $relationField['repeaters'][substr($key, strlen($prefix))] = $repeater;
+            }
+        }
+    }
+
     /**
      * This makes sure that arrays are json encode (translations).
      */