Skip to content

Commit 7275b48

Browse files
authored
Merge pull request #4224 from Northeastern-Electric-Racing/4218-uploads-not-displaying-on-parts-review-page
4218-uploads-not-displaying-on-parts-review-page clear stale files state when part form modals close
2 parents 2b6ec86 + 5f793a5 commit 7275b48

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartReviewComponents/PartFormModels/ReviewFormModal.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ const ReviewFormModal = ({ open, handleClose, defaultValues, onSubmit, partsInPr
2323
const toast = useToast();
2424
const [files, setFiles] = useState<File[]>([]);
2525
const [uploading, setUploading] = useState(false);
26+
const [selectedPartIndex, setSelectedPartIndex] = useState<number>();
2627
const { mutateAsync: uploadFile } = useUploadFile();
2728

29+
const handleCloseAndReset = () => {
30+
setFiles([]);
31+
setSelectedPartIndex(undefined);
32+
handleClose();
33+
};
34+
2835
const schema = yup.object().shape({
2936
submissionId: yup.string().required(),
3037
notes: yup.string().optional(),
@@ -55,8 +62,6 @@ const ReviewFormModal = ({ open, handleClose, defaultValues, onSubmit, partsInPr
5562
name: 'fileIds'
5663
});
5764

58-
const [selectedPartIndex, setSelectedPartIndex] = useState<number>();
59-
6065
const onFormSubmit = async (data: { submissionId: string; status: Review_Status; notes?: string; fileIds: string[] }) => {
6166
try {
6267
handleClose();
@@ -88,7 +93,7 @@ const ReviewFormModal = ({ open, handleClose, defaultValues, onSubmit, partsInPr
8893
return (
8994
<NERFormModal
9095
open={open}
91-
onHide={handleClose}
96+
onHide={handleCloseAndReset}
9297
title={!!defaultValues ? 'Edit Review' : 'New Review'}
9398
reset={() => reset()}
9499
handleUseFormSubmit={handleSubmit}

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartReviewComponents/PartFormModels/SubmissionFormModal.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ const SubmissionFormModal = ({
3939
const [uploading, setUploading] = useState(false);
4040
const { mutateAsync: uploadFile } = useUploadFile();
4141

42+
const handleCloseAndReset = () => {
43+
setFiles([]);
44+
handleClose();
45+
};
46+
4247
const schema = yup.object().shape({
4348
partId: yup.string().required(),
4449
name: yup.string().required(),
@@ -102,7 +107,7 @@ const SubmissionFormModal = ({
102107
return (
103108
<NERFormModal
104109
open={open}
105-
onHide={handleClose}
110+
onHide={handleCloseAndReset}
106111
title={!!defaultValues ? 'Edit Submission Details' : 'New Submission'}
107112
reset={() => reset()}
108113
handleUseFormSubmit={handleSubmit}

0 commit comments

Comments
 (0)