GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-24 00:01:36 +01:00
Code Issues Releases Activity

Merge branch '12-api-error' into 'dev'

Browse Source 
Rethrow unhandled error from API hooks.

Closes #12

See merge request turris/reforis/foris-js!89
This commit is contained in:
Maciej Lenartowicz 2020-02-18 17:37:34 +01:00
commit 199b27d63a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/hooks.js
View File

@ -53,10 +53,11 @@ function createAPIHook(method) {
payload: result.data,
});
} catch (error) {
const errorPayload = getErrorPayload(error);
dispatch({
type: API_ACTIONS.FAILURE,
status: error.response && error.response.status,
payload: getErrorPayload(error),
payload: errorPayload,
});
}
}, [urlRoot, contentType]);
@ -80,6 +81,12 @@ function APIReducer(state, action) {
if (action.status === 403) {
window.location.assign(ForisURLs.login);
}
// Not an API error - should be rethrown.
if (action.payload && action.payload.stack && action.payload.message) {
throw (action.payload);
}
return {
state: API_STATE.ERROR,
data: action.payload,

5
src/api/utils.js
View File

@ -65,9 +65,8 @@ export function getErrorPayload(error) {
if (error.request) {
return _("No response received.");
}
/* eslint no-console: "off" */
console.error(error);
return _("An unknown error occurred. Check the console for more info.");
// Return original error because it's not directly related to API request/response.
return error;
}
export function getJSONErrorMessage(error) {