From d21e1070454a5dfdee06fca54e1c13a6758a2aad Mon Sep 17 00:00:00 2001
From: sianida26 <chesakeselekkebo@gmail.com>
Date: Mon, 19 Feb 2024 00:25:13 +0700
Subject: [PATCH] Added role in user table:

---
 src/modules/dashboard/actions/getSidebarMenus.ts            | 2 +-
 src/modules/userManagement/tables/UsersTable/UsersTable.tsx | 2 +-
 src/modules/userManagement/tables/UsersTable/columns.tsx    | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/dashboard/actions/getSidebarMenus.ts b/src/modules/dashboard/actions/getSidebarMenus.ts
index a6f86d9..4f2fd9b 100644
--- a/src/modules/dashboard/actions/getSidebarMenus.ts
+++ b/src/modules/dashboard/actions/getSidebarMenus.ts
@@ -28,7 +28,7 @@ const sidebarMenus: SidebarMenu[] = [
 			{
 				label: "Users",
 				link: "/users",
-				allowedPermissions: ["users.getAll"],
+				allowedPermissions: ["users.readAll"],
 			},
 			{ label: "Roles", link: "/roles", allowedRoles: ["super-admin"] },
 			{
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) => <Text>{props.getValue()[0]}</Text>
+		}),
+
 		columnHelper.display({
 			id: "status",
 			header: "Status",