summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-06-06 13:04:02 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-06-06 13:04:02 -0400
commit629b49a119cf58451a80e4667a6f876bea00e6aa (patch)
tree1a9a33b8b9aa10bcb02c53f09b5ba1e523c56237 /webapp
parent384d0eb245e2aa325fdcfe2d8ee22a40c91af589 (diff)
downloadchat-629b49a119cf58451a80e4667a6f876bea00e6aa.tar.gz
chat-629b49a119cf58451a80e4667a6f876bea00e6aa.tar.bz2
chat-629b49a119cf58451a80e4667a6f876bea00e6aa.zip
Remove data source replica from system console UI (#3267)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/database_settings.jsx28
1 files changed, 2 insertions, 26 deletions
diff --git a/webapp/components/admin_console/database_settings.jsx b/webapp/components/admin_console/database_settings.jsx
index 97a6b692c..79c464a03 100644
--- a/webapp/components/admin_console/database_settings.jsx
+++ b/webapp/components/admin_console/database_settings.jsx
@@ -24,7 +24,6 @@ export default class DatabaseSettings extends AdminSettings {
this.state = Object.assign(this.state, {
driverName: this.props.config.SqlSettings.DriverName,
dataSource: this.props.config.SqlSettings.DataSource,
- dataSourceReplicas: this.props.config.SqlSettings.DataSourceReplicas,
maxIdleConns: props.config.SqlSettings.MaxIdleConns,
maxOpenConns: props.config.SqlSettings.MaxOpenConns,
atRestEncryptKey: props.config.SqlSettings.AtRestEncryptKey,
@@ -33,7 +32,7 @@ export default class DatabaseSettings extends AdminSettings {
}
getConfigFromState(config) {
- // driverName, dataSource, and dataSourceReplicas are read-only from the UI
+ // driverName and dataSource are read-only from the UI
config.SqlSettings.MaxIdleConns = this.parseIntNonZero(this.state.maxIdleConns);
config.SqlSettings.MaxOpenConns = this.parseIntNonZero(this.state.maxOpenConns);
@@ -57,15 +56,6 @@ export default class DatabaseSettings extends AdminSettings {
renderSettings() {
const dataSource = '**********' + this.state.dataSource.substring(this.state.dataSource.indexOf('@'));
- let dataSourceReplicas = '';
- this.state.dataSourceReplicas.forEach((replica) => {
- dataSourceReplicas += '[**********' + replica.substring(replica.indexOf('@')) + '] ';
- });
-
- if (this.state.dataSourceReplicas.length === 0) {
- dataSourceReplicas = 'none';
- }
-
return (
<SettingsGroup>
<p>
@@ -102,20 +92,6 @@ export default class DatabaseSettings extends AdminSettings {
<p className='help-text'>{dataSource}</p>
</div>
</div>
- <div className='form-group'>
- <label
- className='control-label col-sm-4'
- htmlFor='DataSourceReplicas'
- >
- <FormattedMessage
- id='admin.sql.replicas'
- defaultMessage='Data Source Replicas:'
- />
- </label>
- <div className='col-sm-8'>
- <p className='help-text'>{dataSourceReplicas}</p>
- </div>
- </div>
<TextSetting
id='maxIdleConns'
label={
@@ -191,4 +167,4 @@ export default class DatabaseSettings extends AdminSettings {
</SettingsGroup>
);
}
-} \ No newline at end of file
+}