diff --git a/demo/collections/AllFields.js b/demo/collections/AllFields.js index adb5c119f5..722d73db9e 100644 --- a/demo/collections/AllFields.js +++ b/demo/collections/AllFields.js @@ -68,7 +68,7 @@ const AllFields = { { name: 'radioGroupExample', label: 'Radio Group Example', - type: 'radioGroup', + type: 'radio', options: [{ value: 'option-1', label: 'Options 1 Label', diff --git a/demo/collections/Customers.js b/demo/collections/PublicUsers.js similarity index 90% rename from demo/collections/Customers.js rename to demo/collections/PublicUsers.js index 8e2a47f427..c539d2f897 100644 --- a/demo/collections/Customers.js +++ b/demo/collections/PublicUsers.js @@ -1,10 +1,10 @@ const checkRole = require('../policies/checkRole'); module.exports = { - slug: 'customers', + slug: 'public-users', labels: { - singular: 'Customer', - plural: 'Customers', + singular: 'Public User', + plural: 'Public Users', }, useAsTitle: 'email', policies: { diff --git a/demo/payload.public.config.js b/demo/payload.public.config.js index c551824e74..cf483bb6a0 100644 --- a/demo/payload.public.config.js +++ b/demo/payload.public.config.js @@ -4,7 +4,6 @@ const AllFields = require('./collections/AllFields'); const Code = require('./collections/Code'); const Conditions = require('./collections/Conditions'); const CustomComponents = require('./collections/CustomComponents'); -const Customers = require('./collections/Customers'); const File = require('./collections/File'); const FlexibleContent = require('./collections/FlexibleContent'); const HiddenFields = require('./collections/HiddenFields'); @@ -12,6 +11,7 @@ const Hooks = require('./collections/Hooks'); const Localized = require('./collections/Localized'); const Media = require('./collections/Media'); const Preview = require('./collections/Preview'); +const PublicUsers = require('./collections/PublicUsers'); const RelationshipA = require('./collections/RelationshipA'); const RelationshipB = require('./collections/RelationshipB'); const RichText = require('./collections/RichText'); @@ -33,7 +33,6 @@ module.exports = { Code, Conditions, CustomComponents, - Customers, File, FlexibleContent, HiddenFields, @@ -41,6 +40,7 @@ module.exports = { Localized, Media, Preview, + PublicUsers, RelationshipA, RelationshipB, RichText, diff --git a/src/client/components/forms/field-types/RadioGroup/index.js b/src/client/components/forms/field-types/RadioGroup/index.js index e226de410f..3df0d3fc32 100644 --- a/src/client/components/forms/field-types/RadioGroup/index.js +++ b/src/client/components/forms/field-types/RadioGroup/index.js @@ -6,7 +6,7 @@ import withCondition from '../../withCondition'; import Error from '../../Error'; import Label from '../../Label'; import RadioInput from './RadioInput'; -import { radioGroup } from '../../../../../fields/validations'; +import { radio } from '../../../../../fields/validations'; import './index.scss'; @@ -87,7 +87,7 @@ RadioGroup.defaultProps = { readOnly: false, defaultValue: null, initialData: false, - validate: radioGroup, + validate: radio, width: undefined, style: {}, path: '', diff --git a/src/client/components/forms/field-types/index.js b/src/client/components/forms/field-types/index.js index d9ae0bbe16..be542bbd94 100644 --- a/src/client/components/forms/field-types/index.js +++ b/src/client/components/forms/field-types/index.js @@ -9,7 +9,7 @@ export { default as textarea } from './Textarea'; export { default as select } from './Select'; export { default as number } from './Number'; export { default as checkbox } from './Checkbox'; -export { default as radioGroup } from './RadioGroup'; +export { default as radio } from './RadioGroup'; export { default as flexible } from './Flexible'; export { default as group } from './Group'; diff --git a/src/fields/validations.js b/src/fields/validations.js index 8d111a310f..5aeea60eb2 100644 --- a/src/fields/validations.js +++ b/src/fields/validations.js @@ -136,7 +136,7 @@ const optionsToValidatorMap = { if (value && value.length > 0) return true; return 'This field is required.'; }, - radioGroup: (value) => { + radio: (value) => { if (value) return true; return 'This field is required.'; }, diff --git a/src/graphql/schema/buildMutationInputType.js b/src/graphql/schema/buildMutationInputType.js index bfb408d828..c4f3a93e91 100644 --- a/src/graphql/schema/buildMutationInputType.js +++ b/src/graphql/schema/buildMutationInputType.js @@ -26,7 +26,7 @@ function buildMutationInputType(name, fields, parentName) { upload: field => ({ type: withNullableType(field, GraphQLString) }), 'rich-text': field => ({ type: withNullableType(field, GraphQLString) }), html: field => ({ type: withNullableType(field, GraphQLString) }), - radioGroup: field => ({ type: withNullableType(field, GraphQLString) }), + radio: field => ({ type: withNullableType(field, GraphQLString) }), checkbox: () => ({ type: GraphQLBoolean }), select: (field) => { const formattedName = `${combineParentName(parentName, field.name)}_MutationInput`; diff --git a/src/graphql/schema/buildObjectType.js b/src/graphql/schema/buildObjectType.js index b56d572ffa..874cf1f14c 100644 --- a/src/graphql/schema/buildObjectType.js +++ b/src/graphql/schema/buildObjectType.js @@ -29,7 +29,7 @@ function buildObjectType(name, fields, parentName, baseFields = {}) { code: field => ({ type: withNullableType(field, GraphQLString) }), date: field => ({ type: withNullableType(field, GraphQLString) }), upload: field => ({ type: withNullableType(field, GraphQLString) }), - radioGroup: field => ({ type: withNullableType(field, GraphQLString) }), + radio: field => ({ type: withNullableType(field, GraphQLString) }), checkbox: field => ({ type: withNullableType(field, GraphQLBoolean) }), select: (field) => { const fullName = combineParentName(parentName, field.name); diff --git a/src/graphql/schema/buildWhereInputType.js b/src/graphql/schema/buildWhereInputType.js index c51e7df758..7f961676db 100644 --- a/src/graphql/schema/buildWhereInputType.js +++ b/src/graphql/schema/buildWhereInputType.js @@ -123,7 +123,7 @@ const buildWhereInputType = (name, fields, parentName) => { ), }; }, - radioGroup: (field) => { + radio: (field) => { const type = GraphQLString; return { type: withOperators( diff --git a/src/mongoose/buildSchema.js b/src/mongoose/buildSchema.js index b37749fd82..a25e94689c 100644 --- a/src/mongoose/buildSchema.js +++ b/src/mongoose/buildSchema.js @@ -82,7 +82,7 @@ const fieldToSchemaMap = { [field.name]: { ...formatBaseSchema(field), type: String }, }; }, - radioGroup: (field, fields) => { + radio: (field, fields) => { return { ...fields, [field.name]: { ...formatBaseSchema(field), type: String },