Added Str macros to use the actions and filters class names as titles and id

Author: Gustavinho

src/Actions/Action.php

@@ -3,6 +3,7 @@
 namespace LaravelViews\Actions;
 
 use LaravelViews\Views\View;
+use Illuminate\Support\Str;
 
 abstract class Action
 {
@@ -35,12 +36,7 @@ public function isRedirect()
 
     public function getId()
     {
-        return $this->camelToDashCase((new \ReflectionClass($this))->getShortName());
-    }
-
-    private function camelToDashCase($camelStr)
-    {
-        return strtolower(preg_replace('%([a-z])([A-Z])%', '\1-\2', $camelStr));
+        return Str::camelToDash((new \ReflectionClass($this))->getShortName());
     }
 
     public function renderIf($item, View $view)

src/Actions/Confirmable.php

@@ -4,7 +4,11 @@
 
 trait Confirmable
 {
-    public function getConfirmationMessage($item = null)
+    /**
+     * Model instance who fired the action, it is null if it
+     * was a bulk action
+     */
+    public function getConfirmationMessage($model = null)
     {
         return __('Do you really want to perform this action?');
     }

src/Actions/WithActions.php

@@ -86,7 +86,7 @@ public function getBulkActionsProperty()
     private function confirmAction($action, $modelId = null)
     {
         $actionData = [
-            'message' => $action->getConfirmationMessage(),
+            'message' => $action->getConfirmationMessage($modelId ? $this->getModelWhoFiredAction($modelId) : null),
             'id' => $action->getId()
         ];
 

src/Filters/BaseFilter.php

@@ -2,8 +2,7 @@
 
 namespace LaravelViews\Filters;
 
-use LaravelViews\Views\View;
-use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class BaseFilter
 {
@@ -52,28 +51,15 @@ public function value()
     public function getTitle()
     {
         if (!$this->title) {
-            return $this->camelToTitle((new \ReflectionClass($this))->getShortName());
+            return Str::classNameAsSentence((new \ReflectionClass($this))->getShortName());
         }
 
         return $this->title;
     }
 
     public function getId()
     {
-        return $this->camelToDashCase((new \ReflectionClass($this))->getShortName());
-    }
-
-    private function camelToTitle($camelStr)
-    {
-        $intermediate = preg_replace('/(?!^)([[:upper:]][[:lower:]]+)/', ' $0', $camelStr);
-        $titleStr = preg_replace('/(?!^)([[:lower:]])([[:upper:]])/', '$1 $2', $intermediate);
-
-        return $titleStr;
-    }
-
-    private function camelToDashCase($camelStr)
-    {
-        return strtolower(preg_replace('%([a-z])([A-Z])%', '\1-\2', $camelStr));
+        return Str::camelToDash((new \ReflectionClass($this))->getShortName());
     }
 
     public function passValuesFromRequestToFilter($values)

src/LaravelViewsServiceProvider.php

@@ -14,6 +14,7 @@
 use LaravelViews\UI\Header;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Str;
 use LaravelViews\Console\GridViewMakeCommand;
 use LaravelViews\Console\ListViewMakeCommand;
 use LaravelViews\Console\MakeViewCommand;
@@ -70,7 +71,8 @@ public function boot()
             ->publish()
             ->bladeDirectives()
             ->loadComponents()
-            ->configFiles();
+            ->configFiles()
+            ->macros();
     }
 
     private function publish()
@@ -159,4 +161,20 @@ private function configFiles()
 
         return $this;
     }
+
+    private function macros()
+    {
+        Str::macro('classNameAsSentence', function ($className) {
+            $intermediate = preg_replace('/(?!^)([[:upper:]][[:lower:]]+)/', ' $0', $className);
+            $titleStr = preg_replace('/(?!^)([[:lower:]])([[:upper:]])/', '$1 $2', $intermediate);
+
+            return $titleStr;
+        });
+
+        Str::macro('camelToDash', function ($str) {
+            return strtolower(preg_replace('%([a-z])([A-Z])%', '\1-\2', $str));
+        });
+
+        return $this;
+    }
 }

tests/TestCase.php

@@ -2,8 +2,9 @@
 
 namespace LaravelViews\Test;
 
+use Illuminate\Translation\TranslationServiceProvider;
+use LaravelViews\Facades\UI;
 use LaravelViews\LaravelViewsServiceProvider;
-use Livewire\Livewire;
 use Livewire\LivewireServiceProvider;
 use Livewire\Testing\TestableLivewire;
 use Orchestra\Testbench\TestCase as TestbenchTestCase;
@@ -47,8 +48,16 @@ protected function getPackageProviders($app)
     {
         return [
 //            \Spatie\LaravelRay\RayServiceProvider::class,
+            TranslationServiceProvider::class,
             LivewireServiceProvider::class,
             LaravelViewsServiceProvider::class,
         ];
     }
+
+    protected function getPackageAliases($app)
+    {
+        return [
+            'UI' => UI::class
+        ];
+    }
 }

tests/Unit/ActionTest.php

@@ -4,9 +4,9 @@
 
 use LaravelViews\Actions\Action;
 use LaravelViews\Actions\Confirmable;
-use PHPUnit\Framework\TestCase as FrameworkTestCase;
+use LaravelViews\Test\TestCase;
 
-class ActionTest extends FrameworkTestCase
+class ActionTest extends TestCase
 {
     public function testShouldBeConfirmed()
     {

tests/Unit/FilterTest.php

@@ -3,7 +3,7 @@
 namespace LaravelViews\Test\Unit;
 
 use LaravelViews\Filters\Filter;
-use PHPUnit\Framework\TestCase as FrameworkTestCase;
+use LaravelViews\Test\TestCase;
 
 class ExampleTest extends Filter
 {
@@ -14,7 +14,7 @@ class ExampleTestWithTitle extends Filter
     protected $title = 'My custom title';
 }
 
-class FilterTest extends FrameworkTestCase
+class FilterTest extends TestCase
 {
     /**
      * A basic unit test example.

tests/Unit/VariantsTest.php

@@ -17,7 +17,7 @@ public function testButtonVariants()
     {
         $this->assertTrue(
             Variants::button('primary')->class() ===
-            'text-white bg-blue-600 hover:bg-blue-500 focus:bg-blue-500 active:bg-blue-500'
+            'text-white bg-blue-600 hover:bg-blue-700 focus:ring-blue-500'
         );
         $this->assertEquals(
             Variants::button('primary-light')->class(),