Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cc9a182

Browse files
arkdev1luanfreitasdev
arkdev1
and
luanfreitasdev
authoredMar 30, 2025··
Moved filter attribute functions to separate classes for error "Your configuration files are not serializable." (#1898)
* Refactor filter attributes to use separate classes for input_text, boolean, and number. - Moved filter attribute functions to separate classes for error " Your configuration files are not serializable." * Refactor InputText attributes structure for input and select fields. - Simplified the attribute structure for input and select fields in the InputText class. * Refactor Livewire PowerGrid filter attribute classes for consistent wire:model usage. - Update wire:model usage in Boolean, InputText, and Number filter attribute classes. - Remove unnecessary imports from the code. * wip * wip * Fix filter number class --------- Co-authored-by: luanfreitasdev <luanfreitas10@protonmail.com>
1 parent 5ef4678 commit cc9a182

File tree

11 files changed

+125
-46
lines changed

11 files changed

+125
-46
lines changed
 

‎resources/config/livewire-powergrid.php

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

33
use Illuminate\Support\Js;
4-
use Illuminate\View\ComponentAttributeBag;
54

65
return [
76

@@ -112,38 +111,10 @@
112111
*/
113112

114113
'filter_attributes' => [
115-
'input_text' => function (string $field, string $title): array {
116-
return [
117-
'inputAttributes' => new ComponentAttributeBag([
118-
'wire:model' => 'filters.input_text.' . $field,
119-
'wire:input.live.debounce.600ms' => 'filterInputText(\'' . $field . '\', $event.target.value, \'' . $title . '\')',
120-
]),
121-
'selectAttributes' => new ComponentAttributeBag([
122-
'wire:model' => 'filters.input_text_options.' . $field,
123-
'wire:input.live.debounce.600ms' => 'filterInputTextOptions(\'' . $field . '\', $event.target.value, \'' . $title . '\')',
124-
]),
125-
];
126-
},
127-
'boolean' => function (string $field, string $title): array {
128-
return [
129-
'selectAttributes' => new ComponentAttributeBag([
130-
'wire:input.live.debounce.600ms' => 'filterBoolean(\'' . $field . '\', $event.target.value, \'' . $title . '\')',
131-
'wire:model' => 'filters.boolean.' . $field,
132-
]),
133-
];
134-
},
135-
'number' => function (string $field, array $filter): array {
136-
return [
137-
'inputStartAttributes' => new ComponentAttributeBag([
138-
'wire:model' => 'filters.number.' . $field . '.start',
139-
'wire:input.live.debounce.600ms' => 'filterNumberStart(\'' . $field . '\', ' . Js::from($filter) . ', $event.target.value)',
140-
]),
141-
'inputEndAttributes' => new ComponentAttributeBag([
142-
'wire:model' => 'filters.number.' . $field . '.end',
143-
'wire:input.live.debounce.600ms' => 'filterNumberEnd(\'' . $field . '\', ' . Js::from($filter) . ', $event.target.value)',
144-
]),
145-
];
146-
},
114+
'input_text' => \PowerComponents\LivewirePowerGrid\FilterAttributes\InputText::class,
115+
'boolean' => \PowerComponents\LivewirePowerGrid\FilterAttributes\Boolean::class,
116+
'number' => \PowerComponents\LivewirePowerGrid\FilterAttributes\Number::class,
117+
'select' => \PowerComponents\LivewirePowerGrid\FilterAttributes\Select::class,
147118
],
148119

149120
/*

‎src/Components/Filters/FilterBoolean.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace PowerComponents\LivewirePowerGrid\Components\Filters;
44

5+
use PowerComponents\LivewirePowerGrid\FilterAttributes\Boolean;
6+
57
class FilterBoolean extends FilterBase
68
{
79
public string $key = 'boolean';
@@ -20,8 +22,11 @@ public function label(string $trueLabel, string $falseLabel): FilterBoolean
2022

2123
public static function getWireAttributes(string $field, string $title): array
2224
{
23-
$configAttributes = config('livewire-powergrid.filter_attributes.boolean');
25+
$configAttributes = config('livewire-powergrid.filter_attributes.boolean', Boolean::class);
26+
27+
/** @var callable $class */
28+
$class = new $configAttributes();
2429

25-
return is_callable($configAttributes) ? $configAttributes($field, $title) : [];
30+
return $class($field, $title);
2631
}
2732
}

‎src/Components/Filters/FilterInputText.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace PowerComponents\LivewirePowerGrid\Components\Filters;
44

