From d83d34671788d438fc75c736dd0cc2755762a420 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Mon, 30 Mar 2026 09:07:25 +0700 Subject: [PATCH] refactor: standardize modal headings across various actions in Filament, improving consistency in user interface --- app/Filament/Actions/Cheerful/DeleteAction.php | 3 ++- app/Filament/Actions/Cheerful/EditAction.php | 3 ++- app/Filament/Actions/Cheerful/ForceDeleteAction.php | 3 ++- app/Filament/Actions/Cheerful/RestoreAction.php | 3 ++- .../Learning/StudyGroup/Actions/DeleteStudyGroupAction.php | 2 +- .../Pages/Learning/StudyGroup/Actions/EditStudyGroupAction.php | 2 +- .../Learning/Assignments/Actions/DeleteAssignmentAction.php | 2 +- .../Learning/Assignments/Actions/EditAssignmentAction.php | 2 +- .../Learning/Assignments/Pages/SubmissionDetailPage.php | 2 +- .../ClassSessions/Actions/ViewAssignmentDetailAction.php | 2 +- .../Learning/ClassSessions/Actions/ViewAssignmentsAction.php | 2 +- .../Learning/ClassSessions/Actions/ViewAttendanceAction.php | 2 +- .../ClassSessions/Actions/ViewMaterialDetailAction.php | 2 +- .../Learning/ClassSessions/Actions/ViewMaterialsAction.php | 2 +- .../Learning/Materials/Actions/ViewMaterialAction.php | 1 + 15 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/Filament/Actions/Cheerful/DeleteAction.php b/app/Filament/Actions/Cheerful/DeleteAction.php index 94dd337..f31935f 100644 --- a/app/Filament/Actions/Cheerful/DeleteAction.php +++ b/app/Filament/Actions/Cheerful/DeleteAction.php @@ -13,6 +13,7 @@ protected function setUp(): void $this->successNotification( SystemNotification::delete() - ); + ) + ->modalHeading('Hapus Data'); } } diff --git a/app/Filament/Actions/Cheerful/EditAction.php b/app/Filament/Actions/Cheerful/EditAction.php index 9ebdb0b..2955f68 100644 --- a/app/Filament/Actions/Cheerful/EditAction.php +++ b/app/Filament/Actions/Cheerful/EditAction.php @@ -14,6 +14,7 @@ protected function setUp(): void $this->successNotification( SystemNotification::update() ) - ->color('warning'); + ->color('warning') + ->modalHeading('Ubah Data'); } } diff --git a/app/Filament/Actions/Cheerful/ForceDeleteAction.php b/app/Filament/Actions/Cheerful/ForceDeleteAction.php index 81c8ffc..5fe6938 100644 --- a/app/Filament/Actions/Cheerful/ForceDeleteAction.php +++ b/app/Filament/Actions/Cheerful/ForceDeleteAction.php @@ -13,6 +13,7 @@ protected function setUp(): void $this->successNotification( SystemNotification::forceDelete() - ); + ) + ->modalHeading('Hapus Data Selamanya'); } } diff --git a/app/Filament/Actions/Cheerful/RestoreAction.php b/app/Filament/Actions/Cheerful/RestoreAction.php index 9205e5c..ef65996 100644 --- a/app/Filament/Actions/Cheerful/RestoreAction.php +++ b/app/Filament/Actions/Cheerful/RestoreAction.php @@ -13,6 +13,7 @@ protected function setUp(): void $this->successNotification( SystemNotification::restore() - ); + ) + ->modalHeading('Pulihkan Data'); } } diff --git a/app/Filament/Pages/Learning/StudyGroup/Actions/DeleteStudyGroupAction.php b/app/Filament/Pages/Learning/StudyGroup/Actions/DeleteStudyGroupAction.php index e9d50d4..05def85 100644 --- a/app/Filament/Pages/Learning/StudyGroup/Actions/DeleteStudyGroupAction.php +++ b/app/Filament/Pages/Learning/StudyGroup/Actions/DeleteStudyGroupAction.php @@ -22,7 +22,7 @@ protected function setUp(): void ->color('danger') ->link() ->tooltip('Hapus') - ->modalHeading(fn (StudyGroup $record) => "Hapus {$record->name}") + ->modalHeading('Hapus Data') ->modalDescription('Apakah Anda yakin ingin menghapus kelompok ini? Tindakan ini tidak dapat dibatalkan.') ->modalSubmitActionLabel('Hapus') ->modalCancelActionLabel('Batal'); diff --git a/app/Filament/Pages/Learning/StudyGroup/Actions/EditStudyGroupAction.php b/app/Filament/Pages/Learning/StudyGroup/Actions/EditStudyGroupAction.php index 819f82d..d11dec6 100644 --- a/app/Filament/Pages/Learning/StudyGroup/Actions/EditStudyGroupAction.php +++ b/app/Filament/Pages/Learning/StudyGroup/Actions/EditStudyGroupAction.php @@ -24,7 +24,7 @@ protected function setUp(): void ->link() ->tooltip('Ubah') ->record(fn (array $arguments): StudyGroup => StudyGroup::findOrFail($arguments['studyGroup'])) - ->modalHeading(fn (StudyGroup $record) => "Ubah {$record->name}") + ->modalHeading('Ubah Data') ->modalSubmitActionLabel('Simpan') ->modalCancelActionLabel('Batal') ->modalWidth(Width::ThreeExtraLarge) diff --git a/app/Filament/Resources/Learning/Assignments/Actions/DeleteAssignmentAction.php b/app/Filament/Resources/Learning/Assignments/Actions/DeleteAssignmentAction.php index da25bd5..e705f6b 100644 --- a/app/Filament/Resources/Learning/Assignments/Actions/DeleteAssignmentAction.php +++ b/app/Filament/Resources/Learning/Assignments/Actions/DeleteAssignmentAction.php @@ -20,7 +20,7 @@ protected function setUp(): void ->label('Hapus') ->icon('heroicon-o-trash') ->link() - ->modalHeading(fn (Assignment $record) => "Hapus {$record->title}") + ->modalHeading('Hapus Data') ->record(fn (array $arguments) => Assignment::find($arguments['record'])) ->after(function ($livewire) { unset($livewire->assignments); diff --git a/app/Filament/Resources/Learning/Assignments/Actions/EditAssignmentAction.php b/app/Filament/Resources/Learning/Assignments/Actions/EditAssignmentAction.php index 9563adb..2ae7aa1 100644 --- a/app/Filament/Resources/Learning/Assignments/Actions/EditAssignmentAction.php +++ b/app/Filament/Resources/Learning/Assignments/Actions/EditAssignmentAction.php @@ -29,7 +29,7 @@ protected function setUp(): void ->link() ->tooltip('Ubah') ->record(fn (array $arguments) => Assignment::find($arguments['record'])) - ->modalHeading(fn (Assignment $record) => "Ubah {$record->title}") + ->modalHeading('Ubah Data') ->modalWidth(Width::FourExtraLarge) ->form(AssignmentForm::configure(new Schema)->getComponents()) ->fillForm(function (Assignment $record): array { diff --git a/app/Filament/Resources/Learning/Assignments/Pages/SubmissionDetailPage.php b/app/Filament/Resources/Learning/Assignments/Pages/SubmissionDetailPage.php index 60ba18b..b01935d 100644 --- a/app/Filament/Resources/Learning/Assignments/Pages/SubmissionDetailPage.php +++ b/app/Filament/Resources/Learning/Assignments/Pages/SubmissionDetailPage.php @@ -171,7 +171,7 @@ public function previewSubmissionAction(): Action { return Action::make('previewSubmission') ->record(fn (array $arguments) => AssignmentSubmission::find($arguments['submissionId'])) - ->modalHeading(fn (AssignmentSubmission $record) => 'File Tugas: '.($record->study_group_id ? $record->studyGroup->name : $record->student->full_name)) + ->modalHeading('File Tugas') ->modalWidth(Width::SixExtraLarge) ->infolist([ PdfViewerEntry::make('submission') diff --git a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentDetailAction.php b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentDetailAction.php index c420a8f..208460d 100644 --- a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentDetailAction.php +++ b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentDetailAction.php @@ -19,7 +19,7 @@ protected function setUp(): void { parent::setUp(); - $this->modalHeading(fn (array $arguments) => Assignment::find($arguments['record'], ['*'])?->title ?? 'Detail Tugas') + $this->modalHeading('Detail Tugas') ->modalSubmitAction(false) ->modalCancelActionLabel('Tutup') ->modalWidth(Width::FourExtraLarge) diff --git a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentsAction.php b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentsAction.php index 0a70a14..83749f6 100644 --- a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentsAction.php +++ b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAssignmentsAction.php @@ -21,7 +21,7 @@ protected function setUp(): void ->color('info') ->icon('heroicon-o-clipboard-document-list') ->link() - ->modalHeading(fn (array $arguments) => 'Tugas Kuliah - Sesi Ke-'.(ClassSession::find($arguments['session'] ?? null, ['*'])?->session_number ?? '')) + ->modalHeading('Tugas Kuliah') ->modalSubmitAction(false) ->modalCancelActionLabel('Tutup') ->modalWidth(Width::Large) diff --git a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAttendanceAction.php b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAttendanceAction.php index cc83c12..3cbe8b0 100644 --- a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAttendanceAction.php +++ b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewAttendanceAction.php @@ -21,7 +21,7 @@ protected function setUp(): void ->color('success') ->icon('heroicon-o-check-circle') ->link() - ->modalHeading(fn (array $arguments) => 'Daftar Presensi - Sesi Ke-'.ClassSession::find($arguments['session'] ?? null, ['*'])?->session_number) + ->modalHeading('Daftar Presensi') ->modalSubmitAction(false) ->modalCancelActionLabel('Tutup') ->modalWidth(Width::ExtraLarge) diff --git a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialDetailAction.php b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialDetailAction.php index 9042a98..bd05a00 100644 --- a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialDetailAction.php +++ b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialDetailAction.php @@ -18,7 +18,7 @@ protected function setUp(): void parent::setUp(); $this->record(fn (array $arguments) => Material::find($arguments['record'] ?? null, ['*'])) - ->modalHeading(fn (?Material $record) => $record?->title ?? 'Detail Materi') + ->modalHeading('Detail Materi') ->modalSubmitAction(false) ->modalCancelActionLabel('Tutup') ->modalWidth(Width::FourExtraLarge) diff --git a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialsAction.php b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialsAction.php index ca87b0f..d286b36 100644 --- a/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialsAction.php +++ b/app/Filament/Resources/Learning/ClassSessions/Actions/ViewMaterialsAction.php @@ -21,7 +21,7 @@ protected function setUp(): void ->color('warning') ->icon('heroicon-o-book-open') ->link() - ->modalHeading(fn (array $arguments) => 'Materi Kuliah - Sesi Ke-'.(ClassSession::find($arguments['session'] ?? null, ['*'])?->session_number ?? '')) + ->modalHeading('Materi Kuliah') ->modalSubmitAction(false) ->modalCancelActionLabel('Tutup') ->modalWidth(Width::Large) diff --git a/app/Filament/Resources/Learning/Materials/Actions/ViewMaterialAction.php b/app/Filament/Resources/Learning/Materials/Actions/ViewMaterialAction.php index fedf1a2..86d59a9 100644 --- a/app/Filament/Resources/Learning/Materials/Actions/ViewMaterialAction.php +++ b/app/Filament/Resources/Learning/Materials/Actions/ViewMaterialAction.php @@ -19,6 +19,7 @@ protected function setUp(): void parent::setUp(); $this->modalWidth(Width::FourExtraLarge) + ->modalHeading('Lihat Materi') ->schema(function (Material $record) { return $record->getMedia('materials')->map(function ($item, $index) { return PdfViewerEntry::make('pdf_'.$index)