Add prunable method to QueueMonitor model and

filters to QueueMonitorResource table
croustibat · Dec 7, 2023 · 4616bb4 · 4616bb4
1 parent 08d724f
commit 4616bb4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/Models/QueueMonitor.php b/src/Models/QueueMonitor.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Prunable;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Hash;
 
 class QueueMonitor extends Model
@@ -102,7 +103,7 @@ public function hasSucceeded(): bool
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function prunable()
+    public function prunable(): Builder|bool
     {
         if (FilamentJobsMonitorPlugin::get()->getPruning()) {
             return static::where('created_at', '<=', now()->subDays(FilamentJobsMonitorPlugin::get()->getPruningRetention()));

diff --git a/src/Resources/QueueMonitorResource.php b/src/Resources/QueueMonitorResource.php
@@ -13,8 +13,11 @@
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Builder;
+
 
 class QueueMonitorResource extends Resource
 {
@@ -49,7 +52,6 @@ public static function table(Table $table): Table
                 TextColumn::make('status')
                     ->badge()
                     ->label(__('filament-jobs-monitor::translations.status'))
-                    ->sortable()
                     ->formatStateUsing(fn (string $state): string => __("filament-jobs-monitor::translations.{$state}"))
                     ->color(fn (string $state): string => match ($state) {
                         'running' => 'primary',
@@ -74,6 +76,30 @@ public static function table(Table $table): Table
             ->defaultSort('started_at', 'desc')
             ->bulkActions([
                 DeleteBulkAction::make(),
+            ])
+            ->filters([
+                SelectFilter::make('status')
+                    ->options([
+                        'running' => 'Running',
+                        'succeeded' => 'Succeeded',
+                        'failed' => 'Failed',
+                    ])
+                    ->query(function (Builder $query, array $data) {
+                        if ($data['value'] === 'succeeded') {
+                            return $query
+                                ->whereNotNull('finished_at')
+                                ->where('failed', 0);
+                        }
+                        else if ($data['value'] === 'failed') {
+                            return $query
+                                ->whereNotNull('finished_at')
+                                ->where('failed', 1);
+                        }
+                        else if ($data['value'] === 'running') {
+                            return $query
+                                ->whereNull('finished_at');
+                        }
+                    }),
             ]);
     }