Enhancements model-grid soft-deletes

Author: z-song

src/Actions/BatchAction.php

@@ -47,6 +47,10 @@ public function retrieveModel(Request $request)
             $key = explode(',', $key);
         }
 
+        if ($this->modelUseSoftDeletes($modelClass)) {
+            return $modelClass::withTrashed()->findOrFail($key);
+        }
+
         return $modelClass::findOrFail($key);
     }
 

src/Actions/GridAction.php

@@ -3,6 +3,7 @@
 namespace Encore\Admin\Actions;
 
 use Encore\Admin\Grid;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Http\Request;
 
 /**
@@ -61,4 +62,15 @@ public function parameters()
     {
         return ['_model' => $this->getModelClass()];
     }
+
+    /**
+     * Indicates if model uses soft-deletes.
+     *
+     * @param $modelClass
+     * @return bool
+     */
+    protected function modelUseSoftDeletes($modelClass)
+    {
+        return in_array(SoftDeletes::class, class_uses_deep($modelClass));
+    }
 }

src/Actions/RowAction.php

@@ -27,11 +27,6 @@ abstract class RowAction extends GridAction
      */
     protected $asColumn = false;
 
-    /**
-     * @var bool
-     */
-    protected $withTrashed = false;
-
     /**
      * Get primary key value of current row.
      *
@@ -121,7 +116,7 @@ public function retrieveModel(Request $request)
 
         $modelClass = str_replace('_', '\\', $request->get('_model'));
 
-        if ($this->withTrashed) {
+        if ($this->modelUseSoftDeletes($modelClass)) {
             return $modelClass::withTrashed()->findOrFail($key);
         }