diff --git a/apps/portal/src/components/offers/constants.ts b/apps/portal/src/components/offers/constants.ts index f8d2bb6e..e360a505 100644 --- a/apps/portal/src/components/offers/constants.ts +++ b/apps/portal/src/components/offers/constants.ts @@ -1,13 +1,9 @@ import { EducationBackgroundType } from './types'; -const emptyOption = { - label: '----', - value: '', -}; +export const emptyOption = '----'; // TODO: use enums export const titleOptions = [ - emptyOption, { label: 'Software engineer', value: 'Software engineer', @@ -27,7 +23,6 @@ export const titleOptions = [ ]; export const companyOptions = [ - emptyOption, { label: 'Amazon', value: 'cl93patjt0000txewdi601mub', @@ -51,7 +46,6 @@ export const companyOptions = [ ]; export const locationOptions = [ - emptyOption, { label: 'Singapore, Singapore', value: 'Singapore, Singapore', @@ -67,7 +61,6 @@ export const locationOptions = [ ]; export const internshipCycleOptions = [ - emptyOption, { label: 'Summer', value: 'Summer', @@ -91,7 +84,6 @@ export const internshipCycleOptions = [ ]; export const yearOptions = [ - emptyOption, { label: '2021', value: '2021', @@ -110,17 +102,14 @@ export const yearOptions = [ }, ]; -const educationBackgroundTypes = Object.entries(EducationBackgroundType).map( - ([key, value]) => ({ - label: key, - value, - }), -); - -export const educationLevelOptions = [emptyOption, ...educationBackgroundTypes]; +export const educationLevelOptions = Object.entries( + EducationBackgroundType, +).map(([key, value]) => ({ + label: key, + value, +})); export const educationFieldOptions = [ - emptyOption, { label: 'Computer Science', value: 'Computer Science', diff --git a/apps/portal/src/components/offers/forms/OfferDetailsForm.tsx b/apps/portal/src/components/offers/forms/OfferDetailsForm.tsx index fb0990f0..9f17e221 100644 --- a/apps/portal/src/components/offers/forms/OfferDetailsForm.tsx +++ b/apps/portal/src/components/offers/forms/OfferDetailsForm.tsx @@ -13,6 +13,7 @@ import FormTextArea from './components/FormTextArea'; import FormTextInput from './components/FormTextInput'; import { companyOptions, + emptyOption, FieldError, internshipCycleOptions, locationOptions, @@ -39,7 +40,7 @@ function FullTimeOfferDetailsForm({ const { register, formState, setValue } = useFormContext<{ offers: Array; }>(); - const jobFields = formState.errors.offers?.[index]?.job; + const offerFields = formState.errors.offers?.[index]; const watchCurrency = useWatch({ name: `offers.${index}.job.totalCompensation.currency`, @@ -56,15 +57,17 @@ function FullTimeOfferDetailsForm({
} endAddOnType="element" - errorMessage={jobFields?.totalCompensation?.value?.message} + errorMessage={offerFields?.job?.totalCompensation?.value?.message} label="Total Compensation (Annual)" - placeholder="0.00" + placeholder="0" required={true} startAddOn="$" startAddOnType="label" @@ -151,9 +161,9 @@ function FullTimeOfferDetailsForm({ /> } endAddOnType="element" - errorMessage={jobFields?.base?.value?.message} + errorMessage={offerFields?.job?.base?.value?.message} label="Base Salary (Annual)" - placeholder="0.00" + placeholder="0" required={true} startAddOn="$" startAddOnType="label" @@ -177,9 +187,9 @@ function FullTimeOfferDetailsForm({ /> } endAddOnType="element" - errorMessage={jobFields?.bonus?.value?.message} + errorMessage={offerFields?.job?.bonus?.value?.message} label="Bonus (Annual)" - placeholder="0.00" + placeholder="0" required={true} startAddOn="$" startAddOnType="label" @@ -205,9 +215,9 @@ function FullTimeOfferDetailsForm({ /> } endAddOnType="element" - errorMessage={jobFields?.stocks?.value?.message} + errorMessage={offerFields?.job?.stocks?.value?.message} label="Stocks (Annual)" - placeholder="0.00" + placeholder="0" required={true} startAddOn="$" startAddOnType="label" @@ -260,15 +270,17 @@ function InternshipOfferDetailsForm({ offers: Array; }>(); - const jobFields = formState.errors.offers?.[index]?.job; + const offerFields = formState.errors.offers?.[index]; return (
-
-

Date received:

+
} endAddOnType="element" - errorMessage={jobFields?.monthlySalary?.value?.message} + errorMessage={offerFields?.job?.monthlySalary?.value?.message} label="Salary (Monthly)" - placeholder="0.00" + placeholder="0" required={true} startAddOn="$" startAddOnType="label"