From 5844aeb621e3e9814f34a7c9dab1e69656723ce5 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Wed, 26 Aug 2026 08:56:45 +0100
Subject: [PATCH] users menu listing

---
 .../Livewire/HelpdeskDashboardWidget.php      |  8 ++++++--
 Modules/Helpdesk/Livewire/TicketIndex.php     |  1 +
 Modules/Helpdesk/Models/Ticket.php            |  2 +-
 .../views/layouts/app/sidebar.blade.php       | 20 -------------------
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Modules/Helpdesk/Livewire/HelpdeskDashboardWidget.php b/Modules/Helpdesk/Livewire/HelpdeskDashboardWidget.php
index fbcb9b1..ff25975 100644
--- a/Modules/Helpdesk/Livewire/HelpdeskDashboardWidget.php
+++ b/Modules/Helpdesk/Livewire/HelpdeskDashboardWidget.php
@@ -23,7 +23,7 @@ final class HelpdeskDashboardWidget extends Component
     public function render(): View
     {
         $user = Auth::user();
-        $base = Ticket::query()->visibleTo($user);
+        $base = Ticket::query()->without('user')->visibleTo($user);
         $totalCount = (clone $base)->count();
         $openCount = (clone $base)->whereNull('completed_at')->count();
         $closedCount = (clone $base)->whereNotNull('completed_at')->count();
@@ -57,7 +57,11 @@ final class HelpdeskDashboardWidget extends Component
             'trend' => $trend,
             'priorityBreakdown' => $priorityBreakdown,
             'topRequesters' => $topRequesters,
-            'recentTickets' => (clone $base)->with(['status', 'priority'])->latest('last_activity_at')->limit(5)->get(),
+            'recentTickets' => (clone $base)
+                ->with(['user:id,name,email', 'status', 'priority'])
+                ->latest('last_activity_at')
+                ->limit(5)
+                ->get(),
         ]);
     }
 }
diff --git a/Modules/Helpdesk/Livewire/TicketIndex.php b/Modules/Helpdesk/Livewire/TicketIndex.php
index 33b1835..d4b30a4 100644
--- a/Modules/Helpdesk/Livewire/TicketIndex.php
+++ b/Modules/Helpdesk/Livewire/TicketIndex.php
@@ -125,6 +125,7 @@ final class TicketIndex extends Component
         $search = trim($this->search);
 
         return Ticket::query()
+            ->without('user')
             ->select('helpdesk_tickets.*')
             ->addSelect([
                 'agent_name' => User::query()
diff --git a/Modules/Helpdesk/Models/Ticket.php b/Modules/Helpdesk/Models/Ticket.php
index c00d075..6fcd183 100644
--- a/Modules/Helpdesk/Models/Ticket.php
+++ b/Modules/Helpdesk/Models/Ticket.php
@@ -27,7 +27,7 @@ final class Ticket extends Model
 
     protected $table = 'helpdesk_tickets';
 
-    protected $with = ['user', 'agent'];
+    protected $with = ['user'];
 
     /** @var list<string> */
     protected $fillable = [
diff --git a/resources/themes/backend/views/layouts/app/sidebar.blade.php b/resources/themes/backend/views/layouts/app/sidebar.blade.php
index 989ca13..7d0701e 100644
--- a/resources/themes/backend/views/layouts/app/sidebar.blade.php
+++ b/resources/themes/backend/views/layouts/app/sidebar.blade.php
@@ -53,26 +53,6 @@
                     <i class="fa-solid fa-house"></i>
                     <span>Dashboard</span>
                 </a>
-
-                @if ($isAdmin)
-                    <a
-                        class="hd-nav-link {{ request()->is('admin/users') || request()->is('admin/users/create') || request()->is('admin/users/*/edit') ? 'is-active' : '' }}"
-                        href="{{ url('/admin/users') }}"
-                        wire:navigate
-                    >
-                        <i class="fa-solid fa-users"></i>
-                        <span>Users</span>
-                    </a>
-
-                    <a
-                        class="hd-nav-link {{ request()->is('admin/users/roles') ? 'is-active' : '' }}"
-                        href="{{ url('/admin/users/roles') }}"
-                        wire:navigate
-                    >
-                        <i class="fa-solid fa-shield-halved"></i>
-                        <span>Roles &amp; Permissions</span>
-                    </a>
-                @endif
             </div>
 
             <div class="hd-nav-section"><div class="hd-nav-heading">Helpdesk</div>