diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-06 16:07:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-06 16:07:56 -0400 |
commit | b114062c1b8128fe650fce72454ba4f1fcbe5733 (patch) | |
tree | 0a51e9d1342bf89c435662c618d9aac5ba651b4b /webapp/components/admin_console/configuration_settings.jsx | |
parent | b1520d0b9458d1dab09d9e3e05dd7522fc28ba57 (diff) | |
download | chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.tar.gz chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.tar.bz2 chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.zip |
PLT-3237 Update displayed config values in admin console after saving (#3506)
* Reloaded admin console data when settings are saved
* Fixed attempting to save an invalid config setting overwriting the stored config
Diffstat (limited to 'webapp/components/admin_console/configuration_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index 4f88a1954..e34167a30 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -19,17 +19,12 @@ export default class ConfigurationSettings extends AdminSettings { this.getConfigFromState = this.getConfigFromState.bind(this); this.renderSettings = this.renderSettings.bind(this); - - this.state = Object.assign(this.state, { - listenAddress: props.config.ServiceSettings.ListenAddress, - webserverMode: props.config.ServiceSettings.WebserverMode - }); } componentWillReceiveProps(nextProps) { - if (nextProps.config.ServiceSettings.ListenAddress !== this.props.config.ServiceSettings.ListenAddress) { - this.setState({listenAddress: nextProps.config.ServiceSettings.ListenAddress}); - } + // special case for this page since we don't update AdminSettings components when the + // stored config changes, but we want this page to update when you reload the config + this.setState(this.getStateFromConfig(nextProps.config)); } getConfigFromState(config) { @@ -39,6 +34,13 @@ export default class ConfigurationSettings extends AdminSettings { return config; } + getStateFromConfig(config) { + return { + listenAddress: config.ServiceSettings.ListenAddress, + webserverMode: config.ServiceSettings.WebserverMode + }; + } + renderTitle() { return ( <h3> |