yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-14 16:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4767 from strapi/ctb/fix-category-regex

Browse Source 
Update ctb's category regex
This commit is contained in:
Alexandre BODIN 2019-12-19 10:27:42 +01:00 committed by GitHub
commit 6ed4298992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/attributesRegexes.js
View File

@ -1,4 +1,5 @@
const NAME_REGEX = new RegExp('^[A-Za-z][_0-9A-Za-z]*$'); const CATEGORY_NAME_REGEX = new RegExp('^[A-Za-z][-_0-9A-Za-z]*$');
const ENUM_REGEX = new RegExp('^[_A-Za-z][_0-9A-Za-z]*$'); const ENUM_REGEX = new RegExp('^[_A-Za-z][_0-9A-Za-z]*$');
const NAME_REGEX = new RegExp('^[A-Za-z][_0-9A-Za-z]*$');
export { ENUM_REGEX, NAME_REGEX }; export { CATEGORY_NAME_REGEX, ENUM_REGEX, NAME_REGEX };

9
packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js
View File

@ -8,7 +8,11 @@ import getTrad from '../../../utils/getTrad';
import { createComponentUid, createUid, nameToSlug } from './createUid'; import { createComponentUid, createUid, nameToSlug } from './createUid';
import componentForm from './componentForm'; import componentForm from './componentForm';
import fields from './staticFields'; import fields from './staticFields';
import { NAME_REGEX, ENUM_REGEX } from './attributesRegexes'; import {
NAME_REGEX,
ENUM_REGEX,
CATEGORY_NAME_REGEX,
} from './attributesRegexes';
import RESERVED_NAMES from './reservedNames'; import RESERVED_NAMES from './reservedNames';
yup.addMethod(yup.mixed, 'defined', function() { yup.addMethod(yup.mixed, 'defined', function() {
@ -829,7 +833,7 @@ const forms = {
.required(errorsTrads.required), .required(errorsTrads.required),
category: yup category: yup
.string() .string()
.matches(NAME_REGEX, errorsTrads.regex) .matches(CATEGORY_NAME_REGEX, errorsTrads.regex)
.required(errorsTrads.required), .required(errorsTrads.required),
icon: yup.string().required(errorsTrads.required), icon: yup.string().required(errorsTrads.required),
collectionName: yup.string().nullable(), collectionName: yup.string().nullable(),
@ -892,6 +896,7 @@ const forms = {
return yup.object().shape({ return yup.object().shape({
name: yup name: yup
.string() .string()
.matches(CATEGORY_NAME_REGEX, errorsTrads.regex)
.unique(errorsTrads.unique, allowedCategories, toLower) .unique(errorsTrads.unique, allowedCategories, toLower)
.required(errorsTrads.required), .required(errorsTrads.required),
}); });