pkp/pkp-lib#10337 Use error as fallback if errorMessage does not exis…

…t from error response
blesildaramirez · Feb 20, 2025 · 31a36d4 · 31a36d4
1 parent f25426e
commit 31a36d4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/components/Form/Form.vue b/src/components/Form/Form.vue
@@ -460,10 +460,11 @@ export default {
 			} else if (
 				r.status &&
 				[403, 404].includes(r.status) &&
-				r.responseJSON &&
-				r.responseJSON.errorMessage
+				(r.responseJSON?.errorMessage || r.responseJSON?.error)
 			) {
-				pkp.eventBus.$emit('notify', r.responseJSON.errorMessage, 'warning');
+				const errorMessage =
+					r.responseJSON.errorMessage || r.responseJSON.error;
+				pkp.eventBus.$emit('notify', errorMessage, 'warning');
 			} else {
 				pkp.eventBus.$emit('notify', this.t('common.unknownError', 'warning'));
 			}

diff --git a/src/mixins/ajaxError.js b/src/mixins/ajaxError.js
@@ -36,8 +36,8 @@ export default {
 			}
 
 			let msg;
-			if ('responseJSON' in r && 'errorMessage' in r.responseJSON) {
-				msg = r.responseJSON.errorMessage;
+			if (r?.responseJSON?.errorMessage || r?.responseJSON?.error) {
+				msg = r.responseJSON.errorMessage || r.responseJSON.error;
 			} else {
 				msg = this.t('common.unknownError');
 			}

diff --git a/src/stores/modalStore.js b/src/stores/modalStore.js
@@ -39,7 +39,10 @@ export const useModalStore = defineStore('modal', () => {
 
 	/** Default network error */
 	function openDialogNetworkError(fetchError) {
-		const msg = fetchError?.data?.errorMessage || t('common.unknownError');
+		const msg =
+			fetchError?.data?.errorMessage ||
+			fetchError?.data?.error ||
+			t('common.unknownError');
 
 		openDialog({
 			name: 'ajaxError',