Skip to content

Commit 963fa57

Browse files
committed
#1195 Cleaned up default values
1 parent c78f810 commit 963fa57

1 file changed

Lines changed: 7 additions & 11 deletions

File tree

src/frontend/src/pages/WorkPackageDetailPage/ActivateWorkPackageModalContainer/ActivateWorkPackageModal.tsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ const schema = yup.object().shape({
4747
confirmDetails: yup.boolean().required()
4848
});
4949

50-
//startDate: new Date().toLocaleDateString(),
51-
5250
const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
5351
allUsers,
5452
wbsNum,
@@ -62,19 +60,17 @@ const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
6260
const daysUntilNextMonday = (7 - today + 1) % 7;
6361
startDate.setDate(startDate.getDate() + daysUntilNextMonday);
6462
}
65-
const { reset, handleSubmit, control } = useForm<FormInput>({
66-
resolver: yupResolver(schema),
67-
defaultValues: {
68-
confirmDetails: false,
69-
startDate
70-
}
71-
});
7263

7364
const defaultValues: FormInput = {
74-
startDate: new Date(),
65+
startDate: startDate,
7566
confirmDetails: false
7667
};
7768

69+
const { reset, handleSubmit, control } = useForm<FormInput>({
70+
resolver: yupResolver(schema),
71+
defaultValues: defaultValues
72+
});
73+
7874
const [projectLeadId, setProjectLeadId] = useState<string>();
7975
const [projectManagerId, setProjectManagerId] = useState<string>();
8076
const toast = useToast();
@@ -149,7 +145,7 @@ const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
149145
inputFormat="yyyy-MM-dd"
150146
onChange={(date) => onChange(date ?? new Date())}
151147
className={'padding: 10'}
152-
value={value}
148+
value={startDate}
153149
shouldDisableDate={disableStartDate}
154150
renderInput={(params) => <TextField autoComplete="off" {...params} />}
155151
/>

0 commit comments

Comments
 (0)