[AIDAPP-979]: Update existing Filament resource structure: engagement module (#949)

rebecca-canyon · web-flow · commit d9e927c38b85 · 2026-03-25T20:32:04.000Z
* Update engagement resource to use Filament v4 resource structure

* Address failing tests

* Address failing tests

* Update test structure to match new resource structure

* Update test structure to match new resource structure
diff --git a/app-modules/contact/src/Filament/Resources/ContactResource/Pages/ManageContactFiles.php b/app-modules/contact/src/Filament/Resources/ContactResource/Pages/ManageContactFiles.php
@@ -37,7 +37,7 @@
 namespace AidingApp\Contact\Filament\Resources\ContactResource\Pages;
 
 use AidingApp\Contact\Filament\Resources\ContactResource;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\RelationManagers\EngagementFilesRelationManager;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\RelationManagers\EngagementFilesRelationManager;
 use Filament\Resources\Pages\ManageRelatedRecords;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app-modules/engagement/src/Filament/Resources/EmailTemplates/EmailTemplateResource.php b/app-modules/engagement/src/Filament/Resources/EmailTemplates/EmailTemplateResource.php
@@ -34,11 +34,11 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources;
+namespace AidingApp\Engagement\Filament\Resources\EmailTemplates;
 
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages\CreateEmailTemplate;
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages\EditEmailTemplate;
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages\ListEmailTemplates;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages\CreateEmailTemplate;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages\EditEmailTemplate;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages\ListEmailTemplates;
 use AidingApp\Engagement\Models\EmailTemplate;
 use App\Filament\Clusters\Communication;
 use Filament\Resources\Resource;
diff --git a/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/CreateEmailTemplate.php b/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/CreateEmailTemplate.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\EmailTemplateResource;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Resources\Pages\CreateRecord;
diff --git a/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/EditEmailTemplate.php b/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/EditEmailTemplate.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\EmailTemplateResource;
 use App\Concerns\EditPageRedirection;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Textarea;
diff --git a/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/ListEmailTemplates.php b/app-modules/engagement/src/Filament/Resources/EmailTemplates/Pages/ListEmailTemplates.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EmailTemplateResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EmailTemplates\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EmailTemplateResource;
+use AidingApp\Engagement\Filament\Resources\EmailTemplates\EmailTemplateResource;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/EngagementFileResource.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/EngagementFileResource.php
@@ -34,12 +34,12 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\CreateEngagementFile;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\EditEngagementFile;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\ListEngagementFiles;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\ViewEngagementFile;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\CreateEngagementFile;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\EditEngagementFile;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\ListEngagementFiles;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\ViewEngagementFile;
 use AidingApp\Engagement\Models\EngagementFile;
 use BackedEnum;
 use Filament\Forms\Components\DatePicker;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/CreateEngagementFile.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/CreateEngagementFile.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateEngagementFile extends CreateRecord
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/EditEngagementFile.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/EditEngagementFile.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use App\Concerns\EditPageRedirection;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\ViewAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/ListEngagementFiles.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/ListEngagementFiles.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use App\Filament\Tables\Columns\IdColumn;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\CreateAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/ViewEngagementFile.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/Pages/ViewEngagementFile.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use AidingApp\Engagement\Models\EngagementFile;
 use Filament\Actions\Action;
 use Filament\Actions\EditAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFiles/RelationManagers/EngagementFilesRelationManager.php b/app-modules/engagement/src/Filament/Resources/EngagementFiles/RelationManagers/EngagementFilesRelationManager.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementFileResource\RelationManagers;
+namespace AidingApp\Engagement\Filament\Resources\EngagementFiles\RelationManagers;
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use App\Filament\Tables\Columns\IdColumn;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\CreateAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementResponses/Actions/EngagementResponseViewAction.php b/app-modules/engagement/src/Filament/Resources/EngagementResponses/Actions/EngagementResponseViewAction.php
@@ -34,7 +34,7 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Actions;
+namespace AidingApp\Engagement\Filament\Resources\EngagementResponses\Actions;
 
 use AidingApp\Engagement\Models\EngagementResponse;
 use Filament\Actions\ViewAction;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementResponses/EngagementResponseResource.php b/app-modules/engagement/src/Filament/Resources/EngagementResponses/EngagementResponseResource.php
@@ -34,10 +34,10 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources;
+namespace AidingApp\Engagement\Filament\Resources\EngagementResponses;
 
-use AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Pages\ListEngagementResponses;
-use AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Pages\ViewEngagementResponse;
+use AidingApp\Engagement\Filament\Resources\EngagementResponses\Pages\ListEngagementResponses;
+use AidingApp\Engagement\Filament\Resources\EngagementResponses\Pages\ViewEngagementResponse;
 use AidingApp\Engagement\Models\EngagementResponse;
 use BackedEnum;
 use Filament\Resources\Resource;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementResponses/Pages/ListEngagementResponses.php b/app-modules/engagement/src/Filament/Resources/EngagementResponses/Pages/ListEngagementResponses.php
@@ -34,9 +34,9 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementResponses\Pages;
 
-use AidingApp\Engagement\Filament\Resources\EngagementResponseResource;
+use AidingApp\Engagement\Filament\Resources\EngagementResponses\EngagementResponseResource;
 use App\Filament\Tables\Columns\IdColumn;
 use Filament\Actions\ViewAction;
 use Filament\Resources\Pages\ListRecords;
diff --git a/app-modules/engagement/src/Filament/Resources/EngagementResponses/Pages/ViewEngagementResponse.php b/app-modules/engagement/src/Filament/Resources/EngagementResponses/Pages/ViewEngagementResponse.php
@@ -34,11 +34,11 @@
 </COPYRIGHT>
 */
 
-namespace AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Pages;
+namespace AidingApp\Engagement\Filament\Resources\EngagementResponses\Pages;
 
 use AidingApp\Contact\Filament\Resources\ContactResource;
 use AidingApp\Contact\Models\Contact;
-use AidingApp\Engagement\Filament\Resources\EngagementResponseResource;
+use AidingApp\Engagement\Filament\Resources\EngagementResponses\EngagementResponseResource;
 use AidingApp\Engagement\Models\EngagementResponse;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Resources\Pages\ViewRecord;
@@ -62,17 +62,13 @@ public function infolist(Schema $schema): Schema
                                 /** @var Contact $sender */
                                 $sender = $record->sender;
 
-                                return match ($sender::class) {
-                                    Contact::class => "{$sender->full} (Contact)",
-                                };
+                                return "{$sender->full_name} (Contact)";
                             })
                             ->url(function (EngagementResponse $record) {
                                 /** @var Contact $sender */
                                 $sender = $record->sender;
 
-                                return match ($sender::class) {
-                                    Contact::class => ContactResource::getUrl('view', ['record' => $sender->id]),
-                                };
+                                return ContactResource::getUrl('view', ['record' => $sender->id]);
                             }),
                         TextEntry::make('content'),
                     ])
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/EngagementFilePruningTest.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/EngagementFilePruningTest.php
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/CreateEngagementFileTest.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/CreateEngagementFileTest.php
@@ -33,8 +33,8 @@
 
 </COPYRIGHT>
 */
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\CreateEngagementFile;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\CreateEngagementFile;
 use App\Models\User;
 
 use function Pest\Laravel\actingAs;
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/EditEngagementFileTest.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/EditEngagementFileTest.php
@@ -33,8 +33,8 @@
 
 </COPYRIGHT>
 */
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource\Pages\EditEngagementFile;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\Pages\EditEngagementFile;
 use AidingApp\Engagement\Models\EngagementFile;
 use App\Models\User;
 
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/ListEngagementFileTest.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/ListEngagementFileTest.php
@@ -34,7 +34,7 @@
 </COPYRIGHT>
 */
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use App\Models\User;
 
 use function Pest\Laravel\actingAs;
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/ViewEngagementFileTest.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/Pages/ViewEngagementFileTest.php
@@ -34,7 +34,7 @@
 </COPYRIGHT>
 */
 
