Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions client/modules/IDE/actions/uploader.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,23 @@ export function dropzoneCompleteCallback(file) {
content: file.content
};
dispatch(handleCreateFile(formParams, false));
} else if (file.status === 'error' || file.xhr.status >= 400) {
let uploadFileErrorMessage = 'Uploading file to AWS failed.';
if (file.xhr?.response) {
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(file.xhr.response, 'text/xml');
const message = xmlDoc.getElementsByTagName('Message')[0]?.textContent;
const code = xmlDoc.getElementsByTagName('Code')[0]?.textContent;
uploadFileErrorMessage = `${code}: ${message}`;
}
file.previewElement.classList.add('dz-error');
file.previewElement.classList.remove('dz-success');
const dzErrorMessageElement = file.previewElement?.querySelector(
'[data-dz-errormessage]'
);
if (dzErrorMessageElement) {
dzErrorMessageElement.textContent = uploadFileErrorMessage;
}
}
};
}
26 changes: 25 additions & 1 deletion client/modules/IDE/components/FileUploader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,36 @@ const StyledUploader = styled.div`
.dz-preview.dz-image-preview {
background-color: transparent;
}
.dz-image img {
width: 100%;
height: auto;
}
.dz-details .dz-filename:hover {
overflow: hidden;
}
.dz-error-message span {
width: 100%;
height: auto;
overflow: hidden;
display: block;
}
.dz-error-mark:hover {
cursor: pointer !important;
}
`;

function FileUploader() {
const { t } = useTranslation();
const dispatch = useDispatch();
const userId = useSelector((state) => state.user.id);

const deleteUploadErrorFiles = (uploader, file) => {
if (file.status === 'error') {
file.previewElement.addEventListener('click', (e) => {
e.stopPropagation();
uploader.removeFile(file);
});
}
};
useEffect(() => {
const uploader = new Dropzone('div#uploader', {
url: s3BucketHttps,
Expand All @@ -52,6 +75,7 @@ function FileUploader() {
});
uploader.on('complete', (file) => {
dispatch(dropzoneCompleteCallback(file));
deleteUploadErrorFiles(uploader, file);
});
return () => {
uploader.destroy();
Expand Down