users menu listing

2026-08-26 08:01:49 +01:00
parent 6f8d0c7abf
commit 7dc31371f6
29 changed files with 779 additions and 669 deletions
@@ -4,49 +4,60 @@ declare(strict_types=1);

 namespace Modules\Helpdesk\Livewire;

+use App\Models\User;
+use Carbon\CarbonPeriod;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
-use Modules\Helpdesk\Models\GitCommit;
 use Modules\Helpdesk\Models\Ticket;

 final class HelpdeskDashboardWidget extends Component
 {
+    public int $days = 7;
+
+    public function updatedDays(): void
+    {
+        if (! in_array($this->days, [7, 14, 30], true)) $this->days = 7;
+    }
+
    public function render(): View
    {
        $user = Auth::user();
-        $base = Ticket::query();
-
-        if ($user->helpdesk_admin ?? false) {
-            // no filter
-        } elseif ($user->helpdesk_agent ?? false) {
-            $base->where(function ($q) use ($user) {
-                $q->where('agent_id', $user->id)
-                    ->orWhere('user_id', $user->id);
-            });
-        } else {
-            $base->where('user_id', $user->id);
-        }
+        $base = Ticket::query()->visibleTo($user);
        $totalCount = (clone $base)->count();
        $openCount = (clone $base)->whereNull('completed_at')->count();
        $closedCount = (clone $base)->whereNotNull('completed_at')->count();
-        $criticalCount = (clone $base)->whereNull('completed_at')->whereHas('priority', static fn ($q) => $q->whereIn('slug', ['critical', 'urgent', 'high']))->count();
-        $closedPercent = $totalCount > 0 ? (int) round(($closedCount / $totalCount) * 100) : 0;
-        $openPercent = $totalCount > 0 ? (int) round(($openCount / $totalCount) * 100) : 0;
+        $inProgressCount = (clone $base)->whereNull('completed_at')->whereHas('status', static fn ($q) => $q->whereIn('slug', ['assigned', 'in-progress', 'in_progress', 'progress']))->count();
+
+        $period = CarbonPeriod::create(now()->subDays($this->days - 1)->startOfDay(), now()->startOfDay());
+        $trendRows = (clone $base)->where('created_at', '>=', now()->subDays($this->days - 1)->startOfDay())->get(['created_at', 'completed_at']);
+        $trend = collect($period)->map(function ($date) use ($trendRows): array {
+            $day = $date->toDateString();
+            return [
+                'label' => $date->format('M j'),
+                'created' => $trendRows->filter(fn ($ticket) => optional($ticket->created_at)->toDateString() === $day)->count(),
+                'resolved' => $trendRows->filter(fn ($ticket) => optional($ticket->completed_at)->toDateString() === $day)->count(),
+            ];
+        })->values();
+
+        $priorityRows = (clone $base)->with('priority')->get();
+        $priorityBreakdown = $priorityRows->groupBy(fn ($ticket) => strtolower((string) ($ticket->priority?->name ?? 'Unspecified')))
+            ->map(fn ($rows, $name) => ['name' => ucfirst($name), 'count' => $rows->count()])
+            ->sortByDesc('count')->take(4)->values();
+
+        $requesterCounts = (clone $base)->selectRaw('user_id, COUNT(*) as ticket_count')->whereNotNull('user_id')->groupBy('user_id')->orderByDesc('ticket_count')->limit(5)->get();
+        $requesters = User::query()->whereIn('id', $requesterCounts->pluck('user_id'))->get()->keyBy('id');
+        $topRequesters = $requesterCounts->map(fn ($row) => ['user' => $requesters->get($row->user_id), 'count' => (int) $row->ticket_count])->filter(fn ($row) => $row['user'] !== null)->values();

        return view('modules.helpdesk.livewire.dashboard-widget', [
            'totalCount' => $totalCount,
            'openCount' => $openCount,
            'closedCount' => $closedCount,
-            'criticalCount' => $criticalCount,
-            'closedPercent' => $closedPercent,
-            'openPercent' => $openPercent,
-            'recentCommits' => GitCommit::query()->with(['repository', 'ticket'])->latest('committed_at')->limit(6)->get(),
-            'recentTickets' => (clone $base)
-                ->with(['status', 'priority'])
-                ->latest('last_activity_at')
-                ->limit(5)
-                ->get(),
+            'inProgressCount' => $inProgressCount,
+            'trend' => $trend,
+            'priorityBreakdown' => $priorityBreakdown,
+            'topRequesters' => $topRequesters,
+            'recentTickets' => (clone $base)->with(['status', 'priority'])->latest('last_activity_at')->limit(5)->get(),
        ]);
    }
 }
