fix: adjust location component container

Author: andreiio

app/Filament/Forms/Components/Location.php

@@ -4,7 +4,6 @@
 
 namespace App\Filament\Forms\Components;
 
-use App\Filament\Schemas\Components\Subsection;
 use App\Models\City;
 use App\Models\County;
 use Closure;
@@ -16,14 +15,11 @@
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
-use Filament\Support\Concerns\CanBeContained;
-use Filament\Support\Icons\Heroicon;
 
 class Location extends Component implements CanEntangleWithSingularRelationships
 {
     use EntanglesStateWithSingularRelationship;
     use CanBeValidated;
-    use CanBeContained;
 
     protected string $view = 'filament-schemas::components.grid';
 
@@ -54,65 +50,52 @@ protected function setUp(): void
     {
         $this->columnSpanFull();
 
-        $this->schema(function () {
-            $components = [
-                Select::make($this->getCountyField())
-                    ->label($this->getCountyLabel())
-                    ->placeholder(__('placeholder.county'))
-                    ->options(County::cachedList())
-                    ->searchable()
-                    ->preload()
-                    ->live()
-                    ->required($this->isRequired())
-                    ->afterStateUpdated(function (Set $set) {
-                        if (! $this->hasCity()) {
-                            return;
-                        }
-
-                        $set($this->getCityField(), null);
-                    })
-                    ->when(! $this->hasCity(), fn (Select $component) => $component->columnSpanFull()),
-
-                Select::make($this->getCityField())
-                    ->label($this->getCityLabel())
-                    ->placeholder(__('placeholder.city'))
-                    ->allowHtml()
-                    ->searchable()
-                    ->required($this->isRequired())
-                    ->getSearchResultsUsing(function (string $search, Get $get) {
-                        $countyId = (int) $get($this->getCountyField());
-
-                        if (! $countyId) {
-                            return [];
-                        }
-
-                        return City::query()
-                            ->where('county_id', $countyId)
-                            ->search($search)
-                            ->limit(50)
-                            ->get()
-                            ->mapWithKeys(fn (City $city) => [
-                                $city->getKey() => $city->formatted_name,
-                            ]);
-                    })
-                    ->visible(fn () => $this->hasCity())
-                    ->getOptionLabelUsing(fn (int $value) => City::find($value)->formatted_name),
-            ];
-
-            if (! $this->isContained()) {
-                return [
-                    Grid::make()
-                        ->components($components),
-                ];
-            }
-
-            return [
-                Subsection::make()
-                    ->icon(Heroicon::OutlinedMapPin)
-                    ->columns()
-                    ->components($components),
-            ];
-        });
+        $this->schema(fn () => [
+            Grid::make()
+                ->components([
+                    Select::make($this->getCountyField())
+                        ->label($this->getCountyLabel())
+                        ->placeholder(__('placeholder.county'))
+                        ->options(County::cachedList())
+                        ->searchable()
+                        ->preload()
+                        ->live()
+                        ->required($this->isRequired())
+                        ->afterStateUpdated(function (Set $set) {
+                            if (! $this->hasCity()) {
+                                return;
+                            }
+
+                            $set($this->getCityField(), null);
+                        })
+                        ->when(! $this->hasCity(), fn (Select $component) => $component->columnSpanFull()),
+
+                    Select::make($this->getCityField())
+                        ->label($this->getCityLabel())
+                        ->placeholder(__('placeholder.city'))
+                        ->allowHtml()
+                        ->searchable()
+                        ->required($this->isRequired())
+                        ->getSearchResultsUsing(function (string $search, Get $get) {
+                            $countyId = (int) $get($this->getCountyField());
+
+                            if (! $countyId) {
+                                return [];
+                            }
+
+                            return City::query()
+                                ->where('county_id', $countyId)
+                                ->search($search)
+                                ->limit(50)
+                                ->get()
+                                ->mapWithKeys(fn (City $city) => [
+                                    $city->getKey() => $city->formatted_name,
+                                ]);
+                        })
+                        ->visible(fn () => $this->hasCity())
+                        ->getOptionLabelUsing(fn (int $value) => City::findOrFail($value)->formatted_name),
+                ]),
+        ]);
     }
 
     public function getCountyField(): string

app/Filament/Resources/Beneficiaries/Pages/CreateBeneficiary.php

@@ -35,6 +35,7 @@ public function form(Schema $schema): Schema
             ->columns(1)
             ->components([
                 Section::make()
+                    ->contained(false)
                     ->components([
                         Select::make('type')
                             ->label(__('field.beneficiary_type'))

app/Filament/Resources/Beneficiaries/Resources/Catagraphies/Schemas/SummaryInfolist.php

@@ -52,6 +52,7 @@ private static function vulnerabilities(): Section
                         EmptyState::make(__('catagraphy.vulnerability.empty.title'))
                             ->description(__('catagraphy.vulnerability.empty.description'))
                             ->icon('icon-empty-state')
+                            ->contained(false)
                             ->footer([
                                 Action::make('create')
                                     ->label(__('catagraphy.vulnerability.empty.create'))
@@ -108,7 +109,8 @@ private static function recommendations(): Section
                     return [
                         EmptyState::make(__('catagraphy.recommendation.empty.title'))
                             ->description(__('catagraphy.recommendation.empty.description'))
-                            ->icon('icon-clipboard'),
+                            ->icon('icon-clipboard')
+                            ->contained(false),
                     ];
                 }
 

app/Filament/Resources/Profiles/Schemas/EmployersForm.php

@@ -81,8 +81,7 @@ public static function configure(Schema $schema): Schema
                                             }),
                                     ]),
 
-                                Location::make()
-                                    ->contained(false),
+                                Location::make(),
 
                                 TextInput::make('email')
                                     ->label(__('field.employer_email'))

app/Filament/Resources/Profiles/Schemas/GeneralForm.php

@@ -60,8 +60,7 @@ public static function configure(Schema $schema): Schema
                     ->icon(Heroicon::OutlinedMapPin)
                     ->columns()
                     ->schema([
-                        Location::make()
-                            ->contained(false),
+                        Location::make(),
 
                         TextInput::make('email')
                             ->label(__('field.email'))

app/Filament/Resources/Profiles/Schemas/StudiesForm.php

@@ -58,8 +58,7 @@ public static function configure(Schema $schema): Schema
                                     ->maxValue(100)
                                     ->nullable(),
 
-                                Location::make()
-                                    ->contained(false),
+                                Location::make(),
 
                                 YearPicker::make('start_year')
                                     ->label(__('field.start_year'))

app/Filament/Resources/Users/Schemas/UserForm.php

@@ -65,7 +65,6 @@ public static function configure(Schema $schema): Schema
                                     ->default(Role::NURSE),
 
                                 Location::make()
-                                    ->contained(false)
                                     ->city(false)
                                     ->required()
                                     ->visible(fn (Get $get) => Role::COORDINATOR->is($get('role')))