From 34486a710200797a49c2d065547dc37799125166 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Mon, 15 Apr 2024 18:08:37 +0800
Subject: [PATCH] org user

---
 .../DetailsPage_Organization/LoginGrid.js     | 18 ++++++--------
 .../User/DetailsPage_Organization/index.js    | 24 ++-----------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/src/pages/User/DetailsPage_Organization/LoginGrid.js b/src/pages/User/DetailsPage_Organization/LoginGrid.js
index b9617fc..ba059da 100644
--- a/src/pages/User/DetailsPage_Organization/LoginGrid.js
+++ b/src/pages/User/DetailsPage_Organization/LoginGrid.js
@@ -7,18 +7,12 @@ import {
     useMediaQuery
 } from '@mui/material';
 import * as DateUtils from "utils/DateUtils"
-// import {useNavigate} from "react-router-dom";
-// import {
-//     isORGLoggedIn,
-//   } from "utils/Utils";
 import {useTheme} from "@emotion/react";
-// import {getStatusIntl} from "utils/statusUtils/PublicNoteStatusUtils";
-// import {
-//     FormattedMessage, 
-//     useIntl} from "react-intl";
+import {GET_LOGIN_LOG_LIST } from "utils/ApiPathConst";
+
 // ==============================|| EVENT TABLE ||============================== //
 
-export default function LoginGrid({rows}) {
+export default function LoginGrid({userId}) {
     // const navigate = useNavigate()
     const theme = useTheme();
     const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
@@ -64,11 +58,13 @@ export default function LoginGrid({rows}) {
     return (
         <div style={{minHeight: 200, height:"100%", width: '100%', padding: 4}}>
             <FiDataGrid
-                rows={rows}
                 columns={columns}
                 customPageSize={10}
-                // onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
+                doLoad={{
+                    url:GET_LOGIN_LOG_LIST,
+                    params:{userId:userId}
+                }}
             />
         </div>
     );
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index 1bccccd..fce8a34 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -48,7 +48,6 @@ const UserMaintainPage_Organization = () => {
     const params = useParams();
     const navigate = useNavigate();
     const [userData, setUserData] = useState({})
-    const [loginLogData, setLoginLogData] = React.useState([])
     const [orgData, setOrgData] = useState({})
     const [isLoading, setLoding] = useState(true);
     const intl = useIntl();
@@ -161,7 +160,7 @@ const UserMaintainPage_Organization = () => {
                     // console.log(response.data)
                     setUserData(response.data);
                     setOrgData(response.orgList);
-                    getLoginLogList()
+                    setLoding(false);
                 }
             });
         }
@@ -190,25 +189,6 @@ const UserMaintainPage_Organization = () => {
         }
     };
 
-    const getLoginLogList = () => {
-        HttpUtils.get({
-            url: `${UrlUtils.GET_LOGIN_LOG_LIST}`,
-            params:{
-                userId:params.id
-            },
-            onSuccess: function (response) {
-                // console.log(response)    
-                setLoginLogData(response);
-            }
-        });
-    }
-
-
-
-    useEffect(() => {
-        setLoding(false);
-    }, [loginLogData]);
-
     return (
         isLoading ?
             <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
@@ -281,7 +261,7 @@ const UserMaintainPage_Organization = () => {
                                         </TabPanel>
                                         <TabPanel value="2">
                                             <LoginGrid
-                                                rows = {loginLogData}
+                                                userId = {params.id}
                                             />
                                         </TabPanel>
                                     </TabContext>