diff --git a/demo/collections/AllFields.js b/demo/collections/AllFields.js index 9ff3488433..d4d58d6a27 100644 --- a/demo/collections/AllFields.js +++ b/demo/collections/AllFields.js @@ -6,13 +6,12 @@ const CallToAction = require('../blocks/CallToAction'); const AllFields = { slug: 'all-fields', - labels: { - singular: 'All Fields', - plural: 'All Fields', - }, + // labels: { + // singular: 'All Fields', + // plural: 'All Fields', + // }, admin: { useAsTitle: 'text', - disableScrollOnSuccess: true, }, preview: (doc, token) => { if (doc && doc.text) { @@ -101,6 +100,9 @@ const AllFields = { }], defaultValue: 'option-2', required: true, + admin: { + readOnly: true, + }, }, { type: 'row', diff --git a/demo/collections/DefaultValueTest.js b/demo/collections/DefaultValueTest.js index dc7786aca6..75c07705be 100644 --- a/demo/collections/DefaultValueTest.js +++ b/demo/collections/DefaultValueTest.js @@ -96,6 +96,9 @@ const DefaultValueTest = { label: 'Option 3 Label', }], defaultValue: 'option-2', + admin: { + readOnly: true, + }, }, { type: 'row', diff --git a/demo/collections/RelationshipA.js b/demo/collections/RelationshipA.js index ee9cbd568a..88a16e76d7 100644 --- a/demo/collections/RelationshipA.js +++ b/demo/collections/RelationshipA.js @@ -13,7 +13,23 @@ module.exports = { label: 'Post', type: 'relationship', relationTo: 'relationship-b', - localized: false, + localized: true, + }, + // { + // name: 'LocalizedPost', + // label: 'Localized Post', + // type: 'relationship', + // relationTo: 'localized-posts', + // hasMany: true, + // localized: true, + // }, + { + name: 'postLocalizedMultiple', + label: 'Localized Post Multiple', + type: 'relationship', + relationTo: ['localized-posts', 'all-fields'], + hasMany: true, + localized: true, }, ], timestamps: true, diff --git a/src/collections/bindCollection.ts b/src/collections/bindCollection.ts index e4ffd4f9da..5499a95c72 100644 --- a/src/collections/bindCollection.ts +++ b/src/collections/bindCollection.ts @@ -5,4 +5,4 @@ const bindCollectionMiddleware = (collection) => { }; }; -module.exports = bindCollectionMiddleware; +export default bindCollectionMiddleware; diff --git a/src/collections/buildSchema.ts b/src/collections/buildSchema.ts index ad1a884543..f859707416 100644 --- a/src/collections/buildSchema.ts +++ b/src/collections/buildSchema.ts @@ -16,4 +16,4 @@ const buildCollectionSchema = (collection, config, schemaOptions = {}) => { return schema; }; -module.exports = buildCollectionSchema; +export default buildCollectionSchema; diff --git a/src/collections/graphql/init.ts b/src/collections/graphql/init.ts index a7948bfa9c..0f79a7e6bf 100644 --- a/src/collections/graphql/init.ts +++ b/src/collections/graphql/init.ts @@ -1,19 +1,8 @@ -const { - DateTimeResolver, -} = require('graphql-scalars'); +import { DateTimeResolver } from 'graphql-scalars'; +import { GraphQLString, GraphQLObjectType, GraphQLBoolean, GraphQLNonNull, GraphQLInt } from 'graphql'; -const { - GraphQLString, - GraphQLObjectType, - GraphQLBoolean, - GraphQLNonNull, - GraphQLInt, -} = require('graphql'); - - -const formatName = require('../../graphql/utilities/formatName'); - -const buildPaginatedListType = require('../../graphql/schema/buildPaginatedListType'); +import formatName from '../../graphql/utilities/formatName'; +import buildPaginatedListType from '../../graphql/schema/buildPaginatedListType'; function registerCollections() { const { diff --git a/src/collections/graphql/resolvers/create.ts b/src/collections/graphql/resolvers/create.ts index 659fa7c369..24289d1db4 100644 --- a/src/collections/graphql/resolvers/create.ts +++ b/src/collections/graphql/resolvers/create.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -function create(collection) { +export default function create(collection) { async function resolver(_, args, context) { if (args.locale) { context.req.locale = args.locale; @@ -20,5 +20,3 @@ function create(collection) { const createResolver = resolver.bind(this); return createResolver; } - -module.exports = create; diff --git a/src/collections/graphql/resolvers/delete.ts b/src/collections/graphql/resolvers/delete.ts index 2aa35bc7ac..0503d1abb8 100644 --- a/src/collections/graphql/resolvers/delete.ts +++ b/src/collections/graphql/resolvers/delete.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -function getDeleteResolver(collection) { +export default function getDeleteResolver(collection) { async function resolver(_, args, context) { if (args.locale) context.req.locale = args.locale; if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale; @@ -18,5 +18,3 @@ function getDeleteResolver(collection) { const deleteResolver = resolver.bind(this); return deleteResolver; } - -module.exports = getDeleteResolver; diff --git a/src/collections/graphql/resolvers/find.ts b/src/collections/graphql/resolvers/find.ts index 52833244e3..6e26a6b715 100644 --- a/src/collections/graphql/resolvers/find.ts +++ b/src/collections/graphql/resolvers/find.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -function find(collection) { +export default function find(collection) { async function resolver(_, args, context) { if (args.locale) context.req.locale = args.locale; if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale; @@ -20,5 +20,3 @@ function find(collection) { const findResolver = resolver.bind(this); return findResolver; } - -module.exports = find; diff --git a/src/collections/graphql/resolvers/findByID.ts b/src/collections/graphql/resolvers/findByID.ts index 7a06a0eebb..ff9ea90dd2 100644 --- a/src/collections/graphql/resolvers/findByID.ts +++ b/src/collections/graphql/resolvers/findByID.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -function findByID(collection) { +export default function findByID(collection) { async function resolver(_, args, context) { if (args.locale) context.req.locale = args.locale; if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale; @@ -18,5 +18,3 @@ function findByID(collection) { const findByIDResolver = resolver.bind(this); return findByIDResolver; } - -module.exports = findByID; diff --git a/src/collections/graphql/resolvers/update.ts b/src/collections/graphql/resolvers/update.ts index 1a51d50506..9ba1f56648 100644 --- a/src/collections/graphql/resolvers/update.ts +++ b/src/collections/graphql/resolvers/update.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -function update(collection) { +export default function update(collection) { async function resolver(_, args, context) { if (args.locale) context.req.locale = args.locale; if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale; @@ -21,5 +21,3 @@ function update(collection) { const updateResolver = resolver.bind(this); return updateResolver; } - -module.exports = update; diff --git a/src/collections/operations/local/create.ts b/src/collections/operations/local/create.ts index 02cd6128b3..f4226e8aaa 100644 --- a/src/collections/operations/local/create.ts +++ b/src/collections/operations/local/create.ts @@ -1,4 +1,4 @@ -async function create(options) { +export default async function create(options) { const { collection: collectionSlug, depth, @@ -29,5 +29,3 @@ async function create(options) { }, }); } - -module.exports = create; diff --git a/src/collections/operations/local/delete.ts b/src/collections/operations/local/delete.ts index 1c79022899..dffcc41c6d 100644 --- a/src/collections/operations/local/delete.ts +++ b/src/collections/operations/local/delete.ts @@ -1,4 +1,4 @@ -async function localDelete(options) { +export default async function localDelete(options) { const { collection: collectionSlug, depth, @@ -27,5 +27,3 @@ async function localDelete(options) { }, }); } - -module.exports = localDelete; diff --git a/src/collections/operations/local/find.ts b/src/collections/operations/local/find.ts index 04f452fcc7..cd4d3112e5 100644 --- a/src/collections/operations/local/find.ts +++ b/src/collections/operations/local/find.ts @@ -1,4 +1,4 @@ -async function find(options) { +export default async function find(options) { const { collection: collectionSlug, depth, @@ -31,5 +31,3 @@ async function find(options) { }, }); } - -module.exports = find; diff --git a/src/collections/operations/local/findByID.ts b/src/collections/operations/local/findByID.ts index 477612a90a..17729e786c 100644 --- a/src/collections/operations/local/findByID.ts +++ b/src/collections/operations/local/findByID.ts @@ -1,4 +1,4 @@ -async function findByID(options) { +export default async function findByID(options) { const { collection: collectionSlug, depth, @@ -29,5 +29,3 @@ async function findByID(options) { }, }); } - -module.exports = findByID; diff --git a/src/collections/operations/local/index.ts b/src/collections/operations/local/index.ts index 423d017519..7b701c42af 100644 --- a/src/collections/operations/local/index.ts +++ b/src/collections/operations/local/index.ts @@ -1,10 +1,10 @@ -const find = require('./find'); -const findByID = require('./findByID'); -const create = require('./create'); -const update = require('./update'); -const localDelete = require('./delete'); +import find from './find'; +import findByID from './findByID'; +import create from './create'; +import update from './update'; +import localDelete from './delete'; -const authOperations = require('../../../auth/operations/local'); +import authOperations from '../../../auth/operations/local'; module.exports = { find, diff --git a/src/collections/operations/local/update.ts b/src/collections/operations/local/update.ts index 6ee3168bf8..e208ddc729 100644 --- a/src/collections/operations/local/update.ts +++ b/src/collections/operations/local/update.ts @@ -1,4 +1,4 @@ -async function update(options) { +export default async function update(options) { const { collection: collectionSlug, depth, @@ -31,5 +31,3 @@ async function update(options) { return this.operations.collections.update(args); } - -module.exports = update; diff --git a/src/collections/requestHandlers/create.ts b/src/collections/requestHandlers/create.ts index f9f41341df..e62ddea2b8 100644 --- a/src/collections/requestHandlers/create.ts +++ b/src/collections/requestHandlers/create.ts @@ -1,7 +1,7 @@ -const httpStatus = require('http-status'); -const formatSuccessResponse = require('../../express/responses/formatSuccess'); +import httpStatus from 'http-status'; +import formatSuccessResponse from '../../express/responses/formatSuccess'; -async function create(req, res, next) { +export default async function create(req, res, next) { try { const doc = await this.operations.collections.create({ req, @@ -18,5 +18,3 @@ async function create(req, res, next) { return next(error); } } - -module.exports = create; diff --git a/src/collections/requestHandlers/delete.ts b/src/collections/requestHandlers/delete.ts index 4f44aac494..fe9a671e0e 100644 --- a/src/collections/requestHandlers/delete.ts +++ b/src/collections/requestHandlers/delete.ts @@ -1,7 +1,7 @@ -const httpStatus = require('http-status'); -const { NotFound } = require('../../errors'); +import httpStatus from 'http-status'; +import { NotFound } from '../../errors'; -async function deleteHandler(req, res, next) { +export default async function deleteHandler(req, res, next) { try { const doc = await this.operations.collections.delete({ req, @@ -19,5 +19,3 @@ async function deleteHandler(req, res, next) { return next(error); } } - -module.exports = deleteHandler; diff --git a/src/collections/requestHandlers/find.ts b/src/collections/requestHandlers/find.ts index 322cdfd688..8f2cfb1e63 100644 --- a/src/collections/requestHandlers/find.ts +++ b/src/collections/requestHandlers/find.ts @@ -1,6 +1,6 @@ -const httpStatus = require('http-status'); +import httpStatus from 'http-status'; -async function find(req, res, next) { +export default async function find(req, res, next) { try { const options = { req, @@ -19,5 +19,3 @@ async function find(req, res, next) { return next(error); } } - -module.exports = find; diff --git a/src/collections/requestHandlers/findByID.ts b/src/collections/requestHandlers/findByID.ts index b7004c137b..5370645d18 100644 --- a/src/collections/requestHandlers/findByID.ts +++ b/src/collections/requestHandlers/findByID.ts @@ -1,4 +1,4 @@ -async function findByID(req, res, next) { +export default async function findByID(req, res, next) { const options = { req, collection: req.collection, @@ -13,5 +13,3 @@ async function findByID(req, res, next) { return next(error); } } - -module.exports = findByID; diff --git a/src/collections/requestHandlers/update.ts b/src/collections/requestHandlers/update.ts index 59c8a36928..a2121f3f5e 100644 --- a/src/collections/requestHandlers/update.ts +++ b/src/collections/requestHandlers/update.ts @@ -1,7 +1,7 @@ -const httpStatus = require('http-status'); -const formatSuccessResponse = require('../../express/responses/formatSuccess'); +import httpStatus from 'http-status'; +import formatSuccessResponse from '../../express/responses/formatSuccess'; -async function update(req, res, next) { +export default async function update(req, res, next) { try { const doc = await this.operations.collections.update({ req, @@ -19,5 +19,3 @@ async function update(req, res, next) { return next(error); } } - -module.exports = update; diff --git a/src/localization/formatRefPathLocales.ts b/src/localization/formatRefPathLocales.ts index f728ebb8ec..e0c2f96e5b 100644 --- a/src/localization/formatRefPathLocales.ts +++ b/src/localization/formatRefPathLocales.ts @@ -1,4 +1,4 @@ -function formatRefPathLocales(schema, parentSchema, parentPath) { +export default function formatRefPathLocales(schema, parentSchema, parentPath) { // Loop through all refPaths within schema schema.eachPath((pathname, schemaType) => { // If a dynamic refPath is found @@ -48,5 +48,3 @@ function formatRefPathLocales(schema, parentSchema, parentPath) { } }); } - -export default formatRefPathLocales;