Changes

rappasoft · rappasoft · commit 7f464949f05c · 2021-04-22T09:22:32.000-04:00
- Update to $paginationEnabled
- Fix divs
- No need for null coalesce as it will always be a bool
- Moved some properties to traits
- Fixed tests
- Updated changelog and readme
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+### Added
+
+- Ability to disable pagination (https://github.com/rappasoft/laravel-livewire-tables/pull/222)
+
 ## [1.1.0] - 2021-04-21
 
 ### Added
diff --git a/README.md b/README.md
@@ -396,8 +396,9 @@ There are some class level properties you can set:
 | Property | Default | Options | Usage |
 | -------- | ------- | ------- | ----- |
 | $showSearch | true | bool | Show the search box |
-| $showPerPage | true | bool | Show the per page selector |
-| $showPagination | true | bool | Show the pagination |
+| $paginationEnabled | true | bool | Enable pagination or fetch all records with no pagination |
+| $showPerPage | true | bool | Show the per page selector when pagination is enabled |
+| $showPagination | true | bool | Show the pagination when pagination is enabled |
 | $showSorting | true | bool | Show the sorting pills |
 | $showFilters | true | bool | Show the filter pills |
 | $searchFilterDebounce | null | null/int | Adds a debounce of `$searchFilterDebounce` ms to the search input |
diff --git a/resources/views/bootstrap-4/datatable.blade.php b/resources/views/bootstrap-4/datatable.blade.php
@@ -27,10 +27,7 @@ class="container-fluid"
 
         <div class="d-md-flex">
             @include('livewire-tables::bootstrap-4.includes.bulk-actions')
-
-            <div class="ml-0 ml-md-3">
-                @include('livewire-tables::bootstrap-4.includes.per-page')
-            </div>
+            @include('livewire-tables::bootstrap-4.includes.per-page')
         </div>
     </div>
 
diff --git a/resources/views/bootstrap-4/includes/pagination.blade.php b/resources/views/bootstrap-4/includes/pagination.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false && $showPerPage ?? false)
+@if ($paginationEnabled && $showPerPage)
     <div class="row">
         <div class="col-12 col-md-6">
             {{ $rows->links() }}
diff --git a/resources/views/bootstrap-4/includes/per-page.blade.php b/resources/views/bootstrap-4/includes/per-page.blade.php
@@ -1,11 +1,13 @@
-@if ($pagination ?? false && $showPerPage ?? false)
-    <select
-        wire:model="perPage"
-        id="perPage"
-        class="form-control"
-    >
-        <option value="10">10</option>
-        <option value="25">25</option>
-        <option value="50">50</option>
-    </select>
+@if ($paginationEnabled && $showPerPage)
+    <div class="ml-0 ml-md-3">
+        <select
+            wire:model="perPage"
+            id="perPage"
+            class="form-control"
+        >
+            <option value="10">10</option>
+            <option value="25">25</option>
+            <option value="50">50</option>
+        </select>
+    </div>
 @endif
diff --git a/resources/views/bootstrap-5/datatable.blade.php b/resources/views/bootstrap-5/datatable.blade.php
@@ -27,10 +27,7 @@ class="container-fluid"
 
         <div class="d-md-flex">
             @include('livewire-tables::bootstrap-5.includes.bulk-actions')
-
-            <div class="ms-0 ms-md-3">
-                @include('livewire-tables::bootstrap-5.includes.per-page')
-            </div>
+            @include('livewire-tables::bootstrap-5.includes.per-page')
         </div>
     </div>
 
diff --git a/resources/views/bootstrap-5/includes/pagination.blade.php b/resources/views/bootstrap-5/includes/pagination.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false && $showPerPage ?? false)
+@if ($paginationEnabled && $showPerPage)
     <div class="row">
         <div class="col-12 col-md-6">
             {{ $rows->links() }}
diff --git a/resources/views/bootstrap-5/includes/per-page.blade.php b/resources/views/bootstrap-5/includes/per-page.blade.php
@@ -1,11 +1,13 @@
-@if ($pagination ?? false && $showPerPage ?? false)
-    <select
-        wire:model="perPage"
-        id="perPage"
-        class="form-select"
-    >
-        <option value="10">10</option>
-        <option value="25">25</option>
-        <option value="50">50</option>
-    </select>
+@if ($paginationEnabled && $showPerPage)
+    <div class="ms-0 ms-md-3">
+        <select
+            wire:model="perPage"
+            id="perPage"
+            class="form-select"
+        >
+            <option value="10">10</option>
+            <option value="25">25</option>
+            <option value="50">50</option>
+        </select>
+    </div>
 @endif
diff --git a/resources/views/tailwind/datatable.blade.php b/resources/views/tailwind/datatable.blade.php
@@ -25,10 +25,7 @@
 
             <div class="md:space-x-2 md:flex md:items-center">
                 @include('livewire-tables::tailwind.includes.bulk-actions')
