diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:06:27 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:06:27 +0100 |
commit | 4fbdf100c4a942100f6542bbb858d91673af8573 (patch) | |
tree | 60aa15666490ed1d3b79e2b94a6f43c90b3d619f /app/assets/javascripts/components/actions | |
parent | 4bb8ff7c8ea3ab7c291a23893af2846811b99faf (diff) |
Add <MissingIndicator /> when status or account are not found, skip alerts
for those errors
Diffstat (limited to 'app/assets/javascripts/components/actions')
-rw-r--r-- | app/assets/javascripts/components/actions/accounts.jsx | 6 | ||||
-rw-r--r-- | app/assets/javascripts/components/actions/cards.jsx | 3 | ||||
-rw-r--r-- | app/assets/javascripts/components/actions/statuses.jsx | 16 |
3 files changed, 15 insertions, 10 deletions
diff --git a/app/assets/javascripts/components/actions/accounts.jsx b/app/assets/javascripts/components/actions/accounts.jsx index 0be05034e..47c0d9f85 100644 --- a/app/assets/javascripts/components/actions/accounts.jsx +++ b/app/assets/javascripts/components/actions/accounts.jsx @@ -138,7 +138,8 @@ export function fetchAccountFail(id, error) { return { type: ACCOUNT_FETCH_FAIL, id, - error + error, + skipAlert: true }; }; @@ -231,7 +232,8 @@ export function fetchAccountTimelineFail(id, error, skipLoading) { type: ACCOUNT_TIMELINE_FETCH_FAIL, id, error, - skipLoading + skipLoading, + skipAlert: error.response.status === 404 }; }; diff --git a/app/assets/javascripts/components/actions/cards.jsx b/app/assets/javascripts/components/actions/cards.jsx index cc7baf376..d4c1eda60 100644 --- a/app/assets/javascripts/components/actions/cards.jsx +++ b/app/assets/javascripts/components/actions/cards.jsx @@ -46,6 +46,7 @@ export function fetchStatusCardFail(id, error) { type: STATUS_CARD_FETCH_FAIL, id, error, - skipLoading: true + skipLoading: true, + skipAlert: true }; }; diff --git a/app/assets/javascripts/components/actions/statuses.jsx b/app/assets/javascripts/components/actions/statuses.jsx index 6f43539e0..19df2c36c 100644 --- a/app/assets/javascripts/components/actions/statuses.jsx +++ b/app/assets/javascripts/components/actions/statuses.jsx @@ -28,6 +28,7 @@ export function fetchStatus(id) { const skipLoading = getState().getIn(['statuses', id], null) !== null; dispatch(fetchContext(id)); + dispatch(fetchStatusCard(id)); if (skipLoading) { return; @@ -56,7 +57,8 @@ export function fetchStatusFail(id, error, skipLoading) { type: STATUS_FETCH_FAIL, id, error, - skipLoading + skipLoading, + skipAlert: true }; }; @@ -101,14 +103,13 @@ export function fetchContext(id) { api(getState).get(`/api/v1/statuses/${id}/context`).then(response => { dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants)); - dispatch(fetchStatusCard(id)); + }).catch(error => { - if (error.response.status == 404){ - dispatch(deleteStatusSuccess(id)); + if (error.response.status === 404) { dispatch(deleteFromTimelines(id)); - }else{ - dispatch(fetchContextFail(id, error)); } + + dispatch(fetchContextFail(id, error)); }); }; }; @@ -134,6 +135,7 @@ export function fetchContextFail(id, error) { return { type: CONTEXT_FETCH_FAIL, id, - error + error, + skipAlert: true }; }; |