From a2700246f0719ced2da84aef896d136a7e583550 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Tue, 18 Jun 2019 12:14:08 +0100 Subject: [PATCH] Make only one request to API --- assets/js/src/newsletters/sending_status.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/js/src/newsletters/sending_status.jsx b/assets/js/src/newsletters/sending_status.jsx index a90b61587a..f711f514a0 100644 --- a/assets/js/src/newsletters/sending_status.jsx +++ b/assets/js/src/newsletters/sending_status.jsx @@ -28,6 +28,7 @@ const messages = { const SendingStatus = (props) => { const newsletterId = props.match.params.id; + const [isLoading, setIsLoading] = React.useState(true); const [newsletterSubject, setNewsletterSubject] = React.useState(''); React.useEffect(() => { @@ -39,9 +40,11 @@ const SendingStatus = (props) => { id: newsletterId, }, }) - .done(res => setNewsletterSubject(res.data.subject)) + .done((res) => { + setNewsletterSubject(res.data.subject); + setIsLoading(false); + }) .fail((res) => { - setNewsletterSubject(''); MailPoet.Notice.showApiErrorNotice(res); }); }, [newsletterId]); @@ -53,6 +56,7 @@ const SendingStatus = (props) => { newsletterId={newsletterId} newsletterSubject={newsletterSubject} /> + {!isLoading && ( { CronMixin.checkCronStatus(state); }} /> + )} ); };