Move Filter View Traits (#2189)

* Initial Migration for FilterView Traits * Fix styling
rappasoft · Jan 26, 2025 · d56dc78 · d56dc78
1 parent 3f18055
commit d56dc78
Show file tree

Hide file tree

Showing 34 changed files with 44 additions and 48 deletions.
diff --git a/src/Views/Filter.php b/src/Views/Filter.php
@@ -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
 {

diff --git a/src/Views/Filters/BooleanFilter.php b/src/Views/Filters/BooleanFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/DateRangeFilter.php b/src/Views/Filters/DateRangeFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/LivewireComponentArrayFilter.php b/src/Views/Filters/LivewireComponentArrayFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/LivewireComponentFilter.php b/src/Views/Filters/LivewireComponentFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/MultiSelectDropdownFilter.php b/src/Views/Filters/MultiSelectDropdownFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/MultiSelectFilter.php b/src/Views/Filters/MultiSelectFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/NumberRangeFilter.php b/src/Views/Filters/NumberRangeFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/SelectFilter.php b/src/Views/Filters/SelectFilter.php
@@ -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
 {

diff --git a/src/Views/Filters/TextFilter.php b/src/Views/Filters/TextFilter.php
@@ -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
 {

diff --git a/...its/Configuration/FilterConfiguration.php → ...ws/Filters/Traits/FilterConfiguration.php b/...its/Configuration/FilterConfiguration.php → ...ws/Filters/Traits/FilterConfiguration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait FilterConfiguration
 {

diff --git a/src/Views/Traits/Helpers/FilterHelpers.php → src/Views/Filters/Traits/FilterHelpers.php b/src/Views/Traits/Helpers/FilterHelpers.php → src/Views/Filters/Traits/FilterHelpers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 

diff --git a/.../Traits/Filters/HandlesApplyingFilter.php → .../Filters/Traits/HandlesApplyingFilter.php b/.../Traits/Filters/HandlesApplyingFilter.php → .../Filters/Traits/HandlesApplyingFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HandlesApplyingFilter
 {

diff --git a/src/Views/Traits/Filters/HandlesDates.php → src/Views/Filters/Traits/HandlesDates.php b/src/Views/Traits/Filters/HandlesDates.php → src/Views/Filters/Traits/HandlesDates.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Carbon\Carbon;
 

diff --git a/...Views/Traits/Filters/HandlesFieldName.php → ...Views/Filters/Traits/HandlesFieldName.php b/...Views/Traits/Filters/HandlesFieldName.php → ...Views/Filters/Traits/HandlesFieldName.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HandlesFieldName
 {

diff --git a/...Traits/Filters/HandlesWildcardStrings.php → ...Filters/Traits/HandlesWildcardStrings.php b/...Traits/Filters/HandlesWildcardStrings.php → ...Filters/Traits/HandlesWildcardStrings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
 

diff --git a/src/Views/Traits/Filters/HasConfig.php → src/Views/Filters/Traits/HasConfig.php b/src/Views/Traits/Filters/HasConfig.php → src/Views/Filters/Traits/HasConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasConfig
 {

diff --git a/...iews/Traits/Filters/HasCustomPosition.php → ...iews/Filters/Traits/HasCustomPosition.php b/...iews/Traits/Filters/HasCustomPosition.php → ...iews/Filters/Traits/HasCustomPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasCustomPosition
 {

diff --git a/src/Views/Traits/Filters/HasOptions.php → src/Views/Filters/Traits/HasOptions.php b/src/Views/Traits/Filters/HasOptions.php → src/Views/Filters/Traits/HasOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasOptions
 {

diff --git a/src/Views/Traits/Filters/HasPillsLocale.php → src/Views/Filters/Traits/HasPillsLocale.php b/src/Views/Traits/Filters/HasPillsLocale.php → src/Views/Filters/Traits/HasPillsLocale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait HasPillsLocale
 {

diff --git a/src/Views/Traits/Filters/HasVisibility.php → src/Views/Filters/Traits/HasVisibility.php b/src/Views/Traits/Filters/HasVisibility.php → src/Views/Filters/Traits/HasVisibility.php
@@ -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;
 

diff --git a/src/Views/Filters/Traits/HasWireables.php b/src/Views/Filters/Traits/HasWireables.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
+
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables as HasWireablesCore;
+
+trait HasWireables
+{
+    use HasWireablesCore;
+}
diff --git a/src/Views/Traits/Filters/IsArrayFilter.php → src/Views/Filters/Traits/IsArrayFilter.php b/src/Views/Traits/Filters/IsArrayFilter.php → src/Views/Filters/Traits/IsArrayFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsArrayFilter
 {

diff --git a/src/Views/Traits/IsExternalArrayFilter.php → .../Filters/Traits/IsExternalArrayFilter.php b/src/Views/Traits/IsExternalArrayFilter.php → .../Filters/Traits/IsExternalArrayFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Livewire\Attributes\{Modelable, On, Renderless};
 

diff --git a/src/Views/Traits/IsExternalFilter.php → ...Views/Filters/Traits/IsExternalFilter.php b/src/Views/Traits/IsExternalFilter.php → ...Views/Filters/Traits/IsExternalFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Livewire\Attributes\Modelable;
 

diff --git a/src/Views/Traits/IsFilter.php → src/Views/Filters/Traits/IsFilter.php b/src/Views/Traits/IsFilter.php → src/Views/Filters/Traits/IsFilter.php
@@ -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
 {

diff --git a/...its/Filters/IsLivewireComponentFilter.php → ...ters/Traits/IsLivewireComponentFilter.php b/...its/Filters/IsLivewireComponentFilter.php → ...ters/Traits/IsLivewireComponentFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 

diff --git a/src/Views/Traits/Filters/IsNumericFilter.php → src/Views/Filters/Traits/IsNumericFilter.php b/src/Views/Traits/Filters/IsNumericFilter.php → src/Views/Filters/Traits/IsNumericFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsNumericFilter
 {

diff --git a/src/Views/Traits/Filters/IsStringFilter.php → src/Views/Filters/Traits/IsStringFilter.php b/src/Views/Traits/Filters/IsStringFilter.php → src/Views/Filters/Traits/IsStringFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits;
 
 trait IsStringFilter
 {

diff --git a/.../Styling/HandlesFilterInputAttributes.php → .../Styling/HandlesFilterInputAttributes.php b/.../Styling/HandlesFilterInputAttributes.php → .../Styling/HandlesFilterInputAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;
 
 use Illuminate\View\ComponentAttributeBag;
 

diff --git a/.../Styling/HandlesFilterLabelAttributes.php → .../Styling/HandlesFilterLabelAttributes.php b/.../Styling/HandlesFilterLabelAttributes.php → .../Styling/HandlesFilterLabelAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+namespace Rappasoft\LaravelLivewireTables\Views\Filters\Traits\Styling;
 
 use Illuminate\View\ComponentAttributeBag;