Filters type fix.

Author: binaryk

src/Filters/Filter.php

@@ -47,15 +47,15 @@ public function __construct()
         }
 
         if ($this instanceof SearchableFilter) {
-            $this->type = SearchableFilter::TYPE;
+            $this->type = $this->type ?? SearchableFilter::TYPE;
         }
 
         if ($this instanceof SortableFilter) {
-            $this->type = SortableFilter::TYPE;
+            $this->type = $this->type ?? SortableFilter::TYPE;
         }
 
         if ($this instanceof MatchFilter) {
-            $this->type = MatchFilter::TYPE;
+            $this->type = $this->type ?? MatchFilter::TYPE;
         }
 
         $this->booted();

src/Traits/InteractWithSearch.php

@@ -109,7 +109,7 @@ public static function collectFilters($type): Collection
             return $type instanceof Filter
                 ? tap($type, fn ($filter) => $filter->column = $filter->column ?? $column)
                 : tap(new $base, function (Filter $filter) use ($column, $type) {
-                    $filter->type = $filter->type ?? $type;
+                    $filter->type = $type ? $type : 'value';
                     $filter->column = $column;
                 });
         })->values();

tests/Controllers/RepositoryFilterControllerTest.php

@@ -26,19 +26,21 @@ public function test_available_filters_contains_matches_sortables_searches(): vo
             'title',
         ];
 
+        $this->withoutExceptionHandling();
         $this->getJson('posts/filters?include=matches,sortables,searchables')
+            ->dump()
             // 5 custom filters
             // 1 match filter
             // 1 sort
             // 2 searchable
             ->assertJson(
                 fn (AssertableJson $json) => $json
                 ->where('data.0.rules.is_active', 'bool')
-                ->where('data.4.type', MatchFilter::TYPE)
+                ->where('data.4.type', 'text')
                 ->where('data.4.column', 'title')
-                ->where('data.5.type', SortableFilter::TYPE)
+                ->where('data.5.type', 'value')
                 ->where('data.5.column', 'title')
-                ->where('data.6.type', SearchableFilter::TYPE)
+                ->where('data.6.type', 'value')
                 ->where('data.6.column', 'id')
                 ->etc()
             )

tests/Feature/Filters/AdvancedFilterTest.php

@@ -125,7 +125,6 @@ public function test_the_boolean_filter_is_applied(): void
 
         $this
             ->getJson(PostRepository::uriKey().'/filters?include=matches')
-            ->dump()
             ->assertOk()
             ->assertJsonFragment($booleanFilter = [
                 'key' => $key = 'active-booleans',

tests/Unit/AdvancedFilterTest.php

@@ -19,7 +19,7 @@ public function test_advanced_filters_can_serialize(): void
 
             public string $type = 'multiselect';
 
-            public string $title = 'Status filter';
+            public ?string $title = 'Status filter';
 
             public string $description = 'Short description';
 

tests/Unit/MatchableFilterTest.php

@@ -18,9 +18,11 @@ public function test_matchable_filter_has_key(): void
             AssertableJson::fromArray($filter->jsonSerialize()),
             function (AssertableJson $json) {
                 $json
+                    ->dump()
                     ->where('key', 'matches')
                     ->where('title', 'Approved At')
                     ->where('column', 'approved_at')
+                    ->etc()
                 ;
             }
         );