add Custom Groups

app/Actions/LoadCountryGroups.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Actions;
+
+use App\Models\CompetitionGroup;
+use App\Models\Country;
+
+class LoadCountryGroups
+{
+    public static function load()
+    {
+        $res = Country::query()->select('name', 'id')->get();
+        $countries = [];
+        foreach ($res as $value) {
+            $countries[$value->id] = $value->name;
+        }
+
+        $res = CompetitionGroup::where('sport_id', auth()->user()->sport_id)->select('country_id', 'name', 'id')->get();
+
+        $arr = [];
+        foreach ($res as $value) {
+            if (isset($countries[$value->country_id])) {
+                $arr[$value->id] = $countries[$value->country_id].' '.$value->name;
+            } else {
+                $arr[$value->id] = $value->name;
+            }
+        }
+        asort($arr);
+
+        return $arr;
+    }
+}

app/Filament/Resources/Events/Tables/EventsTable.php

@@ -10,6 +10,7 @@ use App\Filament\Tables\Columns\ColumnOdds;
 use App\Filament\Tables\Columns\EventColumn;
 use App\Filament\Tables\Columns\MatchIds;
 use App\Filament\Tables\Columns\TooltipOdds;
+use App\Models\ClientGroupList;
 use App\Models\CompetitionGroup;
 use App\Models\Country;
 use App\Models\Event;
@@ -180,7 +181,7 @@ class EventsTable
             ->extremePaginationLinks()
             ->filters([
                 Filter::make('events')
-                    ->columns(6)->columnSpan(6)
+                    ->columns(7)->columnSpan(7)
                     ->schema([
                         Hidden::make('filter_alarm_green'),
                         Hidden::make('filter_alarm_yellow'),
@@ -253,6 +254,15 @@ class EventsTable
                                 return $arr;
                             })
                             ->live(),
+                        Select::make('client_group_list_id')
+                            ->placeholder('Custom Groups')
+                            ->prefixIcon('phosphor-user-list')
+                            ->searchable()
+                            ->hiddenLabel()
+                            ->label('')
+                            ->preload()
+                            ->options(fn () => ClientGroupList::where('sport_id', auth()->user()->sport_id)->where('client_id', auth()->user()->client_id)->pluck('name', 'id'))
+                            ->live(),
 
                         DateRangePicker::make('starttime_period')
                             ->columnSpan(2)
@@ -290,6 +300,13 @@ class EventsTable
                         )->when(
                             $data['competition_group_id'],
                             fn (Builder $query, $competition_group_id) => $query->whereIn('competition_group_id', $competition_group_id)
+
+                        )->when(
+                            $data['client_group_list_id'],
+                            function (Builder $query, $client_group_list_id) {
+                                $client_group_list_ids = ClientGroupList::where('id', $client_group_list_id)->value('client_groups');
+                                $query->whereIn('competition_group_id', $client_group_list_ids);
+                            }
                         )->when(
                             $data['starttime_period'],
                             function (Builder $query, $starttime_period) {
@@ -448,6 +465,11 @@ class EventsTable
                             }
                         }
 
+                        if ($data['client_group_list_id'] ?? null) {
+                            $client_group_list_name = ClientGroupList::where('id', $data['client_group_list_id'])->value('name');
+                            $indicators[] = Indicator::make('Custom Group: '.$client_group_list_name)->removeField('client_group_list_id')->color('info');
+                        }
+
                         if ($data['filter_stars'] ?? null) {
                             $indicators[] = Indicator::make('Filter Favorits')->removeField('filter_stars')->color('info');
                         }

app/Livewire/ClientGroupListEditor.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Actions\LoadCountryGroups;
+use App\Models\ClientGroupList;
+use App\Models\CompetitionGroup;
+use Filament\Actions\Concerns\InteractsWithActions;
+use Filament\Actions\Contracts\HasActions;
+use Filament\Actions\CreateAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Concerns\InteractsWithSchemas;
+use Filament\Schemas\Contracts\HasSchemas;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Concerns\InteractsWithTable;
+use Filament\Tables\Contracts\HasTable;
+use Filament\Tables\Table;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class ClientGroupListEditor extends Component implements HasActions, HasSchemas, HasTable
+{
+    use InteractsWithActions;
+    use InteractsWithSchemas;
+    use InteractsWithTable;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->query(ClientGroupList::query())
+            ->columns([
+                TextColumn::make('name'),
+                TextColumn::make('client_groups')
+                    ->label('Leagues')
+                    ->badge()
+                    ->wrap()
+                    ->color('info')
+                    ->formatStateUsing(fn (string $state): string => CompetitionGroup::where('id', $state)->pluck('name')->first()),
+            ])
+            ->filters([
+                // ...
+            ])
+            ->recordActions([
+                EditAction::make('edit')
+                    ->iconButton()
+                    ->mutateDataUsing(function (array $data): array {
+                        $data['client_id'] = auth()->user()->client_id;
+                        $data['sport_id'] = auth()->user()->sport_id;
+
+                        return $data;
+                    })
+                    ->schema([
+                        TextInput::make(name: 'name')
+                            ->required()
+                            ->maxLength(255),
+                        Select::make('client_groups')
+                            ->searchable()
+                            ->multiple()
+                            ->preload()
+                            ->options(fn () => LoadCountryGroups::load()),
+                    ])->action(function ($livewire) {
+                        $livewire->dispatch('refreshBettypeMenu');
+                    }),
+                DeleteAction::make('delete')->iconButton(),
+            ])
+            ->headerActions([
+                CreateAction::make()
+                    ->label('New Group')
+                    ->schema([
+                        TextInput::make(name: 'name')
+                            ->required()
+                            ->maxLength(255),
+                        Select::make('client_groups')
+                            ->searchable()
+                            ->options(fn () => LoadCountryGroups::load()),
+                    ]),
+            ]);
+    }
+
+    public function render(): View
+    {
+        return view('livewire.client-group-list-editor');
+    }
+}

app/Models/ClientGroupList.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ClientGroupList extends Model
+{
+    protected $casts = [
+        'client_groups' => 'json',
+    ];
+
+    protected $fillable = [
+        'name',
+        'sport_id',
+        'client_id',
+        'client_groups',
+    ];
+
+    public function client_group()
+    {
+        return $this->belongsTo(CompetitionGroup::class)->with('country');
+    }
+}

app/Models/CompetitionGroup.php

@@ -23,9 +23,4 @@ class CompetitionGroup extends Model
     {
         return $this->belongsTo(Sport::class);
     }
-
-    public function country()
-    {
-        return $this->belongsTo(Country::class)->where('disabled', 0)->where('is_country', 1);
-    }
 }