From 8ec8948c84e946fde736add0c4e6dd55f6efd1ab Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 4 Jul 2017 16:12:02 -0400 Subject: PLT-6554 Add config setting to control enabling API version 3 (#6835) * Add config setting to control enabling API version 3 * Update help text for APIv3 config setting (#6843) * Update configuration_settings.jsx * Update en.json --- .../admin_console/configuration_settings.jsx | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'webapp/components/admin_console/configuration_settings.jsx') diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index 72bd0e330..6ac68a3bb 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import React from 'react'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import ErrorStore from 'stores/error_store.jsx'; @@ -47,6 +47,7 @@ export default class ConfigurationSettings extends AdminSettings { config.ServiceSettings.Forward80To443 = this.state.forward80To443; config.ServiceSettings.ReadTimeout = this.parseIntNonZero(this.state.readTimeout); config.ServiceSettings.WriteTimeout = this.parseIntNonZero(this.state.writeTimeout); + config.ServiceSettings.EnableAPIv3 = this.state.enableAPIv3; return config; } @@ -63,7 +64,8 @@ export default class ConfigurationSettings extends AdminSettings { letsEncryptCertificateCacheFile: config.ServiceSettings.LetsEncryptCertificateCacheFile, forward80To443: config.ServiceSettings.Forward80To443, readTimeout: config.ServiceSettings.ReadTimeout, - writeTimeout: config.ServiceSettings.WriteTimeout + writeTimeout: config.ServiceSettings.WriteTimeout, + enableAPIv3: config.ServiceSettings.EnableAPIv3 }; } @@ -304,6 +306,23 @@ export default class ConfigurationSettings extends AdminSettings { value={this.state.writeTimeout} onChange={this.handleChange} /> + + } + helpText={ + + } + value={this.state.enableAPIv3} + onChange={this.handleChange} + />