Adjustments for ComponentColumn

Author: lrljoe

src/Views/Traits/Columns/HasComponentView.php

@@ -2,13 +2,22 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
 
+use Illuminate\Support\Facades\View;
+
 trait HasComponentView
 {
     protected string $componentView;
 
     public function component(string $component): self
     {
-        $this->componentView = 'components.'.$component;
+        if (View::exists('components.'.$component))
+        {
+            $this->componentView = 'components.'.$component;
+        }
+        elseif (View::exists($component))
+        {
+            $this->componentView = $component;    
+        }
 
         return $this;
     }

tests/TestCase.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\DB;
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
+use Rappasoft\LaravelLivewireTables\Tests\TestServiceProvider;
 use Rappasoft\LaravelLivewireTables\LaravelLivewireTablesServiceProvider;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{BreedsTable,PetsTable,PetsTableEvents,PetsTableUnpaginated,PetsTableWithOwner,SpeciesTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\TestComponent;
@@ -35,7 +36,7 @@ class TestCase extends Orchestra
     protected function setUp(): void
     {
         parent::setUp();
-
+        
         if (! Breed::where('id', 1)->get()) {
             include_once __DIR__.'/../database/migrations/create_test_tables.php.stub';
             (new \CreateTestTables)->down();
@@ -139,6 +140,7 @@ protected function setupUnpaginatedTable()
     protected function getPackageProviders($app): array
     {
         return [
+            TestServiceProvider::class,
             LivewireServiceProvider::class,
             LaravelLivewireTablesServiceProvider::class,
             BladeIconsServiceProvider::class,

tests/TestServiceProvider.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Blade;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Components\TestComponent;
+
+class TestServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Blade::component('test-component', TestComponent::class);
+        $this->loadViewsFrom(__DIR__.'/views', 'livewire-tables-test');
+
+    }
+}

tests/Unit/Views/Columns/ComponentColumnTest.php

@@ -7,9 +7,16 @@
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\ComponentColumn;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Components\TestComponent;
+use Illuminate\Support\Facades\Blade;
 
 final class ComponentColumnTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
     public function test_can_set_the_column_title(): void
     {
         $column = ComponentColumn::make('Name', 'name');
@@ -34,4 +41,59 @@ public function test_can_not_be_both_collapsible_on_mobile_and_on_tablet(): void
         $column->getContents($row);
 
     }
+
+    
+    public function test_can_set_custom_slot(): void
+    {
+        $column = ComponentColumn::make('Age 2', 'age')
+        ->attributes(fn ($value, $row, Column $column) => [
+            'age' => $row->age,
+        ])
+        ->slot(fn ($value, $row, Column $column) => [
+            ($row->age < 2) => 'test1',
+            ($row->age > 2) => 'test2',
+        ]);
+        $this->assertTrue($column->hasSlotCallback());
+    }
+
+        
+    public function test_can_get_custom_slot(): void
+    {
+
+        $column = ComponentColumn::make('Age 2', 'age')
+        ->attributes(fn ($value, $row, Column $column) => [
+            'age' => $row->age,
+        ])
+        ->slot(fn ($value, $row, Column $column) => (($row->age < 10) ? 'youngslot' : 'oldslot'))
+        ->component('livewire-tables-test::test');
+
+        $pet1 = Pet::where('age', '>', 11)->first();
+        $pet1_contents = $column->getContents($pet1);
+        $this->assertSame('oldslot',$pet1_contents->getData()['slot']->__toString());
+
+        $pet2 = Pet::where('age', '<', 5)->first();
+        $pet2_contents = $column->getContents($pet2);
+        $this->assertSame('youngslot',$pet2_contents->getData()['slot']->__toString());
+
+    }
+
+    public function test_can_get_attributes(): void
+    {
+
+        $column = ComponentColumn::make('Age 2', 'age')
+        ->attributes(fn ($value, $row, Column $column) => [
+            'age' => $row->age,
+        ])
+        ->slot(fn ($value, $row, Column $column) => (($row->age < 10) ? 'youngslot' : 'oldslot'))
+        ->component('livewire-tables-test::test');
+
+        $pet1 = Pet::where('age', '>', 11)->first();
+        $pet1_contents = $column->getContents($pet1);
+        $this->assertSame(22, $pet1_contents->getData()['attributes']['age']);
+
+        $pet2 = Pet::where('age', '<', 5)->first();
+        $pet2_contents = $column->getContents($pet2);
+        $this->assertSame(2, $pet2_contents->getData()['attributes']['age']);
+
+    }
 }

tests/Unit/Views/Columns/ViewComponentColumnTest.php

@@ -33,7 +33,7 @@ public function test_can_have_component_view(): void
             ]);
 
         $this->assertFalse($column->hasComponentView());
-        $column->component('test-component');
+        $column->component('livewire-tables-test::test');
         $this->assertTrue($column->hasComponentView());
     }
 

tests/Unit/Views/ComponentColumnTest.php

@@ -0,0 +1,3 @@
+<div>
+    test
+</div>