wip

Author: andreiio

app/Contracts/Pages/WithSidebar.php

@@ -4,6 +4,9 @@
 
 namespace App\Contracts\Pages;
 
+/**
+ * @deprecated Use \Filament\Pages\Concerns\HasSubNavigation instead.
+ */
 interface WithSidebar
 {
     public function getSidebarNavigation(): array;

app/Filament/Resources/AppointmentResource.php

@@ -12,6 +12,8 @@
 use App\Tables\Columns\TextColumn;
 use Filament\Forms\Form;
 use Filament\Infolists\Infolist;
+use Filament\Pages\SubNavigationPosition;
+use Filament\Resources\Pages\Page;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Filters\SelectFilter;
@@ -25,6 +27,17 @@ class AppointmentResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-m-calendar-date-range';
 
+    protected static SubNavigationPosition $subNavigationPosition = SubNavigationPosition::Start;
+
+    public static function getRecordSubNavigation(Page $page): array
+    {
+        return $page->generateNavigationItems([
+            // ...
+            Pages\ViewAppointment::class,
+            Pages\EditAppointment::class,
+        ]);
+    }
+
     public static function getModelLabel(): string
     {
         return __('appointment.label.singular');

app/Filament/Resources/BeneficiaryResource.php

@@ -158,4 +158,16 @@ public static function getWidgets(): array
             ActiveInterventionsWidget::class,
         ];
     }
+
+    public static function getRecordSubNavigation(Page $page): array
+    {
+        return $page->generateNavigationItems([
+            Pages\OverviewBeneficiary::class,
+            Pages\ViewPersonalData::class,
+            Pages\CatagraphySummary::class,
+            // InterventionPages\ListInterventions::class,
+            // DocumentPages\ListDocuments::class,
+            // Pages\ListHistory::class,
+        ]);
+    }
 }

app/Filament/Resources/BeneficiaryResource/Concerns/CommonViewFormSchema.php

@@ -11,7 +11,7 @@
 use App\Forms\Components\RecommendationsSection;
 use App\Forms\Components\VulnerabilityChips;
 use App\Models\Catagraphy;
-use Filament\Actions\Action as PageAction;
+use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\View;
 use Filament\Forms\Form;
@@ -46,7 +46,7 @@ public function mount(int | string $record): void
 
         $this->record = $this->beneficiary->catagraphy;
 
-        abort_unless(static::getResource()::canView($this->getRecord()), 403);
+        abort_unless(BeneficiaryResource::canView($this->getRecord()), 403);
 
         abort_unless($this->getBeneficiary()->isRegular(), 404);
 
@@ -56,23 +56,19 @@ public function mount(int | string $record): void
     public function form(Form $form): Form
     {
         return $form
-            ->columns(1)
             ->schema([
                 Section::make()
                     ->heading(__('catagraphy.header.vulnerabilities'))
-                    ->headerActions(function (Catagraphy $record) {
-                        if (! $record->created_at) {
-                            return false;
-                        }
-
-                        return [
-                            PageAction::make('view')
-                                ->label(__('catagraphy.action.view'))
-                                ->url(static::getResource()::getUrl('catagraphy.view', $this->getBeneficiary()))
-                                ->color('gray'),
-                        ];
-                    })
-                    ->footer($this->getVulnerabilitiesFooter())
+                    ->headerActions([
+                        Action::make('view')
+                            ->label(__('catagraphy.action.view'))
+                            ->visible(fn (Catagraphy $record) => filled($record->created_at))
+                            ->url(BeneficiaryResource::getUrl('catagraphy.view', [
+                                'record' => $this->getBeneficiary(),
+                            ]))
+                            ->color('gray'),
+                    ])
+                    // ->footer($this->getVulnerabilitiesFooter())
                     ->schema($this->getVulnerabilitiesFormSchema()),
 
                 RecommendationsSection::make(),
@@ -91,7 +87,7 @@ protected function getVulnerabilitiesFormSchema(): array
                         'actions' => [
                             TableAction::make('create')
                                 ->label(__('catagraphy.vulnerability.empty.create'))
-                                ->url(static::getResource()::getUrl('catagraphy.edit', ['record' => $this->getBeneficiary()]))
+                                ->url(BeneficiaryResource::getUrl('catagraphy.edit', ['record' => $this->getBeneficiary()]))
                                 ->button()
                                 ->color('gray'),
                         ],
@@ -127,7 +123,9 @@ protected function getVulnerabilitiesFooter(): ?ViewContract
             'created_at' => $catagraphy->created_at->toFormattedDateTime(),
             'updated_at' => $catagraphy->updated_at->toFormattedDateTime(),
             'name' => $catagraphy->nurse->full_name,
-            'history_url' => static::getResource()::getUrl('history', $this->getBeneficiary()),
+            'history_url' => BeneficiaryResource::getUrl('history', [
+                'record' => $this->getBeneficiary(),
+            ]),
         ]);
     }
 

app/Filament/Resources/BeneficiaryResource/Pages/CatagraphySummary.php

@@ -5,19 +5,19 @@
 namespace App\Filament\Resources\BeneficiaryResource\Pages;
 
 use App\Enums\Beneficiary\Type;
+use App\Filament\Resources\AppointmentResource\Schemas\OcasionalBeneficiaryForm;
+use App\Filament\Resources\AppointmentResource\Schemas\RegularBeneficiaryForm;
 use App\Filament\Resources\BeneficiaryResource;
-use App\Filament\Resources\BeneficiaryResource\Concerns;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateBeneficiary extends CreateRecord
 {
-    use Concerns\CommonEditFormSchema;
-
     protected static string $resource = BeneficiaryResource::class;
 
     protected static bool $canCreateAnother = false;
@@ -46,12 +46,12 @@ public function form(Form $form): Form
                             ]),
 
                         Group::make()
-                            ->visible(fn (callable $get) => Type::REGULAR->is($get('type')))
-                            ->schema(static::getRegularBeneficiaryFormSchema()),
+                            ->visible(fn (Get $get) => Type::REGULAR->is($get('type')))
+                            ->schema(RegularBeneficiaryForm::getSchema()),
 
                         Group::make()
-                            ->visible(fn (callable $get) => Type::OCASIONAL->is($get('type')))
-                            ->schema(static::getOcasionalBeneficiaryFormSchema()),
+                            ->visible(fn (Get $get) => Type::OCASIONAL->is($get('type')))
+                            ->schema(OcasionalBeneficiaryForm::getSchema()),
                     ]),
             ]);
     }