diff --git a/assets/js/src/newsletters/sending_status.jsx b/assets/js/src/newsletters/sending_status.jsx index 454e92ff63..b8236233eb 100644 --- a/assets/js/src/newsletters/sending_status.jsx +++ b/assets/js/src/newsletters/sending_status.jsx @@ -9,10 +9,7 @@ import { CronMixin, MailerMixin } from 'newsletters/listings/mixins.jsx'; const SendingStatus = props => { const newsletterId = props.match.params.id; - const [state, setState] = React.useState({ - error: null, - newsletterSubject: null, - }); + const [newsletterSubject, setNewsletterSubject] = React.useState(''); React.useEffect(() => { MailPoet.Ajax.post({ @@ -23,26 +20,24 @@ const SendingStatus = props => { id: newsletterId, }, }) - .done(res => setState({ - error: null, - newsletterSubject: res.data.subject, - })) - .fail(() => setState({ - newsletterSubject: null, - error: 'loadingNewsletterError', - })); + .done(res => setNewsletterSubject(res.data.subject)) + .fail((res) => { + setNewsletterSubject(''); + MailPoet.Notice.error( + res.errors.map(error => error.message), + { scroll: true } + ); + }); }, [newsletterId]); - const {error, newsletterSubject} = state; return (

{MailPoet.I18n.t('sendingStatusTitle')}

- - {newsletterSubject && { MailerMixin.checkMailerStatus(state); CronMixin.checkCronStatus(state); }} - /> } + /> ); }; @@ -71,18 +66,6 @@ SendingStatus.propTypes = { }).isRequired, }; -const LoadingError = ({error}) => { - if (!error) return null; - return ( -
-

{ MailPoet.I18n.t(error) }

-
- ); -} -LoadingError.propTypes = { - error: PropTypes.string, -}; - const StatsLink = ({newsletterId, newsletterSubject}) => { if (!newsletterId || !newsletterSubject) return null; if (window.mailpoet_premium_active) { diff --git a/views/newsletters.html b/views/newsletters.html index bbd633d0de..b46a5e383f 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -356,7 +356,6 @@ 'unprocessed': _x('Unprocessed', 'status when the sending of a newsletter has not been processed'), 'sent': _x('Sent', 'status when a newsletter has been sent'), 'failed': _x('Failed', 'status when the sending of a newsletter has failed'), - 'loadingNewsletterError': __('An error occured while loading the newsletter.'), 'noSendingTaskFound': __('No sending task found.') }) %> <% endblock %>