Skip to content

Fixes file uploader showing invalid file modal just one time #5537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

Fixes file uploader showing invalid file modal just one time #5537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
732c910
corrected buggy modal from uploader.vue and corrected linting
kart-u Nov 5, 2025
d4e39e4
added reset in handleFiles
kart-u Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions contentcuration/contentcuration/frontend/shared/views/files/Uploader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,36 +208,40 @@
this.$emit('upload');

if (!this.readonly) {
files = this.allowMultiple ? files : [files[0]];
files = await this.validateFiles(files);
try {
files = this.allowMultiple ? files : [files[0]];
files = await this.validateFiles(files);

// Show errors if relevant
if (this.totalUploadSize > this.availableSpace) {
this.showStorageExceededAlert = true;
return;
} else if (this.unsupportedFiles.length) {
this.showUnsupportedFilesAlert = true;
} else if (this.tooLargeFiles.length) {
this.showTooLargeFilesAlert = true;
}
return this.handleUploads(files).then(fileUploads => {
const objects = fileUploads.map(f => f.fileObject).filter(f => !f.error);
if (fileUploads.length) {
for (const fileUpload of fileUploads) {
fileUpload.uploadPromise
.then(fileObject => {
if (isFunction(this.uploadCompleteHandler)) {
this.uploadCompleteHandler(this.getFileUpload(fileObject.id));
}
})
.catch(() => {});
}
if (isFunction(this.uploadingHandler)) {
this.uploadingHandler(this.allowMultiple ? objects : objects[0]);
}
// Show errors if relevant
if (this.totalUploadSize > this.availableSpace) {
this.showStorageExceededAlert = true;
return;
} else if (this.unsupportedFiles.length) {
this.showUnsupportedFilesAlert = true;
} else if (this.tooLargeFiles.length) {
this.showTooLargeFilesAlert = true;
}
return objects;
});
return this.handleUploads(files).then(fileUploads => {
const objects = fileUploads.map(f => f.fileObject).filter(f => !f.error);
if (fileUploads.length) {
for (const fileUpload of fileUploads) {
fileUpload.uploadPromise
.then(fileObject => {
if (isFunction(this.uploadCompleteHandler)) {
this.uploadCompleteHandler(this.getFileUpload(fileObject.id));
}
})
.catch(() => {});
}
if (isFunction(this.uploadingHandler)) {
this.uploadingHandler(this.allowMultiple ? objects : objects[0]);
}
}
return objects;
});
} finally {
this.resetFileInput();
}
}
},
handleUploads(files) {
Expand All @@ -255,6 +259,9 @@
return fileUploads.filter(Boolean);
});
},
resetFileInput() {
this.$refs.fileUpload.value = '';
},
},
$trs: {
unsupportedFilesHeader: 'Unsupported files',
Expand Down
Loading