From 91c70c1b4d9ef5485b3c7f792e4c34123a74cca7 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Tue, 5 Mar 2024 18:06:27 +0800
Subject: [PATCH] change login log display message

---
 src/pages/AuditLog/UserSearchForm.js          | 22 +++----------------
 .../User/DetailsPage_Individual/LoginGrid.js  |  2 +-
 .../DetailsPage_Organization/LoginGrid.js     |  2 +-
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/pages/AuditLog/UserSearchForm.js b/src/pages/AuditLog/UserSearchForm.js
index c815e34..8a72d96 100644
--- a/src/pages/AuditLog/UserSearchForm.js
+++ b/src/pages/AuditLog/UserSearchForm.js
@@ -15,8 +15,7 @@ import {
 
 import Checkbox from "@mui/material/Checkbox";
 import * as React from "react";
-import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
-import { useNavigate } from "react-router";
+// import { useNavigate } from "react-router";
 import axios from "axios";
 import { GET_EMAIL_LIST } from 'utils/ApiPathConst';
 import {PNSPS_BUTTON_THEME} from "themes/buttonConst";
@@ -26,7 +25,7 @@ import {ThemeProvider} from "@emotion/react";
 
 
 const UserSearchForm = ({ applySearch }) => {
-    const navigate = useNavigate();
+    // const navigate = useNavigate();
 
     const [type, setType] = useState([]);
     const [locked, setLocked] = useState(false);
@@ -65,12 +64,6 @@ const UserSearchForm = ({ applySearch }) => {
         })
     }
 
-    const handleNewUserClick = () => {
-        // console.log(id)
-        navigate('/user/-1');
-        // navigate('/user/' + id);
-    };
-
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
@@ -157,16 +150,7 @@ const UserSearchForm = ({ applySearch }) => {
                         alignItems="center">
                         <ThemeProvider theme={PNSPS_BUTTON_THEME}>
 
-                        <Grid item xs={3} md={3} sx={{ ml: 3,mb: 3 }}>
-                            <Button
-                                variant="contained"
-                                onClick={handleNewUserClick}
-                                startIcon={<AddCircleOutlineIcon/>}
-                            >
-                                New User
-                            </Button>
-                        </Grid>
-                        <Grid item xs={8} md={8}>
+                        <Grid item xs={12} md={12}>
                             <Grid container maxWidth justifyContent="flex-end">
                                 <Grid item sx={{ ml: 3, mr: 3, mb: 3,}}>
                                     <Button
diff --git a/src/pages/User/DetailsPage_Individual/LoginGrid.js b/src/pages/User/DetailsPage_Individual/LoginGrid.js
index df785cc..9e367e8 100644
--- a/src/pages/User/DetailsPage_Individual/LoginGrid.js
+++ b/src/pages/User/DetailsPage_Individual/LoginGrid.js
@@ -56,7 +56,7 @@ export default function LoginGrid({rows}) {
                     resultMessage="Fail"
                 }
                 if (params.row.success<0){
-                    resultMessage= params.row.actionType + " by " + params.row.modifiedBy
+                    resultMessage= params.row.actionType + " by " + (params.row.modifiedBy == null?"multiple times failed login attempt.":params.row.modifiedBy) 
                 }
                 return resultMessage;
             }
diff --git a/src/pages/User/DetailsPage_Organization/LoginGrid.js b/src/pages/User/DetailsPage_Organization/LoginGrid.js
index df785cc..9e367e8 100644
--- a/src/pages/User/DetailsPage_Organization/LoginGrid.js
+++ b/src/pages/User/DetailsPage_Organization/LoginGrid.js
@@ -56,7 +56,7 @@ export default function LoginGrid({rows}) {
                     resultMessage="Fail"
                 }
                 if (params.row.success<0){
-                    resultMessage= params.row.actionType + " by " + params.row.modifiedBy
+                    resultMessage= params.row.actionType + " by " + (params.row.modifiedBy == null?"multiple times failed login attempt.":params.row.modifiedBy) 
                 }
                 return resultMessage;
             }