From f325e336344187134ddee76c49277dded61e877c Mon Sep 17 00:00:00 2001 From: marco76tv Date: Mon, 26 Feb 2024 11:36:34 +0100 Subject: [PATCH] up --- Filament/Resources/JobBatchResource.php | 60 +++++++++++++++---- .../ScheduleResource/Pages/ViewSchedule.php | 5 +- Http/Livewire/Broad.php | 6 +- Models/BaseModel.php | 4 +- 4 files changed, 56 insertions(+), 19 deletions(-) diff --git a/Filament/Resources/JobBatchResource.php b/Filament/Resources/JobBatchResource.php index a7f093f8..a23882a4 100644 --- a/Filament/Resources/JobBatchResource.php +++ b/Filament/Resources/JobBatchResource.php @@ -14,6 +14,7 @@ use Modules\Job\Filament\Resources\JobBatchResource\Pages\ListJobBatches; use Modules\Job\Models\JobBatch; use Modules\Xot\Filament\Resources\XotBaseResource; +use Webmozart\Assert\Assert; class JobBatchResource extends XotBaseResource { @@ -27,19 +28,55 @@ class JobBatchResource extends XotBaseResource public static function table(Table $table): Table { + Assert::string($date_format = config('app.date_format')); + return $table ->columns( [ - TextColumn::make('created_at')->dateTime(config('app.date_format'))->sortable()->searchable()->toggleable(), - TextColumn::make('id')->sortable()->searchable()->toggleable(), - TextColumn::make('name')->sortable()->searchable()->toggleable(), - TextColumn::make('cancelled_at')->dateTime(config('app.date_format'))->sortable()->searchable()->toggleable(), - TextColumn::make('failed_at')->dateTime(config('app.date_format'))->sortable()->searchable()->toggleable(), - TextColumn::make('finished_at')->dateTime(config('app.date_format'))->sortable()->searchable()->toggleable(), - TextColumn::make('total_jobs')->sortable()->searchable()->toggleable(), - TextColumn::make('pending_jobs')->sortable()->searchable()->toggleable(), - TextColumn::make('failed_jobs')->sortable()->searchable()->toggleable(), - TextColumn::make('failed_job_ids')->sortable()->searchable()->toggleable(), + TextColumn::make('created_at') + ->dateTime($date_format) + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('id') + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('name') + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('cancelled_at') + ->dateTime($date_format) + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('failed_at') + ->dateTime($date_format) + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('finished_at') + ->dateTime($date_format) + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('total_jobs') + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('pending_jobs') + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('failed_jobs') + ->sortable() + ->searchable() + ->toggleable(), + TextColumn::make('failed_job_ids') + ->sortable() + ->searchable() + ->toggleable(), ] ) ->actions( @@ -59,6 +96,7 @@ public static function getPages(): array public static function getNavigationBadge(): ?string { - return (string) JobBatch::query()->count(); + return (string) JobBatch::query() +->count(); } } diff --git a/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php b/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php index b5caec77..1f84bdf0 100644 --- a/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php +++ b/Filament/Resources/ScheduleResource/Pages/ViewSchedule.php @@ -14,6 +14,7 @@ use Illuminate\Support\HtmlString; use Livewire\Attributes\Url; use Modules\Job\Filament\Resources\ScheduleResource; +use Webmozart\Assert\Assert; class ViewSchedule extends Page implements HasTable { @@ -71,12 +72,14 @@ protected function getTableQuery(): Builder protected function getTableColumns(): array { + $date_format = Assert::string(config('app.date_format')); + return [ Tables\Columns\Layout\Split::make([ Tables\Columns\TextColumn::make('command')->label(__('job::schedule.fields.command')), Tables\Columns\TextColumn::make('created_at') ->label(__('job::schedule.fields.expression')) - ->dateTime(config('app.date_format')), + ->dateTime($date_format), Tables\Columns\TextColumn::make('updated_at') ->label(__('job::schedule.fields.expression')) ->formatStateUsing(static function ($state, $record) { diff --git a/Http/Livewire/Broad.php b/Http/Livewire/Broad.php index f7f042b5..70b1b980 100644 --- a/Http/Livewire/Broad.php +++ b/Http/Livewire/Broad.php @@ -11,11 +11,9 @@ class Broad extends Component { - /** - * @var array - */ + /** @var array */ protected $listeners = [ - 'echo:public,PublicEvent' => 'notifyEvent' + 'echo:public,PublicEvent' => 'notifyEvent', ]; public function render(): Renderable diff --git a/Models/BaseModel.php b/Models/BaseModel.php index b8e70888..1bc7ef3c 100644 --- a/Models/BaseModel.php +++ b/Models/BaseModel.php @@ -45,9 +45,7 @@ abstract class BaseModel extends Model /** @var array */ protected $fillable = ['id']; - /** - * @var array - */ + /** @var array */ protected $casts = [ 'published_at' => 'datetime', 'created_at' => 'datetime',