From f441166a3bf27c145a48ae2350cd8cd0931504e9 Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Tue, 28 Aug 2018 15:47:02 +0500 Subject: Refactor and add error handling --- src/redux/github/actions.js | 25 +++++++++---------------- src/redux/github/reducer.js | 8 +------- src/redux/github/types.js | 1 - 3 files changed, 10 insertions(+), 24 deletions(-) (limited to 'src/redux') diff --git a/src/redux/github/actions.js b/src/redux/github/actions.js index 5474144..73dba10 100644 --- a/src/redux/github/actions.js +++ b/src/redux/github/actions.js @@ -5,7 +5,6 @@ import { FETCH_TRENDING_FAILED, FETCH_TRENDING_SUCCESS, PROCESS_FETCH_TRENDING, - UPDATE_FILTERS } from './types'; const API_URL = 'https://api.github.com/search/repositories'; @@ -49,24 +48,18 @@ export const fetchTrending = function (filters) { } }); }).catch(error => { + let message = error.response && + error.response.data && + error.response.data.message; + + if (!message) { + message = error.message; + } + dispatch({ type: FETCH_TRENDING_FAILED, - payload: error + payload: message }); }); }; }; - -/** - * Updates the filters used in queries - * @param filters - * @return {Function} - */ -export const updateFilters = function (filters) { - return dispatch => { - dispatch({ - type: UPDATE_FILTERS, - payload: filters - }); - }; -}; diff --git a/src/redux/github/reducer.js b/src/redux/github/reducer.js index 79543b8..0d443f6 100644 --- a/src/redux/github/reducer.js +++ b/src/redux/github/reducer.js @@ -1,4 +1,4 @@ -import { FETCH_TRENDING_FAILED, FETCH_TRENDING_SUCCESS, PROCESS_FETCH_TRENDING, UPDATE_FILTERS } from './types'; +import { FETCH_TRENDING_FAILED, FETCH_TRENDING_SUCCESS, PROCESS_FETCH_TRENDING } from './types'; import { UPDATE_DATE_TYPE, UPDATE_LANGUAGE } from '../preference/types'; export const initialState = { @@ -9,7 +9,6 @@ export const initialState = { // { start: '', end: '', data: [] } // ] repositories: [], - filters: {}, error: null, }; @@ -44,11 +43,6 @@ export default function reducer(state = initialState, action) { processing: false, error: action.payload }; - case UPDATE_FILTERS: - return { - ...state, - filters: action.payload - }; default: return state; } diff --git a/src/redux/github/types.js b/src/redux/github/types.js index c5be4bc..a345496 100644 --- a/src/redux/github/types.js +++ b/src/redux/github/types.js @@ -1,4 +1,3 @@ export const PROCESS_FETCH_TRENDING = 'PROCESS_FETCH_TRENDING'; export const FETCH_TRENDING_SUCCESS = 'FETCH_TRENDING_SUCCESS'; export const FETCH_TRENDING_FAILED = 'FETCH_TRENDING_FAILED'; -export const UPDATE_FILTERS = 'UPDATE_FILTERS'; -- cgit v1.3