Skip to content

Commit

Permalink
Merge branch 'main' of github.com:vormkracht10/filament-mails
Browse files Browse the repository at this point in the history
  • Loading branch information
@Baspa
Baspa committed Sep 12, 2024
2 parents 633c599 + 62e9956 commit 91fa204
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 30 deletions.
1 change: 0 additions & 1 deletion resources/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"View": "View",
"Mail ID": "Mail ID",
"Subject": "Subject",
"Occured At": "Occurred At",
"Mails": "Mails",
"Mail": "Mail",
"From": "From",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/nl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"View": "Bekijken",
"Mail ID": "E-mail ID",
"Subject": "Onderwerp",
"Occured At": "Opgetreden op",
"Mails": "E-mails",
"Mail": "E-mail",
"From": "Van",
Expand Down
14 changes: 7 additions & 7 deletions src/Resources/EventResource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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 => 'success',
Expand Down Expand Up @@ -123,7 +123,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'))
Expand Down Expand Up @@ -152,7 +152,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'))
Expand Down Expand Up @@ -200,7 +200,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 => 'success',
Expand All @@ -215,7 +215,7 @@ 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', [
->url(fn (MailEvent $record) => route('filament.' . filament()->getCurrentPanel()?->getId() . '.resources.mails.view', [
'record' => $record->mail,
'tenant' => filament()->getTenant()?->id,

Check failure on line 220 in src/Resources/EventResource.php

View workflow job for this annotation

GitHub Actions / phpstan 

Access to an undefined property Illuminate\Database\Eloquent\Model::$id.
]))
Expand All @@ -225,7 +225,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(),
])
Expand Down Expand Up @@ -253,4 +253,4 @@ public static function getPages(): array
'view' => ViewEvent::route('/{record}/view'),
];
}
}
}
46 changes: 25 additions & 21 deletions src/Resources/MailResource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@

namespace Vormkracht10\FilamentMails\Resources;

use Filament\Tables;
use Illuminate\View\View;
use Filament\Tables\Table;
use Filament\Infolists\Infolist;
use Filament\Resources\Resource;
use Illuminate\Support\Collection;
use Filament\Tables\Actions\Action;
use Filament\Infolists\Components\Grid;
use Filament\Infolists\Components\Tabs;
use Filament\Forms\Components\TextInput;
use Filament\Notifications\Notification;
use Vormkracht10\Mails\Models\MailEvent;
use Filament\Infolists\Components\Section;
use Vormkracht10\Mails\Actions\ResendMail;
use Filament\Infolists\Components\Tabs\Tab;
use Vormkracht10\FilamentMails\Models\Mail;
use Filament\Infolists\Components\TextEntry;
use Filament\Infolists\Components\ViewEntry;
use Vormkracht10\Mails\Enums\WebhookEventType;
use Filament\Infolists\Components\RepeatableEntry;
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ViewMail;
use Filament\Infolists\Infolist;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Actions\Action;
use Filament\Tables\Table;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use Vormkracht10\FilamentMails\Models\Mail;
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListMails;
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ViewMail;
use Vormkracht10\Mails\Actions\ResendMail;
use Vormkracht10\Mails\Enums\EventType;
use Vormkracht10\Mails\Models\MailEvent;

class MailResource extends Resource
{
Expand Down Expand Up @@ -154,14 +154,17 @@ public static function infolist(Infolist $infolist): Infolist
'record' => $record,
'tenant' => filament()->getTenant()?->id,

Check failure on line 155 in src/Resources/MailResource.php

View workflow job for this annotation

GitHub Actions / phpstan 

Access to an undefined property Illuminate\Database\Eloquent\Model::$id.
]))
->color(fn(WebhookEventType $state): string => match ($state) {
WebhookEventType::DELIVERY => 'success',
WebhookEventType::CLICK => 'clicked',
WebhookEventType::OPEN => 'success',
WebhookEventType::BOUNCE => 'danger',
WebhookEventType::COMPLAINT => 'danger',
->color(fn(EventType $state): string => match ($state) {
EventType::DELIVERED => 'success',
EventType::CLICKED => 'clicked',
EventType::OPENED => 'success',
EventType::SOFT_BOUNCED => 'danger',
EventType::HARD_BOUNCED => 'danger',
EventType::COMPLAINED => 'danger',
EventType::UNSUBSCRIBED => 'danger',
EventType::ACCEPTED => 'success',
})
->formatStateUsing(function (WebhookEventType $state) {
->formatStateUsing(function (EventType $state) {
return ucfirst($state->value);
}),
TextEntry::make('occurred_at')
Expand Down Expand Up @@ -268,13 +271,14 @@ public static function table(Table $table): Table
->badge()
->color(fn(string $state): string => match ($state) {
__('Soft Bounced') => 'warning',
__('Hard Bounced') => 'danger',
__('Complained') => 'danger',
__('Clicked') => 'clicked',
__('Opened') => 'success',
__('Delivered') => 'success',
__('Sent') => 'info',
__('Resent') => 'info',
__('Pending') => 'gray',
__('Unsent') => 'gray',
default => 'gray',
}),
Tables\Columns\TextColumn::make('subject')
Expand Down

0 comments on commit 91fa204

Please sign in to comment.