Skip to content

Commit ccf0a9a

Browse files
committed
#1250: Fixed bad try/catches
1 parent 8ba8c13 commit ccf0a9a

4 files changed

Lines changed: 25 additions & 47 deletions

File tree

src/frontend/src/hooks/auth.hooks.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,9 @@ export const useProvideAuth = () => {
2727
};
2828

2929
const signin = async (id_token: string) => {
30-
try {
31-
const user = await mutateAsync(id_token);
32-
setUser(user);
33-
return user;
34-
} catch (e) {
35-
// do nothing; toasting error message will cause errors
36-
}
30+
const user = await mutateAsync(id_token);
31+
setUser(user);
32+
return user;
3733
};
3834

3935
const signout = () => {

src/frontend/src/pages/CreateChangeRequestPage/CreateChangeRequest.tsx

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,23 @@ const CreateChangeRequest: React.FC<CreateChangeRequestProps> = () => {
5353
const crId = parseInt(cr.message);
5454
proposedSolutions.forEach(async (ps) => {
5555
const { description, timelineImpact, scopeImpact, budgetImpact } = ps;
56-
try {
57-
await cpsMutateAsync({
58-
crId,
59-
submitterId: userId,
60-
description,
61-
timelineImpact,
62-
scopeImpact,
63-
budgetImpact
64-
});
65-
} catch (error: unknown) {
66-
if (error instanceof Error) {
67-
toast.error(error.message);
68-
}
69-
}
56+
57+
await cpsMutateAsync({
58+
crId,
59+
submitterId: userId,
60+
description,
61+
timelineImpact,
62+
scopeImpact,
63+
budgetImpact
64+
});
7065
});
66+
67+
history.push(routes.CHANGE_REQUESTS);
7168
} catch (e) {
7269
if (e instanceof Error) {
7370
toast.error(e.message);
7471
}
7572
}
76-
77-
history.push(routes.CHANGE_REQUESTS);
7873
};
7974

8075
const handleCancel = () => {

src/frontend/src/pages/FinancePage/CreateReimbursementRequest.tsx

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,12 @@ const CreateReimbursementRequestPage: React.FC = () => {
2020
if (createReimbursementRequestIsLoading || receiptsIsLoading) return <LoadingIndicator />;
2121

2222
const onSubmit = async (data: ReimbursementRequestDataSubmission): Promise<string> => {
23-
try {
24-
const { reimbursementRequestId } = await createReimbursementRequest(data);
25-
await uploadReceipts({
26-
id: reimbursementRequestId,
27-
files: data.receiptFiles.map((file) => file.file!)
28-
});
29-
return reimbursementRequestId;
30-
} catch (e) {
31-
if (e instanceof Error) {
32-
toast.error(e.message);
33-
}
34-
}
35-
throw new Error('Could not create reimbursement.');
23+
const { reimbursementRequestId } = await createReimbursementRequest(data);
24+
await uploadReceipts({
25+
id: reimbursementRequestId,
26+
files: data.receiptFiles.map((file) => file.file!)
27+
});
28+
return reimbursementRequestId;
3629
};
3730

3831
return (

src/frontend/src/pages/FinancePage/EditReimbursementRequest/EditReimbursementRequest.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@ const EditReimbursementRequestPage: React.FC = () => {
3131
const onSubmit = async (data: ReimbursementRequestDataSubmission): Promise<string> => {
3232
const filesToKeep = data.receiptFiles.filter((file) => file.googleFileId !== '');
3333

34-
try {
35-
await editReimbursementRequest({ ...data, receiptPictures: filesToKeep });
36-
await uploadReceipts({
37-
id: reimbursementRequest.reimbursementRequestId,
38-
files: data.receiptFiles.filter((receipt) => receipt.googleFileId === '').map((file) => file.file!)
39-
});
40-
} catch (e) {
41-
if (e instanceof Error) {
42-
toast.error(e.message);
43-
}
44-
}
34+
await editReimbursementRequest({ ...data, receiptPictures: filesToKeep });
35+
await uploadReceipts({
36+
id: reimbursementRequest.reimbursementRequestId,
37+
files: data.receiptFiles.filter((receipt) => receipt.googleFileId === '').map((file) => file.file!)
38+
});
4539

4640
return reimbursementRequest.reimbursementRequestId;
4741
};

0 commit comments

Comments
 (0)