fixes

Author: iamgergo

src/Fields/Field.php

@@ -462,15 +462,25 @@ public function value(?Closure $callback = null): static
     }
 
     /**
-     * Resolve the value.
+     * Hydrate the model from the old value.
      */
-    public function resolveValue(Request $request, Model $model): mixed
+    public function hydrateFromRequest(Request $request, Model $model): void
     {
         once(function () use ($request, $model): void {
-            if ($this->withOldValue && $request->session()->hasOldInput($this->getRequestKey())) {
+            if (in_array($request->method(), ['POST', 'PATCH']) && $request->isTurboFrameRequest()) {
+                $this->resolveHydrate($request, $model, $this->getValueForHydrate($request));
+            } elseif ($this->withOldValue && $request->session()->hasOldInput($this->getRequestKey())) {
                 $this->resolveHydrate($request, $model, $this->getOldValue($request));
             }
         });
+    }
+
+    /**
+     * Resolve the value.
+     */
+    public function resolveValue(Request $request, Model $model): mixed
+    {
+        $this->hydrateFromRequest($request, $model);
 
         $value = $this->getValue($model);
 

src/Fields/Fields.php

@@ -37,6 +37,16 @@ public function persist(Request $request, Model $model): void
         });
     }
 
+    /**
+     * Hydrate the model from the request.
+     */
+    public function hydrateFromRequest(Request $request, Model $model): static
+    {
+        return $this->each(static function (Field $field) use ($request, $model): void {
+            $field->hydrateFromRequest($request, $model);
+        });
+    }
+
     /**
      * Filter the fields that are available for the current request and model.
      */

src/Fields/Relation.php

@@ -849,24 +849,6 @@ public function formResponse(Request $request, Model $model): Response
             ->with('alerts.relation-saved', Alert::success(__('The relation has been saved!')));
     }
 
-    /**
-     * Hydrate the model with the request data.
-     */
-    public function handleHydrateRequest(Request $request, Model $model, Model $related): void
-    {
-        DB::transaction(function () use ($request, $model, $related): void {
-            $related->setRelation('related', $model);
-
-            $this->resolveFields($request)
-                ->authorized($request, $related)
-                ->visible($request->isMethod('POST') ? 'create' : 'update')
-                ->subResource(false)
-                ->each(static function (Field $field) use ($request, $related): void {
-                    $field->resolveHydrate($request, $related, $field->getValueForHydrate($request));
-                });
-        });
-    }
-
     /**
      * Handle the saved form event.
      */
@@ -1168,8 +1150,9 @@ public function toCreate(Request $request, Model $model): array
             'method' => 'POST',
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
-                ->authorized($request, $related)
                 ->visible('create')
+                ->hydrateFromRequest($request, $related)
+                ->authorized($request, $related)
                 ->mapToInputs($request, $related),
         ]);
     }
@@ -1216,8 +1199,9 @@ public function toEdit(Request $request, Model $model, Model $related): array
             'uploads' => $this->hasFileField($request),
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
-                ->authorized($request, $related)
                 ->visible('update')
+                ->hydrateFromRequest($request, $related)
+                ->authorized($request, $related)
                 ->mapToInputs($request, $related),
             'abilities' => array_merge(
                 $this->mapRelationAbilities($request, $model),

src/Http/Controllers/RelationController.php

@@ -10,6 +10,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response as ResponseFactory;
 
@@ -125,15 +126,13 @@ public function hydrate(Request $request, Model $model, Model $related): Respons
         /** @var \Cone\Root\Fields\Relation $field */
         $field = $request->route('field');
 
-        $field->handleHydrateRequest($request, $model, $related);
+        return DB::transaction(static function () use ($request, $model, $related, $field): Response {
+            $data = match (true) {
+                $model->exists => $field->toEdit($request, $model, $related),
+                default => $field->toCreate($request, $model),
+            };
 
-        $data = match (true) {
-            $model->exists => $field->toEdit($request, $model, $related),
-            default => $field->toCreate($request, $model),
-        };
-
-        return ResponseFactory::view(
-            'root::resources.form-turbo-frame', $data
-        );
+            return ResponseFactory::view('root::resources.form-turbo-frame', $data);
+        });
     }
 }

src/Http/Controllers/ResourceController.php

@@ -11,6 +11,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response as ResponseFactory;
 
@@ -115,15 +116,13 @@ public function restore(Request $request, Resource $resource, Model $model): Red
      */
     public function hydrate(Request $request, Resource $resource, Model $model): Response
     {
-        $resource->handleHydrateRequest($request, $model);
-
-        $data = match (true) {
-            $model->exists => $resource->toEdit($request, $model),
-            default => $resource->toCreate($request),
-        };
-
-        return ResponseFactory::view(
-            'root::resources.form-turbo-frame', $data
-        );
+        return DB::transaction(static function () use ($resource, $request, $model): Response {
+            $data = match (true) {
+                $model->exists => $resource->toEdit($request, $model),
+                default => $resource->toCreate($request),
+            };
+
+            return ResponseFactory::view('root::resources.form-turbo-frame', $data);
+        });
     }
 }

src/Resources/Resource.php

@@ -560,22 +560,6 @@ public function handleFormRequest(Request $request, Model $model): Response
         }
     }
 
-    /**
-     * Hydrate the model with the request data.
-     */
-    public function handleHydrateRequest(Request $request, Model $model): void
-    {
-        DB::transaction(function () use ($request, $model): void {
-            $this->resolveFields($request)
-                ->authorized($request, $model)
-                ->visible($request->isMethod('POST') ? 'create' : 'update')
-                ->subResource(false)
-                ->each(static function (Field $field) use ($request, $model): void {
-                    $field->resolveHydrate($request, $model, $field->getValueForHydrate($request));
-                });
-        });
-    }
-
     /**
      * Make a form response.
      */
@@ -717,8 +701,9 @@ public function toCreate(Request $request): array
             'uploads' => $this->hasFileField($request),
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
-                ->authorized($request, $model)
                 ->visible('create')
+                ->hydrateFromRequest($request, $model)
+                ->authorized($request, $model)
                 ->mapToInputs($request, $model),
             'abilities' => $this->mapResourceAbilities($request),
         ]);
@@ -776,8 +761,9 @@ public function toEdit(Request $request, Model $model): array
             'uploads' => $this->hasFileField($request),
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
-                ->authorized($request, $model)
                 ->visible('update')
+                ->hydrateFromRequest($request, $model)
+                ->authorized($request, $model)
                 ->mapToInputs($request, $model),
             'abilities' => array_merge(
                 $this->mapResourceAbilities($request),