Merge pull request #15 from bcollins-oxford/patch-1

Update QueueMonitorResource to Fix and apply sorting
croustibat · Aug 9, 2023 · 6ce726d · 6ce726d
2 parents baad905 + d92e44e
commit 6ce726d
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/Resources/QueueMonitorResource.php b/src/Resources/QueueMonitorResource.php
@@ -27,16 +27,15 @@ public static function form(Form $form): Form
                     ->maxLength(255),
                 Forms\Components\TextInput::make('queue')
                     ->maxLength(255),
-                Forms\Components\DateTimePicker::make('started_at')
-                    ->sortable(),
+                Forms\Components\DateTimePicker::make('started_at'),
                 Forms\Components\DateTimePicker::make('finished_at'),
                 Forms\Components\Toggle::make('failed')
                     ->required(),
                 Forms\Components\TextInput::make('attempt')
                     ->required(),
                 Forms\Components\Textarea::make('exception_message')
                     ->maxLength(65535),
-            ])->defaultSort('started_at', 'desc');
+            ]);
     }
 
     public static function table(Table $table): Table
@@ -54,16 +53,16 @@ public static function table(Table $table): Table
                         'primary' => 'running',
                         'success' => 'succeeded',
                         'danger' => 'failed',
-                    ]),
+                    ])->sortable(),
                 Tables\Columns\TextColumn::make('name')
-                    ->label(__('filament-jobs-monitor::translations.name')),
+                    ->label(__('filament-jobs-monitor::translations.name'))->sortable(),
                 Tables\Columns\TextColumn::make('queue')
-                    ->label(__('filament-jobs-monitor::translations.queue')),
-                ProgressColumn::make('progress')->label(__('filament-jobs-monitor::translations.progress'))->color('warning'),
+                    ->label(__('filament-jobs-monitor::translations.queue'))->sortable(),
+                ProgressColumn::make('progress')->label(__('filament-jobs-monitor::translations.progress'))->color('warning')->sortable(),
                 Tables\Columns\TextColumn::make('started_at')
                     ->label(__('filament-jobs-monitor::translations.started_at'))
-                    ->since(),
-            ])
+                    ->since()->sortable(),
+            ])->defaultSort('started_at', 'desc')
             ->bulkActions([
                 Tables\Actions\DeleteBulkAction::make(),
             ]);