Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add missing rejection handling for Promises (#7008)

Browse source 
* Add eslint-plugin-promise to detect uncaught rejections

* Move alert generation for errors to actions/alert

* Add missing rejection handling for Promises

* Use catch() instead of onReject on then()

Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though.
This commit is contained in:
unarist 2018-04-02 21:51:02 +09:00 • committed by Eugen Rochko
parent e7a1716701
commit 2c51bc0ca5
13 changed files with 84 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/javascript/mastodon/middleware/errors.js
View file

@ -1,34 +1,14 @@
import { defineMessages } from 'react-intl';
import { showAlert } from '../actions/alerts';
import { showAlertForError } from '../actions/alerts';
const defaultFailSuffix = 'FAIL';
const messages = defineMessages({
unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' },
unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' },
});
export default function errorsMiddleware() {
return ({ dispatch }) => next => action => {
if (action.type && !action.skipAlert) {
const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
if (action.type.match(isFail)) {
if (action.error.response) {
const { data, status, statusText } = action.error.response;
let message = statusText;
let title = `${status}`;
if (data.error) {
message = data.error;
}
dispatch(showAlert(title, message));
} else {
console.error(action.error);
dispatch(showAlert(messages.unexpectedTitle, messages.unexpectedMessage));
}
dispatch(showAlertForError(action.error));
}
}