tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove duplicate removal of temp upload file (#3818)

Browse Source
This commit is contained in:
Elliot DeNolf
2023-10-23 13:01:18 -04:00
committed by GitHub
parent dd0ff50621
commit 219aa3b2f3
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/payload/src/collections/operations/create.ts
View File

@@ -23,7 +23,9 @@ 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 fileExists from '../../uploads/fileExists'
import { generateFileData } from '../../uploads/generateFileData'
import { unlinkTempFiles } from '../../uploads/unlinkTempFiles'
import { uploadFiles } from '../../uploads/uploadFiles'
import { initTransaction } from '../../utilities/initTransaction'
import { killTransaction } from '../../utilities/killTransaction'
@@ -339,18 +341,6 @@ async function create<TSlug extends keyof GeneratedTypes['collections']>(
req,
})
// Remove temp files if enabled, as express-fileupload does not do this automatically
if (config.upload?.useTempFiles && collectionConfig.upload) {
const { files } = req
const fileArray = Array.isArray(files) ? files : [files]
await mapAsync(fileArray, async ({ file }) => {
// Still need this check because this will not be populated if using local API
if (file.tempFilePath) {
await unlinkFile(file.tempFilePath)
}
})
}
// /////////////////////////////////////
// afterChange - Collection
// /////////////////////////////////////
@@ -383,17 +373,7 @@ async function create<TSlug extends keyof GeneratedTypes['collections']>(
result,
})
// Remove temp files if enabled, as express-fileupload does not do this automatically
if (config.upload?.useTempFiles && collectionConfig.upload) {
const { files } = req
const fileArray = Array.isArray(files) ? files : [files]
await mapAsync(fileArray, async ({ file }) => {
// Still need this check because this will not be populated if using local API
if (file.tempFilePath) {
await unlinkFile(file.tempFilePath)
}
})
}
await unlinkTempFiles({ collectionConfig, config, req })
// /////////////////////////////////////
// Return results