From a1828c30c3e0e7526a6f0c3b0a042582e899e9f6 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Wed, 1 May 2019 15:53:22 +0200 Subject: [PATCH] Review changes: code cleanup --- js/api.js | 11 +++-------- js/components/TournamentList.js | 8 +------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/js/api.js b/js/api.js index 6a70330..9808ca7 100644 --- a/js/api.js +++ b/js/api.js @@ -75,7 +75,6 @@ const defaultstate_tournamentinfo = { const actiontypes_tournamentlist = { 'FETCH': 'FETCH', 'FETCH_SUCCESS': 'FETCH_SUCCESS', - 'FETCH_ERROR': 'FETCH_ERROR', 'REHYDRATE': 'REHYDRATE' }; @@ -354,18 +353,14 @@ const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) => storeOptionalToken(resp); action.parameters.successCallback(resp.data); }).catch((error) => { - __store.dispatch({ - type: actiontypes_tournamentlist.FETCH_ERROR, - parameters: {error: error} - }); - storeOptionalToken(error.response); + if(error.response) { + storeOptionalToken(error.response); + } action.parameters.errorCallback(); }); return state; case actiontypes_tournamentlist.FETCH_SUCCESS: return Object.assign({}, state, {tournaments: action.parameters}); - case actiontypes_tournamentlist.FETCH_ERROR: - return state; default: return state; } diff --git a/js/components/TournamentList.js b/js/components/TournamentList.js index 30ff6e3..9a0ac00 100644 --- a/js/components/TournamentList.js +++ b/js/components/TournamentList.js @@ -5,7 +5,6 @@ export default class TournamentList extends React.Component { constructor(props) { super(props); this.state = { - error: null, tournaments: [] }; } @@ -15,12 +14,7 @@ export default class TournamentList extends React.Component { this.setState({ tournaments: tournaments }); - }, - error => { - this.setState({ - error - }); - }); + }, () => {}); } render() {