From 6f1de675237d0b31d120cfc6a35c8ff7b6d39684 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Wed, 5 Jun 2024 16:03:04 -0400
Subject: [PATCH] Remove extraneous parameters

---
 .../Controllers/Admin/Nodes/NodeController.php  |  3 +--
 .../Admin/Nodes/NodeViewController.php          | 17 +++++------------
 .../Admin/Servers/ServerController.php          |  3 +--
 app/Http/Controllers/Admin/UserController.php   |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Admin/Nodes/NodeController.php b/app/Http/Controllers/Admin/Nodes/NodeController.php
index b02ada6680..f4d7982cf9 100644
--- a/app/Http/Controllers/Admin/Nodes/NodeController.php
+++ b/app/Http/Controllers/Admin/Nodes/NodeController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
-use Illuminate\Http\Request;
 use App\Models\Node;
 use Spatie\QueryBuilder\QueryBuilder;
 use App\Http\Controllers\Controller;
@@ -13,7 +12,7 @@ class NodeController extends Controller
     /**
      * Returns a listing of nodes on the system.
      */
-    public function index(Request $request): View
+    public function index(): View
     {
         $nodes = QueryBuilder::for(
             Node::query()->withCount('servers')
diff --git a/app/Http/Controllers/Admin/Nodes/NodeViewController.php b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
index 9407ef2a7d..95dc7ede0a 100644
--- a/app/Http/Controllers/Admin/Nodes/NodeViewController.php
+++ b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
-use Illuminate\Http\Request;
 use App\Models\Node;
 use Illuminate\Support\Collection;
 use App\Models\Allocation;
@@ -29,16 +28,10 @@ public function __construct(
     /**
      * Returns index view for a specific node on the system.
      */
-    public function index(Request $request, Node $node): View
+    public function index(Node $node): View
     {
         $node->loadCount('servers');
 
-        $stats = Node::query()
-            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
-            ->join('servers', 'servers.node_id', '=', 'nodes.id')
-            ->where('node_id', '=', $node->id)
-            ->first();
-
         return view('admin.nodes.view.index', [
             'node' => $node,
             'version' => $this->versionService,
@@ -48,7 +41,7 @@ public function index(Request $request, Node $node): View
     /**
      * Returns the settings page for a specific node.
      */
-    public function settings(Request $request, Node $node): View
+    public function settings(Node $node): View
     {
         return view('admin.nodes.view.settings', [
             'node' => $node,
@@ -58,7 +51,7 @@ public function settings(Request $request, Node $node): View
     /**
      * Return the node configuration page for a specific node.
      */
-    public function configuration(Request $request, Node $node): View
+    public function configuration(Node $node): View
     {
         return view('admin.nodes.view.configuration', compact('node'));
     }
@@ -66,7 +59,7 @@ public function configuration(Request $request, Node $node): View
     /**
      * Return the node allocation management page.
      */
-    public function allocations(Request $request, Node $node): View
+    public function allocations(Node $node): View
     {
         $node->setRelation(
             'allocations',
@@ -92,7 +85,7 @@ public function allocations(Request $request, Node $node): View
     /**
      * Return a listing of servers that exist for this specific node.
      */
-    public function servers(Request $request, Node $node): View
+    public function servers(Node $node): View
     {
         $this->plainInject([
             'node' => Collection::wrap($node->makeVisible(['daemon_token_id', 'daemon_token']))
diff --git a/app/Http/Controllers/Admin/Servers/ServerController.php b/app/Http/Controllers/Admin/Servers/ServerController.php
index 06853e49e5..5e4595225a 100644
--- a/app/Http/Controllers/Admin/Servers/ServerController.php
+++ b/app/Http/Controllers/Admin/Servers/ServerController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin\Servers;
 
 use Illuminate\View\View;
-use Illuminate\Http\Request;
 use App\Models\Server;
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\AllowedFilter;
@@ -16,7 +15,7 @@ class ServerController extends Controller
      * Returns all the servers that exist on the system using a paginated result set. If
      * a query is passed along in the request it is also passed to the repository function.
      */
-    public function index(Request $request): View
+    public function index(): View
     {
         $servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation'))
             ->allowedFilters([
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 33ced4b752..d69dc4301c 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -37,7 +37,7 @@ public function __construct(
     /**
      * Display user index page.
      */
-    public function index(Request $request): View
+    public function index(): View
     {
         $users = QueryBuilder::for(
             User::query()->select('users.*')