5+
use PowerComponents\LivewirePowerGrid\FilterAttributes\InputText;
6+
57
class FilterInputText extends FilterBase
68
{
79
public string $key = 'input_text';
@@ -38,9 +40,12 @@ public function operators(array $value = []): FilterInputText
3840

3941
public static function getWireAttributes(string $field, string $title): array
4042
{
41-
$configAttributes = config('livewire-powergrid.filter_attributes.input_text');
43+
$configAttributes = config('livewire-powergrid.filter_attributes.input_text', InputText::class);
44+
45+
/** @var callable $class */
46+
$class = new $configAttributes();
4247

43-
return is_callable($configAttributes) ? $configAttributes($field, $title) : [];
48+
return $class($field, $title);
4449
}
4550

4651
public function placeholder(string $placeholder): FilterInputText

‎src/Components/Filters/FilterNumber.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace PowerComponents\LivewirePowerGrid\Components\Filters;
44

5+
use PowerComponents\LivewirePowerGrid\FilterAttributes\Number;
6+
57
class FilterNumber extends FilterBase
68
{
79
public string $key = 'number';
@@ -38,8 +40,11 @@ public function placeholder(string $min, string $max): FilterNumber
3840

3941
public static function getWireAttributes(string $field, array $filter): array
4042
{
41-
$configAttributes = config('livewire-powergrid.filter_attributes.number');
43+
$configAttributes = config('livewire-powergrid.filter_attributes.number', Number::class);
44+
45+
/** @var callable $class */
46+
$class = new $configAttributes();
4247

43-
return is_callable($configAttributes) ? $configAttributes($field, $filter) : [];
48+
return $class($field, $filter);
4449
}
4550
}

‎src/Components/Filters/FilterSelect.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Closure;
66
use Illuminate\Support\{Collection};
7-
use Illuminate\View\ComponentAttributeBag;
7+
use PowerComponents\LivewirePowerGrid\FilterAttributes\Select;
88

99
class FilterSelect extends FilterBase
1010
{
@@ -59,12 +59,12 @@ public function optionLabel(string $value): FilterSelect
5959

6060
public static function getWireAttributes(string $field, string $title): array
6161
{
62-
return collect()
63-
->put('selectAttributes', new ComponentAttributeBag([
64-
'wire:model' => 'filters.select.' . $field,
65-
'wire:input.live.debounce.600ms' => 'filterSelect(\'' . $field . '\', \'' . $title . '\')',
66-
]))
67-
->all();
62+
$configAttributes = config('livewire-powergrid.filter_attributes.select', Select::class);
63+
64+
/** @var callable $class */
65+
$class = new $configAttributes();
66+
67+
return $class($field, $title);
6868
}
6969

7070
public function params(array $params): FilterSelect

‎src/FilterAttributes/Boolean.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace PowerComponents\LivewirePowerGrid\FilterAttributes;
4+
5+
use Illuminate\View\ComponentAttributeBag;
6+
7+
class Boolean
8+
{
9+
public function __invoke(string $field, string $title): array
10+
{
11+
return [
12+
'selectAttributes' => new ComponentAttributeBag([
13+
'wire:model' => 'filters.boolean.' . $field,
14+
'wire:input.live.debounce.600ms' => "filterBoolean('{$field}', \$event.target.value, '{$title}')",
15+
]),
16+
];
17+
}
18+
}

‎src/FilterAttributes/InputText.php

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
namespace PowerComponents\LivewirePowerGrid\FilterAttributes;
4+
5+
use Illuminate\View\ComponentAttributeBag;
6+
7+
class InputText
8+
{
9+
public function __invoke(string $field, string $title): array
10+
{
11+
return [
12+
'inputAttributes' => new ComponentAttributeBag([
13+
'wire:model' => 'filters.input_text.' . $field,
14+
'wire:input.live.debounce.600ms' => "filterInputText('{$field}', \$event.target.value, '{$title}')",
15+
]),
16+
'selectAttributes' => new ComponentAttributeBag([
17+
'wire:model' => 'filters.input_text_options.' . $field,
18+
'wire:input.live.debounce.600ms' => "filterInputTextOptions('{$field}', \$event.target.value, '{$title}')",
19+
]),
20+
];
21+
}
22+
}

‎src/FilterAttributes/Number.php

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
namespace PowerComponents\LivewirePowerGrid\FilterAttributes;
4+
5+
use Illuminate\Support\Js;
6+
use Illuminate\View\ComponentAttributeBag;
7+
8+
class Number
9+
{
10+
public function __invoke(string $field, array $filter): array
11+
{
12+
return [
13+
'inputStartAttributes' => new ComponentAttributeBag([
14+
'wire:model' => "filters.number.{$field}.start",
15+
'wire:input.live.debounce.600ms' => 'filterNumberStart(\'' . $field . '\', ' . Js::from($filter) . ', $event.target.value)',
16+
]),
17+
'inputEndAttributes' => new ComponentAttributeBag([
18+
'wire:model' => "filters.number.{$field}.end",
19+
'wire:input.live.debounce.600ms' => 'filterNumberEnd(\'' . $field . '\', ' . Js::from($filter) . ', $event.target.value)',
20+
]),
21+
];
22+
}
23+
}

‎src/FilterAttributes/Select.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace PowerComponents\LivewirePowerGrid\FilterAttributes;
4+
5+
use Illuminate\View\ComponentAttributeBag;
6+
7+
class Select
8+
{
9+
public function __invoke(string $field, string $title): array
10+
{
11+
return [
12+
'selectAttributes' => new ComponentAttributeBag([
13+
'wire:model' => 'filters.select.' . $field,
14+
'wire:input.live.debounce.600ms' => 'filterSelect(\'' . $field . '\', \'' . $title . '\')',
15+
]),
16+
];
17+
}
18+
}

‎tests/cypress/mysql.sh

+6
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ composer require power-components/livewire-powergrid
4545
# | ------------------------- |
4646
php artisan key:generate
4747

48+
php artisan optimize:clear
49+
50+
php artisan config:cache
51+
52+
php artisan view:cache
53+
4854
npm install
4955

5056
npm run build

‎tests/cypress/pgsql.sh

+6
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ composer require power-components/livewire-powergrid
4545
# | ------------------------- |
4646
php artisan key:generate
4747

48+
php artisan optimize:clear
49+
50+
php artisan config:cache
51+
52+
php artisan view:cache
53+
4854
npm install
4955

5056
npm run build

0 commit comments

Comments
 (0)
Please sign in to comment.