Fix row action model

Author: odiaseo

src/Form.php

@@ -39,6 +39,7 @@ class Form implements Renderable
     use HasFormAttributes;
     use HandleCascadeFields;
     use ShouldSnakeAttributes;
+
     /**
      * Remove flag in `has many` form.
      */
@@ -183,8 +184,12 @@ public function pushField(Field $field): self
     /**
      * @return Model
      */
-    public function model(): Model
+    public function model(): ?Model
     {
+        if ($this->model instanceof Actions\Interactor\Form) {
+            return $this->model->getRow();
+        }
+
         return $this->model;
     }
 
@@ -224,9 +229,9 @@ public function edit($id): self
     /**
      * Use tab to split form.
      *
-     * @param string  $title
+     * @param string $title
      * @param Closure $content
-     * @param bool    $active
+     * @param bool $active
      *
      * @return $this
      */
@@ -300,12 +305,12 @@ public function destroy($id)
             }
 
             $response = [
-                'status'  => true,
+                'status' => true,
                 'message' => trans('admin.delete_succeeded'),
             ];
         } catch (\Exception $exception) {
             $response = [
-                'status'  => false,
+                'status' => false,
                 'message' => $exception->getMessage() ?: trans('admin.delete_failed'),
             ];
         }
@@ -317,7 +322,7 @@ public function destroy($id)
      * Remove files in record.
      *
      * @param Model $model
