mirror of
https://github.com/elyby/accounts-frontend.git
synced 2024-11-09 01:22:27 +05:30
#149: show bsod for 500 errors
This commit is contained in:
parent
4394346a2a
commit
ae11dbdc97
23
src/components/ui/bsod/dispatchBsod.js
Normal file
23
src/components/ui/bsod/dispatchBsod.js
Normal file
@ -0,0 +1,23 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
|
||||
import { bsod } from './actions';
|
||||
import BSoD from 'components/ui/bsod/BSoD';
|
||||
|
||||
let injectedStore;
|
||||
let onBsod;
|
||||
|
||||
export default function dispatchBsod(store = injectedStore) {
|
||||
store.dispatch(bsod());
|
||||
onBsod && onBsod();
|
||||
|
||||
ReactDOM.render(
|
||||
<BSoD />,
|
||||
document.getElementById('app')
|
||||
);
|
||||
}
|
||||
|
||||
export function inject(store, stopLoading) {
|
||||
injectedStore = store;
|
||||
onBsod = stopLoading;
|
||||
}
|
18
src/components/ui/bsod/factory.js
Normal file
18
src/components/ui/bsod/factory.js
Normal file
@ -0,0 +1,18 @@
|
||||
import request from 'services/request';
|
||||
|
||||
import dispatchBsod, { inject } from './dispatchBsod';
|
||||
|
||||
export default function factory(store, stopLoading) {
|
||||
inject(store, stopLoading);
|
||||
|
||||
// do bsod for 500 errors
|
||||
request.addMiddleware({
|
||||
catch(resp) {
|
||||
if (resp && resp.originalResponse.status === 500) {
|
||||
dispatchBsod();
|
||||
}
|
||||
|
||||
return Promise.reject(resp);
|
||||
}
|
||||
});
|
||||
}
|
@ -10,14 +10,14 @@ import { factory as userFactory } from 'components/user/factory';
|
||||
import { IntlProvider } from 'components/i18n';
|
||||
import routesFactory from 'routes';
|
||||
import storeFactory from 'storeFactory';
|
||||
import bsodFactory from 'components/ui/bsod/factory';
|
||||
|
||||
const store = storeFactory();
|
||||
|
||||
bsodFactory(store, stopLoading);
|
||||
|
||||
userFactory(store)
|
||||
.then(() => {
|
||||
// allow :active styles in mobile Safary
|
||||
document.addEventListener('touchstart', () => {}, true);
|
||||
|
||||
ReactDOM.render(
|
||||
<ReduxProvider store={store}>
|
||||
<IntlProvider>
|
||||
|
@ -6,7 +6,6 @@ import classNames from 'classnames';
|
||||
|
||||
import Userbar from 'components/userbar/Userbar';
|
||||
import PopupStack from 'components/ui/popup/PopupStack';
|
||||
import BSoD from 'components/ui/bsod/BSoD';
|
||||
|
||||
import styles from './root.scss';
|
||||
|
||||
@ -23,10 +22,6 @@ if (process.env.NODE_ENV === 'production') {
|
||||
function RootPage(props) {
|
||||
const isRegisterPage = props.location.pathname === '/register';
|
||||
|
||||
if (props.bsod) {
|
||||
return <BSoD />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={styles.root}>
|
||||
<div id="view-port" className={classNames(styles.viewPort, {
|
||||
@ -61,7 +56,6 @@ RootPage.propTypes = {
|
||||
pathname: PropTypes.string
|
||||
}).isRequired,
|
||||
children: PropTypes.element,
|
||||
bsod: PropTypes.bool.isRequired,
|
||||
logout: PropTypes.func.isRequired,
|
||||
isPopupActive: PropTypes.bool.isRequired
|
||||
};
|
||||
@ -70,7 +64,6 @@ import { connect } from 'react-redux';
|
||||
import { logout } from 'components/user/actions';
|
||||
|
||||
export default connect((state) => ({
|
||||
bsod: state.bsod,
|
||||
user: state.user,
|
||||
isPopupActive: state.popup.popups.length > 0
|
||||
}), {
|
||||
|
@ -1,2 +1,5 @@
|
||||
import 'babel-polyfill';
|
||||
import 'promise.prototype.finally';
|
||||
|
||||
// allow :active styles in mobile Safary
|
||||
document.addEventListener('touchstart', () => {}, true);
|
||||
|
@ -54,7 +54,7 @@ export default {
|
||||
* return a Promise that resolves to the new response.
|
||||
*/
|
||||
addMiddleware(middleware) {
|
||||
if (!middlewares.find((mdware) => mdware === middleware)) {
|
||||
if (!middlewares.some((mdware) => mdware === middleware)) {
|
||||
middlewares.push(middleware);
|
||||
}
|
||||
}
|
||||
@ -62,7 +62,7 @@ export default {
|
||||
|
||||
|
||||
const checkStatus = (resp) => Promise[resp.status >= 200 && resp.status < 300 ? 'resolve' : 'reject'](resp);
|
||||
const toJSON = (resp) => resp.json();
|
||||
const toJSON = (resp) => resp.json().then((json) => ({...json, originalResponse: resp}));
|
||||
const rejectWithJSON = (resp) => toJSON(resp).then((resp) => {throw resp;});
|
||||
const handleResponseSuccess = (resp) => Promise[resp.success || typeof resp.success === 'undefined' ? 'resolve' : 'reject'](resp);
|
||||
|
||||
@ -94,7 +94,7 @@ function runMiddlewares(action, data, restart) {
|
||||
return middlewares
|
||||
.filter((middleware) => middleware[action])
|
||||
.reduce(
|
||||
(promise, middleware) => promise.then((resp) => middleware[action](resp, restart)),
|
||||
(promise, middleware) => promise[/^catch|then$/.test(action) ? action : 'then']((resp) => middleware[action](resp, restart)),
|
||||
Promise[action === 'catch' ? 'reject' : 'resolve'](data)
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user