-
-                <div class="w-full md:w-auto">
-                    @include('livewire-tables::tailwind.includes.per-page')
-                </div>
+                @include('livewire-tables::tailwind.includes.per-page')
             </div>
         </div>
 
diff --git a/resources/views/tailwind/includes/pagination.blade.php b/resources/views/tailwind/includes/pagination.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false && $showPerPage ?? false)
+@if ($paginationEnabled && $showPerPage)
     <div class="p-6 md:p-0">
         {{ $rows->links() }}
     </div>
diff --git a/resources/views/tailwind/includes/per-page.blade.php b/resources/views/tailwind/includes/per-page.blade.php
@@ -1,11 +1,13 @@
-@if ($pagination ?? false && $showPerPage ?? false)
-    <select
-        wire:model="perPage"
-        id="perPage"
-        class="rounded-md shadow-sm block w-full pl-3 pr-10 py-2 text-base leading-6 border-gray-300 focus:outline-none focus:border-indigo-300 focus:shadow-outline-indigo sm:text-sm sm:leading-5"
-    >
-        <option value="10">10</option>
-        <option value="25">25</option>
-        <option value="50">50</option>
-    </select>
+@if ($paginationEnabled && $showPerPage)
+    <div class="w-full md:w-auto">
+        <select
+            wire:model="perPage"
+            id="perPage"
+            class="rounded-md shadow-sm block w-full pl-3 pr-10 py-2 text-base leading-6 border-gray-300 focus:outline-none focus:border-indigo-300 focus:shadow-outline-indigo sm:text-sm sm:leading-5"
+        >
+            <option value="10">10</option>
+            <option value="25">25</option>
+            <option value="50">50</option>
+        </select>
+    </div>
 @endif
diff --git a/src/DataTableComponent.php b/src/DataTableComponent.php
@@ -39,34 +39,6 @@ abstract class DataTableComponent extends Component
      */
     public bool $showSearch = true;
 
-    /**
-     * Show the per page select.
-     *
-     * @var bool
-     */
-    public bool $showPerPage = true;
-
-    /**
-     * Show the pagination numbers and links.
-     *
-     * @var bool
-     */
-    public bool $showPagination = true;
-
-    /**
-     * Show the sorting indicators.
-     *
-     * @var bool
-     */
-    public bool $showSorting = true;
-
-    /**
-     * Show the filtering indicators.
-     *
-     * @var bool
-     */
-    public bool $showFilters = true;
-
     /**
      * Whether or not to refresh the table at a certain interval
      * false is off
@@ -166,11 +138,11 @@ public function getRowsQueryProperty(): Builder
      */
     public function getRowsProperty()
     {
-        if ($this->pagination ?? false === true) {
+        if ($this->paginationEnabled) {
             return $this->applyPagination($this->rowsQuery);
-        } else {
-            return $this->rowsQuery->get();
         }
+
+        return $this->rowsQuery->get();
     }
 
     /**
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
@@ -7,6 +7,8 @@
  */
 trait WithBulkActions
 {
+
+    public bool $showFilters = true;
     public bool $selectPage = false;
     public bool $selectAll = false;
     public $selected = [];
diff --git a/src/Traits/WithPerPagePagination.php b/src/Traits/WithPerPagePagination.php
@@ -7,21 +7,11 @@
  */
 trait WithPerPagePagination
 {
-    /**
-     * Enable / Disable Pagination
-     *
-     * @var bool
-     */
-    public bool $pagination = true;
 
-    /**
-     * @var int
-     */
+    public bool $paginationEnabled = true;
+    public bool $showPerPage = true;
+    public bool $showPagination = true;
     public int $perPage = 10;
-
-    /**
-     * @var array|int[]
-     */
     protected array $perPageAccepted = [10, 25, 50];
 
     public function mountWithPerPagePagination(): void
diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
@@ -9,6 +9,8 @@
  */
 trait WithSorting
 {
+
+    public bool $showSorting = true;
     public array $sorts = [];
     public array $sortNames = [];
 
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
@@ -46,7 +46,7 @@ public function test_pagination_default(): void
     {
         $this->assertInstanceOf(LengthAwarePaginator::class, $this->table->rows);
         $this->assertEquals(10, $this->table->perPage);
-        $this->assertTrue($this->table->pagination);
+        $this->assertTrue($this->table->paginationEnabled);
         $this->assertTrue($this->table->showPerPage);
     }
 
@@ -62,7 +62,7 @@ public function test_pagination(): void
     /** @test */
     public function test_pagination_disabled(): void
     {
-        $this->table->pagination = false;
+        $this->table->paginationEnabled = false;
         $this->table->perPage = 2;
         $this->assertInstanceOf(Collection::class, $this->table->rows);
         $this->assertCount(5, $this->table->rows);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@if ($pagination ?? false && $showPerPage ?? false)`
	`1`	`+@if ($paginationEnabled && $showPerPage)`
`2`	`2`	`<div class="row">`
`3`	`3`	`<div class="col-12 col-md-6">`
`4`	`4`	`{{ $rows->links() }}`