diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-08-27 06:47:13 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-08-27 06:47:13 +0200 |
commit | 43575b591921e994761fd531bcfe95239119b695 (patch) | |
tree | 3a45472bff1a6647b87fe0727ac46de5f97d47c1 | |
parent | b47522c11bf5c426f998254f9dc61f0018229b44 (diff) |
show error in create reserve dialog
-rw-r--r-- | src/webex/pages/confirm-create-reserve.tsx | 11 | ||||
-rw-r--r-- | src/webex/wxBackend.ts | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx index f957364c4..7d543860f 100644 --- a/src/webex/pages/confirm-create-reserve.tsx +++ b/src/webex/pages/confirm-create-reserve.tsx @@ -371,7 +371,7 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> { if (this.statusString()) { return ( <p> - <strong style={{color: "red"}}>{i18n.str`A problem occured, see below. ${this.statusString()}`}</strong> + <strong style={{color: "red"}}>{this.statusString()}</strong> </p> ); } @@ -515,12 +515,9 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> { console.dir(r); } catch (e) { console.log("get exchange info rejected", e); - if (e.hasOwnProperty("httpStatus")) { - this.statusString(`Error: request failed with status ${e.httpStatus}`); - } else if (e.hasOwnProperty("errorResponse")) { - const resp = e.errorResponse; - this.statusString(`Error: ${resp.error} (${resp.hint})`); - } + this.statusString(`Error: ${e.message}`); + // Re-try every 5 seconds as long as there is a problem + setTimeout(() => this.statusString() ? this.forceReserveUpdate() : undefined, 5000); } } diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts index 0d1c2d8ca..2f249af44 100644 --- a/src/webex/wxBackend.ts +++ b/src/webex/wxBackend.ts @@ -352,7 +352,7 @@ async function dispatch(req: any, sender: any, sendResponse: any): Promise<void> try { sendResponse({ error: "exception", - hint: e.message, + message: e.message, stack, }); } catch (e) { |