Feature/rev 13429

composer.json

@@ -4,10 +4,9 @@
     "type": "library",
     "require": {
         "php": "^8.0",
-        "laravel/framework": "8.x|9.x",
+        "laravel/framework": "^8.0|^9.0|^10.0",
         "intervention/image": "^2.5",
-        "psr/container": "^1.0|^2.0",
-        "illuminate/contracts": "8.x|^9.43"
+        "psr/container": "^1.0|^2.0"
     },
     "require-dev": {
         "orchestra/testbench": "^7.17",

src/ChildResource.php

@@ -2,7 +2,7 @@
 
 namespace BadChoice\Thrust;
 
-use BadChoice\Thrust\ResourceManager;
+use BadChoice\Thrust\Facades\Thrust;
 
 abstract class ChildResource extends Resource
 {
@@ -57,6 +57,16 @@ public function parent($object)
     public function getParentHasManyUrlParams($object)
     {
         $parent = $this->parent($object);
-        return $this::$parentChildsRelation && $parent ? [app(ResourceManager::class)->resourceNameFromModel($parent), $parent->id, static::$parentChildsRelation] : null; 
+        return $this::$parentChildsRelation && $parent ? [Thrust::resourceNameFromModel($parent), $parent->id, static::$parentChildsRelation] : null; 
+    }
+
+    public function breadcrumbs(mixed $object): ?string
+    {
+        $parent = $this->parent($object);
+        if(! $parent) {
+            return null;
+        }
+        $parentResource = Thrust::make(Thrust::resourceNameFromModel($parent));
+        return implode(' / ', array_filter([$parentResource->breadcrumbs($parent), $parent->{$parentResource->nameField}]));
     }
 }

src/Controllers/ThrustActionsController.php

@@ -25,14 +25,17 @@ public function toggle($resourceName, $id, $field)
 
     public function create($resourceName)
     {
-        $action      = $this->findActionForResource($resourceName, request('action'));
+        $action = $this->findActionForResource($resourceName, request('action'));
 
         if (! $action) {
             abort(404);
         }
 
         $action->setSelectedTargets(collect(explode(',', request('ids'))));
 
+        if(request('search')) {
+            $resourceName = Thrust::make($resourceName)::$searchResource ?? $resourceName;
+        }
         return view('thrust::actions.create', [
             'action'        => $action,
             'resourceName'  => $resourceName,
@@ -60,13 +63,27 @@ public function perform($resourceName)
         return back()->withMessage($response);
     }
 
+    public function index($resourceName)
+    {
+        $resource = Thrust::make($resourceName);
+
+        return view('thrust::components.actionsIndex', [
+            'actions' => collect($resource->searchActions(request('search'))),
+            'resourceName' => $resource->name(),
+        ]);
+    }
+
     private function findActionForResource($resourceName, $actionClass)
     {
         $resource   = Thrust::make($resourceName);
-        $action     =  collect($resource->actions())->first(function ($action) use ($actionClass) {
+        $action     =  collect($resource->searchActions(request('search')))->first(function ($action) use ($actionClass) {
             return $action instanceof $actionClass;
         });
-        $action->resource = $resource;
+
+        $action->resource = request('search') && $resource::$searchResource
+            ? Thrust::make($resource::$searchResource)
+            : $resource;
+
         return $action;
     }
 }

src/Controllers/ThrustBelongsToManyController.php

@@ -4,6 +4,7 @@
 
 use BadChoice\Thrust\Facades\Thrust;
 use BadChoice\Thrust\Fields\BelongsToMany;
+use BadChoice\Thrust\ResourceGate;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as BelongsToManyBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Controller;
@@ -17,7 +18,10 @@ public function index($resourceName, $id, $relationship)
         $object             = $resource->find($id);
         $belongsToManyField = $resource->fieldFor($relationship);
         $explodedPivotClass = explode('\\', $object->$relationship()->getPivotClass());
+        app(ResourceGate::class)->check($resource, 'index');
+
         return view('thrust::belongsToManyIndex', [
+            'resource'                => $resource,
             'resourceName'            => $resourceName,
             'pivotResourceName'       => end($explodedPivotClass),
             'object'                  => $object,

src/Controllers/ThrustController.php

@@ -26,6 +26,7 @@ public function index($resourceName)
         return view('thrust::index', [
             'resourceName' => $resourceName,
             'resource'     => $resource,
+            'actions'      => collect($resource->actions()),
             'searchable'   => count($resource::$search) > 0,
             'description'  => $resource->getDescription(),
         ]);
@@ -64,15 +65,17 @@ public function editInline($resourceName, $id)
     public function store($resourceName)
     {
         $resource = Thrust::make($resourceName);
-        request()->validate($resource->getValidationRules(null));
+        $resource->validate(request(), null);
+
         try {
             $result = $resource->create(request()->all());
         } catch (\Exception $e) {
             if (request()->ajax()) { return response()->json(["error" => $e->getMessage()], Response::HTTP_UNPROCESSABLE_ENTITY);}
             return back()->withErrors(['message' => $e->getMessage()]);
         }
         if (request()->ajax()) { return response()->json($result);}
-        return back()->withMessage(__('thrust::messages.created'));
+
+        return $this->backWithMessage('created');
     }
 
     public function storeMultiple($resourceName)
@@ -95,22 +98,24 @@ public function storeMultiple($resourceName)
         }
 
         DB::commit();
-        return back()->withMessage(__('thrust::messages.created'));
+
+        return $this->backWithMessage('created');
     }
 
     public function update($resourceName, $id)
     {
         $resource = Thrust::make($resourceName);
         if (! request()->has('inline')) {
-            request()->validate($resource->getValidationRules($id));
+            $resource->validate(request(), $id);
         }
 
         try {
             $resource->update($id, request()->except('inline'));
         } catch (\Exception $e) {
             return back()->withErrors(['message' => $e->getMessage()]);
         }
-        return back()->withMessage(__('thrust::messages.updated'));
+
+        return $this->backWithMessage('updated');
     }
 
     public function delete($resourceName, $id)
@@ -120,7 +125,8 @@ public function delete($resourceName, $id)
         } catch (\Exception $e) {
             return back()->withErrors(['delete' => $e->getMessage()]);
         }
-        return back()->withMessage(__('thrust::messages.deleted'));
+
+        return $this->backWithMessage('deleted');
     }
 
     private function singleResourceIndex($resourceName, $resource)
@@ -131,4 +137,12 @@ private function singleResourceIndex($resourceName, $resource)
             'object'        => $resource->first()
         ]);
     }
