Skip to content

Commit 1b4a919

Browse files
committed
chore: fix error result and change how template data is returned
1 parent a208141 commit 1b4a919

File tree

3 files changed

+31
-11
lines changed

3 files changed

+31
-11
lines changed

app/backend/lib/excel_import/template_nine.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ templateNine.post(
555555
}
556556

557557
if (templateNineData) {
558-
return res.status(200).json({ templateNineData });
558+
return res.status(200).json(templateNineData);
559559
}
560560
return res
561561
.status(400)

app/lib/theme/widgets/FileWidget.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const FileWidget: React.FC<FileWidgetProps> = ({
124124
const data = await response.json();
125125
setTemplateData({
126126
templateNumber,
127-
data: data.templateNineData,
127+
data,
128128
templateName: file.name,
129129
});
130130
} else {

app/pages/applicantportal/form/[id]/rfi/[applicantRfiId].tsx

+29-9
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,23 @@ const ApplicantRfiPage = ({
9292
useRfiCoverageMapKmzUploadedEmail();
9393

9494
useEffect(() => {
95+
const getFileDetails = (templateNumber) => {
96+
if (templateNumber === 1) {
97+
return formData?.rfiAdditionalFiles
98+
?.eligibilityAndImpactsCalculator?.[0];
99+
}
100+
if (templateNumber === 2) {
101+
return formData?.rfiAdditionalFiles?.detailedBudget?.[0];
102+
}
103+
if (templateNumber === 9) {
104+
return formData?.rfiAdditionalFiles?.geographicNames?.[0];
105+
}
106+
107+
return null;
108+
};
109+
110+
const fileDetails = getFileDetails(templateData?.templateNumber);
111+
95112
if (templateData?.templateNumber === 1 && !templateData.error) {
96113
const newFormDataWithTemplateOne = {
97114
...newFormData,
@@ -106,6 +123,7 @@ const ApplicantRfiPage = ({
106123
setTemplatesUpdated((prevTemplatesUpdated) => {
107124
return { ...prevTemplatesUpdated, one: true };
108125
});
126+
setTemplateData(null);
109127
setHasApplicationFormDataUpdated(true);
110128
} else if (templateData?.templateNumber === 2 && !templateData.error) {
111129
const newFormDataWithTemplateTwo = {
@@ -121,19 +139,20 @@ const ApplicantRfiPage = ({
121139
return { ...prevTemplatesUpdated, two: true };
122140
});
123141
setHasApplicationFormDataUpdated(true);
142+
setTemplateData(null);
124143
} else if (templateData?.templateNumber === 9 && !templateData.error) {
125144
setTemplatesUpdated((prevTemplatesUpdated) => {
126145
return { ...prevTemplatesUpdated, nine: true };
127146
});
128147
setTemplateNineData({ ...templateData });
148+
setTemplateData(null);
129149
} else if (
150+
fileDetails &&
130151
templateData?.error &&
131152
(templateData?.templateNumber === 1 ||
132153
templateData?.templateNumber === 2 ||
133154
templateData?.templateNumber === 9)
134155
) {
135-
const fileArrayLength =
136-
newFormData.templateUploads?.eligibilityAndImpactsCalculator?.length;
137156
fetch(`/api/email/notifyFailedReadOfTemplateData`, {
138157
method: 'POST',
139158
headers: { 'Content-Type': 'application/json' },
@@ -142,18 +161,16 @@ const ApplicantRfiPage = ({
142161
host: window.location.origin,
143162
params: {
144163
templateNumber: templateData.templateNumber,
145-
uuid: newFormData.templateUploads
146-
?.eligibilityAndImpactsCalculator?.[fileArrayLength - 1]?.uuid,
147-
uploadedAt:
148-
newFormData.templateUploads?.eligibilityAndImpactsCalculator?.[
149-
fileArrayLength - 1
150-
]?.uploadedAt,
164+
uuid: fileDetails.uuid,
165+
uploadedAt: fileDetails?.uploadedAt,
151166
},
152167
}),
168+
}).then(() => {
169+
setTemplateData(null);
153170
});
154171
}
155172
// eslint-disable-next-line react-hooks/exhaustive-deps
156-
}, [templateData]);
173+
}, [templateData, formData]);
157174

158175
const handleSubmit = (e: IChangeEvent<any>) => {
159176
const getTemplateNineUUID = () => {
@@ -204,6 +221,7 @@ const ApplicantRfiPage = ({
204221
},
205222
},
206223
onCompleted: () => {
224+
setTemplateData(null);
207225
checkAndNotifyRfiCoverage().then(() => {
208226
// wait until email is sent before redirecting
209227
router.push(`/applicantportal/dashboard`);
@@ -241,6 +259,7 @@ const ApplicantRfiPage = ({
241259
);
242260
},
243261
onCompleted: () => {
262+
setTemplateData(null);
244263
checkAndNotifyRfiCoverage().then(() => {
245264
// wait until email(s) is sent before redirecting
246265
router.push(`/applicantportal/dashboard`);
@@ -309,6 +328,7 @@ const ApplicantRfiPage = ({
309328
);
310329
},
311330
onCompleted: () => {
331+
setTemplateData(null);
312332
checkAndNotifyHHCount().then(() => {
313333
checkAndNotifyRfiCoverage().then(() => {
314334
// wait until email(s) is sent before redirecting

0 commit comments

Comments
 (0)