Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix error handling in Ack and Exec modals

Browse Source
This commit is contained in:
Alexander Zobnin
2020-06-02 13:01:31 +03:00
parent c4f8fb1501
commit 5e5325ed35
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/panel-triggers/components/AckModal.tsx
View File

@@ -135,8 +135,9 @@ export class AckModalUnthemed extends PureComponent<Props, State> {
this.props.onSubmit(ackData).then(() => { this.props.onSubmit(ackData).then(() => {
this.dismiss(); this.dismiss();
}).catch(err => { }).catch(err => {
const errorMessage = err.data?.message || err.data?.error || err.data || err.statusText || '';
this.setState({ this.setState({
ackError: err.message || err.data, ackError: errorMessage,
loading: false, loading: false,
}); });
}); });

2
src/panel-triggers/components/ExecScriptModal.tsx
View File

@@ -93,7 +93,7 @@ export class ExecScriptModalUnthemed extends PureComponent<Props, State> {
this.setState({ error: true, errorMessage: message, loading: false }); this.setState({ error: true, errorMessage: message, loading: false });
} }
}).catch(err => { }).catch(err => {
let errorMessage = err.message || err.data || ''; let errorMessage = err.data?.message || err.data?.error || err.data || err.statusText || '';
errorMessage = this.formatResult(errorMessage); errorMessage = this.formatResult(errorMessage);
this.setState({ this.setState({
error: true, error: true,