From 4f7e68e481862371b9075f6199512e7831f7ed29 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Thu, 25 Apr 2024 20:28:36 +0800
Subject: [PATCH] update

---
 src/components/EditStaff/EditStaff.tsx        |  5 ++-
 .../EditStaffForm/EditStaffForm.tsx           | 32 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/EditStaff/EditStaff.tsx b/src/components/EditStaff/EditStaff.tsx
index 44e7510..bcc7346 100644
--- a/src/components/EditStaff/EditStaff.tsx
+++ b/src/components/EditStaff/EditStaff.tsx
@@ -53,7 +53,6 @@ const EditStaff: React.FC = async () => {
   const searchParams = useSearchParams();
   const { t } = useTranslation();
   const idString = searchParams.get("id");
-  const [id, setId] = useState(0);
   const [fieldLists, setFieldLists] = useState<Field[][]>();
   const [companyCombo, setCompanyCombo] = useState<comboProp[]>();
   const [teamCombo, setTeamCombo] = useState<comboProp[]>();
@@ -331,11 +330,11 @@ const EditStaff: React.FC = async () => {
       });
     }
     
-  }, [companyCombo, idString]);
+  }, [companyCombo, teamCombo, departmentCombo, positionCombo, gradeCombo, skillCombo, salaryCombo, idString]);
 
   return (
     <>
-      <EditStaffForm Title={title} id={id} fieldLists={fieldLists as Field[][] || [[]]} />
+      <EditStaffForm Title={title} fieldLists={fieldLists as Field[][] || [[]]} />
     </>
   );
 };
diff --git a/src/components/EditStaffForm/EditStaffForm.tsx b/src/components/EditStaffForm/EditStaffForm.tsx
index a02ca88..f15be32 100644
--- a/src/components/EditStaffForm/EditStaffForm.tsx
+++ b/src/components/EditStaffForm/EditStaffForm.tsx
@@ -26,14 +26,15 @@ interface Field {
 }
 
 interface formProps {
-  id: number;
   Title?: string[];
   fieldLists: Field[][];
 }
 
-const EditStaffForm: React.FC<formProps> = ({ id, Title, fieldLists }) => {
+const EditStaffForm: React.FC<formProps> = ({ Title, fieldLists }) => {
   const router = useRouter();
   const { t } = useTranslation();
+  const searchParams = useSearchParams();
+  const idString = searchParams.get("id")
   const [serverError, setServerError] = useState("");
   // make new inputs
   const onSubmit = useCallback<SubmitHandler<CreateStaffInputs>>(
@@ -49,20 +50,21 @@ const EditStaffForm: React.FC<formProps> = ({ id, Title, fieldLists }) => {
           const formattedDate = dayjs(data.departDate, 'MM/DD/YYYY').format('YYYY-MM-DD');
           formatDepartDate = formattedDate;
         }
-        // console.log(data);
-        const temp = {
-            id: id,
-            ...data,
-            emergContactPhone: data.emergContactPhone.toString(),
-            phone1: data.phone1.toString(),
-            phone2: data.phone1.toString(),
-            joinDate: formatJoinDate,
-            departDate: formatDepartDate,
+        if (idString) {
+          const temp = {
+              id: parseInt(idString),
+              ...data,
+              emergContactPhone: data.emergContactPhone.toString(),
+              phone1: data.phone1.toString(),
+              phone2: data.phone1.toString(),
+              joinDate: formatJoinDate,
+              departDate: formatDepartDate,
+          }
+          console.log(temp)
+          setServerError("");
+          await saveStaff(temp);
+          router.replace("/settings/staff");
         }
-        console.log(temp)
-        setServerError("");
-        await saveStaff(temp);
-        router.replace("/settings/staff");
       } catch (e) {
         setServerError(t("An error has occurred. Please try again later."));
       }