Merge pull request #3646 from matrix-org/travis/integration-manager-opt

Add an option to disable the use of integration managers for provisioning

Author: turt2live

res/css/_components.scss

@@ -173,7 +173,7 @@
 @import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
-@import "./views/settings/_IntegrationsManager.scss";
+@import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_KeyBackupPanel.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";

res/css/views/dialogs/_TermsDialog.scss

@@ -16,10 +16,10 @@ limitations under the License.
 
 /*
  * To avoid visual glitching of two modals stacking briefly, we customise the
- * terms dialog sizing when it will appear for the integrations manager so that
+ * terms dialog sizing when it will appear for the integration manager so that
  * it gets the same basic size as the IM's own modal.
  */
-.mx_TermsDialog_forIntegrationsManager .mx_Dialog {
+.mx_TermsDialog_forIntegrationManager .mx_Dialog {
  width: 60%;
  height: 70%;
  box-sizing: border-box;

res/css/views/settings/_IntegrationsManager.scss renamed to res/css/views/settings/_IntegrationManager.scss

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_IntegrationsManager .mx_Dialog {
+.mx_IntegrationManager .mx_Dialog {
  width: 60%;
  height: 70%;
  overflow: hidden;
@@ -23,22 +23,22 @@ limitations under the License.
  max-height: initial;
 }
 
-.mx_IntegrationsManager iframe {
+.mx_IntegrationManager iframe {
  background-color: #fff;
  border: 0px;
  width: 100%;
  height: 100%;
 }
 
-.mx_IntegrationsManager_loading h3 {
+.mx_IntegrationManager_loading h3 {
  text-align: center;
 }
 
-.mx_IntegrationsManager_error {
+.mx_IntegrationManager_error {
  text-align: center;
  padding-top: 20px;
 }
 
-.mx_IntegrationsManager_error h3 {
+.mx_IntegrationManager_error h3 {
  color: $warning-color;
 }

res/css/views/settings/_SetIntegrationManager.scss

@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SetIntegrationManager .mx_Field_input {
- @mixin mx_Settings_fullWidthField;
-}
-
 .mx_SetIntegrationManager {
  margin-top: 10px;
  margin-bottom: 10px;
@@ -32,6 +28,10 @@ limitations under the License.
  padding-left: 5px;
 }
 
-.mx_SetIntegrationManager_tooltip {
- @mixin mx_Settings_tooltip;
+.mx_SetIntegrationManager .mx_ToggleSwitch {
+ display: inline-block;
+ float: right;
+ top: 9px;
+
+ @mixin mx_Settings_fullWidthField;
 }

src/CallHandler.js

@@ -382,7 +382,7 @@ function _onAction(payload) {
 }
 
 async function _startCallApp(roomId, type) {
- // check for a working integrations manager. Technically we could put
+ // check for a working integration manager. Technically we could put
  // the state event in anyway, but the resulting widget would then not
  // work for us. Better that the user knows before everyone else in the
  // room sees it.

src/components/views/dialogs/IntegrationsDisabledDialog.js

@@ -0,0 +1,57 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {_t} from "../../../languageHandler";
+import sdk from "../../../index";
+import dis from '../../../dispatcher';
+
+export default class IntegrationsDisabledDialog extends React.Component {
+ static propTypes = {
+ onFinished: PropTypes.func.isRequired,
+ };
+
+ _onAcknowledgeClick = () => {
+ this.props.onFinished();
+ };
+
+ _onOpenSettingsClick = () => {
+ this.props.onFinished();
+ dis.dispatch({action: "view_user_settings"});
+ };
+
+ render() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+ return (
+ <BaseDialog className='mx_IntegrationsDisabledDialog' hasCancel={true}
+ onFinished={this.props.onFinished}
+ title={_t("Integrations are disabled")}>
+ <div className='mx_IntegrationsDisabledDialog_content'>
+ <p>{_t("Enable 'Manage Integrations' in Settings to do this.")}</p>
+ </div>
+ <DialogButtons
+ primaryButton={_t("Settings")}
+ onPrimaryButtonClick={this._onOpenSettingsClick}
+ cancelButton={_t("OK")}
+ onCancel={this._onAcknowledgeClick}
+ />
+ </BaseDialog>
+ );
+ }
+}

src/components/views/dialogs/IntegrationsImpossibleDialog.js

@@ -0,0 +1,55 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {_t} from "../../../languageHandler";
+import sdk from "../../../index";
+
+export default class IntegrationsImpossibleDialog extends React.Component {
+ static propTypes = {
+ onFinished: PropTypes.func.isRequired,
+ };
+
+ _onAcknowledgeClick = () => {
+ this.props.onFinished();
+ };
+
+ render() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+ return (
+ <BaseDialog className='mx_IntegrationsImpossibleDialog' hasCancel={false}
+ onFinished={this.props.onFinished}
+ title={_t("Integrations not allowed")}>
+ <div className='mx_IntegrationsImpossibleDialog_content'>
+ <p>
+ {_t(
+ "Your Riot doesn't allow you to use an Integration Manager to do this. " +
+ "Please contact an admin.",
+ )}
+ </p>
+ </div>
+ <DialogButtons
+ primaryButton={_t("OK")}
+ onPrimaryButtonClick={this._onAcknowledgeClick}
+ hasCancel={false}
+ />
+ </BaseDialog>
+ );
+ }
+}

src/components/views/dialogs/TabbedIntegrationManagerDialog.js

@@ -82,10 +82,10 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
 
  client.setTermsInteractionCallback((policyInfo, agreedUrls) => {
  // To avoid visual glitching of two modals stacking briefly, we customise the
- // terms dialog sizing when it will appear for the integrations manager so that
+ // terms dialog sizing when it will appear for the integration manager so that
  // it gets the same basic size as the IM's own modal.
  return dialogTermsInteractionCallback(
- policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationsManager',
+ policyInfo, agreedUrls, 'mx_TermsDialog_forIntegrationManager',
  );
  });
 
@@ -139,7 +139,7 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
  }
 
  _renderTab() {
- const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+ const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
  let uiUrl = null;
  if (this.state.currentScalarClient) {
  uiUrl = this.state.currentScalarClient.getScalarInterfaceUrlForRoom(
@@ -148,7 +148,7 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
  this.props.integrationId,
  );
  }
- return <IntegrationsManager
+ return <IntegrationManager
  configured={true}
  loading={this.state.currentLoading}
  connected={this.state.currentConnected}

src/components/views/dialogs/TermsDialog.js

@@ -86,7 +86,7 @@ export default class TermsDialog extends React.PureComponent {
  case Matrix.SERVICE_TYPES.IS:
  return <div>{_t("Identity Server")}<br />({host})</div>;
  case Matrix.SERVICE_TYPES.IM:
- return <div>{_t("Integrations Manager")}<br />({host})</div>;
+ return <div>{_t("Integration Manager")}<br />({host})</div>;
  }
  }
 

src/components/views/rooms/Stickerpicker.js

@@ -74,10 +74,10 @@ export default class Stickerpicker extends React.Component {
  this.forceUpdate();
  return this.scalarClient;
  }).catch((e) => {
- this._imError(_td("Failed to connect to integrations server"), e);
+ this._imError(_td("Failed to connect to integration manager"), e);
  });
  } else {
- this._imError(_td("No integrations server is configured to manage stickers with"));
+ IntegrationManagers.sharedInstance().openNoManagerDialog();
  }
  }
 
@@ -287,12 +287,17 @@ export default class Stickerpicker extends React.Component {
  return stickersContent;
  }
 
- /**
+ // Dev note: this isn't jsdoc because it's angry.
+ /*
  * Show the sticker picker overlay
  * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
- * @param {Event} e Event that triggered the function
  */
  _onShowStickersClick(e) {
+ if (!SettingsStore.getValue("integrationProvisioning")) {
+ // Intercept this case and spawn a warning.
+ return IntegrationManagers.sharedInstance().showDisabledDialog();
+ }
+
  // XXX: Simplify by using a context menu that is positioned relative to the sticker picker button
 
  const buttonRect = e.target.getBoundingClientRect();
@@ -346,7 +351,7 @@ export default class Stickerpicker extends React.Component {
  }
 
  /**
- * Launch the integrations manager on the stickers integration page
+ * Launch the integration manager on the stickers integration page
  */
  _launchManageIntegrations() {
  // TODO: Open the right integration manager for the widget