From af79b633dddef213ccec345b4544216b60826936 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Guhur Date: Sat, 18 Apr 2020 12:20:17 +0000 Subject: [PATCH] [VIEW] fix minor details --- src/components/views/CreateElection.jsx | 25 ++++++++++++++++++------- src/components/views/Result.jsx | 4 ++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/components/views/CreateElection.jsx b/src/components/views/CreateElection.jsx index e50efe5..f4f140f 100644 --- a/src/components/views/CreateElection.jsx +++ b/src/components/views/CreateElection.jsx @@ -256,6 +256,8 @@ class CreateElection extends Component { this.context.routesServer.setElection, ); + const {t} = this.props; + this.setState({waiting: true}); fetch(endpoint, { @@ -274,13 +276,22 @@ class CreateElection extends Component { }), }) .then(response => response.json()) - .then(result => - this.setState(state => ({ - redirectTo: '/create-success/' + result.id, - successCreate: true, - waiting: false - })), - ) + .then(result => { + console.log(result); + if (result.id) { + this.setState(state => ({ + redirectTo: '/create-success/' + result.id, + successCreate: true, + waiting: false + })) + } + else { + toast.error(t('Unknown error. Try again please.'), { + position: toast.POSITION.TOP_CENTER, + }); + this.setState({waiting: false}); + } + }) .catch(error => error); } diff --git a/src/components/views/Result.jsx b/src/components/views/Result.jsx index 9e8075e..85233c9 100644 --- a/src/components/views/Result.jsx +++ b/src/components/views/Result.jsx @@ -200,7 +200,7 @@ class Result extends Component {
  • {candidate.name} {grades[candidate.grade].label} - + {(100 * candidate.score).toFixed(1)}%