diff --git a/src/components/cards/AuthFooter.js b/src/components/cards/AuthFooter.js index 18d5231..46260c6 100644 --- a/src/components/cards/AuthFooter.js +++ b/src/components/cards/AuthFooter.js @@ -2,6 +2,9 @@ import { useMediaQuery, Container, Link, Typography, Stack } from '@mui/material'; import bhkLogo from 'assets/images/BHK_logo_rgb_zh-hk.png'; import {FormattedMessage} from "react-intl"; +import { + isGLDLoggedIn, +} from "utils/Utils"; // ==============================|| FOOTER - AUTHENTICATION ||============================== // const AuthFooter = () => { @@ -42,14 +45,16 @@ const AuthFooter = () => { - - - Level AA conformance, - W3C WAI Web Content Accessibility Guidelines 2.0 - + {!isGLDLoggedIn()? + + Level AA conformance, + W3C WAI Web Content Accessibility Guidelines 2.0 + :null + } + logo { const readyToPayment = appIdList.every(appId => combinedAppIdsArray.includes(appId)); if (readyToPayment){ - // props.setConfirmPayment(true); + props.setConfirmPayment(true); return; }else{ const appIdsInData = appIdList.filter(appId => !combinedAppIdsArray.some(item => item === appId)); diff --git a/src/pages/User/DetailPage/LoginGrid.js b/src/pages/User/DetailPage/LoginGrid.js new file mode 100644 index 0000000..9e367e8 --- /dev/null +++ b/src/pages/User/DetailPage/LoginGrid.js @@ -0,0 +1,81 @@ +// material-ui +import * as React from 'react'; +import {FiDataGrid} from "components/FiDataGrid"; +import { + // Button, + // Typography, + 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"; +// ==============================|| EVENT TABLE ||============================== // + +export default function LoginGrid({rows}) { + // const navigate = useNavigate() + const theme = useTheme(); + const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); + // const intl = useIntl(); + + // const handleDetailClick = (params) => () => { + // navigate('/publicNotice/'+ params.id); + // }; + + // const remarkHeadername = rows.orgId===null?"我的備註":"Care Of / 我的備註" + + const columns = [ + { + id: 'loginTime', + field: 'loginTime', + headerName: "Date Time", + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, + valueGetter:(params)=>{ + return DateUtils.datetimeStr(params?.value); + } + }, + { + id: 'result', + field: 'result', + headerName: 'Result', + width: isMdOrLg ? 'auto' : 300, + flex: isMdOrLg ? 2 : undefined, + valueGetter:(params)=>{ + let resultMessage = ""; + if (params.row.success>0){ + resultMessage="Success" + } + if (params.row.success==0){ + resultMessage="Fail" + } + if (params.row.success<0){ + resultMessage= params.row.actionType + " by " + (params.row.modifiedBy == null?"multiple times failed login attempt.":params.row.modifiedBy) + } + return resultMessage; + } + }, + ]; + + // function handleRowDoubleClick(params) { + // navigate('/publicNotice/'+ params.id); + // } + + return ( +
+ 'auto'} + /> +
+ ); +} diff --git a/src/pages/User/DetailPage/UserAuthTable.js b/src/pages/User/DetailPage/UserAuthTable.js index da7c455..266da9a 100644 --- a/src/pages/User/DetailPage/UserAuthTable.js +++ b/src/pages/User/DetailPage/UserAuthTable.js @@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo // ==============================|| EVENT TABLE ||============================== // -export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) { +export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord,editMode}) { const [authData, setAuthData] = useState([]); const [onReady, setOnReady] = useState(false); const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth); @@ -37,7 +37,8 @@ export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) { axios.get(`${apiPath}${GET_AUTH_LIST}`) .then((response) => { if (response.status === 200) { - setAuthData(response.data.records); + const data = response.data.records + setAuthData(data); } }) .catch(error => { @@ -79,7 +80,7 @@ export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) { editMode="row" initialState={{ pagination: { - paginationModel: {page: 0, pageSize: 20}, + paginationModel: {page: 0, pageSize: 10}, }, }} pageSizeOptions={[10, 20, 30]} @@ -87,8 +88,10 @@ export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) { rowSelectionModel={currentSelectedRow} onRowSelectionModelChange={(ids) => { // console.log(ids); - setSelectedRow(ids); - setCurrentSelectedRow(ids); + if (editMode){ + setSelectedRow(ids); + setCurrentSelectedRow(ids); + } }} autoHeight sx={_sx} diff --git a/src/pages/User/DetailPage/UserAuthorityCard.js b/src/pages/User/DetailPage/UserAuthorityCard.js index 756a33a..7e3971d 100644 --- a/src/pages/User/DetailPage/UserAuthorityCard.js +++ b/src/pages/User/DetailPage/UserAuthorityCard.js @@ -16,7 +16,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo // ==============================|| DASHBOARD - DEFAULT ||============================== // -const UserAuthorityCard = ({ isCollectData, updateUserAuthList, userData, isNewRecord }) => { +const UserAuthorityCard = ({ isCollectData, updateUserAuthList, userData, isNewRecord, editMode}) => { const [currentAuthData, setCurrentAuthData] = React.useState({}); const [onReady, setOnReady] = useState(false); const [selectedRow, setSelectedRow] = useState([]); @@ -59,6 +59,7 @@ const UserAuthorityCard = ({ isCollectData, updateUserAuthList, userData, isNewR userAuth={userData.authIds} setSelectedRow={setSelectedRow} isNewRecord={isNewRecord} + editMode={editMode} />
diff --git a/src/pages/User/DetailPage/UserGroupCard.js b/src/pages/User/DetailPage/UserGroupCard.js index e798706..9454904 100644 --- a/src/pages/User/DetailPage/UserGroupCard.js +++ b/src/pages/User/DetailPage/UserGroupCard.js @@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo // ==============================|| DASHBOARD - DEFAULT ||============================== // -const UserGroupCard = ({isCollectData, updateUserGroupList,userData,isNewRecord}) => { +const UserGroupCard = ({isCollectData, updateUserGroupList,userData,isNewRecord,editMode}) => { const [currentUserData, setCurrentUserData] = React.useState({}); const [onReady, setOnReady] = useState(false); const [selectedRow, setSelectedRow] = useState([]); @@ -58,6 +58,7 @@ const UserGroupCard = ({isCollectData, updateUserGroupList,userData,isNewRecord} userGroup={userData.groupIds} setSelectedRow={setSelectedRow} isNewRecord={isNewRecord} + editMode={editMode} />
diff --git a/src/pages/User/DetailPage/UserGroupTable.js b/src/pages/User/DetailPage/UserGroupTable.js index 6b184de..7f44193 100644 --- a/src/pages/User/DetailPage/UserGroupTable.js +++ b/src/pages/User/DetailPage/UserGroupTable.js @@ -13,7 +13,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo // ==============================|| EVENT TABLE ||============================== // -export default function UserGroupTable({setSelectedRow, userGroup,isNewRecord}) { +export default function UserGroupTable({setSelectedRow, userGroup,isNewRecord,editMode}) { const [groupData, setGroupData] = useState([]); const [onReady, setOnReady] = useState(false); const [currentSelectedRow, setCurrentSelectedRow] = useState(userGroup); @@ -85,8 +85,10 @@ export default function UserGroupTable({setSelectedRow, userGroup,isNewRecord}) rowSelectionModel={currentSelectedRow} onRowSelectionModelChange={(ids) => { // console.log(ids); - setSelectedRow(ids); - setCurrentSelectedRow(ids); + if (editMode){ + setSelectedRow(ids); + setCurrentSelectedRow(ids); + } }} autoHeight sx={_sx} diff --git a/src/pages/User/DetailPage/UserInformationCard.js b/src/pages/User/DetailPage/UserInformationCard.js index 832a362..43b5b22 100644 --- a/src/pages/User/DetailPage/UserInformationCard.js +++ b/src/pages/User/DetailPage/UserInformationCard.js @@ -22,7 +22,7 @@ import VisibilityOff from '@mui/icons-material/VisibilityOff'; import { useIntl } from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // -const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewRecord }) => { +const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewRecord, editMode}) => { //const params = useParams(); const [currentUserData, setCurrentUserData] = React.useState({}); const [locked, setLocked] = useState(false); @@ -56,12 +56,12 @@ const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewR }, [currentUserData]); useEffect(() => { - console.log("num"); - console.log(pw.match(/^(?=.*[0-9])/)); - console.log("small char"); - console.log(pw.match(/^(?=.*[a-z])/)); - console.log("SpecialChar"); - console.log(pw.match(/^(?=.*[!@#%&]?)/)); + // console.log("num"); + // console.log(pw.match(/^(?=.*[0-9])/)); + // console.log("small char"); + // console.log(pw.match(/^(?=.*[a-z])/)); + // console.log("SpecialChar"); + // console.log(pw.match(/^(?=.*[!@#%&]?)/)); setPwErr(''); if (pw.length == 0) { @@ -205,6 +205,7 @@ const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewR value: currentUserData.enName, })} id='enName' + disabled={!editMode} /> @@ -228,6 +229,7 @@ const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewR value: currentUserData.post, })} id='post' + disabled={!editMode} /> @@ -251,6 +253,7 @@ const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewR value: currentUserData.emailAddress, })} id='emailAddress' + disabled={!editMode} /> @@ -294,6 +297,7 @@ const UserInformationCard = ({ isCollectData, updateUserObject, userData, isNewR name="checked" color="primary" size="small" + disabled={!editMode} /> diff --git a/src/pages/User/DetailPage/index.js b/src/pages/User/DetailPage/index.js index 55aea6e..b8afced 100644 --- a/src/pages/User/DetailPage/index.js +++ b/src/pages/User/DetailPage/index.js @@ -10,7 +10,8 @@ import { useEffect, useState } from "react"; import * as React from "react"; import axios from "axios"; import { useNavigate, useParams } from "react-router-dom"; -import { GLD_USER_PATH, DELETE_USER, POST_ADMIN_USER_REGISTER } from "utils/ApiPathConst"; +import { GLD_USER_PATH, DELETE_USER, POST_ADMIN_USER_REGISTER,GET_LOGIN_LOG_LIST } from "utils/ApiPathConst"; +import * as HttpUtils from "utils/HttpUtils"; import Loadable from 'components/Loadable'; import { lazy } from 'react'; @@ -18,6 +19,10 @@ const UserInformationCard = Loadable(lazy(() => import('./UserInformationCard')) const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); const UserGroupCard = Loadable(lazy(() => import('./UserGroupCard'))); const UserAuthorityCard = Loadable(lazy(() => import('./UserAuthorityCard'))); +const LoginGrid = Loadable(React.lazy(() => import('./LoginGrid'))); +import {ThemeProvider} from "@emotion/react"; +import {PNSPS_BUTTON_THEME} from "themes/buttonConst"; + import { GeneralConfirmWindow, getDeletedRecordWithRefList, @@ -51,7 +56,8 @@ const UserMaintainPage = () => { const [userConfirm, setUserConfirm] = useState(false); const [isNewRecord, setIsNewRecord] = useState(false); const [refUserData, setRefUserData] = React.useState({}); - + const [loginLogData, setLoginLogData] = React.useState([]) + const [editMode, setEditMode] = React.useState(false); function updateUserObject(userData) { setEditedCustomerData(userData); @@ -99,17 +105,7 @@ const UserMaintainPage = () => { useEffect(() => { if (params.id > 0) { - axios.get(`${GLD_USER_PATH}/${params.id}`) - .then((response) => { - if (response.status === 200) { - setRefUserData(response.data); - setUserData(response.data); - } - }) - .catch(error => { - console.log(error); - return false; - }); + loadData() } else { setUserData( @@ -131,7 +127,25 @@ const UserMaintainPage = () => { }, []); + const loadData = () => { + setOnReady(false); + setEditMode(false); + axios.get(`${GLD_USER_PATH}/${params.id}`) + .then((response) => { + if (response.status === 200) { + setRefUserData(response.data); + setUserData(response.data); + getLoginLogList() + } + }) + .catch(error => { + console.log(error); + return false; + }); + } + useEffect(() => { + // if (Object.keys(userData).length > 0 && userData !== undefined) { if (Object.keys(userData).length > 0 && userData !== undefined) { setOnReady(true); } @@ -201,6 +215,23 @@ const UserMaintainPage = () => { setUserConfirm(false); }, [editedCustomerData, userGroupData, userAuthData]); + const getLoginLogList = () => { + HttpUtils.get({ + url: `${GET_LOGIN_LOG_LIST}`, + params:{ + userId:params.id + }, + onSuccess: function (response) { + // console.log(response) + setLoginLogData(response); + } + }); + } + + const onEditClick = () => { + setEditMode(true); + }; + return ( !onReady ? @@ -223,6 +254,70 @@ const UserMaintainPage = () => { {/*col 1*/} + {/*bottom button*/} + + + {editMode ? + + + + + + + + : + + + + + + + + + + + } + + @@ -232,6 +327,7 @@ const UserMaintainPage = () => { userData={userData} isCollectData={isCollectData} isNewRecord={isNewRecord} + editMode={editMode} /> @@ -243,6 +339,7 @@ const UserMaintainPage = () => { userData={userData} isCollectData={isCollectData} isNewRecord={isNewRecord} + editMode={editMode} /> @@ -256,50 +353,16 @@ const UserMaintainPage = () => { userData={userData} isCollectData={isCollectData} isNewRecord={isNewRecord} + editMode={editMode} /> - - {/*bottom button*/} - - - - - - - - - - - + + + + );