From 86b70d41e54e35206582608b7fdfa7f9c0dc78b3 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 13 May 2026 11:25:47 +0200 Subject: [PATCH] fix: remove all folders from file drop upload queue Public file drops don't support directory creation, hence remove all folders from the upload queue. --- packages/web-app-files/src/HandleUpload.ts | 4 +++- packages/web-app-files/tests/unit/HandleUpload.spec.ts | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts index d497dfeeca2..816f1a961d1 100644 --- a/packages/web-app-files/src/HandleUpload.ts +++ b/packages/web-app-files/src/HandleUpload.ts @@ -417,7 +417,9 @@ export class HandleUpload extends BasePlugin if (!this.directoryTreeCreateEnabled) { // if directory tree creation is disabled, we need to remove all folder files - // from the upload queue + // from the upload queue (both locally and from Uppy's state to prevent upload attempts) + const directoryFiles = filesToUpload.filter((file) => file.type === 'directory') + this.removeFilesFromUpload(directoryFiles) filesToUpload = filesToUpload.filter((file) => file.type !== 'directory') if (!filesToUpload.length) { // if there are no files left to upload, we can clear the inputs and do nothing diff --git a/packages/web-app-files/tests/unit/HandleUpload.spec.ts b/packages/web-app-files/tests/unit/HandleUpload.spec.ts index 49fc1c3b2c7..c9771b3af2a 100644 --- a/packages/web-app-files/tests/unit/HandleUpload.spec.ts +++ b/packages/web-app-files/tests/unit/HandleUpload.spec.ts @@ -298,6 +298,15 @@ describe('HandleUpload', () => { await instance.handleUpload([mock({ name: 'name' })]) expect(createDirectoryTreeSpy).not.toHaveBeenCalled() }) + it('removes directory dummy files from uppy queue when directory tree creation is disabled', async () => { + const { instance, mocks } = getWrapper({ directoryTreeCreateEnabled: false }) + const removeFilesFromUploadSpy = vi.spyOn(instance, 'removeFilesFromUpload') + const directoryFile = mock({ id: 'dir-1', name: 'emptyDir', type: 'directory' }) + const regularFile = mock({ id: 'file-1', name: 'file.txt' }) + await instance.handleUpload([directoryFile, regularFile]) + expect(removeFilesFromUploadSpy).toHaveBeenCalledWith([directoryFile]) + expect(mocks.opts.uppyService.uploadFiles).toHaveBeenCalled() + }) }) }) })