Add better response handling for updating existing message

mbta · Oct 29, 2024 · b3f70ce · b3f70ce
1 parent 6c50e93
commit b3f70ce
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/assets/js/components/Dashboard/EditPaMessage/EditPaMessage.tsx b/assets/js/components/Dashboard/EditPaMessage/EditPaMessage.tsx
@@ -107,16 +107,17 @@ const EditPaMessage = ({ paMessage, alert }: Props) => {
       defaultAudioState={AudioPreview.Reviewed}
       paused={paMessage.paused}
       onSubmit={async (data) => {
-        const result = await updateExistingPaMessage(paMessage.id, data);
-
-        if (result.status === 200) {
+        try {
+          await updateExistingPaMessage(paMessage.id, data);
           mutate(`/api/pa-messages/${paMessage.id}`);
           navigate("/pa-messages");
-        } else if (result.status === 422) {
-          setErrorMessage("Correct the following errors:");
-          setErrors(Object.keys(result.body.errors));
-        } else {
-          setErrorMessage("Something went wrong. Please try again.");
+        } catch (error) {
+          if (Array.isArray(error)) {
+            setErrorMessage("Correct the following errors:");
+            setErrors(error);
+          } else {
+            setErrorMessage((error as Error).message);
+          }
         }
       }}
     />

diff --git a/assets/js/components/Dashboard/PaMessagesPage.tsx b/assets/js/components/Dashboard/PaMessagesPage.tsx
@@ -306,14 +306,13 @@ const PaMessageRow: ComponentType<PaMessageRowProps> = ({
 
   const togglePaused = async (event: React.MouseEvent<HTMLDivElement>) => {
     event.stopPropagation();
-    const result = await updateExistingPaMessage(paMessage.id, {
-      paused: !paMessage.paused,
-    } as UpdatePaMessageBody);
-
-    if (result.status === 200) {
+    try {
+      await updateExistingPaMessage(paMessage.id, {
+        paused: !paMessage.paused,
+      } as UpdatePaMessageBody);
       updatePaMessage({ ...paMessage, paused: !paMessage.paused });
-    } else {
-      setErrorMessage("Something went wrong. Please try again.");
+    } catch (error) {
+      setErrorMessage((error as Error).message);
     }
   };
 

diff --git a/assets/js/utils/api.ts b/assets/js/utils/api.ts
@@ -149,6 +149,17 @@ export const updateExistingPaMessage = async (
     body: JSON.stringify(updates),
   });
 
+  if (response.status === 422) {
+    const body = await response.json();
+    const error = Object.keys(body.errors);
+
+    throw error;
+  } else if (!response.ok) {
+    const error = new Error(`Error: ${response.status} ${response.statusText}`);
+
+    throw error;
+  }
+
   return {
     status: response.status,
     body: await response.json(),