Fix handling of internal errors when uploading theming files #33332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a file can not be uploaded in the Theming app due to an expected error (like an invalid mime type) the response contains a "data.message" field. However, if the upload fails due to an unexpected error (like an internal error, for example if the "mime_content_type" function is disabled) there is no such field, so it should not be used. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
|
/backport to stable24 |
|
/backport to stable23 |
Merged
Pytal
reviewed
Aug 16, 2022
| @@ -127,7 +127,8 @@ window.addEventListener('DOMContentLoaded', function () { | |||
| }, | |||
| fail: function (e, response){ | |||
| var $form = $(e.target).closest('form'); | |||
| OC.msg.finishedError('#theming_settings_msg', response._response.jqXHR.responseJSON.data.message); | |||
| const responseJSON = response._response.jqXHR.responseJSON; | |||
| OC.msg.finishedError('#theming_settings_msg', responseJSON && responseJSON.data && responseJSON.data.message ? responseJSON.data.message : t('theming', 'Error uploading the file')); | |||
There was a problem hiding this comment.
Suggested change
| OC.msg.finishedError('#theming_settings_msg', responseJSON && responseJSON.data && responseJSON.data.message ? responseJSON.data.message : t('theming', 'Error uploading the file')); | |
| OC.msg.finishedError('#theming_settings_msg', responseJSON?.data?.message || t('theming', 'Error uploading the file')); |
Let's shorten this
There was a problem hiding this comment.
I used the long syntax because the JavaScript file is not transpiled. Is it safe to use the optional chaining operator in that case?
There was a problem hiding this comment.
Judging from the compatibility table and the supported browsers of our browserslist config it looks like everything is fully compatible except for 0.560% of users on v12.2-12.5 of Safari iOS
So for now I'd say to not use the modern syntax to ensure compatibility
Merged
Pytal
approved these changes
Sep 1, 2022
PVince81
deleted the
fix-handling-of-internal-errors-when-uploading-theming-files
branch
This was referenced Sep 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a file can not be uploaded in the Theming app due to an expected error (like an invalid mime type) the response contains a
data.messagefield. However, if the upload fails due to an unexpected error (like an internal error, for example if themime_content_typefunction is disabled) there is no such field, so it should not be used.How to test
throw new \Exception();toThemingController::updateImageResult with this pull request
Error uploading the file is shown and the spinner on the upload button is replaced again with the upload icon
Result without this pull request
No error message is shown and the spinner on the upload button never ends