Skip to content

Commit 0dd22f5

Browse files
committed
Fixes for QueryString & Centralising Methods
1 parent 424ab84 commit 0dd22f5

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

src/Traits/Filters/HasFilterQueryString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
trait HasFilterQueryString
88
{
99
#[Locked]
10-
public ?bool $queryStringStatusForFilter;
10+
public bool $queryStringStatusForFilter = true;
1111

1212
protected ?string $queryStringAliasForFilter;
1313

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
namespace Rappasoft\LaravelLivewireTables\Traits\Filters;
44

5-
use Illuminate\Database\Eloquent\Builder;
5+
use Rappasoft\LaravelLivewireTables\Traits\Filters\Configuration\FilterConfiguration;
6+
use Rappasoft\LaravelLivewireTables\Traits\Filters\Helpers\FilterHelpers;
67

7-
trait ManagesFilters
8+
trait HasFiltersCore
89
{
10+
use FilterConfiguration,
11+
FilterHelpers;
12+
913
/**
1014
* Sets Filter Default Values
1115
*/
12-
public function mountManagesFilters(): void
16+
public function mountHasFiltersCore(): void
1317
{
1418
$this->restoreFilterValues();
1519

@@ -26,12 +30,13 @@ public function mountManagesFilters(): void
2630
}
2731
}
2832

29-
public function bootedManagesFilters(): void
33+
public function bootedHasFiltersCore(): void
3034
{
3135
$this->setBuilder($this->builder());
3236

3337
foreach ($this->filterComponents as $filterKey => $value) {
3438
$this->appliedFilters[$filterKey] = $value;
3539
}
3640
}
37-
}
41+
42+
}

src/Traits/WithFilters.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@
44

55
use Illuminate\Support\Collection;
66
use Livewire\Attributes\Locked;
7-
use Rappasoft\LaravelLivewireTables\Traits\Filters\{Configuration\FilterConfiguration, HasFilterGenericData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersStatus, HasFiltersVisibility, Helpers\FilterHelpers, ManagesFilters};
7+
use Rappasoft\LaravelLivewireTables\Traits\Filters\{HasFilterGenericData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersCore, HasFiltersStatus, HasFiltersVisibility};
88

99
trait WithFilters
1010
{
11-
use FilterConfiguration,
12-
FilterHelpers,
13-
HasFiltersStatus,
11+
use HasFiltersStatus,
1412
HasFilterGenericData,
1513
HasFilterMenu,
1614
HasFilterPills,
1715
HasFilterQueryString,
1816
HasFiltersVisibility,
19-
ManagesFilters;
17+
HasFiltersCore;
2018

2119
// Set in JS
2220
public array $filterComponents = [];

tests/Http/Livewire/BaseTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public function bootAll()
3434

3535
$this->boot();
3636
$this->bootedComponentUtilities();
37-
$this->bootedManagesFilters();
37+
$this->bootedHasFiltersCore();
3838
$this->bootedWithColumns();
3939
$this->bootedWithColumnSelect();
4040
$this->booted();
41-
$this->mountManagesFilters();
41+
$this->mountHasFiltersCore();
4242
$this->mountComponentUtilities();
4343
$this->mountWithSorting();
4444
$this->renderAll($view);

tests/Unit/DataTableComponentTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function test_minimum_one_column_expected(): void
6868
{
6969
$this->expectException(\Rappasoft\LaravelLivewireTables\Exceptions\NoColumnsException::class);
7070
$table = new NoColumnsTable;
71-
$table->mountManagesFilters();
71+
$table->mountHasFiltersCore();
7272
$table->boot();
73-
$table->bootedManagesFilters();
73+
$table->bootedHasFiltersCore();
7474
$table->bootedComponentUtilities();
7575
$table->bootedWithColumns();
7676
$table->bootedWithColumnSelect();

tests/Unit/Traits/WithMountTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function test_mounttable_gets_correct_first_item(): void
1414
$table = new PetsTableMount;
1515
$table->boot();
1616
$table->mount(102);
17-
$table->mountManagesFilters();
17+
$table->mountHasFiltersCore();
1818
$table->bootedComponentUtilities();
1919
$table->bootedWithColumns();
2020
$table->bootedWithColumnSelect();
@@ -30,9 +30,9 @@ public function test_mounttable_gets_correct_first_item(): void
3030
$table2 = new PetsTableMount;
3131
$table2->boot();
3232
$table2->mount(202);
33-
$table2->mountManagesFilters();
33+
$table2->mountHasFiltersCore();
3434
$table2->bootedComponentUtilities();
35-
$table2->bootedManagesFilters();
35+
$table2->bootedHasFiltersCore();
3636
$table2->bootedWithColumns();
3737
$table2->bootedWithColumnSelect();
3838
$table2->booted();
@@ -46,8 +46,8 @@ public function test_mounttable_gets_correct_first_item(): void
4646
$table3 = new PetsTableMount;
4747
$table3->boot();
4848
$table3->mount();
49-
$table3->mountManagesFilters();
50-
$table3->bootedManagesFilters();
49+
$table3->mountHasFiltersCore();
50+
$table3->bootedHasFiltersCore();
5151
$table3->bootedComponentUtilities();
5252
$table3->bootedWithColumns();
5353
$table3->bootedWithColumnSelect();

0 commit comments

Comments
 (0)