Fix an issue from previous PR

In elastic#104024, the error handling incorrectly used the `message` property on the response, when it should have been the attributes.errors array.
scottybollinger · Jul 5, 2021 · 3295dc4 · 3295dc4
1 parent f5e7b46
commit 3295dc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...pplications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts b/...pplications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts
@@ -393,8 +393,10 @@ describe('SchemaLogic', () => {
 
         it('handles error with message', async () => {
           const onSchemaSetFormErrorsSpy = jest.spyOn(SchemaLogic.actions, 'onSchemaSetFormErrors');
-          // We expect body.message to be a string[] when it is present
-          http.post.mockReturnValue(Promise.reject({ body: { message: ['this is an error'] } }));
+          // We expect body.attributes.errors to be a string[] when it is present
+          http.post.mockReturnValue(
+            Promise.reject({ body: { attributes: { errors: ['this is an error'] } } })
+          );
           SchemaLogic.actions.setServerField(schema, ADD);
           await nextTick();
 

diff --git a/...lic/applications/workplace_search/views/content_sources/components/schema/schema_logic.ts b/...lic/applications/workplace_search/views/content_sources/components/schema/schema_logic.ts
@@ -350,8 +350,8 @@ export const SchemaLogic = kea<MakeLogicType<SchemaValues, SchemaActions>>({
       } catch (e) {
         window.scrollTo(0, 0);
         if (isAdding) {
-          // We expect body.message to be a string[] for actions.onSchemaSetFormErrors
-          const message: string[] = e?.body?.message || [defaultErrorMessage];
+          // We expect body.attributes.errors to be a string[] for actions.onSchemaSetFormErrors
+          const message: string[] = e?.body?.attributes?.errors || [defaultErrorMessage];
           actions.onSchemaSetFormErrors(message);
         } else {
           flashAPIErrors(e);