- Cleanup

Author: rappasoft

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
-All notable changes to `livewire-tables` will be documented in this file
+All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## 1.0.0 - 2020-03-23
+## 1.0.0 - 2020-XX-XX
 
 - Initial release

composer.json

@@ -19,12 +19,10 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
-        "illuminate/support": "^6.0|^7.0"
+        "php": "^7.2.5"
     },
     "require-dev": {
         "livewire/livewire": "^1.0",
-        "orchestra/testbench": "^4.0|^5.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {

config/laravel-livewire-tables.php

@@ -104,22 +104,20 @@ public function models() : Builder
     {
         $models = $this->query();
 
-        if ($this->searchEnabled && $this->search) {
+        if ($this->searchEnabled && trim($this->search) !== '') {
             $models->where(function (Builder $query) {
                 foreach ($this->columns() as $column) {
                     if ($column->searchable) {
                         if (is_callable($column->searchCallback)) {
                             $query = app()->call($column->searchCallback, ['builder' => $query, 'term' => $this->search]);
+                        } elseif (Str::contains($column->attribute, '.')) {
+                            $relationship = $this->relationship($column->attribute);
+ 
+                            $query->orWhereHas($relationship->name, function (Builder $query) use ($relationship) {
+                                $query->where($relationship->attribute, 'like', '%' . $this->search . '%');
+                            });
                         } else {
-                            if (Str::contains($column->attribute, '.')) {
-                                $relationship = $this->relationship($column->attribute);
-
-                                $query->orWhereHas($relationship->name, function (Builder $query) use ($relationship) {
-                                    $query->where($relationship->attribute, 'like', '%' . $this->search . '%');
-                                });
-                            } else {
-                                $query->orWhere($query->getModel()->getTable() . '.' . $column->attribute, 'like', '%' . $this->search . '%');
-                            }
+                            $query->orWhere($query->getModel()->getTable() . '.' . $column->attribute, 'like', '%' . $this->search . '%');
                         }
                     }
                 }

src/Http/Livewire/TableComponent.php

@@ -15,21 +15,6 @@ class LivewireTablesServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if ($this->app->runningInConsole()) {
-            $this->publishes([
-                __DIR__.'/../config/laravel-livewire-tables.php' => config_path('laravel-livewire-tables.php'),
-            ], 'config');
-        }
-
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'laravel-livewire-tables');
     }
-
-    /**
-     * Register the application services.
-     */
-    public function register()
-    {
-        // Register the config file
-        $this->mergeConfigFrom(__DIR__.'/../config/laravel-livewire-tables.php', 'laravel-livewire-tables');
-    }
 }