add error catching to all measurement thunks

bodynar · Apr 8, 2023 · 456d38c · 456d38c
1 parent c8842cf
commit 456d38c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/src/redux/measurements/thunks/deleteRecord.ts b/src/redux/measurements/thunks/deleteRecord.ts
@@ -30,16 +30,21 @@ export const deleteRecord = (id: number): ThunkAction<void, CompositeAppState, u
                 saveCallback: async (): Promise<void> => {
                     dispatch(getSetAppIsLoadingAction(true));
 
-                    await deleteMeasurement(id);
-
-                    getDisplaySuccessMessageAction(dispatch, getState)("Measurement record successfully deleted");
-
-                    getMeasurements()
-                        .then(measurements => {
-                            dispatch(getSetMeasurementsAction(measurements));
-                            dispatch(getSetAppIsLoadingAction(false));
-                        })
-                        .catch(getDisplayErrorMessageAction(dispatch, getState));
+                    try {
+                        await deleteMeasurement(id);
+
+                        getDisplaySuccessMessageAction(dispatch, getState)("Measurement record successfully deleted");
+
+                        getMeasurements()
+                            .then(measurements => {
+                                dispatch(getSetMeasurementsAction(measurements));
+                                dispatch(getSetAppIsLoadingAction(false));
+                            })
+                            .catch(getDisplayErrorMessageAction(dispatch, getState));
+                    } catch (error: any) {
+                        getDisplayErrorMessageAction(dispatch, getState)(error);
+                        dispatch(getSetAppIsLoadingAction(false));
+                    }
                 },
                 cancelCallback: (): void => { }
             }

diff --git a/src/redux/measurements/thunks/type/deleteRecord.ts b/src/redux/measurements/thunks/type/deleteRecord.ts
@@ -30,16 +30,21 @@ export const deleteTypeRecord = (id: number): ThunkAction<void, CompositeAppStat
                 saveCallback: async (): Promise<void> => {
                     dispatch(getSetAppIsLoadingAction(true));
 
-                    await deleteRecordAction(id);
-
-                    getDisplaySuccessMessageAction(dispatch, getState)(`Measurement type [${measurementType.caption}] successfully deleted`);
-
-                    getMeasurementTypes()
-                        .then(items => {
-                            dispatch(getSetMeasurementTypesAction(items));
-                            dispatch(getSetAppIsLoadingAction(false));
-                        })
-                        .catch(getDisplayErrorMessageAction(dispatch, getState));
+                    try {
+                        await deleteRecordAction(id);
+
+                        getDisplaySuccessMessageAction(dispatch, getState)(`Measurement type [${measurementType.caption}] successfully deleted`);
+
+                        getMeasurementTypes()
+                            .then(items => {
+                                dispatch(getSetMeasurementTypesAction(items));
+                                dispatch(getSetAppIsLoadingAction(false));
+                            })
+                            .catch(getDisplayErrorMessageAction(dispatch, getState));
+                    } catch (error: any) {
+                        getDisplayErrorMessageAction(dispatch, getState)(error);
+                        dispatch(getSetAppIsLoadingAction(false));
+                    }
                 },
                 cancelCallback: (): void => { }
             }

diff --git a/src/redux/measurements/thunks/type/saveCard.ts b/src/redux/measurements/thunks/type/saveCard.ts
@@ -18,7 +18,14 @@ export const saveTypeCard = (values: Array<FieldValue>, id?: string): ThunkActio
 ): Promise<void> => {
     dispatch(getSetAppIsLoadingAction(true));
 
-    await saveCardAction(values, id);
+    try {
+        await saveCardAction(values, id);
+    } catch (error: any) {
+        getDisplayErrorMessageAction(dispatch, getState)(error);
+        dispatch(getSetAppIsLoadingAction(false));
+
+        return new Promise((_, reject) => reject(error as string));
+    }
 
     getDisplaySuccessMessageAction(dispatch, getState)("Measurement type successfully saved");