Merge pull request #287 from rappasoft/develop

rappasoft · web-flow · commit 34820380312e · 2021-05-18T23:05:52.000-04:00
v1.7.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [1.7.0] - 2021-05-18
+
+### Added
+
+- [Ability to turn off filter dropdown](https://github.com/rappasoft/laravel-livewire-tables/pull/285)
+
+### Changed
+
+- [Fix ambiguous column id when using Relation instead of Builder](https://github.com/rappasoft/laravel-livewire-tables/pull/283)
+- [Use column text for sorting and filter pills if no $filterNames or $sortNames exist](https://github.com/rappasoft/laravel-livewire-tables/pull/286)
+- [Fix tailwind pagination view](https://github.com/rappasoft/laravel-livewire-tables/pull/284)
+
 ## [1.6.1] - 2021-05-13
 
 ### Changed
@@ -329,7 +341,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.6.1...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.7.0...development
+[1.7.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.6.1...v1.7.0
 [1.6.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.6.0...v1.6.1
 [1.6.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.5.1...v1.6.0
 [1.5.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.4.0...v1.5.1
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/datatable.blade.php b/resources/views/bootstrap-4/datatable.blade.php
@@ -20,9 +20,11 @@ class="container-fluid p-0"
         <div class="d-md-flex">
             @include('livewire-tables::bootstrap-4.includes.search')
 
-            <div class="ml-0 ml-md-3 mb-3 mb-md-0">
-                @include('livewire-tables::bootstrap-4.includes.filters')
-            </div>
+            @if ($showFilterDropdown)
+                <div class="ml-0 ml-md-3 mb-3 mb-md-0">
+                    @include('livewire-tables::bootstrap-4.includes.filters')
+                </div>
+            @endif
         </div>
 
         <div class="d-md-flex">
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/datatable.blade.php b/resources/views/bootstrap-5/datatable.blade.php
@@ -20,9 +20,11 @@ class="container-fluid p-0"
         <div class="d-md-flex">
             @include('livewire-tables::bootstrap-5.includes.search')
 
-            <div class="ms-0 ms-md-3 mb-3 mb-md-0">
-                @include('livewire-tables::bootstrap-5.includes.filters')
-            </div>
+            @if ($showFilterDropdown)
+                <div class="ms-0 ms-md-3 mb-3 mb-md-0">
+                    @include('livewire-tables::bootstrap-5.includes.filters')
+                </div>
+            @endif
         </div>
 
         <div class="d-md-flex">
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/filters.blade.php b/resources/views/tailwind/includes/filters.blade.php
@@ -1,4 +1,4 @@
-@if ($filtersView || count($customFilters))
+@if ($showFilterDropdown && ($filtersView || count($customFilters)))
     <div
         x-data="{ open: false }"
         @keydown.escape.stop="open = false"
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
@@ -11,7 +11,6 @@
 trait WithBulkActions
 {
     public string $primaryKey = 'id';
-    public bool $showFilters = true;
     public bool $selectPage = false;
     public bool $selectAll = false;
     public $selected = [];
@@ -65,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));
     }
 
     /**
@@ -78,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/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
@@ -27,6 +27,20 @@ trait WithFilters
      */
     public array $filterNames = [];
 
+    /**
+     * Show the filter pills
+     *
+     * @var bool
+     */
+    public bool $showFilters = true;
+
+    /**
+     * Show the filter dropdown
+     *
+     * @var bool
+     */
+    public bool $showFilterDropdown = true;
+
     /**
      * Default filters
      *
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
diff --git a/tests/TestCase.php b/tests/TestCase.php

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`