wip

README.md

@@ -109,6 +109,7 @@ return [
     'resources' => [
         'mail' => \App\Filament\Resources\MailResource::class,
         'event' => \App\Filament\Resources\EventResource::class,
+        'suppressions' => \App\Filament\Resources\SuppressionResource::class
     ],
 ];
 ```

composer.json

@@ -23,7 +23,7 @@
         "php": "^8.1",
         "filament/filament": "^3.0",
         "spatie/laravel-package-tools": "^1.15.0",
-        "vormkracht10/laravel-mails": "^1.0"
+        "vormkracht10/laravel-mails": "dev-feature/suppressions-list"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
@@ -74,5 +74,11 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
-}
+    "prefer-stable": true,
+    "repositories": {
+        "laravel-mails": {
+            "type": "path",
+            "url": "/var/www/laravel-mails"
+        }
+    }
+}

config/filament-mails.php

@@ -2,10 +2,12 @@
 
 use Vormkracht10\FilamentMails\Resources\EventResource;
 use Vormkracht10\FilamentMails\Resources\MailResource;
+use Vormkracht10\FilamentMails\Resources\SuppressionResource;
 
 return [
     'resources' => [
         'mail' => MailResource::class,
         'event' => EventResource::class,
+        'suppressions' => SuppressionResource::class
     ],
 ];

src/FilamentMailsPlugin.php

@@ -22,6 +22,7 @@ public function register(Panel $panel): void
             ->resources([
                 config('filament-mails.resources.mail'),
                 config('filament-mails.resources.event'),
+                config('filament-mails.resources.suppressions'),
             ]);
     }
 

src/Resources/EventResource.php

@@ -73,7 +73,7 @@ public static function infolist(Infolist $infolist): Infolist
                                 TextEntry::make('type')
                                     ->label(__('Type'))
                                     ->badge()
-                                    ->color(fn (EventType $state): string => match ($state) {
+                                    ->color(fn(EventType $state): string => match ($state) {
                                         EventType::DELIVERED => 'success',
                                         EventType::CLICKED => 'clicked',
                                         EventType::OPENED => 'info',
@@ -121,7 +121,7 @@ public static function infolist(Infolist $infolist): Infolist
                                     ->default(__('Unknown'))
                                     ->label(__('User Agent'))
                                     ->limit(50)
-                                    ->tooltip(fn ($state) => $state),
+                                    ->tooltip(fn($state) => $state),
                             ]),
                     ]),
                 Section::make(__('Location'))
@@ -150,7 +150,7 @@ public static function infolist(Infolist $infolist): Infolist
                                     ->default(__('Unknown'))
                                     ->label(__('Link'))
                                     ->limit(50)
-                                    ->url(fn ($state) => $state)
+                                    ->url(fn($state) => $state)
                                     ->openUrlInNewTab(),
                                 TextEntry::make('tag')
                                     ->default(__('Unknown'))
@@ -199,7 +199,7 @@ public static function table(Table $table): Table
                     ->label(__('Type'))
                     ->sortable()
                     ->badge()
-                    ->color(fn (EventType $state): string => match ($state) {
+                    ->color(fn(EventType $state): string => match ($state) {
                         EventType::DELIVERED => 'success',
                         EventType::CLICKED => 'clicked',
                         EventType::OPENED => 'info',
@@ -220,7 +220,7 @@ public static function table(Table $table): Table
                     ->label(__('Occurred At'))
                     ->dateTime('d-m-Y H:i')
                     ->since()
-                    ->tooltip(fn (MailEvent $record) => $record->occurred_at->format('d-m-Y H:i'))
+                    ->tooltip(fn(MailEvent $record) => $record->occurred_at->format('d-m-Y H:i'))
                     ->sortable()
                     ->searchable(),
             ])

src/Resources/SuppressionResource.php

@@ -2,9 +2,11 @@
 
 namespace Vormkracht10\FilamentMails\Resources;
 
+use Filament\Infolists\Infolist;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Vormkracht10\FilamentMails\Resources\SuppressionResource\Pages\ListSuppressions;
 use Vormkracht10\FilamentMails\Resources\SuppressionResource\Pages\ViewSuppression;
 use Vormkracht10\Mails\Enums\EventType;
@@ -55,50 +57,57 @@ public static function getNavigationIcon(): string
         return 'heroicon-o-no-symbol';
     }
 
+    public static function getEloquentQuery(): Builder
+    {
+        return parent::getEloquentQuery()
+            ->where('type', EventType::HARD_BOUNCED)
+            ->whereNull('unsuppressed_at')
+            ->orWhere('unsuppressed_at', '')
+            ->latest('occurred_at')
+            ->orderBy('occurred_at', 'desc');
+    }
+
     public static function table(Table $table): Table
     {
         return $table
-            ->recordAction('view')
-            ->recordUrl(null)
-            ->defaultSort('created_at', 'desc')
+            ->defaultSort('occurred_at', 'desc')
             ->columns([
                 Tables\Columns\TextColumn::make('mail.to')
                     ->label(__('Email address'))
-                    ->formatStateUsing(fn (MailEvent $record) => key($record->mail->to))
+                    ->formatStateUsing(fn(MailEvent $record) => key($record->mail->to))
                     ->searchable(['to']),
+
                 Tables\Columns\TextColumn::make('occurred_at')
+                    ->badge()
                     ->label(__('Suppressed At'))
                     ->dateTime('d-m-Y H:i')
                     ->since()
-                    ->tooltip(fn (MailEvent $record) => $record->occurred_at->format('d-m-Y H:i'))
+                    ->tooltip(fn(MailEvent $record) => $record->occurred_at->format('d-m-Y H:i'))
                     ->sortable()
                     ->searchable(),
             ])
-            ->modifyQueryUsing(fn ($query) => $query->where('type', EventType::HARD_BOUNCED))
-            ->filters([
-                //
-            ])
             ->actions([
+                Tables\Actions\Action::make('unsupress')
+                    ->action(function (MailEvent $record) {
+                        $record->unsuppressed_at = now();
+                        $record->save();
+                    }),
+
                 Tables\Actions\ViewAction::make()
                     ->url(null)
                     ->modal()
                     ->slideOver()
                     ->label(__('View'))
                     ->hiddenLabel()
-                    ->tooltip(__('View')),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
+                    ->tooltip(__('View'))
+                    ->infolist(fn(Infolist $infolist) => EventResource::infolist($infolist)),
             ]);
     }
 
     public static function getPages(): array
     {
         return [
-            'index' => ListSuppressions::route('/'),
-            'view' => ViewSuppression::route('/{record}/view'),
+            'index' => ListSuppressions::route('/')
         ];
     }
 }