From baa9a15ad70d0050979823e83b3c77c8a7960e37 Mon Sep 17 00:00:00 2001
From: bmodee <bjomo323@student.liu.se>
Date: Tue, 11 May 2021 11:22:14 +0200
Subject: [PATCH] Fix dashboard to display correct information
---
.../dashboard/components/CurrentUser.tsx | 33 +++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/client/src/pages/admin/dashboard/components/CurrentUser.tsx b/client/src/pages/admin/dashboard/components/CurrentUser.tsx
index 826a9a6d..10b2ed94 100644
--- a/client/src/pages/admin/dashboard/components/CurrentUser.tsx
+++ b/client/src/pages/admin/dashboard/components/CurrentUser.tsx
@@ -6,6 +6,35 @@ import { useAppSelector } from '../../../../hooks'
const CurrentUser: React.FC = () => {
const currentUser = useAppSelector((state: { user: { userInfo: any } }) => state.user.userInfo)
+ const regions = useAppSelector((state) => state.cities.cities)
+ //const regionlist = regions.map((index) => index.name)
+ const regionlist = regions.map((index) => index)
+ const roles = useAppSelector((state) => state.roles.roles)
+ const rolelist = roles.map((index) => index)
+
+ /** This is a temporary fix, these values "should" be stored in the state along with all the othe userinfo */
+ const getRegionName = () => {
+ if (currentUser && regions) {
+ for (let i = 0; i < regionlist.length; i++) {
+ if (regionlist[i].id === currentUser.city_id) {
+ return regionlist[i].name
+ }
+ }
+ }
+ return 'N/A'
+ }
+
+ /** This is a temporary fix, these values "should" be stored in the state along with all the othe userinfo */
+ const getRoleName = () => {
+ if (currentUser && roles) {
+ for (let i = 0; i < rolelist.length; i++) {
+ if (rolelist[i].id === currentUser.role_id) {
+ return rolelist[i].name
+ }
+ }
+ }
+ return 'N/A'
+ }
return (
<div>
@@ -21,10 +50,10 @@ const CurrentUser: React.FC = () => {
</Typography>
</div>
<div>
- <Typography variant="h6">Region:</Typography>
+ <Typography variant="h6">Region: {getRegionName()}</Typography>
</div>
<div>
- <Typography variant="h6">Roll: </Typography>
+ <Typography variant="h6">Roll: {getRoleName()}</Typography>
</div>
</Box>
</div>
--
GitLab