From c44683a75928eb204d81b1c8fbe066e91b8a39e4 Mon Sep 17 00:00:00 2001 From: fabiorodriguesroque Date: Wed, 13 Nov 2024 19:18:04 +0000 Subject: [PATCH] refactor: update RecentMentions, RecentComments and RecentItems --- app/Livewire/RecentMentions.php | 12 +++++++++--- app/Livewire/Welcome/RecentComments.php | 6 +++++- app/Livewire/Welcome/RecentItems.php | 6 +++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/Livewire/RecentMentions.php b/app/Livewire/RecentMentions.php index 029c69c7..ec5a1032 100644 --- a/app/Livewire/RecentMentions.php +++ b/app/Livewire/RecentMentions.php @@ -2,22 +2,28 @@ namespace App\Livewire; +use App\Models\Comment; use Closure; use Filament\Tables; +use Illuminate\Contracts\View\View; use Livewire\Component; use Filament\Forms\Contracts\HasForms; use Filament\Tables\Contracts\HasTable; use Illuminate\Database\Eloquent\Builder; use Filament\Forms\Concerns\InteractsWithForms; use Filament\Tables\Concerns\InteractsWithTable; +use Xetaio\Mentions\Models\Mention; class RecentMentions extends Component implements HasTable, HasForms { use InteractsWithTable, InteractsWithForms; - protected function getTableQuery(): Builder + /** + * @return Builder|null + */ + protected function getTableQuery(): Builder|null { - return auth()->user()->mentions()->latest('mentions.created_at')->getQuery(); + return auth()->user()?->mentions()->latest('mentions.created_at')->getQuery(); } protected function getTableRecordsPerPageSelectOptions(): array @@ -41,7 +47,7 @@ protected function getTableRecordUrlUsing(): ?Closure }; } - public function render() + public function render(): View { return view('livewire.recent-mentions'); } diff --git a/app/Livewire/Welcome/RecentComments.php b/app/Livewire/Welcome/RecentComments.php index 556889eb..0dd2a2e2 100644 --- a/app/Livewire/Welcome/RecentComments.php +++ b/app/Livewire/Welcome/RecentComments.php @@ -5,6 +5,7 @@ use Closure; use Filament\Tables; use App\Models\Comment; +use Illuminate\Contracts\View\View; use Livewire\Component; use Filament\Forms\Contracts\HasForms; use Filament\Tables\Contracts\HasTable; @@ -16,6 +17,9 @@ class RecentComments extends Component implements HasTable, HasForms { use InteractsWithTable, InteractsWithForms; + /** + * @return Builder + */ protected function getTableQuery(): Builder { return Comment::query()->public()->limit(10); @@ -55,7 +59,7 @@ protected function getDefaultTableSortDirection(): ?string return 'desc'; } - public function render() + public function render(): View { return view('livewire.welcome.recent-comments'); } diff --git a/app/Livewire/Welcome/RecentItems.php b/app/Livewire/Welcome/RecentItems.php index 63490d71..009bd934 100644 --- a/app/Livewire/Welcome/RecentItems.php +++ b/app/Livewire/Welcome/RecentItems.php @@ -5,6 +5,7 @@ use Closure; use App\Models\Item; use Filament\Tables; +use Illuminate\Contracts\View\View; use Livewire\Component; use Illuminate\Support\Arr; use App\Settings\GeneralSettings; @@ -18,6 +19,9 @@ class RecentItems extends Component implements HasTable, HasForms { use InteractsWithTable, InteractsWithForms; + /** + * @return Builder + */ protected function getTableQuery(): Builder { $recentItemsConfig = collect(app(GeneralSettings::class)->dashboard_items)->first(); @@ -88,7 +92,7 @@ protected function getDefaultTableSortDirection(): ?string return 'desc'; } - public function render() + public function render(): View { return view('livewire.welcome.recent-items'); }