Add fallback for http errors without an errors array

- all http error messages should still be expected to contain a message key, so should be a reliable fallback
elastic · Sep 16, 2020 · 2128958 · 2128958
1 parent 268cb6d
commit 2128958
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...ins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts b/...ins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts
@@ -52,6 +52,20 @@ describe('flashAPIErrors', () => {
     ]);
   });
 
+  it('falls back to the basic message for http responses without an errors array', () => {
+    flashAPIErrors({
+      body: {
+        statusCode: 404,
+        error: 'Not Found',
+        message: 'Not Found',
+      },
+    } as any);
+
+    expect(FlashMessagesLogic.actions.setFlashMessages).toHaveBeenCalledWith([
+      { type: 'error', message: 'Not Found' },
+    ]);
+  });
+
   it('displays a generic error message and re-throws non-API errors', () => {
     try {
       flashAPIErrors(Error('whatever') as any);

diff --git a/.../plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts b/.../plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
@@ -40,7 +40,7 @@ export const flashAPIErrors = (
 
   const errorFlashMessages: IFlashMessage[] = Array.isArray(error?.body?.attributes?.errors)
     ? error.body!.attributes.errors.map((message) => ({ type: 'error', message }))
-    : [{ type: 'error', message: defaultErrorMessage }];
+    : [{ type: 'error', message: error?.body?.message || defaultErrorMessage }];
 
   if (isQueued) {
     FlashMessagesLogic.actions.setQueuedMessages(errorFlashMessages);