ui(admin): too many changes, not enough commits

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -56,8 +56,8 @@ class NodeController extends ApplicationApiController
         }
 
         $nodes = QueryBuilder::for(Node::query())
-            ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id'])
-            ->allowedSorts(['id', 'uuid', 'memory', 'disk'])
+            ->allowedFilters(['id', 'uuid', 'name', 'fqdn', 'daemon_token_id'])
+            ->allowedSorts(['id', 'uuid', 'name', 'location_id', 'fqdn', 'memory', 'disk'])
             ->paginate($perPage);
 
         return $this->fractal->collection($nodes)

app/Http/Controllers/Api/Application/Servers/ServerController.php

@@ -48,7 +48,7 @@ class ServerController extends ApplicationApiController
 
         $servers = QueryBuilder::for(Server::query())
             ->allowedFilters(['uuid', 'name', 'image', 'external_id'])
-            ->allowedSorts(['id', 'uuid', 'owner_id', 'node_id', 'status'])
+            ->allowedSorts(['id', 'uuid', 'uuidShort', 'name', 'owner_id', 'node_id', 'status'])
             ->paginate($perPage);
 
         return $this->fractal->collection($servers)

app/Http/Controllers/Api/Application/Users/UserController.php

@@ -19,7 +19,7 @@ use Pterodactyl\Http\Requests\Api\Application\Users\DeleteUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\UpdateUserRequest;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
-class UserController extends ApplicationApiController
+class                       UserController extends ApplicationApiController
 {
     private UserRepositoryInterface $repository;
     private UserCreationService $creationService;

app/Transformers/Api/Application/ServerTransformer.php

@@ -60,8 +60,6 @@ class ServerTransformer extends BaseTransformer
             'name' => $model->name,
             'description' => $model->description,
             'status' => $model->status,
-            // This field is deprecated, please use "status".
-            'suspended' => $model->isSuspended(),
             'limits' => [
                 'memory' => $model->memory,
                 'swap' => $model->swap,
@@ -75,16 +73,14 @@ class ServerTransformer extends BaseTransformer
                 'allocations' => $model->allocation_limit,
                 'backups' => $model->backup_limit,
             ],
-            'user' => $model->owner_id,
-            'node' => $model->node_id,
-            'allocation' => $model->allocation_id,
-            'nest' => $model->nest_id,
-            'egg' => $model->egg_id,
+            'owner_id' => $model->owner_id,
+            'node_id' => $model->node_id,
+            'allocation_id' => $model->allocation_id,
+            'nest_id' => $model->nest_id,
+            'egg_id' => $model->egg_id,
             'container' => [
                 'startup_command' => $model->startup,
                 'image' => $model->image,
-                // This field is deprecated, please use "status".
-                'installed' => $model->isInstalled() ? 1 : 0,
                 'environment' => $this->environmentService->handle($model),
             ],
             $model->getUpdatedAtColumn() => $this->formatTimestamp($model->updated_at),