Skip to content
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.

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

Show error message when uploading fails #14349

Merged
merged 1 commit into from
Oct 24, 2024
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
5 changes: 5 additions & 0 deletions packages/filesystem/src/browser/file-upload-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ export class FileUploadService {
} catch (error) {
uploadSemaphore.cancel();
if (!isCancelled(error)) {
this.messageService.error(nls.localize('theia/filesystem/uploadFailed', 'An error occurred while uploading a file. {0}', error.message));
throw error;
}
}
Expand Down Expand Up @@ -348,6 +349,10 @@ export class FileUploadService {
unregister();
if (xhr.status === 200) {
resolve();
} else if (xhr.status === 500 && xhr.statusText !== xhr.response) {
// internal error with cause message
// see packages/filesystem/src/node/node-file-upload-service.ts
reject(new Error(`Internal server error: ${xhr.response}`));
} else {
reject(new Error(`POST request failed: ${xhr.status} ${xhr.statusText}`));
}
Expand Down
8 changes: 7 additions & 1 deletion packages/filesystem/src/node/node-file-upload-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@ export class NodeFileUploadService implements BackendApplicationContribution {
response.status(200).send(target); // ok
} catch (error) {
console.error(error);
response.sendStatus(500); // internal server error
if (error.message) {
// internal server error with error message as response
response.status(500).send(error.message);
} else {
// default internal server error
response.sendStatus(500);
}
}
}

Expand Down
Loading