Browse Source

fix the error message on a successful result

pull/72/head
Trent Larson 1 year ago
parent
commit
6d2df4a50c
  1. 25
      src/views/HomeView.vue

25
src/views/HomeView.vue

@ -524,15 +524,18 @@ export default class HomeView extends Vue {
hours, hours,
); );
if (this.isGiveCreationError(result)) { if (
result.type === "error" ||
this.isGiveCreationError(result.response)
) {
const errorMessage = this.getGiveCreationErrorMessage(result); const errorMessage = this.getGiveCreationErrorMessage(result);
console.log("Error with give result:", result); console.log("Error with give creation result:", result);
this.$notify( this.$notify(
{ {
group: "alert", group: "alert",
type: "danger", type: "danger",
title: "Error", title: "Error",
text: errorMessage || "There was an error recording the give.", text: errorMessage || "There was an error creating the give.",
}, },
-1, -1,
); );
@ -549,7 +552,7 @@ export default class HomeView extends Vue {
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (error: any) { } catch (error: any) {
console.log("Error with give caught:", error); console.log("Error with give recordation caught:", error);
const message = const message =
error.userMessage || error.userMessage ||
error.response?.data?.error?.message || error.response?.data?.error?.message ||
@ -568,14 +571,26 @@ export default class HomeView extends Vue {
// Helper functions for readability // Helper functions for readability
/**
* @param result response "data" from the server
* @returns true if the result indicates an error
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
isGiveCreationError(result: any) { isGiveCreationError(result: any) {
return result.status !== 201 || result.data?.error; return result.status !== 201 || result.data?.error;
} }
/**
* @param result direct response from the server (potentially with embedded "data")
* @returns best guess at an error message
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
getGiveCreationErrorMessage(result: any) { getGiveCreationErrorMessage(result: any) {
return result.data?.error?.message; return (
result.error?.userMessage ||
result.error?.error ||
result.data?.error?.message
);
} }
} }
</script> </script>

Loading…
Cancel
Save