+
+    private function backWithMessage(string $message)
+    {
+        if (session()->has('thrust-redirect')) {
+            return redirect(session('thrust-redirect'));
+        }
+        return back()->withMessage(__("thrust::messages.{$message}"));
+    }
 }

src/Controllers/ThrustHasManyController.php

@@ -2,6 +2,7 @@
 
 namespace BadChoice\Thrust\Controllers;
 
+use BadChoice\Thrust\ResourceGate;
 use Illuminate\Routing\Controller;
 use BadChoice\Thrust\Facades\Thrust;
 use BadChoice\Thrust\ChildResource;
@@ -14,13 +15,15 @@ public function index($resourceName, $id, $relationship)
         $object             = $resource->find($id);
         $hasManyField       = $resource->fieldFor($relationship);
         $childResource      = Thrust::make($hasManyField->resourceName)->parentId($id);
+        app(ResourceGate::class)->check($resource, 'index');
 
         $backHasManyURLParams = $resource instanceof ChildResource ? $resource->getParentHasManyUrlParams($object) : null;
 
         return view('thrust::index', [
             'resourceName'            => $hasManyField->resourceName,
             'searchable'              => count($resource::$search) > 0,
             'resource'                => $childResource,
+            'actions'                 => collect($childResource->actions()),
             'parent_id'               => $id,
             'isChild'                 => $resource instanceof ChildResource && $backHasManyURLParams,
             'hasManyBackUrlParams'    => $backHasManyURLParams,

src/Controllers/ThrustImportController.php

@@ -7,6 +7,7 @@
 use BadChoice\Thrust\Importer\Importer;
 use BadChoice\Thrust\ResourceGate;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\DB;
 
 class ThrustImportController extends Controller
 {
@@ -47,6 +48,7 @@ public function store($resourceName)
         app(ResourceGate::class)->check($resource, 'create');
         $importer = new Importer(request('csv'), $resource);
         try {
+            DB::connection()->disableQueryLog();
             $imported = $importer->import(request('mapping'));
         }catch(\Exception $e){
 //            dd($e->validator->errors()->getMessages());

src/Fields/Decimal.php

@@ -5,11 +5,15 @@
 class Decimal extends Text
 {
     protected $asInteger = false;
+    protected $nullable = false;
     public $rowClass = 'text-right';
 
     public function getValue($object)
     {
         $value = parent::getValue($object);
+        if ($value === null & $this->nullable) {
+            return null;
+        }
         if ($value && $this->asInteger) {
             return number_format(floatval($value) / 100.0, 2);
         }
@@ -30,6 +34,12 @@ public function asInteger($asInteger = true)
         return $this;
     }
 
+    public function nullable($nullable = true)
+    {
+        $this->nullable = $nullable;
+        return $this;
+    }
+
     protected function getFieldType()
     {
         return 'number';

src/Fields/Field.php

@@ -18,6 +18,7 @@ abstract class Field
 
     public $showInIndex  = true;
     public $showInEdit   = true;
+    public $showInSearch = false;
     public $policyAction = null;
 
     public $withDesc    = false;
@@ -161,6 +162,12 @@ public function hideInEdit($hideInEdit = true)
         return $this;
     }
 
+    public function showInSearch(bool $show = true): self
+    {
+        $this->showInSearch = $show;
+        return $this;
+    }
+
     public function onlyInEdit()
     {
         $this->showInIndex = false;

src/Fields/Image.php

@@ -18,6 +18,7 @@ class Image extends File implements Prunable
     protected $maxHeight = 400;
     protected $maxWidth  = 400;
     protected $square  = false;
+    protected $forceFilename = null;
 
     protected $maxFileSize = 1024; // 1 MB
 
@@ -28,6 +29,12 @@ public function gravatar($field = 'email', $default = null)
         return $this;
     }
 
+    public function withForcedFilename($filename) : self
+    {
+        $this->forceFilename = $filename;
+        return $this;
+    }
+
     public function maxSize($width, $height)
     {
         $this->maxWidth  = $width;
@@ -92,7 +99,7 @@ public function store($object, $file)
             $image->crop($size, $size);
         }
 
-        $filename   = Str::random(10) . '.png';
+        $filename = $this->forceFilename ?? Str::random(10) . '.png';
         $this->getStorage()->put($this->getPath() . $filename, (string)$image->encode('png'), $this->storageVisibility);
         $this->getStorage()->put($this->getPath() . "{$this->resizedPrefix}{$filename}", (string)$image->resize(100, 100, function ($constraint) {
             $constraint->aspectRatio();

src/Fields/Text.php

@@ -69,7 +69,12 @@ public function getValue($object)
         if (! $object) {
             return null;
         }
-        return htmlspecialchars(parent::getValue($object));
+
+        $value = parent::getValue($object);
+
+        return $value === null
+            ? null
+            : htmlspecialchars($value);
     }
 
     public function allowScripts()

src/Html/Edit.php

@@ -30,7 +30,7 @@ public function getEditFields($multiple = false)
                 return $field->excludeOnMultiple;
             });
         }
-        if ($this->resource::$sortable) {
+        if ($this->resource->canSort()) {
             $fields->prepend(Hidden::make($this->resource::$sortField));
         }
         if ($this->resource instanceof ChildResource) {
@@ -56,6 +56,7 @@ public function show($id, $fullPage = false, $multiple = false)
         return view('thrust::edit', [
             'title'                     => $this->resource->getTitle(),
             'nameField'                 => $this->resource->nameField,
+            'breadcrumbs'               => $this->resource->breadcrumbs($object),
             'resourceName'              => $this->resourceName ? : $this->resource->name(),
             'fields'                    => $this->getEditFields($multiple),
             'object'                    => $object,
@@ -74,7 +75,7 @@ public function showInline($id)
             'nameField'     => $this->resource->nameField,
             'resourceName'  => $this->resource->name(),
             'fields'        => $this->getEditInlineFields(),
-            'sortable'      => $this->resource::$sortable,
+            'sortable'      => $this->resource->canSort(),
             'object'        => $object,
         ])->render();
     }
@@ -87,7 +88,7 @@ public function showBelongsToManyInline($id, $belongsToManyField)
             'nameField'          => $this->resource->nameField,
             'resourceName'       => $this->resource->name(),
             'fields'             => $this->getEditInlineFields(),
-            'sortable'           => $this->resource::$sortable,
+            'sortable'           => $this->resource->canSort(),
             'object'             => $object,
             'belongsToManyField' => $belongsToManyField,
             'relatedName' => $object->{$relation}?->{$belongsToManyField->relationDisplayField},