Add table to admin/UsersContainer.tsx

app/Http/Controllers/Api/Application/Roles/RoleController.php

@@ -6,6 +6,7 @@ use Illuminate\Http\JsonResponse;
 use Pterodactyl\Models\AdminRole;
 use Pterodactyl\Repositories\Eloquent\AdminRolesRepository;
 use Pterodactyl\Transformers\Api\Application\AdminRoleTransformer;
+use Pterodactyl\Http\Requests\Api\Application\Roles\GetRoleRequest;
 use Pterodactyl\Http\Requests\Api\Application\Roles\GetRolesRequest;
 use Pterodactyl\Http\Requests\Api\Application\Roles\StoreRoleRequest;
 use Pterodactyl\Http\Requests\Api\Application\Roles\DeleteRoleRequest;
@@ -49,13 +50,13 @@ class RoleController extends ApplicationApiController
     /**
      * Returns a single role.
      *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Roles\GetRolesRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Roles\GetRoleRequest $request
      * @param \Pterodactyl\Models\AdminRole $role
      *
      * @return array
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function view(GetRolesRequest $request, AdminRole $role): array
+    public function view(GetRoleRequest $request, AdminRole $role): array
     {
         return $this->fractal->item($role)
             ->transformWith($this->getTransformer(AdminRoleTransformer::class))

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

@@ -10,6 +10,8 @@ use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Users\UserDeletionService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\UserTransformer;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\StoreUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\DeleteUserRequest;
@@ -18,6 +20,11 @@ use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
 class UserController extends ApplicationApiController
 {
+    /**
+     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
+     */
+    private $repository;
+
     /**
      * @var \Pterodactyl\Services\Users\UserCreationService
      */
@@ -28,11 +35,6 @@ class UserController extends ApplicationApiController
      */
     private $deletionService;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
-     */
-    private $repository;
-
     /**
      * @var \Pterodactyl\Services\Users\UserUpdateService
      */
@@ -51,13 +53,12 @@ class UserController extends ApplicationApiController
         UserCreationService $creationService,
         UserDeletionService $deletionService,
         UserUpdateService $updateService
-    )
-    {
+    ) {
         parent::__construct();
 
+        $this->repository = $repository;
         $this->creationService = $creationService;
         $this->deletionService = $deletionService;
-        $this->repository = $repository;
         $this->updateService = $updateService;
     }
 
@@ -73,10 +74,17 @@ class UserController extends ApplicationApiController
      */
     public function index(GetUsersRequest $request): array
     {
+        $perPage = $request->query('per_page', 10);
+        if ($perPage < 1) {
+            $perPage = 10;
+        } else if ($perPage > 100) {
+            throw new BadRequestHttpException('"per_page" query parameter must be below 100.');
+        }
+
         $users = QueryBuilder::for(User::query())
             ->allowedFilters(['email', 'uuid', 'username', 'external_id'])
             ->allowedSorts(['id', 'uuid'])
-            ->paginate(100);
+            ->paginate($perPage);
 
         return $this->fractal->collection($users)
             ->transformWith($this->getTransformer(UserTransformer::class))
@@ -87,13 +95,13 @@ class UserController extends ApplicationApiController
      * Handle a request to view a single user. Includes any relations that
      * were defined in the request.
      *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest $request
      * @param \Pterodactyl\Models\User $user
      *
      * @return array
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function view(GetUsersRequest $request, User $user): array
+    public function view(GetUserRequest $request, User $user): array
     {
         return $this->fractal->item($user)
             ->transformWith($this->getTransformer(UserTransformer::class))
@@ -122,10 +130,9 @@ class UserController extends ApplicationApiController
         $this->updateService->setUserLevel(User::USER_LEVEL_ADMIN);
         $user = $this->updateService->handle($user, $request->validated());
 
-        $response = $this->fractal->item($user)
-            ->transformWith($this->getTransformer(UserTransformer::class));
-
-        return $response->toArray();
+        return $this->fractal->item($user)
+            ->transformWith($this->getTransformer(UserTransformer::class))
+            ->toArray();
     }
 
     /**