-use AidingApp\Engagement\Filament\Resources\EngagementFileResource;
+use AidingApp\Engagement\Filament\Resources\EngagementFiles\EngagementFileResource;
 use AidingApp\Engagement\Models\EngagementFile;
 use App\Models\User;
 
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/RequestFactories/CreateEngagementFileRequestFactory.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/RequestFactories/CreateEngagementFileRequestFactory.php
diff --git a/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/RequestFactories/EditEngagementFileRequestFactory.php b/app-modules/engagement/tests/Tenant/Filament/Resources/EngagementFiles/RequestFactories/EditEngagementFileRequestFactory.php
diff --git a/app-modules/timeline/src/Timelines/EngagementResponseTimeline.php b/app-modules/timeline/src/Timelines/EngagementResponseTimeline.php
@@ -36,7 +36,7 @@
 
 namespace AidingApp\Timeline\Timelines;
 
-use AidingApp\Engagement\Filament\Resources\EngagementResponseResource\Actions\EngagementResponseViewAction;
+use AidingApp\Engagement\Filament\Resources\EngagementResponses\Actions\EngagementResponseViewAction;
 use AidingApp\Engagement\Models\EngagementResponse;
 use AidingApp\Timeline\Models\CustomTimeline;
 use Filament\Actions\ViewAction;
