Allows to use Relation instead of Builder to generate data

Took 8 minutes

Author: fabio-ivona

src/DataTableComponent.php

@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables;
 
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -99,9 +100,9 @@ abstract public function columns(): array;
     /**
      * The base query with search and filters for the table.
      *
-     * @return Builder
+     * @return Builder|Relation
      */
-    abstract public function query(): Builder;
+    abstract public function query();
 
     /**
      * TableComponent constructor.
@@ -124,9 +125,9 @@ public function __construct($id = null)
     /**
      * Get the rows query builder with sorting applied.
      *
-     * @return Builder
+     * @return Builder|Relation
      */
-    public function rowsQuery(): Builder
+    public function rowsQuery()
     {
         $this->cleanFilters();
 

src/Traits/WithBulkActions.php

@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Relation;
 
 /**
  * Trait WithBulkActions.
@@ -58,13 +59,19 @@ public function resetBulk(): void
         $this->selected = [];
     }
 
-    public function selectedRowsQuery(): Builder
+    /**
+     * @return Builder|Relation
+     */
+    public function selectedRowsQuery()
     {
         return (clone $this->rowsQuery())
             ->unless($this->selectAll, fn ($query) => $query->whereIn($this->primaryKey, $this->selected));
     }
 
-    public function getSelectedRowsQueryProperty(): Builder
+    /**
+     * @return Builder|Relation
+     */
+    public function getSelectedRowsQueryProperty()
     {
         return $this->selectedRowsQuery();
     }

src/Traits/WithFilters.php

@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;
 use Rappasoft\LaravelLivewireTables\Views\Column;
@@ -253,10 +254,10 @@ public function getSearchableColumns() : array
     /**
      * Apply Search Filter
      *
-     * @param Builder $query
-     * @return Builder
+     * @param Builder|Relation $query
+     * @return Builder|Relation
      */
-    public function applySearchFilter(Builder $query): Builder
+    public function applySearchFilter($query)
     {
         $searchableColumns = $this->getSearchableColumns();
 

src/Traits/WithSorting.php

@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Builder;
 
 /**
@@ -34,7 +35,12 @@ public function sortBy(string $field): ?string
         return null;
     }
 
-    public function applySorting(Builder $query): Builder
+    /**
+     * @param  Builder|Relation  $query
+     *
+     * @return Builder|Relation
+     */
+    public function applySorting($query)
     {
         foreach ($this->sorts as $field => $direction) {
             if (optional($this->getColumn($field))->hasSortCallback()) {