From 999d83cb8da047b718abbe52642b926f75911e94 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 16 Oct 2020 13:54:37 +0100
Subject: [PATCH] Show Integrations error if iframe failed to load too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/settings/IntegrationManager.js | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index fd6a62d73a..da11832cf5 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -42,6 +42,14 @@ export default class IntegrationManager extends React.Component {
loading: false,
};
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ errored: false,
+ };
+ }
+
componentDidMount() {
this.dispatcherRef = dis.register(this.onAction);
document.addEventListener("keydown", this.onKeyDown);
@@ -66,6 +74,10 @@ export default class IntegrationManager extends React.Component {
}
};
+ onError = () => {
+ this.setState({ errored: true });
+ };
+
render() {
if (this.props.loading) {
const Spinner = sdk.getComponent("elements.Spinner");
@@ -77,7 +89,7 @@ export default class IntegrationManager extends React.Component {
);
}
- if (!this.props.connected) {
+ if (!this.props.connected || this.state.errored) {
return (
<div className='mx_IntegrationManager_error'>
<h3>{_t("Cannot connect to integration manager")}</h3>
@@ -86,6 +98,6 @@ export default class IntegrationManager extends React.Component {
);
}
- return <iframe src={this.props.url}></iframe>;
+ return <iframe src={this.props.url} onError={this.onError} />;
}
}