Merge pull request strapi#11683 from strapi/v4/unique-validator

[v4] add `unique` validator
originallyus · Nov 29, 2021 · 3e9e3f1 · 3e9e3f1
2 parents e8867ad + 652cac0
commit 3e9e3f1
Show file tree

Hide file tree

Showing 8 changed files with 1,752 additions and 106 deletions.
diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js
@@ -46,7 +46,7 @@ const advancedForm = {
             id: getTrad('form.attribute.item.settings.name'),
             defaultMessage: 'Settings',
           },
-          items: [options.required, options.unique, options.private],
+          items: [options.required, options.private],
         },
       ],
     };
@@ -209,7 +209,7 @@ const advancedForm = {
             id: getTrad('form.attribute.item.settings.name'),
             defaultMessage: 'Settings',
           },
-          items: [options.required, options.unique, options.private],
+          items: [options.required, options.private],
         },
       ],
     };
@@ -222,7 +222,7 @@ const advancedForm = {
             id: getTrad('form.attribute.item.settings.name'),
             defaultMessage: 'Settings',
           },
-          items: [options.required, options.unique, options.private],
+          items: [options.required, options.private],
         },
       ],
     };
@@ -297,13 +297,7 @@ const advancedForm = {
             id: getTrad('form.attribute.item.settings.name'),
             defaultMessage: 'Settings',
           },
-          items: [
-            options.required,
-            options.unique,
-            options.maxLength,
-            options.minLength,
-            options.private,
-          ],
+          items: [options.required, options.maxLength, options.minLength, options.private],
         },
       ],
     };
@@ -330,13 +324,7 @@ const advancedForm = {
             id: getTrad('form.attribute.item.settings.name'),
             defaultMessage: 'Settings',
           },
-          items: [
-            options.required,
-            options.unique,
-            options.maxLength,
-            options.minLength,
-            options.private,
-          ],
+          items: [options.required, options.maxLength, options.minLength, options.private],
         },
       ],
     };

diff --git a/packages/core/content-type-builder/server/controllers/validation/types.js b/packages/core/content-type-builder/server/controllers/validation/types.js
@@ -51,7 +51,6 @@ const getTypeShape = (attribute, { modelType, attributes } = {}) => {
       return {
         multiple: yup.boolean(),
         required: validators.required,
-        unique: validators.unique,
         allowedTypes: yup
           .array()
           .of(yup.string().oneOf(['images', 'videos', 'files']))
@@ -129,7 +128,6 @@ const getTypeShape = (attribute, { modelType, attributes } = {}) => {
       return {
         default: yup.mixed().test(isValidDefaultJSON),
         required: validators.required,
-        unique: validators.unique,
       };
     }
     case 'enumeration': {
@@ -148,7 +146,6 @@ const getTypeShape = (attribute, { modelType, attributes } = {}) => {
         default: yup.string().when('enum', enumVal => yup.string().oneOf(enumVal)),
         enumName: yup.string().test(isValidName),
         required: validators.required,
-        unique: validators.unique,
       };
     }
     case 'password': {
@@ -225,7 +222,6 @@ const getTypeShape = (attribute, { modelType, attributes } = {}) => {
       return {
         default: yup.boolean(),
         required: validators.required,
-        unique: validators.unique,
       };
     }
 

diff --git a/packages/core/strapi/lib/services/entity-service/index.js b/packages/core/strapi/lib/services/entity-service/index.js
@@ -202,9 +202,14 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const isDraft = contentTypesUtils.isDraft(entityToUpdate, model);
 
-    const validData = await entityValidator.validateEntityUpdate(model, data, {
-      isDraft,
-    });
+    const validData = await entityValidator.validateEntityUpdate(
+      model,
+      data,
+      {
+        isDraft,
+      },
+      entityToUpdate
+    );
 
     const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));