diff options
Diffstat (limited to 'app/assets/javascripts/ide/stores/modules/merge_requests/actions.js')
-rw-r--r-- | app/assets/javascripts/ide/stores/modules/merge_requests/actions.js | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js index 551dd322c9b..cdd8076952f 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js @@ -1,6 +1,5 @@ import { __ } from '../../../../locale'; import Api from '../../../../api'; -import flash from '../../../../flash'; import router from '../../../ide_router'; import { scopes } from './constants'; import * as types from './mutation_types'; @@ -8,8 +7,20 @@ import * as rootTypes from '../../mutation_types'; export const requestMergeRequests = ({ commit }, type) => commit(types.REQUEST_MERGE_REQUESTS, type); -export const receiveMergeRequestsError = ({ commit }, type) => { - flash(__('Error loading merge requests.')); +export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }) => { + dispatch( + 'setErrorMessage', + { + text: __('Error loading merge requests.'), + action: payload => + dispatch('fetchMergeRequests', payload).then(() => + dispatch('setErrorMessage', null, { root: true }), + ), + actionText: __('Please try again'), + actionPayload: { type, search }, + }, + { root: true }, + ); commit(types.RECEIVE_MERGE_REQUESTS_ERROR, type); }; export const receiveMergeRequestsSuccess = ({ commit }, { type, data }) => @@ -22,7 +33,7 @@ export const fetchMergeRequests = ({ dispatch, state: { state } }, { type, searc Api.mergeRequests({ scope, state, search }) .then(({ data }) => dispatch('receiveMergeRequestsSuccess', { type, data })) - .catch(() => dispatch('receiveMergeRequestsError', type)); + .catch(() => dispatch('receiveMergeRequestsError', { type, search })); }; export const resetMergeRequests = ({ commit }, type) => commit(types.RESET_MERGE_REQUESTS, type); |