diff --git a/packages/next/src/utilities/createPayloadRequest.ts b/packages/next/src/utilities/createPayloadRequest.ts index dc0d08e089..ea2258c999 100644 --- a/packages/next/src/utilities/createPayloadRequest.ts +++ b/packages/next/src/utilities/createPayloadRequest.ts @@ -82,7 +82,6 @@ export const createPayloadRequest = async ({ // need to add: // ------------ - // - transactionID // - payloadDataLoader // - payloadUploadSizes } diff --git a/packages/payload/src/collections/operations/local/create.ts b/packages/payload/src/collections/operations/local/create.ts index 8379112489..16d2c86b9e 100644 --- a/packages/payload/src/collections/operations/local/create.ts +++ b/packages/payload/src/collections/operations/local/create.ts @@ -80,9 +80,7 @@ export default async function createLocal( const i18n = incomingReq?.i18n || getLocalI18n({ config: payload.config }) - const req = { + const req: PayloadRequest = { fallbackLocale: typeof fallbackLocale !== 'undefined' ? fallbackLocale : defaultLocale, i18n, locale: locale ?? defaultLocale, diff --git a/packages/payload/src/collections/operations/local/restoreVersion.ts b/packages/payload/src/collections/operations/local/restoreVersion.ts index 81e6289da9..f60c79e83d 100644 --- a/packages/payload/src/collections/operations/local/restoreVersion.ts +++ b/packages/payload/src/collections/operations/local/restoreVersion.ts @@ -54,7 +54,7 @@ export default async function restoreVersionLocal( const i18n = incomingReq?.i18n || getLocalI18n({ config: payload.config }) - const req = { + const req: PayloadRequest = { fallbackLocale: typeof fallbackLocale !== 'undefined' ? fallbackLocale : defaultLocale, - files: { - file: file ?? (await getFileByPath(filePath)), - }, + file: file ?? (await getFileByPath(filePath)), i18n, locale: locale ?? defaultLocale, payload, @@ -110,7 +108,7 @@ async function updateLocal( t: i18n.t, transactionID: incomingReq?.transactionID, user, - } as unknown as PayloadRequest + } as PayloadRequest setRequestContext(req, context) if (!req.payloadDataLoader) req.payloadDataLoader = getDataLoader(req) diff --git a/packages/payload/src/collections/operations/update.ts b/packages/payload/src/collections/operations/update.ts index 3c951379f2..af6238dc0f 100644 --- a/packages/payload/src/collections/operations/update.ts +++ b/packages/payload/src/collections/operations/update.ts @@ -17,10 +17,10 @@ import { afterChange } from '../../fields/hooks/afterChange' import { afterRead } from '../../fields/hooks/afterRead' import { beforeChange } from '../../fields/hooks/beforeChange' import { beforeValidate } from '../../fields/hooks/beforeValidate' -// import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' -// import { generateFileData } from '../../uploads/generateFileData' +import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' +import { generateFileData } from '../../uploads/generateFileData' import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' -// import { uploadFiles } from '../../uploads/uploadFiles' +import { uploadFiles } from '../../uploads/uploadFiles' import { commitTransaction } from '../../utilities/commitTransaction' import { initTransaction } from '../../utilities/initTransaction' import { killTransaction } from '../../utilities/killTransaction' @@ -150,14 +150,14 @@ export const updateOperation = async = Request & { - /** Information about the collection that is being accessed - * - Configuration from payload-config.ts - * - MongoDB model for this collection - * - GraphQL type metadata - */ - collection?: Collection - /** context allows you to pass your own data to the request object as context - * This is useful for, for example, passing data from a beforeChange hook to an afterChange hook. - * payoadContext can also be fully typed using declare module - * {@link https://payloadcms.com/docs/hooks/context More info in the Payload Documentation}. - */ - context: RequestContext - /** The locale that should be used for a field when it is not translated to the requested locale */ - fallbackLocale?: string - /** Uploaded files */ - files?: { - /** - * This is the file that Payload will use for the file upload, other files are ignored. - * - */ - file: UploadedFile - } - /** Cache of documents related to the current request */ - findByID?: { - [transactionID: string]: { - [slug: string]: (q: FindOneArgs) => Promise - } - } - /** I18next instance */ - i18n: any // this file will be removed - /** - * The requested locale if specified - * Only available for localised collections - */ - locale?: string - /** The global payload object */ - payload: Payload - /** What triggered this request */ - payloadAPI?: 'GraphQL' | 'REST' | 'local' - /** Optimized document loader */ - payloadDataLoader: DataLoader - /** Resized versions of the image that was uploaded during this request */ - payloadUploadSizes?: Record - /** Get a translation for the admin screen */ - t: TFunction - /** - * Identifier for the database transaction for interactions in a single, all-or-nothing operation. - */ - transactionID?: number | string - /** - * Used to ensure consistency when multiple operations try to create a transaction concurrently on the same request - */ - transactionIDPromise?: Promise - /** The signed in user */ - user: (U & User) | null -} - -export interface RequestContext { - [key: string]: unknown -} diff --git a/packages/payload/src/globals/operations/local/findOne.ts b/packages/payload/src/globals/operations/local/findOne.ts index 24aaca23b1..a77eb92d6b 100644 --- a/packages/payload/src/globals/operations/local/findOne.ts +++ b/packages/payload/src/globals/operations/local/findOne.ts @@ -49,7 +49,7 @@ export default async function findOneLocal { const imageSizes = (collection?.upload as IncomingUploadType)?.imageSizes || [] + const { searchParams } = new URL(req.url) + const filename = searchParams.get('filename') + const files = await req.payload.find({ collection: collection.slug, where: { or: [ { - filename: { equals: req.params.filename }, + filename: { equals: filename }, }, ...imageSizes.map((imageSize) => ({ - [`sizes.${imageSize.name}.filename`]: { equals: req.params.filename }, + [`sizes.${imageSize.name}.filename`]: { equals: filename }, })), ], }, diff --git a/packages/plugin-cloud/src/utilities/getIncomingFiles.ts b/packages/plugin-cloud/src/utilities/getIncomingFiles.ts index eed07b1286..e8689afbd6 100644 --- a/packages/plugin-cloud/src/utilities/getIncomingFiles.ts +++ b/packages/plugin-cloud/src/utilities/getIncomingFiles.ts @@ -10,7 +10,7 @@ export function getIncomingFiles({ data: Partial req: PayloadRequest }): File[] { - const file = req.files?.file + const file = req.file let files: File[] = []