Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-01-23 02:25:07 +00:00
Code Issues Projects Releases Wiki Activity

@uppy/golden-retriever: fix crash after manually removing a restored file (#5911)

Browse source 
fixes "cannot read properties of undefined (reading isRemote)" because
the file gets removed when the user presses "done"
closes #5837

---------

Co-authored-by: Merlijn Vos <merlijn@soverin.net>
This commit is contained in:
Mikael Finstad 2025-08-20 12:36:49 +02:00 • committed by GitHub
parent 79502f7646
commit a0a248a6fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.changeset/cool-islands-obey.md Normal file
View file

@ -0,0 +1,5 @@
---
"@uppy/golden-retriever": patch
---
Fix golden retriever crash when removing a file after restoring and clicking upload

72
packages/@uppy/golden-retriever/src/index.ts
View file

@ -110,53 +110,33 @@ export default class GoldenRetriever<
}
}
/**
* Get file objects that are currently waiting: they've been selected,
* but aren't yet being uploaded.
*/
getWaitingFiles(): Record<string, UppyFile<M, B>> {
const waitingFiles: Record<string, UppyFile<M, B>> = {}
this.uppy.getFiles().forEach((file) => {
if (!file.progress || !file.progress.uploadStarted) {
waitingFiles[file.id] = file
}
})
return waitingFiles
}
/**
* Get file objects that are currently being uploaded. If a file has finished
* uploading, but the other files in the same batch have not, the finished
* file is also returned.
*/
getUploadingFiles(): Record<string, UppyFile<M, B>> {
const uploadingFiles: Record<string, UppyFile<M, B>> = {}
const { currentUploads } = this.uppy.getState()
if (currentUploads) {
const uploadIDs = Object.keys(currentUploads)
uploadIDs.forEach((uploadID) => {
const filesInUpload = currentUploads[uploadID].fileIDs
filesInUpload.forEach((fileID) => {
uploadingFiles[fileID] = this.uppy.getFile(fileID)
})
})
}
return uploadingFiles
}
saveFilesStateToLocalStorage(): void {
const filesToSave = {
...this.getWaitingFiles(),
...this.getUploadingFiles(),
}
const fileToSaveEntries = Object.entries(filesToSave)
// File objects that are currently waiting: they've been selected,
// but aren't yet being uploaded.
const waitingFiles = this.uppy
.getFiles()
.filter((file) => !file.progress || !file.progress.uploadStarted)
// File objects that are currently being uploaded. If a file has finished
// uploading, but the other files in the same batch have not, the finished
// file is also returned.
const uploadingFiles = Object.values(this.uppy.getState().currentUploads)
.map((currentUpload) =>
currentUpload.fileIDs.map((fileID) => {
const file = this.uppy.getFile(fileID)
return file != null ? [file] : [] // file might have been removed
}),
)
.flat(2)
const allFiles = [...waitingFiles, ...uploadingFiles]
// unique by file.id
const fileToSave = Object.values(
Object.fromEntries(allFiles.map((file) => [file.id, file])),
)
// If all files have been removed by the user, clear recovery state
if (fileToSaveEntries.length === 0) {
if (fileToSave.length === 0) {
if (this.uppy.getState().recoveredState !== null) {
this.uppy.setState({ recoveredState: null })
}
@ -168,8 +148,8 @@ export default class GoldenRetriever<
// and we want to avoid having weird properties in the serialized object.
// Also adding file.isRestored to all files, since they will be restored from local storage
const filesToSaveWithoutData = Object.fromEntries(
fileToSaveEntries.map(([id, fileInfo]) => [
id,
fileToSave.map((fileInfo) => [
fileInfo.id,
fileInfo.isRemote
? {
...fileInfo,