yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-13 00:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(entity-validator): improve error messaging

Browse Source
This commit is contained in:
Jamie Howard 2022-11-23 14:32:26 +00:00
parent 7d64a36867
commit df0fe1c9be
4 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/content-manager/server/tests/api/basic-dp-dz.test.api.js
View File

@ -280,7 +280,8 @@ describe('CM API - Basic + dz + draftAndPublish', () => {
name: 'ValidationError', name: 'ValidationError',
}, },
{ {
message: 'Cannot build relations store: "uid" is undefined', message:
'Cannot build relations store from dynamiczone, component identifier is undefined',
name: 'ValidationError', name: 'ValidationError',
path: [], path: [],
}, },

3
packages/core/content-manager/server/tests/api/basic-dz.test.api.js
View File

@ -310,7 +310,8 @@ describe('CM API - Basic + dz', () => {
name: 'ValidationError', name: 'ValidationError',
}, },
{ {
message: 'Cannot build relations store: "uid" is undefined', message:
'Cannot build relations store from dynamiczone, component identifier is undefined',
name: 'ValidationError', name: 'ValidationError',
path: [], path: [],
}, },

68
packages/core/strapi/lib/services/entity-validator/index.js
View File

@ -293,40 +293,48 @@ const buildRelationsStore = ({ uid, data }) => {
break; break;
} }
case 'component': { case 'component': {
return castArray(value).reduce( return castArray(value).reduce((relationsStore, componentValue) => {
(relationsStore, componentValue) => if (!attribute.component) {
mergeWith( throw new ValidationError(
relationsStore, `Cannot build relations store from component, component identifier is undefined`
buildRelationsStore({ );
uid: attribute.component, }
data: componentValue,
}), return mergeWith(
(objValue, srcValue) => { relationsStore,
if (isArray(objValue)) { buildRelationsStore({
return objValue.concat(srcValue); uid: attribute.component,
} data: componentValue,
}),
(objValue, srcValue) => {
if (isArray(objValue)) {
return objValue.concat(srcValue);
} }
), }
result );
); }, result);
} }
case 'dynamiczone': { case 'dynamiczone': {
return value.reduce( return value.reduce((relationsStore, dzValue) => {
(relationsStore, dzValue) => if (!dzValue.__component) {
mergeWith( throw new ValidationError(
relationsStore, `Cannot build relations store from dynamiczone, component identifier is undefined`
buildRelationsStore({ );
uid: dzValue.__component, }
data: dzValue,
}), return mergeWith(
(objValue, srcValue) => { relationsStore,
if (isArray(objValue)) { buildRelationsStore({
return objValue.concat(srcValue); uid: dzValue.__component,
} data: dzValue,
}),
(objValue, srcValue) => {
if (isArray(objValue)) {
return objValue.concat(srcValue);
} }
), }
result );
); }, result);
} }
default: default:
break; break;

3
packages/core/strapi/tests/api/basic-dz.test.api.js
View File

@ -350,7 +350,8 @@ describe('Core API - Basic + dz', () => {
name: 'ValidationError', name: 'ValidationError',
}, },
{ {
message: 'Cannot build relations store: "uid" is undefined', message:
'Cannot build relations store from dynamiczone, component identifier is undefined',
name: 'ValidationError', name: 'ValidationError',
path: [], path: [],
}, },