-     * @param bool  $forceDelete
+     * @param bool $forceDelete
      */
     protected function deleteFiles(Model $model, $forceDelete = false)
     {
@@ -401,9 +406,9 @@ protected function responseValidationError(MessageBag $message)
     {
         if (\request()->ajax() && !\request()->pjax()) {
             return response()->json([
-                'status'     => false,
+                'status' => false,
                 'validation' => $message,
-                'message'    => $message->first(),
+                'message' => $message->first(),
             ]);
         }
 
@@ -424,7 +429,7 @@ protected function ajaxResponse($message)
         // ajax but not pjax
         if ($request->ajax() && !$request->pjax()) {
             return response()->json([
-                'status'  => true,
+                'status' => true,
                 'message' => $message,
                 'display' => $this->applayFieldDisplay(),
             ]);
@@ -517,7 +522,7 @@ protected function getRelationInputs($inputs = []): array
 
         foreach ($inputs as $column => $value) {
             if ((method_exists($this->model, $column)
-                || method_exists($this->model, $column = Str::camel($column)))
+                    || method_exists($this->model, $column = Str::camel($column)))
                 && !method_exists(Model::class, $column)
             ) {
                 $relation = call_user_func([$this->model, $column]);
@@ -534,7 +539,7 @@ protected function getRelationInputs($inputs = []): array
     /**
      * Handle update.
      *
-     * @param int  $id
+     * @param int $id
      * @param null $data
      *
      * @return bool|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|mixed|null|Response
@@ -605,7 +610,7 @@ public function update($id, $data = null)
     protected function redirectAfterStore()
     {
         $resourcesPath = $this->resource(0);
-        $key           = $this->model->getKey();
+        $key = $this->model->getKey();
 
         return $this->redirectAfterSaving($resourcesPath, $key);
     }
@@ -636,13 +641,13 @@ protected function redirectAfterSaving($resourcesPath, $key)
     {
         if (request('after-save') == 'continue_editing') {
             // continue editing
-            $url = rtrim($resourcesPath, '/')."/{$key}/edit";
+            $url = rtrim($resourcesPath, '/') . "/{$key}/edit";
         } elseif (request('after-save') == 'continue_creating') {
             // continue creating
-            $url = rtrim($resourcesPath, '/').'/create';
+            $url = rtrim($resourcesPath, '/') . '/create';
         } elseif (request('after-save') == 'view') {
             // view resource
-            $url = rtrim($resourcesPath, '/')."/{$key}";
+            $url = rtrim($resourcesPath, '/') . "/{$key}";
         } elseif (request('after-save') == 'exit') {
             // return message
             return trans('admin.save_succeeded');
@@ -673,7 +678,7 @@ protected function isEditable(array $input = []): bool
     /**
      * Handle updates for single column.
      *
-     * @param int   $id
+     * @param int $id
      * @param array $data
      *
      * @return array|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|Response
@@ -684,7 +689,7 @@ protected function handleColumnUpdates($id, $data)
 
         if ($this->handleOrderable($id, $data)) {
             return response([
-                'status'  => true,
+                'status' => true,
                 'message' => trans('admin.update_succeeded'),
             ]);
         }
@@ -702,7 +707,7 @@ protected function handleColumnUpdates($id, $data)
     protected function handleEditable(array $input = []): array
     {
         if (array_key_exists('_editable', $input)) {
-            $name  = $input['name'];
+            $name = $input['name'];
             $value = $input['value'];
 
             Arr::forget($input, ['pk', 'value', 'name']);
@@ -715,7 +720,7 @@ protected function handleEditable(array $input = []): array
     /**
      * Handle orderable update.
      *
-     * @param int   $id
+     * @param int $id
      * @param array $input
      *
      * @return bool
@@ -768,7 +773,7 @@ protected function updateRelation($relationsData)
                 || $relation instanceof Relations\BelongsTo;
 
             $isRelationUpdate = true;
-            $prepared         = $this->prepareUpdate([$name => $values], $oneToOneRelation, $isRelationUpdate);
+            $prepared = $this->prepareUpdate([$name => $values], $oneToOneRelation, $isRelationUpdate);
 
             if (empty($prepared)) {
                 continue;
@@ -839,7 +844,7 @@ protected function updateRelation($relationsData)
      * Prepare input data for update.
      *
      * @param array $updates
-     * @param bool  $oneToOneRelation If column is one-to-one relation.
+     * @param bool $oneToOneRelation If column is one-to-one relation.
      *
      * @return array
      */
@@ -876,13 +881,13 @@ protected function prepareUpdate(array $updates, $oneToOneRelation = false, $isR
 
     /**
      * @param string|array $columns
-     * @param bool         $containsDot
+     * @param bool $containsDot
      *
      * @return bool
      */
     protected function isInvalidColumn($columns, $containsDot = false): bool
     {
-        foreach ((array) $columns as $column) {
+        foreach ((array)$columns as $column) {
             if ((!$containsDot && Str::contains($column, '.'))
                 || ($containsDot && !Str::contains($column, '.'))) {
                 return true;
@@ -955,13 +960,13 @@ protected function isHasOneRelation($inserts): bool
      */
     public function ignore($fields): self
     {
-        $this->ignored = array_merge($this->ignored, (array) $fields);
+        $this->ignored = array_merge($this->ignored, (array)$fields);
 
         return $this;
     }
 
     /**
-     * @param array        $data
+     * @param array $data
      * @param string|array $columns
      *
      * @return array|mixed
@@ -1055,7 +1060,7 @@ protected function setFieldValue($id)
     /**
      * Add a fieldset to form.
      *
-     * @param string  $title
+     * @param string $title
      * @param Closure $setCallback
      *
      * @return Field\Fieldset
@@ -1178,7 +1183,7 @@ public function setAction($action): self
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
     {
         $this->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
-            /* @var Field $field  */
+            /* @var Field $field */
             $field->setWidth($fieldWidth, $labelWidth);
         });
 
@@ -1426,7 +1431,7 @@ public function render()
      * Get or set input data.
      *
      * @param string $key
-     * @param null   $value
+     * @param null $value
      *
      * @return array|mixed
      */
@@ -1442,7 +1447,7 @@ public function input($key, $value = null)
     /**
      * Add a new layout column.
      *
-     * @param int      $width
+     * @param int $width
      * @param \Closure $closure
      *
      * @return $this
@@ -1480,7 +1485,7 @@ public function __get($name)
      * Setter.
      *
      * @param string $name
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @return array
      */
@@ -1505,7 +1510,7 @@ public function __isset($name)
      * Generate a Field object and add to form builder if Field exists.
      *
      * @param string $method
-     * @param array  $arguments
+     * @param array $arguments
      *
      * @return Field
      */