Merge branch 'develop' into DeltaSystems-master-rappasoft

rappasoft · rappasoft · commit 3c564eb1ca85 · 2021-05-18T22:57:31.000-04:00
# Conflicts:
#	CHANGELOG.md
diff --git a/database/migrations/create_test_tables.php.stub b/database/migrations/create_test_tables.php.stub
@@ -35,5 +35,17 @@ class CreateTestTables extends Migration
             $table->foreign('species_id')->references('id')->on('species');
             $table->foreign('breed_id')->references('id')->on('breeds');
         });
+
+        Schema::create('veterinaries', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->index();
+            $table->string('phone')->index();
+        });
+
+        Schema::create('pet_veterinary', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('pet_id')->constrained();
+            $table->foreignId('veterinary_id')->constrained();
+        });
     }
 }
diff --git a/resources/views/bootstrap-4/includes/filter-pills.blade.php b/resources/views/bootstrap-4/includes/filter-pills.blade.php
@@ -8,7 +8,7 @@
                     wire:key="filter-pill-{{ $key }}"
                     class="badge badge-pill badge-info d-inline-flex align-items-center"
                 >
-                    {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
+                    {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:
                     @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
                         {{ $customFilters[$key]->options()[$value] ?? $value }}
                     @else
diff --git a/resources/views/bootstrap-4/includes/pagination.blade.php b/resources/views/bootstrap-4/includes/pagination.blade.php
@@ -1,5 +1,5 @@
 @if ($showPagination)
-    @if ($paginationEnabled && $showPerPage && $rows->lastPage() > 1)
+    @if ($paginationEnabled && $rows->lastPage() > 1)
         <div class="row">
             <div class="col-12 col-md-6">
                 {{ $rows->links() }}
diff --git a/resources/views/bootstrap-4/includes/sorting-pills.blade.php b/resources/views/bootstrap-4/includes/sorting-pills.blade.php
@@ -7,7 +7,7 @@
                 wire:key="sorting-pill-{{ $col }}"
                 class="badge badge-pill badge-info d-inline-flex align-items-center"
             >
-                <span>{{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>
+                <span>{{ $sortNames[$col] ?? collect($this->columns())->pluck('text', 'column')->get($col, ucwords(strtr($col, ['_' => ' ', '-' => ' ']))) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>
 
                 <a
                     href="#"
diff --git a/resources/views/bootstrap-5/includes/filter-pills.blade.php b/resources/views/bootstrap-5/includes/filter-pills.blade.php
@@ -8,7 +8,7 @@
                     wire:key="filter-pill-{{ $key }}"
                     class="badge rounded-pill bg-info d-inline-flex align-items-center"
                 >
-                    {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
+                    {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:
                     @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
                         {{ $customFilters[$key]->options()[$value] ?? $value }}
                     @else
diff --git a/resources/views/bootstrap-5/includes/pagination.blade.php b/resources/views/bootstrap-5/includes/pagination.blade.php
@@ -1,5 +1,5 @@
 @if ($showPagination)
-    @if ($paginationEnabled && $showPerPage && $rows->lastPage() > 1)
+    @if ($paginationEnabled && $rows->lastPage() > 1)
         <div class="row">
             <div class="col-12 col-md-6">
                 {{ $rows->links() }}
diff --git a/resources/views/bootstrap-5/includes/sorting-pills.blade.php b/resources/views/bootstrap-5/includes/sorting-pills.blade.php
@@ -7,7 +7,7 @@
                 wire:key="sorting-pill-{{ $col }}"
                 class="badge rounded-pill bg-info d-inline-flex align-items-center"
             >
-                <span>{{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>
+                <span>{{ $sortNames[$col] ?? collect($this->columns())->pluck('text', 'column')->get($col, ucwords(strtr($col, ['_' => ' ', '-' => ' ']))) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>
 
                 <a
                     href="#"
diff --git a/resources/views/tailwind/includes/filter-pills.blade.php b/resources/views/tailwind/includes/filter-pills.blade.php
@@ -8,7 +8,7 @@
                     wire:key="filter-pill-{{ $key }}"
                     class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"
                 >
-                    {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
+                    {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:
                     @if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
                         {{ $customFilters[$key]->options()[$value] ?? $value }}
                     @else
diff --git a/resources/views/tailwind/includes/pagination.blade.php b/resources/views/tailwind/includes/pagination.blade.php
@@ -1,6 +1,6 @@
 @if ($showPagination)
     <div class="p-6 md:p-0">
-        @if ($paginationEnabled && $showPerPage && $rows->lastPage() > 1)
+        @if ($paginationEnabled && $rows->lastPage() > 1)
             {{ $rows->links() }}
         @else
             <p class="text-sm text-gray-700 leading-5">
diff --git a/resources/views/tailwind/includes/sorting-pills.blade.php b/resources/views/tailwind/includes/sorting-pills.blade.php
@@ -7,7 +7,7 @@
                 wire:key="sorting-pill-{{ $col }}"
                 class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"
             >
-                {{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}
+                {{ $sortNames[$col] ?? collect($this->columns())->pluck('text', 'column')->get($col, ucwords(strtr($col, ['_' => ' ', '-' => ' ']))) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}
 
                 <button
                     wire:click="removeSort('{{ $col }}')"
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
@@ -64,7 +64,7 @@ public function resetBulk(): void
     public function selectedRowsQuery()
     {
         return (clone $this->rowsQuery())
-            ->unless($this->selectAll, fn ($query) => $query->whereIn($this->primaryKey, $this->selected));
+            ->unless($this->selectAll, fn ($query) => $query->whereIn($query->qualifyColumn($this->primaryKey), $this->selected));
     }
 
     /**
@@ -77,7 +77,7 @@ public function getSelectedRowsQueryProperty()
 
     public function selectedKeys(): array
     {
-        return $this->selectedRowsQuery()->pluck($this->primaryKey)->toArray();
+        return $this->selectedRowsQuery()->pluck($this->rowsQuery()->qualifyColumn($this->primaryKey))->toArray();
     }
 
     public function getSelectedKeysProperty(): array
diff --git a/tests/Http/Livewire/CatsTable.php b/tests/Http/Livewire/CatsTable.php
diff --git a/tests/Http/Livewire/PetVeterinariesTable.php b/tests/Http/Livewire/PetVeterinariesTable.php
@@ -0,0 +1,41 @@
+<?php
+
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+
+class PetVeterinariesTable extends DataTableComponent
+{
+    public Pet $pet;
+
+    public array $bulkActions = [
+        'count' => 'Count selected',
+    ];
+
+    public function query(): Relation
+    {
+        return $this->pet->veterinaries();
+    }
+
+    public function columns(): array
+    {
+        return [
+            Column::make('Name', 'name')
+                ->searchable(),
+            Column::make('Phone', 'phone')
+                ->searchable(function (Builder $query, $search) {
+                    $query->orWhere('phone', '=', $search);
+                }),
+        ];
+    }
+
+    public function count(): int
+    {
+        return $this->selectedRowsQuery()->count();
+    }
+}
diff --git a/tests/Models/Pet.php b/tests/Models/Pet.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property int $id
@@ -64,4 +65,9 @@ public function breed()
     {
         return $this->belongsTo(Breed::class);
     }
+
+    public function veterinaries(): BelongsToMany
+    {
+        return $this->belongsToMany(Veterinary::class);
+    }
 }
diff --git a/tests/Models/Veterinary.php b/tests/Models/Veterinary.php
@@ -0,0 +1,45 @@
+<?php
+
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Veterinary extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'veterinaries';
+
+    /**
+     * The primary key for the model.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * @var bool
+     */
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'name',
+        'phone',
+    ];
+
+    public function pets(): BelongsToMany
+    {
+        return $this->belongsToMany(Pet::class);
+    }
+}
diff --git a/tests/RelationshipDataTableComponentTest.php b/tests/RelationshipDataTableComponentTest.php
@@ -5,7 +5,8 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
-use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\CatsTable;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetVeterinariesTable;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 
 class RelationshipDataTableComponentTest extends TestCase
 {
@@ -15,7 +16,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->table = new CatsTable();
+        $this->table = new PetVeterinariesTable();
+        $this->table->pet = Pet::find(1);
     }
 
     /** @test */
@@ -29,7 +31,7 @@ public function columns(): void
     {
         $columns = $this->table->columns();
 
-        $this->assertCount(5, $columns);
+        $this->assertCount(2, $columns);
     }
 
     /** @test */
@@ -71,30 +73,37 @@ public function pagination_disabled(): void
     /** @test */
     public function search_filter(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->assertEquals(1, $this->table->getRowsProperty()->total());
     }
 
     /** @test */
     public function search_filter_reset(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->table->resetFilters();
         $this->assertEquals(1, $this->table->rows->total());
     }
 
     /** @test */
     public function search_filter_remove(): void
     {
-        $this->table->filters['search'] = 'Cartman';
+        $this->table->filters['search'] = 'John';
         $this->table->removeFilter('search');
         $this->assertEquals(2, $this->table->rows->total());
     }
 
     /** @test */
     public function search_filter_callback(): void
     {
-        $this->table->filters['search'] = '22';
+        $this->table->filters['search'] = '123456798';
         $this->assertEquals(1, $this->table->getRowsProperty()->total());
     }
+
+    /** @test */
+    public function bulk_actions()
+    {
+        $this->table->selected[] = 1;
+        $this->assertEquals(1, $this->table->count());
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,11 +2,13 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
+use DB;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Rappasoft\LaravelLivewireTables\LaravelLivewireTablesServiceProvider;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Veterinary;
 
 class TestCase extends Orchestra
 {
@@ -44,6 +46,19 @@ protected function setUp(): void
             [ 'id' => 4, 'name' => 'Ben', 'age' => 5, 'species_id' => 3, 'breed_id' => 200 ],
             [ 'id' => 5, 'name' => 'Chico', 'age' => 7, 'species_id' => 3, 'breed_id' => 202 ],
         ]);
+
+        Veterinary::insert([
+            ['id' => 1, 'name' => 'Dr John Smith', 'phone' => "123456798"],
+            ['id' => 2, 'name' => 'Dr Fabio Ivona', 'phone' => "789456123"],
+            ['id' => 3, 'name' => 'Dr Anthony Rappa', 'phone' => "987654321"],
+        ]);
+
+        DB::table('pet_veterinary')->insert([
+            ['id' => 1, 'pet_id' => 1, 'veterinary_id' => 1],
+            ['id' => 2, 'pet_id' => 1, 'veterinary_id' => 2],
+            ['id' => 3, 'pet_id' => 2, 'veterinary_id' => 1],
+            ['id' => 4, 'pet_id' => 2, 'veterinary_id' => 3],
+        ]);
     }
 
     protected function getPackageProviders($app)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`wire:key="filter-pill-{{ $key }}"`
`9`	`9`	`class="badge badge-pill badge-info d-inline-flex align-items-center"`
`10`	`10`	`>`
`11`		`- {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:`
	`11`	`+ {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:`
`12`	`12`	`@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))`
`13`	`13`	`{{ $customFilters[$key]->options()[$value] ?? $value }}`
`14`	`14`	`@else`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`wire:key="sorting-pill-{{ $col }}"`
`8`	`8`	`class="badge badge-pill badge-info d-inline-flex align-items-center"`
`9`	`9`	`>`
`10`		`- <span>{{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>`
	`10`	`+ <span>{{ $sortNames[$col] ?? collect($this->columns())->pluck('text', 'column')->get($col, ucwords(strtr($col, ['_' => ' ', '-' => ' ']))) }}: {{ $dir === 'asc' ? ($sortDirectionNames[$col]['asc'] ?? 'A-Z') : ($sortDirectionNames[$col]['desc'] ?? 'Z-A') }}</span>`
`11`	`11`
`12`	`12`	`<a`
`13`	`13`	`href="#"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`wire:key="filter-pill-{{ $key }}"`
`9`	`9`	`class="badge rounded-pill bg-info d-inline-flex align-items-center"`
`10`	`10`	`>`
`11`		`- {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:`
	`11`	`+ {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:`
`12`	`12`	`@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))`
`13`	`13`	`{{ $customFilters[$key]->options()[$value] ?? $value }}`
`14`	`14`	`@else`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`wire:key="filter-pill-{{ $key }}"`
`9`	`9`	`class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"`
`10`	`10`	`>`
`11`		`- {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:`
	`11`	`+ {{ $filterNames[$key] ?? collect($this->columns())->pluck('text', 'column')->get($key, ucwords(strtr($key, ['_' => ' ', '-' => ' ']))) }}:`
`12`	`12`	`@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))`
`13`	`13`	`{{ $customFilters[$key]->options()[$value] ?? $value }}`
`14`	`14`	`@else`