Fixes for QueryString & Centralising Methods

Author: lrljoe

src/Traits/Filters/HasFilterQueryString.php

@@ -7,7 +7,7 @@
 trait HasFilterQueryString
 {
     #[Locked]
-    public ?bool $queryStringStatusForFilter;
+    public bool $queryStringStatusForFilter = true;
 
     protected ?string $queryStringAliasForFilter;
 

src/Traits/Filters/ManagesFilters.php renamed to src/Traits/Filters/HasFiltersCore.php

@@ -2,14 +2,18 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Filters;
 
-use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\Traits\Filters\Configuration\FilterConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Filters\Helpers\FilterHelpers;
 
-trait ManagesFilters
+trait HasFiltersCore
 {
+    use FilterConfiguration,
+        FilterHelpers;
+        
     /**
      * Sets Filter Default Values
      */
-    public function mountManagesFilters(): void
+    public function mountHasFiltersCore(): void
     {
         $this->restoreFilterValues();
 
@@ -26,12 +30,13 @@ public function mountManagesFilters(): void
         }
     }
 
-    public function bootedManagesFilters(): void
+    public function bootedHasFiltersCore(): void
     {
         $this->setBuilder($this->builder());
 
         foreach ($this->filterComponents as $filterKey => $value) {
             $this->appliedFilters[$filterKey] = $value;
         }
     }
-}
+
+}

src/Traits/WithFilters.php

@@ -4,19 +4,17 @@
 
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Locked;
-use Rappasoft\LaravelLivewireTables\Traits\Filters\{Configuration\FilterConfiguration, HasFilterGenericData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersStatus, HasFiltersVisibility, Helpers\FilterHelpers, ManagesFilters};
+use Rappasoft\LaravelLivewireTables\Traits\Filters\{HasFilterGenericData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersCore, HasFiltersStatus, HasFiltersVisibility};
 
 trait WithFilters
 {
-    use FilterConfiguration,
-        FilterHelpers,
-        HasFiltersStatus,
+    use HasFiltersStatus,
         HasFilterGenericData,
         HasFilterMenu,
         HasFilterPills,
         HasFilterQueryString,
         HasFiltersVisibility,
-        ManagesFilters;
+        HasFiltersCore;
 
     // Set in JS
     public array $filterComponents = [];

tests/Http/Livewire/BaseTable.php

@@ -34,11 +34,11 @@ public function bootAll()
 
         $this->boot();
         $this->bootedComponentUtilities();
-        $this->bootedManagesFilters();
+        $this->bootedHasFiltersCore();
         $this->bootedWithColumns();
         $this->bootedWithColumnSelect();
         $this->booted();
-        $this->mountManagesFilters();
+        $this->mountHasFiltersCore();
         $this->mountComponentUtilities();
         $this->mountWithSorting();
         $this->renderAll($view);

tests/Unit/DataTableComponentTest.php

@@ -68,9 +68,9 @@ public function test_minimum_one_column_expected(): void
     {
         $this->expectException(\Rappasoft\LaravelLivewireTables\Exceptions\NoColumnsException::class);
         $table = new NoColumnsTable;
-        $table->mountManagesFilters();
+        $table->mountHasFiltersCore();
         $table->boot();
-        $table->bootedManagesFilters();
+        $table->bootedHasFiltersCore();
         $table->bootedComponentUtilities();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();

tests/Unit/Traits/WithMountTest.php

@@ -14,7 +14,7 @@ public function test_mounttable_gets_correct_first_item(): void
         $table = new PetsTableMount;
         $table->boot();
         $table->mount(102);
-        $table->mountManagesFilters();
+        $table->mountHasFiltersCore();
         $table->bootedComponentUtilities();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();
@@ -30,9 +30,9 @@ public function test_mounttable_gets_correct_first_item(): void
         $table2 = new PetsTableMount;
         $table2->boot();
         $table2->mount(202);
-        $table2->mountManagesFilters();
+        $table2->mountHasFiltersCore();
         $table2->bootedComponentUtilities();
-        $table2->bootedManagesFilters();
+        $table2->bootedHasFiltersCore();
         $table2->bootedWithColumns();
         $table2->bootedWithColumnSelect();
         $table2->booted();
@@ -46,8 +46,8 @@ public function test_mounttable_gets_correct_first_item(): void
         $table3 = new PetsTableMount;
         $table3->boot();
         $table3->mount();
-        $table3->mountManagesFilters();
-        $table3->bootedManagesFilters();
+        $table3->mountHasFiltersCore();
+        $table3->bootedHasFiltersCore();
         $table3->bootedComponentUtilities();
         $table3->bootedWithColumns();
         $table3->bootedWithColumnSelect();