mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 04:35:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show the error that occured when trying to reach scalar

Browse source 
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
This commit is contained in:
Luke Barnard 2016-11-08 10:57:48 +00:00
parent 884ae0e218
commit c0c662aeaf
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/views/rooms/RoomSettings.js
View file

@ -66,6 +66,7 @@ module.exports = React.createClass({
// components from uncontrolled to controlled
isRoomPublished: this._originalIsRoomPublished || false,
scalar_error: null,
showIntegrationsError: false,
};
},
@ -424,6 +425,13 @@ module.exports = React.createClass({
}, "mx_IntegrationsManager");
},
onShowIntegrationsError(ev) {
ev.preventDefault();
this.setState({
showIntegrationsError: !this.state.showIntegrationsError,
});
},
onLeaveClick() {
dis.dispatch({
action: 'leave_room',
@ -668,6 +676,15 @@ module.exports = React.createClass({
}
var integrationsButton;
var integrationsError;
if (this.state.showIntegrationsError && this.state.scalar_error) {
console.error(this.state.scalar_error);
integrationsError = (
<span className="mx_RoomSettings_integrationsButton_errorPopup">
{ this.state.scalar_error.message }
</span>
);
}
if (UserSettingsStore.isFeatureEnabled("integration_management")) {
if (this.scalarClient.hasCredentials()) {
integrationsButton = (
@ -676,7 +693,12 @@ module.exports = React.createClass({
</div>
);
} else if (this.state.scalar_error) {
console.error("Unable to contact integrations server");
integrationsButton = (
<div className="mx_RoomSettings_integrationsButton_error" onClick={ this.onShowIntegrationsError }>
Integrations Error <img src="img/warning.svg" width="17"/>
{ integrationsError }
</div>
);
} else {
integrationsButton = (
<div className="mx_RoomSettings_integrationsButton" style={{ opacity: 0.5 }}>