fix: bulk upload mimetype wildcard file selection (#8954)

Fixes an issue where using wildcards in upload-enabled collection
mimeType restrictions would prevent files from being selected in the
bulk upload file selector.
This commit is contained in:
James Mikrut
2024-10-30 18:26:36 -04:00
committed by GitHub
parent d89db00295
commit 03e5ae8095
5 changed files with 24 additions and 7 deletions

View File

@@ -3,10 +3,13 @@
import type { JsonObject } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { validateMimeType } from 'payload/shared'
import React from 'react'
import { toast } from 'sonner'
import { useConfig } from '../../providers/Config/index.js'
import { EditDepthProvider, useEditDepth } from '../../providers/EditDepth/index.js'
import { useTranslation } from '../../providers/Translation/index.js'
import { Drawer } from '../Drawer/index.js'
import { AddFilesView } from './AddFilesView/index.js'
import { AddingFilesView } from './AddingFilesView/index.js'
@@ -19,6 +22,7 @@ function DrawerContent() {
const { closeModal } = useModal()
const { collectionSlug, drawerSlug } = useBulkUpload()
const { config } = useConfig()
const { t } = useTranslation()
const uploadCollection = config.collections.find((col) => col.slug === collectionSlug)
const uploadConfig = uploadCollection.upload
@@ -31,14 +35,18 @@ function DrawerContent() {
if (
uploadMimeTypes === undefined ||
uploadMimeTypes.length === 0 ||
uploadMimeTypes?.includes(candidateFile.type)
validateMimeType(candidateFile.type, uploadMimeTypes)
) {
fileTransfer.items.add(candidateFile)
}
}
void addFiles(fileTransfer.files)
if (fileTransfer.files.length === 0) {
toast.error(t('error:invalidFileType'))
} else {
void addFiles(fileTransfer.files)
}
},
[addFiles, uploadMimeTypes],
[addFiles, t, uploadMimeTypes],
)
if (!collectionSlug) {