yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-01 17:41:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QA] Form validation when D&P for DZ and Rep component (#11673)

Browse Source 
* removed not isDraft condition in yup schema for DZ and rep component

* feedback fix

* removed required + min for dz in restaurant

* removed required false in restaurant schema..

* pair prog errors refacto dz + fixed rep components
This commit is contained in:
ronronscelestes 2021-11-25 13:29:32 +01:00 committed by GitHub
parent 71bdfa3463
commit 9bd2011f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js
View File

@ -100,10 +100,11 @@ const createYupSchema = (
if (attribute.repeatable === true) {
const { min, max, required } = attribute;
let componentSchema = yup.lazy(value => {
let baseSchema = yup.array().of(componentFieldSchema);
if (min && !options.isDraft) {
if (min) {
if (required) {
baseSchema = baseSchema.min(min, errorsTrads.min);
} else if (required !== true && isEmpty(value)) {
@ -111,6 +112,8 @@ const createYupSchema = (
} else {
baseSchema = baseSchema.min(min, errorsTrads.min);
}
} else if (required && !options.isDraft) {
baseSchema = baseSchema.min(1, errorsTrads.required);
}
if (max) {
@ -152,20 +155,8 @@ const createYupSchema = (
const { max, min } = attribute;
if (attribute.required && !options.isDraft) {
dynamicZoneSchema = dynamicZoneSchema.test('required', errorsTrads.required, value => {
if (options.isCreatingEntry) {
return value !== null || value !== undefined;
}
if (value === undefined) {
return true;
}
return value !== null;
});
if (min) {
if (min) {
if (attribute.required) {
dynamicZoneSchema = dynamicZoneSchema
.test('min', errorsTrads.min, value => {
if (options.isCreatingEntry) {
@ -189,12 +180,21 @@ const createYupSchema = (
return value !== null;
});
}
} else {
// eslint-disable-next-line no-lonely-if
if (min) {
} else {
dynamicZoneSchema = dynamicZoneSchema.notEmptyMin(min);
}
} else if (attribute.required && !options.isDraft) {
dynamicZoneSchema = dynamicZoneSchema.test('required', errorsTrads.required, value => {
if (options.isCreatingEntry) {
return value !== null || value !== undefined;
}
if (value === undefined) {
return true;
}
return value !== null;
});
}
if (max) {