fix(entity-validator): improve error messaging

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

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

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

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

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

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

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

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