@@ -222,7 +222,6 @@ final class TicketEdit extends Component
    {
        return $ticket->fresh([
            'user:id,name,email',
-            'owner:id,name,email',
            'agent:id,name,email',
            'status',
            'priority',
@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\UserManagement\Http\Controllers;
+
+use App\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Rule;
+
+final class UserController extends Controller
+{
+    public function index(Request $request): View
+    {
+        $search = trim((string) $request->query('search', ''));
+
+        $users = User::query()
+            ->when($search !== '', static function ($query) use ($search): void {
+                $query->where(static function ($query) use ($search): void {
+                    $query->where('name', 'like', '%'.$search.'%')
+                        ->orWhere('email', 'like', '%'.$search.'%');
+                });
+            })
+            ->orderBy('name')
+            ->paginate(20)
+            ->withQueryString();
+
+        return view('modules.user-management.index', compact('users', 'search'));
+    }
+
+    public function create(): View
+    {
+        return view('modules.user-management.create');
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        $data = $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'email', 'max:255', 'unique:users,email'],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
+            'helpdesk_agent' => ['sometimes', 'boolean'],
+            'helpdesk_admin' => ['sometimes', 'boolean'],
+        ]);
+
+        $user = User::query()->create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => Hash::make($data['password']),
+            'email_verified_at' => now(),
+            'helpdesk_agent' => $request->boolean('helpdesk_agent') || $request->boolean('helpdesk_admin'),
+            'helpdesk_admin' => $request->boolean('helpdesk_admin'),
+        ]);
+
+        return redirect()->route('user-management.edit', $user)
+            ->with('status', 'User created successfully.');
+    }
+
+    public function edit(User $user): View
+    {
+        return view('modules.user-management.edit', compact('user'));
+    }
+
+    public function update(Request $request, User $user): RedirectResponse
+    {
+        $data = $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'email', 'max:255', Rule::unique('users', 'email')->ignore($user->id)],
+            'password' => ['nullable', 'string', 'min:8', 'confirmed'],
+            'helpdesk_agent' => ['sometimes', 'boolean'],
+            'helpdesk_admin' => ['sometimes', 'boolean'],
+        ]);
+
+        $user->name = $data['name'];
+        $user->email = $data['email'];
+        $user->helpdesk_admin = $request->boolean('helpdesk_admin');
+        $user->helpdesk_agent = $user->helpdesk_admin || $request->boolean('helpdesk_agent');
+
+        if (filled($data['password'] ?? null)) {
+            $user->password = Hash::make($data['password']);
+        }
+
+        $user->save();
+
+        return back()->with('status', 'User updated successfully.');
+    }
+
+    public function destroy(Request $request, User $user): RedirectResponse
+    {
+        abort_if((int) $request->user()->id === (int) $user->id, 422, 'You cannot delete your own account.');
+
+        if ($user->isHelpdeskAdmin() && User::query()->where('helpdesk_admin', true)->count() <= 1) {
+            return back()->withErrors(['user' => 'The last Helpdesk administrator cannot be deleted.']);
+        }
+
+        $user->delete();
+
+        return redirect()->route('user-management.index')->with('status', 'User deleted.');
+    }
+
+    public function roles(): View
+    {
+        $counts = [
+            'admins' => User::query()->where('helpdesk_admin', true)->count(),
+            'agents' => User::query()->where('helpdesk_agent', true)->count(),
+            'users' => User::query()->count(),
+        ];
+
+        return view('modules.user-management.roles', compact('counts'));
+    }
+}
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\UserManagement\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+final class EnsureUserManagementAdmin
+{
+    public function handle(Request $request, Closure $next): Response
+    {
+        $user = $request->user();
+
+        $allowed = $user !== null && (
+            (method_exists($user, 'isHelpdeskAdmin') && $user->isHelpdeskAdmin())
+            || (method_exists($user, 'isAdmin') && $user->isAdmin())
+            || (bool) ($user->helpdesk_admin ?? false)
+        );
+
+        abort_unless($allowed, 403);
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\UserManagement\Providers;
+
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
+use Modules\UserManagement\Http\Middleware\EnsureUserManagementAdmin;
+
+final class RouteServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        parent::boot();
+
+        Route::middleware(['web', 'auth', EnsureUserManagementAdmin::class])
+            ->prefix('admin/users')
+            ->name('user-management.')
+            ->group(module_path('UserManagement', 'Routes/web.php'));
+    }
+}
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\UserManagement\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+final class UserManagementServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+}
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Route;
+use Modules\UserManagement\Http\Controllers\UserController;
+
+Route::get('/', [UserController::class, 'index'])->name('index');
+Route::get('/create', [UserController::class, 'create'])->name('create');
+Route::post('/', [UserController::class, 'store'])->name('store');
+Route::get('/roles', [UserController::class, 'roles'])->name('roles');
+Route::get('/{user}/edit', [UserController::class, 'edit'])->name('edit');
+Route::put('/{user}', [UserController::class, 'update'])->name('update');
+Route::delete('/{user}', [UserController::class, 'destroy'])->name('destroy');
@@ -0,0 +1,9 @@
+{
+    "name": "modules/user-management",
+    "description": "Helpdesk user management module",
+    "autoload": {
+        "psr-4": {
+            "Modules\\UserManagement\\": ""
+        }
+    }
+}
@@ -0,0 +1,12 @@
+{
+    "name": "UserManagement",
+    "alias": "user-management",
+    "version": "1.0.0",
+    "description": "Administrator-only user, Helpdesk role and permission management.",
+    "keywords": ["users", "administration", "roles", "permissions"],
+    "priority": 0,
+    "providers": ["Modules\\UserManagement\\Providers\\UserManagementServiceProvider"],
+    "aliases": {},
+    "files": [],
+    "requires": []
+}