diff --git a/addons/api/addon/adapters/application.js b/addons/api/addon/adapters/application.js index a2f4f3097..d2c91e481 100644 --- a/addons/api/addon/adapters/application.js +++ b/addons/api/addon/adapters/application.js @@ -235,7 +235,7 @@ export default class ApplicationAdapter extends RESTAdapter.extend( * @return {object} */ transformValidationErrors(payload) { - const fieldErrors = get(payload, 'details.fields') || []; + const fieldErrors = get(payload, 'details.request_fields') || []; // Normalize the primary error message into "base", which is an error // that applies to the whole model instance const baseError = { @@ -247,7 +247,7 @@ export default class ApplicationAdapter extends RESTAdapter.extend( }; // Normalize field-specific errors, if any. const errors = fieldErrors.map((error) => ({ - detail: error.message, + detail: error.description, source: { pointer: `/data/attributes/${error.name}` }, })); // Return a list of JSON API errors rooted under the `errors` key. diff --git a/addons/api/tests/unit/adapters/application-test.js b/addons/api/tests/unit/adapters/application-test.js index 9ec67f6f3..633dc7b73 100644 --- a/addons/api/tests/unit/adapters/application-test.js +++ b/addons/api/tests/unit/adapters/application-test.js @@ -158,7 +158,7 @@ module('Unit | Adapter | application', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [{ name: 'name', message: 'Name is wrong.' }], + request_fields: [{ name: 'name', description: 'Name is wrong.' }], }, }; const handledResponse = adapter.handleResponse(400, {}, payload); diff --git a/ui/core/tests/acceptance/groups-test.js b/ui/core/tests/acceptance/groups-test.js index 017d2e669..df2967970 100644 --- a/ui/core/tests/acceptance/groups-test.js +++ b/ui/core/tests/acceptance/groups-test.js @@ -84,10 +84,10 @@ module('Acceptance | groups', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, @@ -145,10 +145,10 @@ module('Acceptance | groups', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, diff --git a/ui/core/tests/acceptance/host-catalogs-test.js b/ui/core/tests/acceptance/host-catalogs-test.js index f88332113..7b4f0d6b2 100644 --- a/ui/core/tests/acceptance/host-catalogs-test.js +++ b/ui/core/tests/acceptance/host-catalogs-test.js @@ -179,10 +179,10 @@ module('Acceptance | host catalogs', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, @@ -217,10 +217,10 @@ module('Acceptance | host catalogs', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, diff --git a/ui/core/tests/acceptance/projects-test.js b/ui/core/tests/acceptance/projects-test.js index 4af813592..f29002157 100644 --- a/ui/core/tests/acceptance/projects-test.js +++ b/ui/core/tests/acceptance/projects-test.js @@ -89,10 +89,10 @@ module('Acceptance | projects', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, @@ -150,10 +150,10 @@ module('Acceptance | projects', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, diff --git a/ui/core/tests/acceptance/roles-test.js b/ui/core/tests/acceptance/roles-test.js index e1b1b3538..edb2d59c3 100644 --- a/ui/core/tests/acceptance/roles-test.js +++ b/ui/core/tests/acceptance/roles-test.js @@ -84,10 +84,10 @@ module('Acceptance | roles', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, @@ -145,10 +145,10 @@ module('Acceptance | roles', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, diff --git a/ui/core/tests/acceptance/users-test.js b/ui/core/tests/acceptance/users-test.js index 26e6b3c55..8ef6afc98 100644 --- a/ui/core/tests/acceptance/users-test.js +++ b/ui/core/tests/acceptance/users-test.js @@ -84,10 +84,10 @@ module('Acceptance | users', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], }, @@ -145,10 +145,10 @@ module('Acceptance | users', function (hooks) { code: 'invalid_argument', message: 'The request was invalid.', details: { - fields: [ + request_fields: [ { name: 'name', - message: 'Name is required.', + description: 'Name is required.', }, ], },