From f445c8386d2dad7d34be634c5f4e417c03e4a63b Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Thu, 31 Aug 2023 14:23:45 +0800
Subject: [PATCH] remove search user info

---
 src/assets/style/navbarStyles.css             |   4 +-
 src/layout/MainLayout/Header/index.js         |   6 +-
 .../UserInformationCard.js                    | 142 +++++++-----------
 .../pnspsUserGroupDetailPage/UserAddTable.js  |  12 +-
 .../pnspsUserSearchPage/UserSearchForm.js     |  68 +++++----
 src/pages/pnspsUserSearchPage/UserTable.js    |  54 +++----
 src/utils/ApiPathConst.js                     |   2 +-
 7 files changed, 129 insertions(+), 159 deletions(-)

diff --git a/src/assets/style/navbarStyles.css b/src/assets/style/navbarStyles.css
index b11c27c..ab5ddce 100644
--- a/src/assets/style/navbarStyles.css
+++ b/src/assets/style/navbarStyles.css
@@ -40,14 +40,14 @@
     height: 2px;
     background:#0C489E;
     position: absolute;
-    top: -4px;
+    top: 1px;
     left: 20px;
 }
 #navbar div li ul {
   background: white;
   visibility: hidden;
   opacity: 0;
-  min-width: 16rem;
+  min-width: 18rem;
   position: absolute;
   /* transition: all 0.5s ease; */
   left: 0;
diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index 0f28f4a..9e46add 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -89,13 +89,13 @@ function Header(props) {
         <Link className="client" >Client<KeyboardArrowDownIcon/></Link>
         <ul className='dropdown'>
           <li>
-            <Link className="userSearchview" to='/userSearchview'>User</Link>
+            <Link className="userSearchview" to='/userSearchview'>Users (GLD)</Link>
           </li>
           <li>
-            <Link className="indUser" to='/indUser'>Individual User</Link>
+            <Link className="indUser" to='/indUser'>Users (Individual)</Link>
           </li>
           <li>
-            <Link className="orgUser" to='/orgUser'>Organization User</Link>
+            <Link className="orgUser" to='/orgUser'>Users (Organization)</Link>
           </li>
           <li>
             <Link className="org" to='/org'>Organization</Link>
diff --git a/src/pages/pnspsUserDetailPage/UserInformationCard.js b/src/pages/pnspsUserDetailPage/UserInformationCard.js
index 6bf419f..755da6a 100644
--- a/src/pages/pnspsUserDetailPage/UserInformationCard.js
+++ b/src/pages/pnspsUserDetailPage/UserInformationCard.js
@@ -5,15 +5,15 @@ import {
 import MainCard from "../../components/MainCard";
 import * as React from "react";
 import {useForm} from "react-hook-form";
-import Autocomplete from "@mui/material/Autocomplete";
-import {
-    subDivision1,
-    subDivision2,
-    subDivision3,
-    subDivision4,
-    subDivision5,
-    subDivision6
-} from "../pnspsUserSearchPage/DummyComboRecord";
+// import Autocomplete from "@mui/material/Autocomplete";
+// import {
+//     subDivision1,
+//     subDivision2,
+//     subDivision3,
+//     subDivision4,
+//     subDivision5,
+//     subDivision6
+// } from "../pnspsUserSearchPage/DummyComboRecord";
 import {useEffect, useState} from "react";
 import Checkbox from "@mui/material/Checkbox";
 import LoadingComponent from "../extra-pages/LoadingComponent";
@@ -22,58 +22,58 @@ import LoadingComponent from "../extra-pages/LoadingComponent";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
-const subDivisionArray = [
-    ...subDivision1,
-    ...subDivision2,
-    ...subDivision3,
-    ...subDivision4,
-    ...subDivision5,
-    ...subDivision6
-];
+// const subDivisionArray = [
+//     ...subDivision1,
+//     ...subDivision2,
+//     ...subDivision3,
+//     ...subDivision4,
+//     ...subDivision5,
+//     ...subDivision6
+// ];
 
 
 const UserInformationCard = ({isCollectData, updateUserObject,userData}) => {
     //const params = useParams();
     const [currentUserData, setCurrentUserData] = React.useState({});
-    const [subDivision, setSubDivision] = useState(null);
+    // const [subDivision, setSubDivision] = useState(null);
     const [locked, setLocked] = useState(false);
-    const [isLotusNoteUser, setIsLotusNoteUser] = useState(false);
-    const [lotusNoteUserList, setLotusNoteUserList] = useState([])
-    const [selectedLotusUser, setSelectedLotusUser] = useState(null);
+    // const [isLotusNoteUser, setIsLotusNoteUser] = useState(false);
+    // const [lotusNoteUserList, setLotusNoteUserList] = useState([])
+    // const [selectedLotusUser, setSelectedLotusUser] = useState(null);
 
     const [onReady, setOnReady] = useState(false);
     const {register, getValues} = useForm()
 
-    useEffect(() => {
-        //TODO: Get lotus note user list
-        setLotusNoteUserList([
-            {
-                key: 1,
-                label: "user01",
-                account: "user123456"
-            },
-            {
-                key: 2,
-                label: "user02",
-                account: "userabcde1"
-            },
-            {
-                key: 3,
-                label: "user03",
-                account: "user2001"
-            },
-            {
-                key: 4,
-                label: "user04",
-                account: "user2000"
-            },
-            {
-                key: 5,
-                label: "user05",
-                account: "user1999"
-            },
-        ])
-    }, []);
+    // useEffect(() => {
+    //     //TODO: Get lotus note user list
+    //     setLotusNoteUserList([
+    //         {
+    //             key: 1,
+    //             label: "user01",
+    //             account: "user123456"
+    //         },
+    //         {
+    //             key: 2,
+    //             label: "user02",
+    //             account: "userabcde1"
+    //         },
+    //         {
+    //             key: 3,
+    //             label: "user03",
+    //             account: "user2001"
+    //         },
+    //         {
+    //             key: 4,
+    //             label: "user04",
+    //             account: "user2000"
+    //         },
+    //         {
+    //             key: 5,
+    //             label: "user05",
+    //             account: "user1999"
+    //         },
+    //     ])
+    // }, []);
 
     useEffect(() => {
         //if user data from parent are not null
@@ -95,8 +95,8 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData}) => {
         const values = getValues();
         const objectData ={
             ...values,
-            selectedLotusUser: selectedLotusUser,
-            subDivision: subDivision,
+            // selectedLotusUser: selectedLotusUser,
+            // subDivision: subDivision,
             locked: locked,
         }
         updateUserObject(objectData);
@@ -117,38 +117,6 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData}) => {
 
 
                 <form>
-                    <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
-                        <Grid container alignItems={"center"}>
-                            <Grid item xs={4} s={4} md={4} lg={4}
-                                  sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
-                                Lotus Note User:
-                            </Grid>
-
-                            <Grid item xs={1} s={1} md={1} lg={1}>
-                                <Checkbox
-                                    checked={isLotusNoteUser}
-                                    onChange={(event) => setIsLotusNoteUser(event.target.checked)}
-                                    name="isLotusNoteUser"
-                                    color="primary"
-                                    size="small"
-                                />
-                            </Grid>
-
-                            <Grid item xs={6} s={6} md={6} lg={5}>
-                                <Autocomplete
-                                    disablePortal
-                                    id="lotus-note-combo"
-                                    value={selectedLotusUser === null ? null : selectedLotusUser}
-                                    options={lotusNoteUserList}
-                                    disabled={!isLotusNoteUser}
-                                    onChange={(event, newValue) => {
-                                        setSelectedLotusUser(newValue);
-                                    }}
-                                    renderInput={(params) => <TextField {...params} />}
-                                />
-                            </Grid>
-                        </Grid>
-                    </Grid>
 
                     <Grid container>
                         <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
@@ -230,7 +198,7 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData}) => {
                             </Grid>
                         </Grid>
 
-                        <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
+                        {/* <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={4} s={4} md={4} lg={4}
                                       sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
@@ -250,7 +218,7 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData}) => {
                                     />
                                 </Grid>
                             </Grid>
-                        </Grid>
+                        </Grid> */}
 
                         <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
                             <Grid container alignItems={"center"}>
diff --git a/src/pages/pnspsUserGroupDetailPage/UserAddTable.js b/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
index 8e2b766..33357ab 100644
--- a/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
+++ b/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
@@ -60,12 +60,12 @@ export default function UserAddTable({setGroupUserData, userList}) {
             headerName: 'User',
             flex: 1,
         },
-        {
-            id: 'subDiv',
-            field: 'subDivisionName',
-            headerName: 'Sub-Division',
-            flex: 1,
-        },
+        // {
+        //     id: 'subDiv',
+        //     field: 'subDivisionName',
+        //     headerName: 'Sub-Division',
+        //     flex: 1,
+        // },
     ];
 
     return (
diff --git a/src/pages/pnspsUserSearchPage/UserSearchForm.js b/src/pages/pnspsUserSearchPage/UserSearchForm.js
index 09336d5..eab02e9 100644
--- a/src/pages/pnspsUserSearchPage/UserSearchForm.js
+++ b/src/pages/pnspsUserSearchPage/UserSearchForm.js
@@ -1,4 +1,4 @@
-// material-ui
+// material-uisubDivision
 import {
     Button,
     CardContent, FormControlLabel,
@@ -8,35 +8,37 @@ import {
 import MainCard from "../../components/MainCard";
 import {useForm} from "react-hook-form";
 
-import {useEffect, useState} from "react";
-import Autocomplete from '@mui/material/Autocomplete';
 import {
-    subDivision1,
-    subDivision2,
-    subDivision3,
-    subDivision4,
-    subDivision5,
-    subDivision6
-} from "pages/pnspsUserSearchPage/DummyComboRecord";
+    // useEffect,
+    useState} from "react";
+// import Autocomplete from '@mui/material/Autocomplete';
+// import {
+//     subDivision1,
+//     subDivision2,
+//     subDivision3,
+//     subDivision4,
+//     subDivision5,
+//     subDivision6
+// } from "pages/pnspsUserSearchPage/DummyComboRecord";
 import Checkbox from "@mui/material/Checkbox";
 import * as React from "react";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
-const subDivisionArray =[
-        ...subDivision1,
-        ...subDivision2,
-        ...subDivision3,
-        ...subDivision4,
-        ...subDivision5,
-        ...subDivision6
-];
+// const subDivisionArray =[
+//         ...subDivision1,
+//         ...subDivision2,
+//         ...subDivision3,
+//         ...subDivision4,
+//         ...subDivision5,
+//         ...subDivision6
+// ];
 
 const UserSearchForm = ({applySearch}) => {
 
     const [type, setType] = useState([]);
-    const [division, setDivision] = useState(null);
-    const [subDivision, setSubDivision] = useState(null);
-    const [isLotusNoteUser, setIsLotusNoteUser] = useState(false);
+    // const [division, setDivision] = useState(null);
+    // const [subDivision, setSubDivision] = useState(null);
+    // const [isLotusNoteUser, setIsLotusNoteUser] = useState(false);
     const [locked, setLocked] = useState(false);
 
 
@@ -62,18 +64,18 @@ const UserSearchForm = ({applySearch}) => {
         applySearch(temp);
     };
 
-    useEffect(() => {
-        if(division != null){
-            setSubDivision(subDivisionArray[division.type-1][0]);
-        }
+    // useEffect(() => {
+    //     if(division != null){
+    //         setSubDivision(subDivisionArray[division.type-1][0]);
+    //     }
 
-    }, [division]);
+    // }, [division]);
 
     function resetForm(){
         setType([]);
-        setDivision(null);
-        setSubDivision(null);
-        setIsLotusNoteUser(false);
+        // setDivision(null);
+        // setSubDivision(null);
+        // setIsLotusNoteUser(false);
         setLocked(false);
         reset();
     }
@@ -120,7 +122,7 @@ const UserSearchForm = ({applySearch}) => {
                         />
                     </Grid>
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
+                    {/* <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                         <Autocomplete
                             disablePortal
                             id="sub-division-combo"
@@ -131,7 +133,7 @@ const UserSearchForm = ({applySearch}) => {
                             }}
                             renderInput={(params) => <TextField {...params} label="Sub-Division" />}
                         />
-                    </Grid>
+                    </Grid> */}
 
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                         <TextField
@@ -151,7 +153,7 @@ const UserSearchForm = ({applySearch}) => {
                         />
                     </Grid>
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
+                    {/* <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                         <FormControlLabel
                             control={
                                 <Checkbox
@@ -164,7 +166,7 @@ const UserSearchForm = ({applySearch}) => {
                             }
                             label={<Typography variant="h6">Lotus Notes User</Typography>}
                         />
-                    </Grid>
+                    </Grid> */}
 
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                         <FormControlLabel
diff --git a/src/pages/pnspsUserSearchPage/UserTable.js b/src/pages/pnspsUserSearchPage/UserTable.js
index ed2ab25..db7f956 100644
--- a/src/pages/pnspsUserSearchPage/UserTable.js
+++ b/src/pages/pnspsUserSearchPage/UserTable.js
@@ -69,33 +69,33 @@ export default function UserTable({recordList}) {
             headerName: 'Email',
             flex: 1,
         },
-        {
-            id: 'subDivisionId',
-            field: 'subDivisionId',
-            //type: 'date',
-            //sortable: false,
-            headerName: 'Sub-Division',
-            flex: 1,
-        },
-        {
-            id: 'lotusNotesUser',
-            field: 'lotusNotesUser',
-            type: 'bool',
-            headerName: 'Lotus Notes User',
-            flex: 1,
-            renderCell: (params) => {
-                return (
-                    <Checkbox
-                        theme={theme}
-                        key="locked"
-                        checked={params.row.lotusNotesUser}
-                        color="primary"
-                        size="small"
-                        //onChange={handleChange}
-                    />
-                );
-            },
-        },
+        // {
+        //     id: 'subDivisionId',
+        //     field: 'subDivisionId',
+        //     //type: 'date',
+        //     //sortable: false,
+        //     headerName: 'Sub-Division',
+        //     flex: 1,
+        // },
+        // {
+        //     id: 'lotusNotesUser',
+        //     field: 'lotusNotesUser',
+        //     type: 'bool',
+        //     headerName: 'Lotus Notes User',
+        //     flex: 1,
+        //     renderCell: (params) => {
+        //         return (
+        //             <Checkbox
+        //                 theme={theme}
+        //                 key="locked"
+        //                 checked={params.row.lotusNotesUser}
+        //                 color="primary"
+        //                 size="small"
+        //                 //onChange={handleChange}
+        //             />
+        //         );
+        //     },
+        // },
         {
             id: 'locked',
             field: 'locked',
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index 8d60ee9..e923ced 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -8,7 +8,7 @@ export const GET_GROUP_COMBO_PATH = '/group/combo';
 export const GET_GROUP_MEMBER_LIST_PATH = '/group/member';
 export const GET_GROUP_AUTH_LIST = '/group/auth/combo';
 
-export const GET_USER_PATH = '/user';
+export const GET_USER_PATH = '/user/gld';
 export const GET_AUTH_LIST = '/user/auth/combo';
 export const GET_USER_COMBO_LIST = '/user/combo';
 export const GET_USER_LOCK = apiPath+'/user/lock';