diff --git a/src/admin/components/elements/PreviewButton/types.ts b/src/admin/components/elements/PreviewButton/types.ts index 06b1845111..f831c7200b 100644 --- a/src/admin/components/elements/PreviewButton/types.ts +++ b/src/admin/components/elements/PreviewButton/types.ts @@ -1,5 +1,5 @@ import { Data } from '../../forms/Form/types'; -import { GeneratePreviewURL } from '../../../../collections/config/types'; +import { GeneratePreviewURL } from '../../../../config/types'; export type Props = { generatePreviewURL?: GeneratePreviewURL, diff --git a/src/admin/components/views/Global/Default.tsx b/src/admin/components/views/Global/Default.tsx index 49c4b78544..d72614ce11 100644 --- a/src/admin/components/views/Global/Default.tsx +++ b/src/admin/components/views/Global/Default.tsx @@ -1,5 +1,6 @@ import React from 'react'; import format from 'date-fns/format'; +import { useConfig } from '@payloadcms/config-provider'; import Eyebrow from '../../elements/Eyebrow'; import Form from '../../forms/Form'; import PreviewButton from '../../elements/PreviewButton'; @@ -12,7 +13,6 @@ import LeaveWithoutSaving from '../../modals/LeaveWithoutSaving'; import { Props } from './types'; import './index.scss'; -import { useConfig } from '@payloadcms/config-provider'; const baseClass = 'global-edit'; @@ -82,7 +82,7 @@ const DefaultGlobalView: React.FC = (props) => {
API URL - {' '} + {' '} any; -type GeneratePreviewURLOptions = { - locale: string - token: string -} - -export type GeneratePreviewURL = (doc: Document, options: GeneratePreviewURLOptions) => string - export type PayloadCollectionConfig = { slug: string; labels?: { diff --git a/src/config/types.ts b/src/config/types.ts index 69d662f021..f8c42ae45c 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -19,6 +19,13 @@ type Email = { // eslint-disable-next-line no-use-before-define type Plugin = (config: Config) => Config; +type GeneratePreviewURLOptions = { + locale: string + token: string +} + +export type GeneratePreviewURL = (doc: Record, options: GeneratePreviewURLOptions) => string + export type EmailTransport = Email & { transport: Transporter; transportOptions?: SMTPConnection.Options; diff --git a/src/globals/config/types.ts b/src/globals/config/types.ts index f7b33f71b1..a2013ff1dd 100644 --- a/src/globals/config/types.ts +++ b/src/globals/config/types.ts @@ -2,7 +2,7 @@ import React from 'react'; import { Model, Document } from 'mongoose'; import { DeepRequired } from 'ts-essentials'; import { PayloadRequest } from '../../express/types'; -import { Access } from '../../config/types'; +import { Access, GeneratePreviewURL } from '../../config/types'; import { Field } from '../../fields/config/types'; export type BeforeValidateHook = (args?: { @@ -39,7 +39,7 @@ export type GlobalModel = Model export type PayloadGlobalConfig = { slug: string label?: string - preview?: (doc: Document, token: string) => string + preview?: GeneratePreviewURL hooks?: { beforeValidate?: BeforeValidateHook[] beforeChange?: BeforeChangeHook[]