matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

Merge pull request #816 from t3chguy/ability_to_disable_scalar

Browse Source 
Disable Scalar Integrations if urls passed to it are falsey
This commit is contained in:
Matthew Hodgson
2017-04-22 01:39:20 +01:00
committed by GitHub
parent d2d24bf0fa 8e9f52e217
commit 304136766d
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/rooms/RoomSettings.js
View File

@@ -129,6 +129,8 @@ module.exports = React.createClass({
console.error("Failed to get room visibility: " + err);
});
this.scalarClient = null;
if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
this.scalarClient = new ScalarAuthClient();
this.scalarClient.connect().done(() => {
this.forceUpdate();
@@ -137,6 +139,7 @@ module.exports = React.createClass({
scalar_error: err
});
});
}
dis.dispatch({
action: 'ui_opacity',
@@ -490,7 +493,7 @@ module.exports = React.createClass({
ev.preventDefault();
var IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
Modal.createDialog(IntegrationsManager, {
src: this.scalarClient.hasCredentials() ?
src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId) :
null,
onFinished: ()=>{
@@ -765,8 +768,10 @@ module.exports = React.createClass({
</div>;
}
var integrationsButton;
var integrationsError;
let integrationsButton;
let integrationsError;
if (this.scalarClient !== null) {
if (this.state.showIntegrationsError && this.state.scalar_error) {
console.error(this.state.scalar_error);
integrationsError = (
@@ -796,6 +801,7 @@ module.exports = React.createClass({
</div>
);
}
}
return (
<div className="mx_RoomSettings">