Skip to content

Move Filter View Traits #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2025
Merged

Move Filter View Traits #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
614e263
Initial Migration for FilterView Traits
lrljoe Jan 26, 2025
6454a90
Fix styling
lrljoe Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Views/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views;

use Illuminate\Support\Str;
use Rappasoft\LaravelLivewireTables\Views\Traits\IsFilter;
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\IsFilter;

abstract class Filter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Filters/BooleanFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\HasWireables;

class BooleanFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/DateFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, IsStringFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasWireables, IsStringFilter};

class DateFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/DateRangeFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use Carbon\Carbon;
use Illuminate\Support\Facades\Validator;
use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, HasOptions};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasOptions, HasWireables};

class DateRangeFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/DateTimeFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesDates, HasConfig, IsStringFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesDates, HasConfig, HasWireables, IsStringFilter};

class DateTimeFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/LivewireComponentArrayFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter, IsLivewireComponentFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter, IsLivewireComponentFilter};

class LivewireComponentArrayFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/LivewireComponentFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\IsLivewireComponentFilter;
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasWireables, IsLivewireComponentFilter};

class LivewireComponentFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/MultiSelectDropdownFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

use Illuminate\Support\Collection;
use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter};

class MultiSelectDropdownFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/MultiSelectFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsArrayFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsArrayFilter};

class MultiSelectFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/NumberFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsNumericFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasWireables, IsNumericFilter};

class NumberFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/NumberRangeFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables};

class NumberRangeFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/SelectFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

use Illuminate\Support\Collection;
use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions, IsStringFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HasOptions, HasWireables, IsStringFilter};

class SelectFilter extends Filter
{
Expand Down
3 changes: 1 addition & 2 deletions src/Views/Filters/TextFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Rappasoft\LaravelLivewireTables\Views\Filters;

use Rappasoft\LaravelLivewireTables\Views\Filter;
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HandlesWildcardStrings, IsStringFilter};
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\{HandlesWildcardStrings, HasWireables, IsStringFilter};

class TextFilter extends Filter
{
Expand Down
2 changes: 1 addition & 1 deletion ...its/Configuration/FilterConfiguration.php → ...ws/Filters/Traits/FilterConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait FilterConfiguration
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Helpers/FilterHelpers.php → src/Views/Filters/Traits/FilterHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Rappasoft\LaravelLivewireTables\Views\Filter;

Expand Down
2 changes: 1 addition & 1 deletion .../Traits/Filters/HandlesApplyingFilter.php → .../Filters/Traits/HandlesApplyingFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HandlesApplyingFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/HandlesDates.php → src/Views/Filters/Traits/HandlesDates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Carbon\Carbon;

Expand Down
2 changes: 1 addition & 1 deletion ...Views/Traits/Filters/HandlesFieldName.php → ...Views/Filters/Traits/HandlesFieldName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HandlesFieldName
{
Expand Down
2 changes: 1 addition & 1 deletion ...Traits/Filters/HandlesWildcardStrings.php → ...Filters/Traits/HandlesWildcardStrings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Illuminate\Database\Eloquent\Builder;

Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/HasConfig.php → src/Views/Filters/Traits/HasConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HasConfig
{
Expand Down
2 changes: 1 addition & 1 deletion ...iews/Traits/Filters/HasCustomPosition.php → ...iews/Filters/Traits/HasCustomPosition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HasCustomPosition
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/HasOptions.php → src/Views/Filters/Traits/HasOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HasOptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/HasPillsLocale.php → src/Views/Filters/Traits/HasPillsLocale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait HasPillsLocale
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/HasVisibility.php → src/Views/Filters/Traits/HasVisibility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasVisibility as HasCoreVisibility;

Expand Down
10 changes: 10 additions & 0 deletions src/Views/Filters/Traits/HasWireables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables as HasWireablesCore;

trait HasWireables
{
use HasWireablesCore;
}
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/IsArrayFilter.php → src/Views/Filters/Traits/IsArrayFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait IsArrayFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/IsExternalArrayFilter.php → .../Filters/Traits/IsExternalArrayFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Livewire\Attributes\{Modelable, On, Renderless};

Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/IsExternalFilter.php → ...Views/Filters/Traits/IsExternalFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Livewire\Attributes\Modelable;

Expand Down
7 changes: 2 additions & 5 deletions src/Views/Traits/IsFilter.php → src/Views/Filters/Traits/IsFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Rappasoft\LaravelLivewireTables\Traits\Core\HasLocalisations;
use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\FilterConfiguration;
use Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition, HasVisibility};
use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers;
use Rappasoft\LaravelLivewireTables\Views\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};

trait IsFilter
{
Expand Down
2 changes: 1 addition & 1 deletion ...its/Filters/IsLivewireComponentFilter.php → ...ters/Traits/IsLivewireComponentFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;

Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/IsNumericFilter.php → src/Views/Filters/Traits/IsNumericFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait IsNumericFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Traits/Filters/IsStringFilter.php → src/Views/Filters/Traits/IsStringFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;

trait IsStringFilter
{
Expand Down
2 changes: 1 addition & 1 deletion .../Styling/HandlesFilterInputAttributes.php → .../Styling/HandlesFilterInputAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;

use Illuminate\View\ComponentAttributeBag;

Expand Down
2 changes: 1 addition & 1 deletion .../Styling/HandlesFilterLabelAttributes.php → .../Styling/HandlesFilterLabelAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;

use Illuminate\View\ComponentAttributeBag;

Expand Down
Loading