mapper search wip

app/Livewire/MapperRight.php

@@ -8,14 +8,16 @@ use App\Models\Mapper;
 use Filament\Actions\Action;
 use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Actions\Contracts\HasActions;
+use Filament\Forms\Components\Select;
 use Filament\Schemas\Concerns\InteractsWithSchemas;
 use Filament\Schemas\Contracts\HasSchemas;
 use Filament\Support\Enums\Alignment;
 use Filament\Tables\Concerns\InteractsWithTable;
 use Filament\Tables\Contracts\HasTable;
 use Filament\Tables\Enums\FiltersLayout;
-use Filament\Tables\Filters\SelectFilter;
+use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Livewire\Component;
 
 class MapperRight extends Component implements HasActions, HasSchemas, HasTable
@@ -34,24 +36,48 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
             ->query(Mapper::query())
             ->columns([
                 MapperRightColumn::make('right')->label(''),
-            ])->searchable(['group', 'home', 'away'])
+            ])->searchable(['home', 'away'])
             ->defaultPaginationPageOption(5)
             ->filters([
-                SelectFilter::make('group_cc')
-                    ->relationship('country_betsapi', 'name')
-                    ->searchable()
-                    ->preload()
-                    ->multiple()
-                    ->placeholder('Country')
-                    ->label('Countries'),
-                SelectFilter::make('group_id')
-                    ->options(fn () => Mapper::groupBy('group_id')->pluck('group', 'group_id'))
-                    ->columnSpan(2)
-                    ->searchable()
-                    ->preload()
-                    ->multiple()
-                    ->placeholder('League')
-                    ->label('Leagues'),
+                Filter::make('events')
+                    ->schema([
+                        Select::make('group_cc')
+                            ->placeholder('Country')
+                            ->hiddenLabel()
+                            ->label('')
+                            ->relationship('country_betsapi', 'name')
+                            ->searchable()
+                            ->preload()
+                            ->multiple()
+                            ->columnSpan(2)
+                            ->live()
+                            ->reactive()
+                            ->placeholder('Country')
+                            ->label('Countries'),
+                        Select::make('group_id')
+                            ->placeholder('League')
+                            ->hiddenLabel()
+                            ->label('')
+                            ->options(fn () => Mapper::groupBy('group_id')->pluck('group', 'group_id'))
+                            ->columnSpan(2)
+                            ->searchable()
+                            ->preload()
+                            ->multiple()
+                            ->live()
+                            ->placeholder('League')
+                            ->label('Leagues'),
+                    ])
+                    ->query(function (Builder $query, array $data): Builder {
+                        return $query
+                            ->when(
+                                $data['group_cc'],
+                                fn (Builder $query, $group_cc) => $query->where('group_cc', $group_cc)
+                            )->when(
+                                $data['group_id'],
+                                fn (Builder $query, $group_id) => $query->whereIn('group_id', $group_id)
+                            );
+                    })
+                    ->columns(4)->columnSpan(4),
             ], layout: FiltersLayout::AboveContent)
             // ->hiddenFilterIndicators()
             ->filtersFormColumns(3)