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

Merge pull request #15778 from strapi/fix/non-required-json-input

Browse Source
This commit is contained in:
markkaylor 2023-03-13 14:23:08 +01:00 committed by GitHub
commit f78ba41c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,10 @@ const createYupSchemaAttribute = (type, validations, options) => {
schema = yup schema = yup
.mixed(errorsTrads.json) .mixed(errorsTrads.json)
.test('isJSON', errorsTrads.json, (value) => { .test('isJSON', errorsTrads.json, (value) => {
if (!value || !value.length) {
return true;
}
try { try {
JSON.parse(value); JSON.parse(value);
@ -226,7 +230,9 @@ const createYupSchemaAttribute = (type, validations, options) => {
}) })
.nullable() .nullable()
.test('required', errorsTrads.required, (value) => { .test('required', errorsTrads.required, (value) => {
if (validations.required && !value.length) return false; if (validations.required && (!value || !value.length)) {
return false;
}
return true; return true;
}); });

8
packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js
View File

@ -5,14 +5,6 @@ const createDefaultForm = (attributes, allComponentsSchema) => {
const attribute = get(attributes, [current], {}); const attribute = get(attributes, [current], {});
const { default: defaultValue, component, type, required, min, repeatable } = attribute; const { default: defaultValue, component, type, required, min, repeatable } = attribute;
if (type === 'json') {
acc[current] = null;
}
if (type === 'json' && required === true) {
acc[current] = {};
}
if (defaultValue !== undefined) { if (defaultValue !== undefined) {
acc[current] = defaultValue; acc[current] = defaultValue;
} }

5
packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js
View File

@ -11,11 +11,6 @@ describe('CONTENT MANAGER | utils | createDefaultForm', () => {
expect(createDefaultForm(attributes, {})).toEqual({}); expect(createDefaultForm(attributes, {})).toEqual({});
}); });
it('should set the json type with the correct value', () => {
expect(createDefaultForm({ test: { type: 'json' } }, {})).toEqual({ test: null });
expect(createDefaultForm({ test: { type: 'json', required: true } }, {})).toEqual({ test: {} });
});
it('should init the requide dynamic zone type with an empty array', () => { it('should init the requide dynamic zone type with an empty array', () => {
expect(createDefaultForm({ test: { type: 'dynamiczone', required: true } })).toEqual({ expect(createDefaultForm({ test: { type: 'dynamiczone', required: true } })).toEqual({
test: [], test: [],

2
packages/core/helper-plugin/lib/src/components/GenericInput/index.js
View File

@ -146,7 +146,7 @@ const GenericInput = ({
required={required} required={required}
onChange={(json) => { onChange={(json) => {
// Default to null when the field is not required and there is no input value // Default to null when the field is not required and there is no input value
const value = !attribute.required && !json.length ? 'null' : json; const value = !attribute.required && !json.length ? null : json;
onChange({ target: { name, value } }); onChange({ target: { name, value } });
}} }}
minHeight={pxToRem(252)} minHeight={pxToRem(252)}