fix: existing date not loaded properly

Author: hentrymartin

src/apps/onboarding/src/components/modal-add-education/index.tsx

@@ -28,7 +28,7 @@ const ModalAddEducation: FC<ModalAddEducationProps> = (props: ModalAddEducationP
     const [educationInfo, setEducationInfo] = useState(emptyEducationInfo())
     const [formErrors, setFormErrors] = useState<any>({
         collegeName: undefined,
-        endDate: undefined,
+        endYear: undefined,
         major: undefined,
     })
 
@@ -42,8 +42,8 @@ const ModalAddEducation: FC<ModalAddEducationProps> = (props: ModalAddEducationP
             errorTmp.major = 'Required'
         }
 
-        if (!educationInfo.endDate) {
-            errorTmp.endDate = 'Required'
+        if (!educationInfo.endYear) {
+            errorTmp.endYear = 'Required'
         }
 
         setFormErrors(errorTmp)
@@ -123,19 +123,16 @@ const ModalAddEducation: FC<ModalAddEducationProps> = (props: ModalAddEducationP
                     <InputSelect
                         tabIndex={0}
                         options={yearOptions}
-                        value={educationInfo.endDate ? `${getYear(educationInfo.endDate)}` : undefined}
+                        value={educationInfo.endYear?.toString()}
                         onChange={function onChange(event: any) {
                             setEducationInfo({
                                 ...educationInfo,
-                                endDate: setYear(
-                                    new Date(),
-                                    parseInt(event.target.value, 10),
-                                ),
+                                endYear: event.target.value,
                             })
                         }}
                         dirty
-                        error={formErrors.endDate}
-                        name='endDate'
+                        error={formErrors.endYear}
+                        name='endYear'
                         label='End Year or Expected *'
                         placeholder='Select year'
                     />

src/apps/onboarding/src/components/modal-add-work/index.tsx

@@ -30,7 +30,7 @@ const industryOptions: any = _.sortBy(INDUSTRIES_OPTIONS)
 const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {
     const [workInfo, setWorkInfo] = useState(emptyWorkInfo())
     const [formErrors, setFormErrors] = useState<any>({
-        company: undefined,
+        companyName: undefined,
         endDate: undefined,
         position: undefined,
         startDate: undefined,
@@ -46,8 +46,8 @@ const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {
 
     const validateField: any = () => {
         const errorTmp: any = {}
-        if (!workInfo.company) {
-            errorTmp.company = 'Required'
+        if (!workInfo.companyName) {
+            errorTmp.companyName = 'Required'
         }
 
         if (!workInfo.position) {
@@ -121,20 +121,20 @@ const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {
             <div className={classNames(styles.modalContent, 'd-flex flex-column align-items-start mobile-gap-16')}>
                 <div className='full-width'>
                     <InputText
-                        name='company'
+                        name='companyName'
                         label='Company *'
-                        value={workInfo.company}
+                        value={workInfo.companyName}
                         onChange={function onChange(event: any) {
                             setWorkInfo({
                                 ...workInfo,
-                                company: event.target.value,
+                                companyName: event.target.value,
                             })
                         }}
                         placeholder='Enter company'
                         tabIndex={0}
                         type='text'
                         dirty
-                        error={formErrors.company}
+                        error={formErrors.companyName}
                     />
                 </div>
                 <div className='full-width'>

src/apps/onboarding/src/models/EducationInfo.ts

@@ -2,14 +2,16 @@ export default interface EducationInfo {
     collegeName: string
     major: string
     dateDescription: string
-    endDate?: Date
-    id: number
+    endYear?: string
+    id: number,
+    traitId: string,
 }
 
 export const emptyEducationInfo: () => EducationInfo = () => ({
     collegeName: '',
     dateDescription: '',
-    endDate: undefined,
+    endYear: undefined,
     id: 0,
     major: '',
+    traitId: '',
 })

src/apps/onboarding/src/models/WorkInfo.ts

@@ -1,5 +1,5 @@
 export default interface WorkInfo {
-    company?: string
+    companyName?: string
     position?: string
     industry?: string
     startDate?: Date

src/apps/onboarding/src/pages/educations/index.tsx

@@ -57,12 +57,10 @@ export const PageEducationsContent: FC<{
     }, [educations])
 
     const displayEducations = useMemo(() => (educations || []).map(educationItem => {
-        const endDate: Date | undefined = educationItem.endDate
-        const endDateString: string = endDate ? moment(endDate)
-            .format('YYYY') : ''
+        const endYear: string = educationItem.endYear as string
         return {
             ...educationItem,
-            dateDescription: endDateString || '',
+            dateDescription: endYear || '',
         }
     }), [educations])
 

src/apps/onboarding/src/pages/works/index.tsx

@@ -73,7 +73,7 @@ export const PageWorksContent: FC<{
                 ...(startDateString ? [startDateString] : []),
                 ...(endDateString ? [endDateString] : []),
             ].join('-'),
-            description: workItem.company,
+            description: workItem.companyName,
         }
     }), [works])
 

src/apps/onboarding/src/redux/actions/member.ts

@@ -117,10 +117,10 @@ export const fetchMemberTraits: any = () => async (dispatch: any) => {
     if (workExpValue) {
         // workExpValue is array of works. fill it to state
         const works: WorkInfo[] = workExpValue.map((j: any, index: number) => {
-            const startDate: Date | undefined = dateTimeToDate(j.timePeriodFrom)
-            const endDate: Date | undefined = dateTimeToDate(j.timePeriodTo)
+            const startDate: Date | undefined = dateTimeToDate(j.startDate)
+            const endDate: Date | undefined = dateTimeToDate(j.endDate)
             return ({
-                company: j.company,
+                companyName: j.companyName,
                 currentlyWorking: j.working,
                 endDate,
                 id: index + 1,
@@ -142,10 +142,11 @@ export const fetchMemberTraits: any = () => async (dispatch: any) => {
             const startDate: Date | undefined = dateTimeToDate(e.timePeriodFrom)
             const endDate: Date | undefined = dateTimeToDate(e.timePeriodTo)
             return ({
-                collegeName: e.schoolCollegeName,
+                collegeName: e.collegeName,
                 endDate,
                 id: index + 1,
-                major: e.major,
+                major: e.degree,
+                endYear: e.endYear,
                 startDate,
             })
         })
@@ -192,11 +193,11 @@ const createWorksPayloadData: any = (works: WorkInfo[]) => {
             currentlyWorking,
         }: any = work
         return {
-            company,
+            companyName: company || '',
             industry,
             position,
-            timePeriodFrom: startDate ? startDate.toISOString() : '',
-            timePeriodTo: endDate ? endDate.toISOString() : '',
+            startDate: startDate ? startDate.toISOString() : null,
+            endDate: endDate ? endDate.toISOString() : null,
             working: currentlyWorking,
         }
     })
@@ -205,6 +206,7 @@ const createWorksPayloadData: any = (works: WorkInfo[]) => {
         categoryName: UserTraitCategoryNames.work,
         traitId: UserTraitIds.work,
         traits: {
+            traitId: UserTraitIds.work,
             data,
         },
     }
@@ -242,21 +244,20 @@ const createEducationsPayloadData: any = (educations: EducationInfo[]) => {
         const {
             collegeName,
             major,
-            startDate,
-            endDate,
+            endYear,
         }: any = education
         return {
-            major,
-            schoolCollegeName: collegeName,
-            timePeriodFrom: startDate ? startDate.toISOString() : '',
-            timePeriodTo: endDate ? endDate.toISOString() : '',
+            degree: major,
+            collegeName,
+            endYear: parseInt(endYear, 10),
         }
     })
 
     const payload: any = {
         categoryName: UserTraitCategoryNames.education,
         traitId: UserTraitIds.education,
         traits: {
+            traitId: UserTraitIds.education,
             data,
         },
     }
@@ -266,7 +267,7 @@ const createEducationsPayloadData: any = (educations: EducationInfo[]) => {
 export const updateMemberEducations: any = (educations: EducationInfo[]) => async (dispatch: any) => {
     try {
         const tokenInfo: TokenModel = await getAsyncToken()
-
+        console.log(createEducationsPayloadData(educations), 'createEducationsPayloadData(educations)')
         await updateMemberTraits(tokenInfo.handle || '', createEducationsPayloadData(educations))
         dispatch(updateEducations(educations))
     } catch (error) {
@@ -310,6 +311,7 @@ const createPersonalizationsPayloadData: any = (personalizations: Personalizatio
         categoryName: UserTraitCategoryNames.personalization,
         traitId: UserTraitIds.personalization,
         traits: {
+            traitId: UserTraitIds.personalization,
             data,
         },
     }