fixes slideovers

vormkracht10 · Dec 23, 2024 · f025911 · f025911
1 parent 11cca95
commit f025911
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/Resources/EventResource.php b/src/Resources/EventResource.php
@@ -24,6 +24,11 @@ class EventResource extends Resource
 
     protected static bool $shouldRegisterNavigation = true;
 
+    public function getTitle(): string
+    {
+        return __('Events');
+    }
+
     public static function getNavigationParentItem(): ?string
     {
         return __('Mails');
@@ -41,7 +46,7 @@ public static function getNavigationLabel(): string
 
     public static function getLabel(): ?string
     {
-        return __('Events');
+        return __('Event');
     }
 
     public static function getPluralModelLabel(): string
@@ -54,11 +59,6 @@ public static function getNavigationIcon(): string
         return 'heroicon-o-calendar';
     }
 
-    public function getTitle(): string
-    {
-        return __('Events');
-    }
-
     public static function infolist(Infolist $infolist): Infolist
     {
         return $infolist
@@ -214,10 +214,6 @@ public static function table(Table $table): Table
                     })
                     ->searchable(),
                 Tables\Columns\TextColumn::make('mail.subject')
-                    ->url(fn (MailEvent $record) => route('filament.' . filament()->getCurrentPanel()?->getId() . '.resources.mails.view', [
-                        'record' => $record->mail,
-                        'tenant' => filament()->getTenant()?->id,
-                    ]))
                     ->label(__('Subject'))
                     ->searchable(['subject', 'payload']),
                 Tables\Columns\TextColumn::make('occurred_at')
@@ -233,6 +229,8 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\ViewAction::make()
+                    ->url(null)
+                    ->modal()
                     ->slideOver()
                     ->label(__('View'))
                     ->hiddenLabel()

diff --git a/src/Resources/EventResource/Pages/ListEvents.php b/src/Resources/EventResource/Pages/ListEvents.php
@@ -54,6 +54,12 @@ public function getTabs(): array
                 ->badge(MailEvent::where('type', EventType::OPENED)->count())
                 ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::OPENED)),
 
+            'soft_bounce' => Tab::make()
+                ->label(__('Soft Bounce'))
+                ->icon('heroicon-o-x-circle')
+                ->badge(MailEvent::where('type', EventType::SOFT_BOUNCED)->count())
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::SOFT_BOUNCED)),
+
             'bounced' => Tab::make()
                 ->label(__('Bounced'))
                 ->badgeColor('danger')

diff --git a/src/Resources/MailResource.php b/src/Resources/MailResource.php
@@ -346,6 +346,8 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\ViewAction::make()
+                    ->url(null)
+                    ->modal()
                     ->slideOver()
                     ->label(__('View'))
                     ->hiddenLabel()