From 89e807b469e98d2e5a69fe1e85152e85c5c19a45 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 26 May 2020 13:40:49 +0300 Subject: [PATCH] Handle errors better --- assets/js/dashboard/api.js | 6 +++++- assets/js/dashboard/stats/current-visitors.js | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js index b21d3b0c3..7af74838e 100644 --- a/assets/js/dashboard/api.js +++ b/assets/js/dashboard/api.js @@ -22,5 +22,9 @@ export function serializeQuery(query, extraQuery=[]) { export function get(url, query, ...extraQuery) { url = url + serializeQuery(query, extraQuery) - return fetch(url).then(res => res.json()) + return fetch(url) + .then( response => { + if (!response.ok) { throw response } + return response.json() + }) } diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index 79f7bc5d7..4adafd514 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -20,7 +20,10 @@ export default class CurrentVisitors extends React.Component { updateCount() { return fetch(`/api/stats/${encodeURIComponent(this.props.site.domain)}/current-visitors`) - .then(res => res.json()) + .then( response => { + if (!response.ok) { throw response } + return response.json() + }) .then((res) => this.setState({currentVisitors: res})) }