wip on #570

Author: gheorghelupu17

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/DetailedEvaluation/EditDetailedEvaluation.php

@@ -9,9 +9,7 @@
 use App\Filament\Organizations\Resources\BeneficiaryResource;
 use App\Forms\Components\DatePicker;
 use App\Forms\Components\Repeater;
-use App\Forms\Components\TableRepeater;
 use App\Services\Breadcrumb\BeneficiaryBreadcrumb;
-use Awcodes\TableRepeater\Header;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\TextInput;
 use Filament\Resources\Pages\EditRecord;
@@ -22,8 +20,8 @@
 
 class EditDetailedEvaluation extends EditRecord
 {
-    use RedirectToDetailedEvaluation;
     use PreventSubmitFormOnEnter;
+    use RedirectToDetailedEvaluation;
 
     protected static string $resource = BeneficiaryResource::class;
 
@@ -54,26 +52,14 @@ protected function getFormSchema(): array
             Section::make()
                 ->maxWidth('3xl')
                 ->schema([
-                    TableRepeater::make('detailedEvaluationSpecialists')
+                    Repeater::make('detailedEvaluationSpecialists')
                         ->relationship('detailedEvaluationSpecialists')
                         ->label(__('beneficiary.section.detailed_evaluation.labels.specialists'))
-                        ->defaultItems(3)
+                        ->minItems(3)
                         ->addActionLabel(__('beneficiary.action.add_row'))
-                        ->showLabels(false)
                         ->deletable()
-                        ->headers([
-                            Header::make('full_name')
-                                ->label(__('beneficiary.section.detailed_evaluation.labels.full_name')),
-
-                            Header::make('institution')
-                                ->label(__('beneficiary.section.detailed_evaluation.labels.institution')),
-
-                            Header::make('relationship')
-                                ->label(__('beneficiary.section.detailed_evaluation.labels.relationship')),
-
-                            Header::make('date')
-                                ->label(__('beneficiary.section.detailed_evaluation.labels.contact_date')),
-                        ])
+                        ->columns(4)
+                        ->itemLabel(fn (array $state): ?string => $state['full_name'] ?? null)
                         ->schema([
                             TextInput::make('full_name')
                                 ->label(__('beneficiary.section.detailed_evaluation.labels.full_name'))

app/Filament/Organizations/Resources/BeneficiaryResource/Resources/MonitoringResource/Pages/EditDetails.php

@@ -8,12 +8,11 @@
 use App\Concerns\RedirectToMonitoring;
 use App\Filament\Organizations\Resources\BeneficiaryResource\Resources\MonitoringResource;
 use App\Forms\Components\DatePicker;
+use App\Forms\Components\Repeater;
 use App\Forms\Components\Select;
-use App\Forms\Components\TableRepeater;
 use App\Models\Monitoring;
 use App\Models\UserRole;
 use App\Services\Breadcrumb\BeneficiaryBreadcrumb;
-use Awcodes\TableRepeater\Header;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
@@ -27,8 +26,8 @@
 
 class EditDetails extends EditRecord
 {
-    use RedirectToMonitoring;
     use PreventSubmitFormOnEnter;
+    use RedirectToMonitoring;
 
     protected static string $resource = MonitoringResource::class;
 
@@ -60,8 +59,8 @@ public function form(Schema $schema): Schema
 
     public static function getFormSchemaStatic(): array
     {
-        $instance = new static();
-        $instance->record = new Monitoring();
+        $instance = new static;
+        $instance->record = new Monitoring;
 
         return $instance->getFormSchema();
     }
@@ -89,23 +88,14 @@ protected function getFormSchema(): array
                     Hidden::make('beneficiary_id')
                         ->formatStateUsing(fn ($record, $state) => $state ?? ($record?->beneficiary_id ?? $this->getParentRecord()?->id)),
 
-                    TableRepeater::make('specialistsTeam')
+                    Repeater::make('specialistsTeam')
                         ->relationship('specialistsTeam')
-                        ->defaultItems(1)
+                        ->minItems(1)
                         ->hiddenLabel()
-                        ->emptyLabel()
                         ->columnSpanFull()
                         ->addActionLabel(__('monitoring.actions.add_specialist'))
-                        ->headers([
-                            Header::make('id')
-                                ->label(__('nomenclature.labels.nr')),
-
-                            Header::make('role_id')
-                                ->label(__('monitoring.labels.role')),
-
-                            Header::make('user_id')
-                                ->label(__('monitoring.labels.specialist_name')),
-                        ])
+                        ->columns(3)
+                        ->itemLabel(fn (array $state): ?string => $state['user_id'] ? \App\Models\User::find($state['user_id'])?->name : null)
                         ->schema([
                             Placeholder::make('id')
                                 ->label(__('nomenclature.labels.nr'))
@@ -137,7 +127,7 @@ protected function getFormSchema(): array
                                 ),
 
                             Hidden::make('specialistable_type')
-                                ->formatStateUsing(fn ($state) => (new Monitoring())->getMorphClass()),
+                                ->formatStateUsing(fn ($state) => (new Monitoring)->getMorphClass()),
 
                         ]),
                 ]),

app/Filament/Organizations/Resources/InterventionServiceResource/Pages/EditCounselingSheet.php

@@ -27,8 +27,6 @@
 use App\Forms\Components\Select;
 use App\Models\InterventionService;
 use App\Services\Breadcrumb\InterventionPlanBreadcrumb;
-use Awcodes\TableRepeater\Components\TableRepeater;
-use Awcodes\TableRepeater\Header;
 use Filament\Actions\Action;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Placeholder;
@@ -163,22 +161,11 @@ public static function getLegalAssistanceForm(): array
 
             Section::make(__('intervention_plan.headings.institution_contacted'))
                 ->schema([
-                    TableRepeater::make('data.institutions')
+                    Repeater::make('data.institutions')
                         ->hiddenLabel()
                         ->addActionLabel(__('intervention_plan.actions.add_institution'))
-                        ->headers([
-                            Header::make('institution')
-                                ->label(__('intervention_plan.labels.responsible_institution')),
-
-                            Header::make('contact_date')
-                                ->label(__('intervention_plan.labels.contact_date')),
-
-                            Header::make('phone')
-                                ->label(__('intervention_plan.labels.phone')),
-
-                            Header::make('contact_person')
-                                ->label(__('intervention_plan.labels.contact_person')),
-                        ])
+                        ->columns(4)
+                        ->itemLabel(fn (array $state): ?string => $state['institution'] ?? null)
                         ->schema([
                             TextInput::make('institution')
                                 ->label(__('intervention_plan.labels.responsible_institution'))

app/Filament/Organizations/Resources/MonthlyPlanResource/Pages/EditMonthlyPlanServicesAndInterventions.php

@@ -12,11 +12,9 @@
 use App\Forms\Components\DatePicker;
 use App\Forms\Components\Repeater;
 use App\Forms\Components\Select;
-use App\Forms\Components\TableRepeater;
 use App\Models\Service;
 use App\Models\ServiceIntervention;
 use App\Services\Breadcrumb\InterventionPlanBreadcrumb;
-use Awcodes\TableRepeater\Header;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Placeholder;
@@ -40,7 +38,7 @@ class EditMonthlyPlanServicesAndInterventions extends EditRecord
 
     public function getBreadcrumbs(): array
     {
-        return  InterventionPlanBreadcrumb::make($this->parent)
+        return InterventionPlanBreadcrumb::make($this->parent)
             ->getViewMonthlyPlan($this->getRecord());
     }
 
@@ -146,23 +144,12 @@ protected function getFormSchema(): array
                                 ->maxLength(2000),
                         ]),
 
-                    TableRepeater::make('monthlyPlanInterventions')
+                    Repeater::make('monthlyPlanInterventions')
                         ->relationship('monthlyPlanInterventions')
                         ->hiddenLabel()
                         ->addActionLabel(__('intervention_plan.actions.add_intervention_repeater'))
-                        ->headers([
-                            Header::make('number')
-                                ->label(__('intervention_plan.labels.count')),
-
-                            Header::make('service_intervention_id')
-                                ->label(__('intervention_plan.headings.interventions')),
-
-                            Header::make('objections')
-                                ->label(__('intervention_plan.labels.objections')),
-
-                            Header::make('observations')
-                                ->label(__('intervention_plan.labels.observations')),
-                        ])
+                        ->columns(4)
+                        ->itemLabel(fn (array $state): ?string => $state['service_intervention_id'] ? ServiceIntervention::find($state['service_intervention_id'])?->name : null)
                         ->schema([
                             Placeholder::make('number')
                                 ->label(__('intervention_plan.labels.count'))

resources/views/components/notice.blade.php

@@ -20,7 +20,7 @@
 
     $actions = array_filter(
         $getActions(),
-        fn(\Filament\Infolists\Components\Actions\Action $action): bool => $action->isVisible(),
+        fn (\Filament\Actions\Action $action): bool => $action->isVisible(),
     );
 
 @endphp