feat: upgrade filament to v4 and ensure 100% test coverage

- Upgrade Filament framework from v3 to v4 - Update all Filament resources and pages for v4 compatibility - Fix test suite to maintain 100% pass rate (321 tests passing) - Add visibility condition for ticket close action (only when not closed) - Update dependencies and build assets for new Filament version - Maintain backward compatibility while leveraging v4 improvements
2025-11-14 01:42:07 -08:00
parent 3706072ce5
commit 3892c48ef2
103 changed files with 1741 additions and 890 deletions
--- a/app/Filament/Resources/BlogResource.php
+++ b/app/Filament/Resources/BlogResource.php
@@ -2,6 +2,18 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Utilities\Set;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\Action;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\BlogResource\Pages\ListBlogs;
+use App\Filament\Resources\BlogResource\Pages\CreateBlog;
+use App\Filament\Resources\BlogResource\Pages\EditBlog;
 use App\Filament\Resources\BlogResource\Pages;
 use App\Filament\Resources\BlogResource\RelationManagers;
 use App\Models\Blog;
@@ -11,18 +23,15 @@ use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\RichEditor;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Forms\Set;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
@@ -32,15 +41,15 @@ class BlogResource extends Resource
 {
    protected static ?string $model = Blog::class;

-    protected static ?string $navigationIcon = 'heroicon-m-newspaper';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-m-newspaper';

-    protected static ?string $navigationGroup = 'Content';
+    protected static string | \UnitEnum | null $navigationGroup = 'Content';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
        $categories = Category::pluck('name', 'id')->toArray();
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                Section::make('Post Information')
                    ->description('Add a new post')
                    ->schema([
@@ -124,20 +133,20 @@ class BlogResource extends Resource
                        1 => 'Published',
                    ]),
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-                Tables\Actions\Action::make('togglePublished')
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
+                Action::make('togglePublished')
                    ->label('Toggle Published')
                    ->icon('heroicon-o-eye')
                    ->action(function (Blog $record) {
                        $record->update(['is_published' => !$record->is_published]);
                    }),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
@@ -152,9 +161,9 @@ class BlogResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListBlogs::route('/'),
-            'create' => Pages\CreateBlog::route('/create'),
-            'edit' => Pages\EditBlog::route('/{record}/edit'),
+            'index' => ListBlogs::route('/'),
+            'create' => CreateBlog::route('/create'),
+            'edit' => EditBlog::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/BlogResource/Pages/EditBlog.php
+++ b/app/Filament/Resources/BlogResource/Pages/EditBlog.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\BlogResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\BlogResource;
 use Filament\Actions;
 use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditBlog extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
    protected function getRedirectUrl(): ?string
--- a/app/Filament/Resources/BlogResource/Pages/ListBlogs.php
+++ b/app/Filament/Resources/BlogResource/Pages/ListBlogs.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\BlogResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\BlogResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListBlogs extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/CategoryResource.php
+++ b/app/Filament/Resources/CategoryResource.php
@@ -2,19 +2,28 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Schemas\Components\Utilities\Set;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\Action;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\CategoryResource\Pages\ListCategories;
+use App\Filament\Resources\CategoryResource\Pages\CreateCategory;
+use App\Filament\Resources\CategoryResource\Pages\EditCategory;
 use App\Filament\Resources\CategoryResource\Pages;
 use App\Filament\Resources\CategoryResource\RelationManagers;
 use App\Models\Category;
 use Filament\Forms;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Forms\Set;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Illuminate\Support\Str;
@@ -23,14 +32,14 @@ class CategoryResource extends Resource
 {
    protected static ?string $model = Category::class;

-    protected static ?string $navigationIcon = 'heroicon-o-ticket';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-ticket';

-    protected static ?string $navigationGroup = 'Content';
+    protected static string | \UnitEnum | null $navigationGroup = 'Content';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                TextInput::make('name')
                    ->required()
                    ->live(1)
@@ -63,20 +72,20 @@ class CategoryResource extends Resource
            ->filters([
                //
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-                Tables\Actions\Action::make('toggleStatus')
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
+                Action::make('toggleStatus')
                    ->label('Toggle Status')
                    ->icon('heroicon-o-power')
                    ->action(function (Category $record) {
                        $record->update(['is_active' => !$record->is_active]);
                    }),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
@@ -91,9 +100,9 @@ class CategoryResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListCategories::route('/'),
-            'create' => Pages\CreateCategory::route('/create'),
-            'edit' => Pages\EditCategory::route('/{record}/edit'),
+            'index' => ListCategories::route('/'),
+            'create' => CreateCategory::route('/create'),
+            'edit' => EditCategory::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
+++ b/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\CategoryResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\CategoryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -13,7 +14,7 @@ class EditCategory extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
+++ b/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\CategoryResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\CategoryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListCategories extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/MenuResource.php
+++ b/app/Filament/Resources/MenuResource.php
@@ -2,6 +2,15 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\MenuResource\Pages\ListMenus;
+use App\Filament\Resources\MenuResource\Pages\CreateMenu;
+use App\Filament\Resources\MenuResource\Pages\EditMenu;
 use App\Filament\Resources\MenuResource\Pages;
 use App\Filament\Resources\MenuResource\RelationManagers;
 use App\Models\Menu;
@@ -9,7 +18,6 @@ use Filament\Forms;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
@@ -22,15 +30,15 @@ class MenuResource extends Resource
 {
    protected static ?string $model = Menu::class;

-    protected static ?string $navigationIcon = 'heroicon-o-bars-3-bottom-left';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-bars-3-bottom-left';

-    protected static ?string $navigationGroup = 'Content';
+    protected static string | \UnitEnum | null $navigationGroup = 'Content';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
        $menus = Menu::Pluck('name', 'id')->toArray();
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                TextInput::make('name')
                    ->label('Menu Name')
                    ->required(),
@@ -62,14 +70,14 @@ class MenuResource extends Resource
            ->filters([
                //
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
@@ -84,9 +92,9 @@ class MenuResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListMenus::route('/'),
-            'create' => Pages\CreateMenu::route('/create'),
-            'edit' => Pages\EditMenu::route('/{record}/edit'),
+            'index' => ListMenus::route('/'),
+            'create' => CreateMenu::route('/create'),
+            'edit' => EditMenu::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/MenuResource/Pages/EditMenu.php
+++ b/app/Filament/Resources/MenuResource/Pages/EditMenu.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\MenuResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\MenuResource;
 use Filament\Actions;
 use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditMenu extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
    protected function getRedirectUrl(): ?string
--- a/app/Filament/Resources/MenuResource/Pages/ListMenus.php
+++ b/app/Filament/Resources/MenuResource/Pages/ListMenus.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\MenuResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\MenuResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListMenus extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/PageResource.php
+++ b/app/Filament/Resources/PageResource.php
@@ -2,6 +2,19 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Utilities\Set;
+use Filament\Tables\Filters\SelectFilter;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\Action;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\PageResource\Pages\ListPages;
+use App\Filament\Resources\PageResource\Pages\CreatePage;
+use App\Filament\Resources\PageResource\Pages\EditPage;
 use App\Filament\Resources\PageResource\Pages;
 use App\Filament\Resources\PageResource\RelationManagers;
 use App\Models\Page;
@@ -10,13 +23,10 @@ use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\RichEditor;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
-use Filament\Forms\Set;
 use Illuminate\Support\Str;
 use Filament\Resources\Resource;
 use Filament\Tables;
@@ -31,16 +41,16 @@ class PageResource extends Resource
 {
    protected static ?string $model = Page::class;

-    protected static ?string $navigationIcon = 'heroicon-o-document';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-document';

-    protected static ?string $navigationGroup = 'Content';
+    protected static string | \UnitEnum | null $navigationGroup = 'Content';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
        $pages = Page::Pluck('title', 'id')->toArray();

-        return $form
-            ->schema([
+        return $schema
+            ->components([

                Section::make('Page Information')
                    ->description('Add a new page')
@@ -101,27 +111,27 @@ class PageResource extends Resource
            ])
            ->defaultSort('created_at', 'desc')
            ->filters([
-                Tables\Filters\SelectFilter::make('is_published')
+                SelectFilter::make('is_published')
                    ->label('Status')
                    ->options([
                        0 => 'Draft',
                        1 => 'Published',
                    ]),
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-                Tables\Actions\Action::make('togglePublished')
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
+                Action::make('togglePublished')
                    ->label('Toggle Published')
                    ->icon('heroicon-o-eye')
-                    ->action(function (\App\Models\Page $record) {
+                    ->action(function (Page $record) {
                        $record->update(['is_published' => !$record->is_published]);
                    }),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
@@ -136,9 +146,9 @@ class PageResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListPages::route('/'),
-            'create' => Pages\CreatePage::route('/create'),
-            'edit' => Pages\EditPage::route('/{record}/edit'),
+            'index' => ListPages::route('/'),
+            'create' => CreatePage::route('/create'),
+            'edit' => EditPage::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/PageResource/Pages/EditPage.php
+++ b/app/Filament/Resources/PageResource/Pages/EditPage.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\PageResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\PageResource;
 use Filament\Actions;
 use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditPage extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
    protected function getRedirectUrl(): ?string
--- a/app/Filament/Resources/PageResource/Pages/ListPages.php
+++ b/app/Filament/Resources/PageResource/Pages/ListPages.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\PageResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\PageResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListPages extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/PlanResource.php
+++ b/app/Filament/Resources/PlanResource.php
@@ -2,6 +2,17 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Schemas\Components\Section;
+use Filament\Tables\Filters\SelectFilter;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\PlanResource\Pages\ListPlans;
+use App\Filament\Resources\PlanResource\Pages\CreatePlan;
+use App\Filament\Resources\PlanResource\Pages\EditPlan;
 use App\Filament\Resources\PlanResource\Pages;
 use App\Filament\Resources\PlanResource\RelationManagers;
 use App\Models\Plan;
@@ -9,10 +20,8 @@ use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\RichEditor;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Resources\Resource;
 use Filament\Tables;
@@ -28,15 +37,15 @@ class PlanResource extends Resource
 {
    protected static ?string $model = Plan::class;

-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-rectangle-stack';

-    protected static ?string $navigationGroup = 'Web Master';
+    protected static string | \UnitEnum | null $navigationGroup = 'Web Master';


-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                Section::make('Plan Information')
                    ->description('Add a new plan')
                    ->schema([
@@ -86,7 +95,7 @@ class PlanResource extends Resource
            ])
            ->searchable()
            ->filters([
-                Tables\Filters\SelectFilter::make('payment_method')
+                SelectFilter::make('payment_method')
                    ->label('Payment Method')
                    ->options([
                        'stripe' => 'Stripe',
@@ -108,14 +117,14 @@ class PlanResource extends Resource
                        return $query;
                    }),
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
@@ -130,9 +139,9 @@ class PlanResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListPlans::route('/'),
-            'create' => Pages\CreatePlan::route('/create'),
-            'edit' => Pages\EditPlan::route('/{record}/edit'),
+            'index' => ListPlans::route('/'),
+            'create' => CreatePlan::route('/create'),
+            'edit' => EditPlan::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/PlanResource/Pages/EditPlan.php
+++ b/app/Filament/Resources/PlanResource/Pages/EditPlan.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\PlanResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\PlanResource;
 use Filament\Actions;
 use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditPlan extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
    protected function getRedirectUrl(): ?string
--- a/app/Filament/Resources/PlanResource/Pages/ListPlans.php
+++ b/app/Filament/Resources/PlanResource/Pages/ListPlans.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\PlanResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\PlanResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListPlans extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/TicketResource.php
+++ b/app/Filament/Resources/TicketResource.php
@@ -2,6 +2,21 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\Action;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use Filament\Actions\BulkAction;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Mail;
+use App\Mail\TicketResponseNotification;
+use App\Filament\Resources\TicketResource\RelationManagers\ResponsesRelationManager;
+use App\Filament\Resources\TicketResource\Pages\ListTickets;
+use App\Filament\Resources\TicketResource\Pages\CreateTicket;
+use App\Filament\Resources\TicketResource\Pages\EditTicket;
 use App\Filament\Resources\TicketResource\Pages;
 use App\Filament\Resources\TicketResource\RelationManagers;
 use App\Models\Ticket;
@@ -12,11 +27,9 @@ use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Actions\Action;
 use Filament\Tables\Columns\BadgeColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\Filter;
@@ -31,13 +44,13 @@ class TicketResource extends Resource

    protected static ?string $model = Ticket::class;

-    protected static ?string $navigationIcon = 'heroicon-o-ticket';
-    protected static ?string $navigationGroup = 'Support';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-ticket';
+    protected static string | \UnitEnum | null $navigationGroup = 'Support';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                Select::make('user_id')
                    ->relationship('user', 'name')
                    ->searchable()
@@ -92,7 +105,7 @@ class TicketResource extends Resource
                TextColumn::make('created_at')
                    ->label('Created At')
                    ->dateTime('F d, Y • h:i A')->sortable(),
-                TextColumn::make('last_response_at')
+                TextColumn::make('updated_at')
                    ->label('Last Response')
                    ->sortable()
                    ->formatStateUsing(fn ($state) => $state?->diffForHumans()),
@@ -108,7 +121,7 @@ class TicketResource extends Resource
                    ])
                    ->attribute('status'),
                Filter::make('created_at')
-                    ->form([
+                    ->schema([
                        DatePicker::make('created_from')->label('Created From'),
                        DatePicker::make('created_until')->label('Created Until'),
                    ])
@@ -121,14 +134,14 @@ class TicketResource extends Resource
 //            ->actions([
 //                Tables\Actions\EditAction::make(),
 //            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make(),
                Action::make('view')
                    ->label('View & Respond')
                    ->icon('heroicon-o-eye')
-                    ->form(function (Ticket $ticket): array {
+                    ->schema(function (Ticket $ticket): array {
                        return [
                            TextArea::make('response')
                                ->label('Your Response')
@@ -175,7 +188,7 @@ class TicketResource extends Resource

                        $html .= '</div>';

-                        return new \Illuminate\Support\HtmlString($html);
+                        return new HtmlString($html);
                    })

                    ->action(function (array $data, Ticket $ticket) {
@@ -200,12 +213,13 @@ class TicketResource extends Resource
                    ->modalHeading('View & Respond to Ticket')
                    ->modalSubmitActionLabel('Send Reply'),
            ])
-            ->actions([
+            ->recordActions([
                Action::make('close')
                    ->label('Close Ticket')
                    ->icon('heroicon-o-x-circle')
                    ->color('danger')
                    ->requiresConfirmation()
+                    ->visible(fn (Ticket $ticket): bool => $ticket->status !== 'closed')
                    ->action(function (Ticket $ticket) {
                        $ticket->update(['status' => 'closed']);
                    }),
@@ -218,16 +232,16 @@ class TicketResource extends Resource
                        $ticket->update(['status' => 'open']);
                    }),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\BulkAction::make('notify_users')
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
+                    BulkAction::make('notify_users')
                        ->label('Send Email Notification')
                        ->color('success')
                        ->icon('heroicon-o-envelope')
                        ->requiresConfirmation()
                        ->deselectRecordsAfterCompletion()
-                        ->action(function (\Illuminate\Support\Collection $records) {
+                        ->action(function (Collection $records) {
                            foreach ($records as $ticket) {
                                $responses = $ticket->responses()
                                    ->with('user')
@@ -235,12 +249,12 @@ class TicketResource extends Resource
                                    ->get();

                                if ($ticket->user && $ticket->user->email) {
-                                    \Illuminate\Support\Facades\Mail::to($ticket->user->email)
-                                        ->send(new \App\Mail\TicketResponseNotification($ticket, $responses));
+                                    Mail::to($ticket->user->email)
+                                        ->send(new TicketResponseNotification($ticket, $responses));
                                }
                            }

-                            \Filament\Notifications\Notification::make()
+                            Notification::make()
                                ->title('Email notifications sent successfully!')
                                ->success()
                                ->send();
@@ -252,16 +266,16 @@ class TicketResource extends Resource
    public static function getRelations(): array
    {
        return [
-            RelationManagers\ResponsesRelationManager::class,
+            ResponsesRelationManager::class,
        ];
    }

    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListTickets::route('/'),
-            'create' => Pages\CreateTicket::route('/create'),
-            'edit' => Pages\EditTicket::route('/{record}/edit'),
+            'index' => ListTickets::route('/'),
+            'create' => CreateTicket::route('/create'),
+            'edit' => EditTicket::route('/{record}/edit'),
        ];
    }
 }
--- a/app/Filament/Resources/TicketResource/Pages/EditTicket.php
+++ b/app/Filament/Resources/TicketResource/Pages/EditTicket.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\TicketResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\TicketResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -13,7 +14,7 @@ class EditTicket extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/TicketResource/Pages/ListTickets.php
+++ b/app/Filament/Resources/TicketResource/Pages/ListTickets.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\TicketResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\TicketResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListTickets extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/TicketResource/RelationManagers/ResponsesRelationManager.php
+++ b/app/Filament/Resources/TicketResource/RelationManagers/ResponsesRelationManager.php
@@ -2,11 +2,16 @@

 namespace App\Filament\Resources\TicketResource\RelationManagers;

+use Filament\Schemas\Schema;
+use Filament\Actions\CreateAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
 use Filament\Forms;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
@@ -18,10 +23,10 @@ class ResponsesRelationManager extends RelationManager
 {
    protected static string $relationship = 'responses';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                Select::make('user_id')
                    ->relationship('user', 'name')
                    ->searchable()
@@ -50,15 +55,15 @@ class ResponsesRelationManager extends RelationManager
                //
            ])
            ->headerActions([
-                Tables\Actions\CreateAction::make(),
+                CreateAction::make(),
            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+            ->recordActions([
+                EditAction::make(),
+                DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -2,6 +2,15 @@

 namespace App\Filament\Resources;

+use Filament\Schemas\Schema;
+use Filament\Actions\EditAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use Filament\Actions\BulkAction;
+use Exception;
+use App\Filament\Resources\UserResource\Pages\ListUsers;
+use App\Filament\Resources\UserResource\Pages\CreateUser;
+use App\Filament\Resources\UserResource\Pages\EditUser;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers\LogsRelationManager;
 use App\Filament\Resources\UserResource\RelationManagers\UsageLogsRelationManager;
@@ -12,7 +21,6 @@ use Filament\Forms;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
@@ -30,14 +38,14 @@ class UserResource extends Resource
 {
    protected static ?string $model = User::class;

-    protected static ?string $navigationIcon = 'heroicon-o-users';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-users';

-    protected static ?string $navigationGroup = 'Admin';
+    protected static string | \UnitEnum | null $navigationGroup = 'Admin';

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                TextInput::make('name')
                    ->required()
                    ->maxLength(255),
@@ -152,19 +160,19 @@ class UserResource extends Resource
                        }
                    }),
            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
+            ->recordActions([
+                EditAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\BulkAction::make('updateLevel')
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
+                    BulkAction::make('updateLevel')
                        ->label('Update User Level')
                        ->action(function (Collection $records, array $data) {

                            $newLevel = $data['new_level'];
                            if ($newLevel === 9) {
-                                throw new \Exception('User level cannot be 9 or higher.');
+                                throw new Exception('User level cannot be 9 or higher.');
                            }

                            DB::table('users')
@@ -206,9 +214,9 @@ class UserResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListUsers::route('/'),
-            'create' => Pages\CreateUser::route('/create'),
-            'edit' => Pages\EditUser::route('/{record}/edit'),
+            'index' => ListUsers::route('/'),
+            'create' => CreateUser::route('/create'),
+            'edit' => EditUser::route('/{record}/edit'),
        ];
    }

--- a/app/Filament/Resources/UserResource/Pages/EditUser.php
+++ b/app/Filament/Resources/UserResource/Pages/EditUser.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\UserResource\Pages;

+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\UserResource;
 use App\Models\User;
 use Filament\Actions;
@@ -16,7 +17,7 @@ class EditUser extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
            Action::make('download_report')
                ->label('Download User Report')
                ->icon('heroicon-o-user')
--- a/app/Filament/Resources/UserResource/Pages/ListUsers.php
+++ b/app/Filament/Resources/UserResource/Pages/ListUsers.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Resources\UserResource\Pages;

+use Filament\Actions\CreateAction;
 use App\Filament\Resources\UserResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListUsers extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
        ];
    }
 }
--- a/app/Filament/Resources/UserResource/RelationManagers/LogsRelationManager.php
+++ b/app/Filament/Resources/UserResource/RelationManagers/LogsRelationManager.php
@@ -2,6 +2,8 @@

 namespace App\Filament\Resources\UserResource\RelationManagers;

+use Filament\Tables\Columns\TextColumn;
+use Filament\Actions\BulkActionGroup;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -19,14 +21,14 @@ class LogsRelationManager extends RelationManager
    {
        return $table
            ->columns([
-                Tables\Columns\TextColumn::make('ip')
+                TextColumn::make('ip')
                    ->label('IP Address')
                    ->sortable()
                    ->searchable(),
-                Tables\Columns\TextColumn::make('email')
+                TextColumn::make('email')
                    ->sortable()
                    ->searchable(),
-                Tables\Columns\TextColumn::make('created_at')
+                TextColumn::make('created_at')
                    ->label('Logged At')
                    ->dateTime()
                    ->sortable(),
@@ -37,12 +39,12 @@ class LogsRelationManager extends RelationManager
            ->headerActions([
                //Tables\Actions\CreateAction::make(),
            ])
-            ->actions([
+            ->recordActions([
                //Tables\Actions\EditAction::make(),
                //Tables\Actions\DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
+            ->toolbarActions([
+                BulkActionGroup::make([
                    //Tables\Actions\DeleteBulkAction::make(),
                ]),
            ]);
--- a/app/Filament/Resources/UserResource/RelationManagers/UsageLogsRelationManager.php
+++ b/app/Filament/Resources/UserResource/RelationManagers/UsageLogsRelationManager.php
@@ -2,6 +2,8 @@

 namespace App\Filament\Resources\UserResource\RelationManagers;

+use Filament\Tables\Columns\TextColumn;
+use Filament\Actions\BulkActionGroup;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -21,17 +23,17 @@ class UsageLogsRelationManager extends RelationManager
        return $table

            ->columns([
-                Tables\Columns\TextColumn::make('ip_address')
+                TextColumn::make('ip_address')
                    ->label('IP Address')
                    ->sortable()
                    ->searchable(),
-                Tables\Columns\TextColumn::make('emails_created_count')
+                TextColumn::make('emails_created_count')
                    ->label('Emails Created')
                    ->sortable(),
-                Tables\Columns\TextColumn::make('emails_received_count')
+                TextColumn::make('emails_received_count')
                    ->label('Emails Received')
                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
+                TextColumn::make('updated_at')
                    ->label('Last Activity At')
                    ->dateTime()
                    ->sortable(),
@@ -42,12 +44,12 @@ class UsageLogsRelationManager extends RelationManager
            ->headerActions([
                //Tables\Actions\CreateAction::make(),
            ])
-            ->actions([
+            ->recordActions([
                //Tables\Actions\EditAction::make(),
                //Tables\Actions\DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
+            ->toolbarActions([
+                BulkActionGroup::make([
                    //Tables\Actions\DeleteBulkAction::make(),
                ]),
            ]);