Merge branch 'feature-searchable' of https://github.com/DeltaSystems/laravel-livewire-tables into feature-searchable

Author: bdelamatre

src/Utilities/ColumnUtilities.php

@@ -3,7 +3,6 @@
 namespace Rappasoft\LaravelLivewireTables\Utilities;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as Builder;
 use Illuminate\Support\Str;
 
@@ -66,23 +65,22 @@ public static function hasWildcardMatch($column, $searchColumns)
         return count(array_filter($searchColumns ?? [], function ($searchColumn) use ($column) {
 
                 // match wildcards such as * or table.*
-                $hasWildcard = Str::endsWith($searchColumn, '*');
+            $hasWildcard = Str::endsWith($searchColumn, '*');
 
-                // if no wildcard, skip
-                if (! $hasWildcard) {
-                    return false;
-                }
-
-                if (! self::hasRelation($column)) {
-                    return true;
-                } else {
-                    $selectColumnPrefix = self::parseRelation($searchColumn);
-                    $columnPrefix = self::parseRelation($column);
+            // if no wildcard, skip
+            if (! $hasWildcard) {
+                return false;
+            }
 
-                    return $selectColumnPrefix === $columnPrefix;
-                }
+            if (! self::hasRelation($column)) {
+                return true;
+            } else {
+                $selectColumnPrefix = self::parseRelation($searchColumn);
+                $columnPrefix = self::parseRelation($column);
 
-            })) > 0;
+                return $selectColumnPrefix === $columnPrefix;
+            }
+        })) > 0;
     }
 
     /**
@@ -165,20 +163,16 @@ public static function mapToSelected($column, $queryBuilder)
 
         // this is easiest when using the eloquent query builder
         } elseif ($queryBuilder instanceof EloquentBuilder) {
-
             $relation = $queryBuilder->getRelation($relationName);
             $possibleTable = $relation->getModel()->getTable();
-
         } elseif ($queryBuilder instanceof Builder) {
 
             // @todo: possible ways to do this?
             $possibleTable = null;
-
         } else {
 
             // we would have already returned before this is possible
             $possibleTable = null;
-
         }
 
         // if we found a possible table

tests/ColumnUtilitiesTest.php

@@ -2,10 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use Rappasoft\LaravelLivewireTables\DataTableComponent;
-use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;