diff --git a/src/modules/userManagement/tables/UsersTable/UsersTable.tsx b/src/modules/userManagement/tables/UsersTable/UsersTable.tsx index 6869b2e..7f44662 100644 --- a/src/modules/userManagement/tables/UsersTable/UsersTable.tsx +++ b/src/modules/userManagement/tables/UsersTable/UsersTable.tsx @@ -33,7 +33,7 @@ export default function UsersTable(props: Props) { }); const table = useReactTable({ - data: props.userData, + data: props.userData.map(data => ({...data, roles: data.roles.map(x => x.name)})), columns: createColumns({ permissions: props.permissions, actions: { diff --git a/src/modules/userManagement/tables/UsersTable/columns.tsx b/src/modules/userManagement/tables/UsersTable/columns.tsx index b20c506..237370c 100644 --- a/src/modules/userManagement/tables/UsersTable/columns.tsx +++ b/src/modules/userManagement/tables/UsersTable/columns.tsx @@ -11,6 +11,7 @@ export interface UserRow { name: string | null; email: string | null; photoUrl: string | null; + roles: string[] } interface ColumnOptions { @@ -64,6 +65,11 @@ const createColumns = (options: ColumnOptions) => { ), }), + columnHelper.accessor("roles", { + header: "Role", + cell: (props) => {props.getValue()[0]} + }), + columnHelper.display({ id: "status", header: "Status",