From 3251b911d0f522e8ce98840ddb32cd69d400eb50 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 3 Sep 2024 15:10:38 +0800
Subject: [PATCH] update staff edit log

---
 src/app/api/staff/actions.ts           |  6 +++---
 src/components/EditStaff/EditStaff.tsx | 17 ++++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/app/api/staff/actions.ts b/src/app/api/staff/actions.ts
index 4d8cb35..26541dd 100644
--- a/src/app/api/staff/actions.ts
+++ b/src/app/api/staff/actions.ts
@@ -57,11 +57,11 @@ export interface CreateStaffInputs {
     remark?: string;
     salaryEffectiveInfo?: any;
     teamHistory: teamHistory[];
-    delTeamHistory?: number[];
+    delTeamHistory: number[];
     gradeHistory: gradeHistory[];
-    delGradeHistory?: number[];
+    delGradeHistory: number[];
     positionHistory: positionHistory[];
-    delPositionHistory?: number[];
+    delPositionHistory: number[];
   }
   
   export interface records {
diff --git a/src/components/EditStaff/EditStaff.tsx b/src/components/EditStaff/EditStaff.tsx
index 1c9e5cb..7b42d6e 100644
--- a/src/components/EditStaff/EditStaff.tsx
+++ b/src/components/EditStaff/EditStaff.tsx
@@ -45,7 +45,6 @@ interface formProps {
 
 
 const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, InvolvedProject, InfoHistory }) => {
-  console.log(combos.position)
   const defaultSkillset = Staff.skillset.map((s: any) => s.skill.id)
   const { t } = useTranslation();
   const searchParams = useSearchParams()
@@ -121,10 +120,10 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
   const onSubmit = useCallback<SubmitHandler<CreateStaffInputs & { salaryEffectiveInfo: SalaryEffectiveInfo[] } >>(
     async (data) => {
       try {
-        console.log(data);
+        // console.log(data);
         let haveError = false;
-        let regex_email = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/
-        let regex_phone = /^\d{8}$/
+        const regex_email = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/
+        const regex_phone = /^\d{8}$/
 
         if (!regex_email.test(data.email)) {
           haveError = true
@@ -194,9 +193,6 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
           from: dayjs(item.from).format('YYYY-MM-DD'),
           to: (item.to as string).length != 0 ? dayjs(item.to).format('YYYY-MM-DD') : undefined,
         }))
-        console.log(teamHistory)
-        console.log(gradeHistory)
-        console.log(positionHistory)
         
         const salaryEffectiveInfo = data.salaryEffectiveInfo.map((item: SalaryEffectiveInfo) => ({
           id: item.id,
@@ -208,9 +204,9 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
           id: id,
           ...data,
           salaryEffectiveInfo: salaryEffectiveInfo,
-          teamHistory: teamHistory,
-          gradeHistory: gradeHistory,
-          positionHistory: positionHistory,
+          teamHistory: teamHistory ?? [],
+          gradeHistory: gradeHistory ?? [],
+          positionHistory: positionHistory ?? [],
           delTeamHistory: data.delTeamHistory ? data.delTeamHistory : [],
           delGradeHistory: data.delGradeHistory ? data.delGradeHistory : [],
           delPositionHistory: data.delPositionHistory ? data.delPositionHistory : [],
@@ -223,7 +219,6 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
         }
         console.log(postData)
         await saveStaff(postData)
-        return 
         router.replace("/settings/staff")
       } catch (e: any) {
         console.log(e);