Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/assets/style/navbarStyles.css

@@ -24,7 +24,7 @@
 }
 #navbar div li a{
     text-decoration: none;
-    font-size: 1.5rem;
+    font-size: 1.2rem;
     font-weight: 600;
     font-family: 微軟正黑體;
     color: black;
@@ -36,11 +36,11 @@
 #navbar div li a:hover::after,
 #navbar div li a:focus::after{
     content: "";
-    width: 60%;
+    width: 80%;
     height: 2px;
     background:#0C489E;
     position: absolute;
-    top: 1px;
+    bottom: 3px;
     left: 20px;
 }
 #navbar div li ul {

src/pages/authentication/RegisterCustom.js

@@ -54,7 +54,7 @@ const RegisterCustom = () => (
 
               <Typography  ml={4} mr={4} mt={4} variant="body1" display="block" sx={{fontWeight: 'bold'}} gutterBottom>
               需上載身份證明文件數碼檔案以進行網上申請。
-              <br/>如：香港身份證；護照；往來港澳通行證等 
+              <br/>如：香港身份證; 護照; 中國內地身份證; 專業執業証書等 
               </Typography>
             </Grid>
             <Grid item xs={12} md={6} sx={{ borderLeft: 1 ,borderColor: 'grey.500' }}>

src/pages/pnspsUserDetailPage/UserGroupCard.js

@@ -30,6 +30,7 @@ const UserGroupCard = ({isCollectData, updateUserGroupList,userData}) => {
 
     useEffect(() => {
         //if state data are ready and assign to different field
+        // if (Object.keys(userData).length > 0 &&currentUserData !== undefined) {
         if (Object.keys(userData).length > 0 &&currentUserData !== undefined) {
             setOnReady(true);
         }

src/pages/pnspsUserDetailPage/UserGroupTable.js

@@ -33,7 +33,8 @@ export default function UserGroupTable({setSelectedRow, userGroup}) {
 
     useEffect(() => {
         //if state data are ready and assign to different field
-        if (groupData.length > 0) {
+        console.log(groupData)
+        if (groupData!== undefined) {
             setOnReady(true);
         }
     }, [groupData]);

src/pages/pnspsUserDetailPage/index.js

@@ -144,7 +144,7 @@ const UserMaintainPage = () => {
                     "removeAuthIds": deletedUserAuth,
                 },
             ).then((response) => {
-                if (response.status === 200) {
+                if (response.status === 204) {
                     // notifySaveSuccess();
                     navigate('/userSearchview');
                 }

src/pages/pnspsUserGroupDetailPage/index.js

@@ -12,7 +12,7 @@ import {
     GeneralConfirmWindow,
     getDeletedRecordWithRefList,
     getIdList,
-    notifyDeleteSuccess,
+    // notifyDeleteSuccess,
     // notifySaveSuccess
 } from "../../utils/CommonFunction";
 import {POST_AND_UPDATE_USER_GROUP,GET_GROUP_LIST_PATH } from "../../utils/ApiPathConst";
@@ -58,7 +58,7 @@ const UserMaintainPage = () => {
         )
             .then((response) => {
                 if (response.status === 204) {
-                    notifyDeleteSuccess();
+                    // notifyDeleteSuccess();
                     setIsWindowOpen(false);
                     navigate('/usergroupSearchview');
                 }