Added getFiltersWithoutSearch method

- Updated getFilter to check the type first
- Added getFiltersWithoutSearch method
- Refactored all views to use getFiltersWithoutSearch

Author: rappasoft

resources/views/bootstrap-4/includes/filter-pills.blade.php

@@ -1,4 +1,4 @@
-@if ($showFilters && count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+@if ($showFilters && count($this->getFiltersWithoutSearch()))
     <div class="mb-3">
         <small>@lang('Applied Filters'):</small>
 

resources/views/bootstrap-4/includes/filters.blade.php

@@ -3,9 +3,9 @@
         <button type="button" class="btn dropdown-toggle d-block w-100 d-md-inline" data-toggle="dropdown">
             @lang('Filters')
 
-            @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+            @if (count($this->getFiltersWithoutSearch()))
                 <span class="badge badge-info">
-                   {{ isset($filters['search']) ? count($this->getFilters()) - 1 : count($this->getFilters()) }}
+                   {{ count($this->getFiltersWithoutSearch()) }}
                 </span>
             @endif
 
@@ -38,7 +38,7 @@ class="form-control"
                     @endforeach
                 @endif
 
-                @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+                @if (count($this->getFiltersWithoutSearch()))
                     <div class="dropdown-divider"></div>
 
                     <a

resources/views/bootstrap-5/includes/filter-pills.blade.php

@@ -1,4 +1,4 @@
-@if ($showFilters && count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+@if ($showFilters && count($this->getFiltersWithoutSearch()))
     <div class="mb-3">
         <small>@lang('Applied Filters'):</small>
 

resources/views/bootstrap-5/includes/filters.blade.php

@@ -3,9 +3,9 @@
         <button type="button" class="btn dropdown-toggle d-block w-100 d-md-inline" data-bs-toggle="dropdown">
             @lang('Filters')
 
-            @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+            @if (count($this->getFiltersWithoutSearch()))
                 <span class="badge bg-info">
-                   {{ isset($filters['search']) ? count($this->getFilters()) - 1 : count($this->getFilters()) }}
+                   {{ count($this->getFiltersWithoutSearch()) }}
                 </span>
             @endif
 
@@ -38,7 +38,7 @@ class="form-control"
                     @endforeach
                 @endif
 
-                @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+                @if (count($this->getFiltersWithoutSearch()))
                     <div class="dropdown-divider"></div>
 
                     <a

resources/views/tailwind/includes/filter-pills.blade.php

@@ -1,4 +1,4 @@
-@if ($showFilters && count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+@if ($showFilters && count($this->getFiltersWithoutSearch()))
     <div class="p-6 md:p-0">
         <small class="text-gray-700">@lang('Applied Filters'):</small>
 

resources/views/tailwind/includes/filters.blade.php

@@ -11,9 +11,9 @@ class="relative block md:inline-block text-left"
                 class="inline-flex justify-center w-full rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:border-indigo-300 focus:shadow-outline-indigo" id="filters-menu" @click="open = !open" aria-haspopup="true" x-bind:aria-expanded="open" aria-expanded="true">
                 @lang('Filters')
 
-                @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+                @if (count($this->getFiltersWithoutSearch()))
                     <span class="ml-1 inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize">
-                       {{ isset($filters['search']) ? count($this->getFilters()) - 1 : count($this->getFilters()) }}
+                       {{ count($this->getFiltersWithoutSearch()) }}
                     </span>
                 @endif
 
@@ -66,7 +66,7 @@ class="rounded-md shadow-sm block w-full pl-3 pr-10 py-2 text-base leading-6 bor
                 @endforeach
             @endif
 
-            @if (count($this->getFilters()) && !(count($this->getFilters()) === 1 && isset($filters['search'])))
+            @if (count($this->getFiltersWithoutSearch()))
                 <div class="py-1" role="none">
                     <div class="block px-4 py-2 text-sm text-gray-700" role="menuitem">
                         <button

src/Traits/WithFilters.php

@@ -165,12 +165,16 @@ public function hasFilter(string $filter): bool
      *
      * @param  string  $filter
      *
-     * @return int|mixed|null
+     * @return int|string|null
      */
     public function getFilter(string $filter)
     {
         if ($this->hasFilter($filter)) {
-            return $this->hasIntegerKeys($filter) ? (int)$this->filters[$filter] : $this->filters[$filter];
+            if (in_array($filter, collect($this->filters())->keys()->toArray(), true) && $this->filters()[$filter]->isSelect()) {
+                return $this->hasIntegerKeys($filter) ? (int)$this->filters[$filter] : trim($this->filters[$filter]);
+            }
+
+            return trim($this->filters[$filter]);
         }
 
         return null;
@@ -186,6 +190,16 @@ public function getFilters(): array
             ->toArray();
     }
 
+    /**
+     * @return array
+     */
+    public function getFiltersWithoutSearch(): array
+    {
+        return collect($this->getFilters())
+            ->reject(fn ($_value, $key) => $key === 'search')
+            ->toArray();
+    }
+
     /**
      * Set a given filter to null
      *
@@ -247,7 +261,7 @@ public function applySearchFilter(Builder $query): Builder
         $searchableColumns = $this->getSearchableColumns();
 
         if ($this->hasFilter('search') && count($searchableColumns)) {
-            $search = trim($this->getFilter('search'));
+            $search = $this->getFilter('search');
 
             // Group search conditions together
             $query->where(function (Builder $subQuery) use ($search, $query, $searchableColumns) {