From 45c3bd1f2216117dee6d8e2d878371ace935e053 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Fri, 19 Jan 2024 11:47:24 +0800
Subject: [PATCH] fix combo display in gld user maintain org user page

---
 .../UserInformationCard_Individual_Pub.js         |  2 +-
 src/pages/User/DetailsPage_Individual/index.js    |  4 ++++
 .../UserInformationCard_Organization.js           |  2 +-
 .../UserInformationCard_Organization_Pub.js       |  2 +-
 src/pages/User/DetailsPage_Organization/index.js  | 15 +++++++++++----
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
index 81b7a63..b36acb5 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
@@ -161,7 +161,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
                     </Grid>
                     {/*end top button*/}
                     <Typography variant="h4" sx={{ mt: 3, mb: 2, borderBottom: "1px solid black" }}>
-                        Individual User Details
+                        User Details
                     </Typography>
                     <Grid item xs={12} sm={12} md={12} lg={12}>
                         <Grid container>
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index d04ced3..cfd421e 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -123,7 +123,11 @@ const UserMaintainPage_Individual = () => {
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
+                        {isGLDLoggedIn()?
                             <Typography ml={15} color='#FFF' variant="h4">Maintain Individual User</Typography>
+                        :
+                            <Typography ml={15} color='#FFF' variant="h4">User Profile</Typography>
+                        }
                         </Stack>
                     </div>
                 </Grid>
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index dd31246..47bbf86 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -524,8 +524,8 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                 {FieldUtils.getComboField({
                                     label: "Country:",
                                     valueName: "country",
-                                    dataList: ComboData.country,
                                     getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
+                                    dataList: ComboData.country,
                                     disabled: true,
                                     form: formik
                                 })}
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
index bec5665..d2a2ab3 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
@@ -161,7 +161,7 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => {
                     {/*end top button*/}
                     <div style={{ paddingLeft: 24, paddingRight: 24 }}>
                         <Typography variant="h4" sx={{ mt: 3, mb: 2, mr: 3, borderBottom: "1px solid black" }}>
-                            Organisation User Details
+                            User Details
                         </Typography>
                         <Grid container spacing={1}>
                             <Grid item lg={12}>
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index 59306ee..4126cae 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -18,6 +18,8 @@ const UserInformationPubCard = Loadable(lazy(() => import('./UserInformationCard
 import ForwardIcon from '@mui/icons-material/Forward';
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import { useNavigate } from 'react-router-dom';
+import * as ComboData from "utils/ComboData";
+import {getObjectByValue} from "utils/CommonFunction";
 
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
@@ -124,9 +126,10 @@ const UserMaintainPage_Organization = () => {
                     response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not verified";
     
                     response.data["lastLoginDate"] = response.data.lastLogin ? DateUtils.datetimeStr(response.data.lastLoginDate) : "";
-                    
-                    response.data["country"] = response.data.addressBus?.country;
-                    response.data["district"] = response.data.addressBus?.district;
+                    // console.log(getObjectByValue(ComboData.country, "key", response.data.addressBus?.country))
+                    // console.log(getObjectByValue(ComboData.country, "key", response.data.addressBus?.district))
+                    response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.addressBus?.country);
+                    response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.addressBus?.district);
                     response.data["addressLine1"] = response.data.addressBus?.addressLine1;
                     response.data["addressLine2"] = response.data.addressBus?.addressLine2;
                     response.data["addressLine3"] = response.data.addressBus?.addressLine3;
@@ -182,7 +185,11 @@ const UserMaintainPage_Organization = () => {
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                            <Typography ml={15} color='#FFF' variant="h4">Maintain Organisation User</Typography>
+                            {isGLDLoggedIn()?
+                                <Typography ml={15} color='#FFF' variant="h4">Maintain Organisation User</Typography>
+                            :
+                                <Typography ml={15} color='#FFF' variant="h4">User Profile</Typography>
+                            }
                         </Stack>
                     </div>
                 </Grid>