diff --git a/app/Transformers/Api/Application/UserTransformer.php b/app/Transformers/Api/Application/UserTransformer.php index 2e55bbb1b..70d74f452 100644 --- a/app/Transformers/Api/Application/UserTransformer.php +++ b/app/Transformers/Api/Application/UserTransformer.php @@ -27,24 +27,25 @@ class UserTransformer extends BaseTransformer /** * Return a transformed User model that can be consumed by external services. * - * @param \Pterodactyl\Models\User $user + * @param \Pterodactyl\Models\User $model * @return array */ - public function transform(User $user): array + public function transform(User $model): array { return [ - 'id' => $user->id, - 'external_id' => $user->external_id, - 'uuid' => $user->uuid, - 'username' => $user->username, - 'email' => $user->email, - 'first_name' => $user->name_first, - 'last_name' => $user->name_last, - 'language' => $user->language, - 'root_admin' => (bool) $user->root_admin, - '2fa' => (bool) $user->use_totp, - 'created_at' => $this->formatTimestamp($user->created_at), - 'updated_at' => $this->formatTimestamp($user->updated_at), + 'id' => $model->id, + 'external_id' => $model->external_id, + 'uuid' => $model->uuid, + 'username' => $model->username, + 'email' => $model->email, + 'first_name' => $model->name_first, + 'last_name' => $model->name_last, + 'language' => $model->language, + 'root_admin' => (bool) $model->root_admin, + '2fa' => (bool) $model->use_totp, + 'role_name' => $model->root_admin ? 'Super Administrator' : 'None', + 'created_at' => $this->formatTimestamp($model->created_at), + 'updated_at' => $this->formatTimestamp($model->updated_at), ]; } @@ -52,8 +53,10 @@ class UserTransformer extends BaseTransformer * Return the servers associated with this user. * * @param \Pterodactyl\Models\User $user + * * @return \League\Fractal\Resource\Collection|\League\Fractal\Resource\NullResource * + * @throws \Illuminate\Contracts\Container\BindingResolutionException * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException */ public function includeServers(User $user) diff --git a/resources/scripts/api/admin/users/getUsers.ts b/resources/scripts/api/admin/users/getUsers.ts index 135d3c9b3..226c426dd 100644 --- a/resources/scripts/api/admin/users/getUsers.ts +++ b/resources/scripts/api/admin/users/getUsers.ts @@ -14,6 +14,7 @@ export interface User { language: string; rootAdmin: boolean; tfa: boolean; + roleName: string; createdAt: Date; updatedAt: Date; } diff --git a/resources/scripts/api/transformers.ts b/resources/scripts/api/transformers.ts index c6a5ef18f..11e1bfb10 100644 --- a/resources/scripts/api/transformers.ts +++ b/resources/scripts/api/transformers.ts @@ -130,6 +130,7 @@ export const rawDataToUser = ({ attributes }: FractalResponseData): User => ({ language: attributes.language, rootAdmin: attributes.root_admin, tfa: attributes['2fa'], + roleName: attributes.role_name, createdAt: new Date(attributes.created_at), updatedAt: new Date(attributes.updated_at), }); diff --git a/resources/scripts/components/admin/users/UsersContainer.tsx b/resources/scripts/components/admin/users/UsersContainer.tsx index ff16d219e..51c2d6b86 100644 --- a/resources/scripts/components/admin/users/UsersContainer.tsx +++ b/resources/scripts/components/admin/users/UsersContainer.tsx @@ -1,7 +1,8 @@ import AdminCheckbox from '@/components/admin/AdminCheckbox'; +import CopyOnClick from '@/components/elements/CopyOnClick'; import React, { useContext, useEffect, useState } from 'react'; import getUsers, { Context as UsersContext } from '@/api/admin/users/getUsers'; -import AdminTable, { ContentWrapper, Loading, NoItems, Pagination, TableBody, TableHead, TableHeader, TableRow } from '@/components/admin/AdminTable'; +import AdminTable, { ContentWrapper, Loading, NoItems, Pagination, TableBody, TableHead, TableHeader } from '@/components/admin/AdminTable'; import Button from '@/components/elements/Button'; import FlashMessageRender from '@/components/FlashMessageRender'; import useFlash from '@/plugins/useFlash'; @@ -11,9 +12,9 @@ import tw from 'twin.macro'; import AdminContentBlock from '@/components/admin/AdminContentBlock'; const RowCheckbox = ({ id }: { id: number}) => { - const isChecked = AdminContext.useStoreState(state => state.nests.selectedNests.indexOf(id) >= 0); - const appendSelectedUser = AdminContext.useStoreActions(actions => actions.nests.appendSelectedNest); - const removeSelectedUser = AdminContext.useStoreActions(actions => actions.nests.removeSelectedNest); + const isChecked = AdminContext.useStoreState(state => state.users.selectedUsers.indexOf(id) >= 0); + const appendSelectedUser = AdminContext.useStoreActions(actions => actions.users.appendSelectedUser); + const removeSelectedUser = AdminContext.useStoreActions(actions => actions.users.removeSelectedUser); return ( { const length = users?.items?.length || 0; - const setSelectedUsers = AdminContext.useStoreActions(actions => actions.nests.setSelectedNests); - const selectedUserLength = AdminContext.useStoreState(state => state.nests.selectedNests.length); + const setSelectedUsers = AdminContext.useStoreActions(actions => actions.users.setSelectedUsers); + const selectedUserLength = AdminContext.useStoreState(state => state.users.selectedUsers.length); const onSelectAllClick = (e: React.ChangeEvent) => { setSelectedUsers(e.currentTarget.checked ? (users?.items?.map(user => user.id) || []) : []); @@ -90,28 +91,56 @@ const UsersContainer = () => { - + - + + { users.items.map(user => ( - + - + + + - - + + + + + )) } diff --git a/resources/scripts/state/admin/index.ts b/resources/scripts/state/admin/index.ts index 7d435e6db..1a80d3715 100644 --- a/resources/scripts/state/admin/index.ts +++ b/resources/scripts/state/admin/index.ts @@ -3,15 +3,18 @@ import { composeWithDevTools } from 'redux-devtools-extension'; import nests, { AdminNestStore } from '@/state/admin/nests'; import roles, { AdminRoleStore } from '@/state/admin/roles'; +import users, { AdminUserStore } from '@/state/admin/users'; interface AdminStore { - nests: AdminNestStore + nests: AdminNestStore; roles: AdminRoleStore; + users: AdminUserStore; } export const AdminContext = createContextStore({ nests, roles, + users, }, { compose: composeWithDevTools({ name: 'AdminStore', diff --git a/resources/scripts/state/admin/users.ts b/resources/scripts/state/admin/users.ts new file mode 100644 index 000000000..6f0ae9582 --- /dev/null +++ b/resources/scripts/state/admin/users.ts @@ -0,0 +1,27 @@ +import { action, Action } from 'easy-peasy'; + +export interface AdminUserStore { + selectedUsers: number[]; + + setSelectedUsers: Action; + appendSelectedUser: Action; + removeSelectedUser: Action; +} + +const roles: AdminUserStore = { + selectedUsers: [], + + setSelectedUsers: action((state, payload) => { + state.selectedUsers = payload; + }), + + appendSelectedUser: action((state, payload) => { + state.selectedUsers = state.selectedUsers.filter(id => id !== payload).concat(payload); + }), + + removeSelectedUser: action((state, payload) => { + state.selectedUsers = state.selectedUsers.filter(id => id !== payload); + }), +}; + +export default roles;
{user.id} - - {user.email} + + {user.id} + + + +
+
+ +
+ +
+
+ {user.firstName} {user.lastName} +
+ +
+ {user.email} +
+
+
{user.username}{user.lastName}, {user.firstName} + + Active + + {user.roleName}