Browse Source

change login log display message

master
Alex Cheung 1 year ago
parent
commit
91c70c1b4d
3 changed files with 5 additions and 21 deletions
  1. +3
    -19
      src/pages/AuditLog/UserSearchForm.js
  2. +1
    -1
      src/pages/User/DetailsPage_Individual/LoginGrid.js
  3. +1
    -1
      src/pages/User/DetailsPage_Organization/LoginGrid.js

+ 3
- 19
src/pages/AuditLog/UserSearchForm.js View File

@@ -15,8 +15,7 @@ import {


import Checkbox from "@mui/material/Checkbox"; import Checkbox from "@mui/material/Checkbox";
import * as React from "react"; 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 axios from "axios";
import { GET_EMAIL_LIST } from 'utils/ApiPathConst'; import { GET_EMAIL_LIST } from 'utils/ApiPathConst';
import {PNSPS_BUTTON_THEME} from "themes/buttonConst"; import {PNSPS_BUTTON_THEME} from "themes/buttonConst";
@@ -26,7 +25,7 @@ import {ThemeProvider} from "@emotion/react";




const UserSearchForm = ({ applySearch }) => { const UserSearchForm = ({ applySearch }) => {
const navigate = useNavigate();
// const navigate = useNavigate();


const [type, setType] = useState([]); const [type, setType] = useState([]);
const [locked, setLocked] = useState(false); const [locked, setLocked] = useState(false);
@@ -65,12 +64,6 @@ const UserSearchForm = ({ applySearch }) => {
}) })
} }


const handleNewUserClick = () => {
// console.log(id)
navigate('/user/-1');
// navigate('/user/' + id);
};

return ( return (
<MainCard xs={12} md={12} lg={12} <MainCard xs={12} md={12} lg={12}
border={false} border={false}
@@ -157,16 +150,7 @@ const UserSearchForm = ({ applySearch }) => {
alignItems="center"> alignItems="center">
<ThemeProvider theme={PNSPS_BUTTON_THEME}> <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 container maxWidth justifyContent="flex-end">
<Grid item sx={{ ml: 3, mr: 3, mb: 3,}}> <Grid item sx={{ ml: 3, mr: 3, mb: 3,}}>
<Button <Button


+ 1
- 1
src/pages/User/DetailsPage_Individual/LoginGrid.js View File

@@ -56,7 +56,7 @@ export default function LoginGrid({rows}) {
resultMessage="Fail" resultMessage="Fail"
} }
if (params.row.success<0){ 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; return resultMessage;
} }


+ 1
- 1
src/pages/User/DetailsPage_Organization/LoginGrid.js View File

@@ -56,7 +56,7 @@ export default function LoginGrid({rows}) {
resultMessage="Fail" resultMessage="Fail"
} }
if (params.row.success<0){ 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; return resultMessage;
} }


Loading…
Cancel
Save