PLT-2257 Reorganized System Console (#3003)

* Reorganized system console

* Fixed the names of some components

* Fixed timestamp for BrandImageSetting

* Fixed merge issues

* Updated push notification settings to match master branch

* Removed top level setting pages and moved enable Gitlab/LDAP settings onto their respective pages

* Re-added restrictDirectMessage setting to system console

* Re-added email connection test and fixed some margins

* Fixed ESLint errors

* Renamed Authentication > Onboarding to Authentication > Email in the system console

* Renamed Customization > Whitelabeling to Customization > Custom Branding in System Console

* Re-added EnableOpenServer to system console

1 files changed, 133 insertions, 346 deletions

diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx
index 5eb099b8a..60818aaf9 100644
--- a/webapp/components/admin_console/rate_settings.jsx
+++ b/webapp/components/admin_console/rate_settings.jsx
@@ -1,371 +1,158 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import $ from 'jquery';
-import ReactDOM from 'react-dom';
-import Client from 'utils/web_client.jsx';
-import * as AsyncClient from 'utils/async_client.jsx';
+import React from 'react';
 
-import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'react-intl';
+import * as Utils from 'utils/utils.jsx';
 
-const holders = defineMessages({
-    queriesExample: {
-        id: 'admin.rate.queriesExample',
-        defaultMessage: 'Ex "10"'
-    },
-    memoryExample: {
-        id: 'admin.rate.memoryExample',
-        defaultMessage: 'Ex "10000"'
-    },
-    httpHeaderExample: {
-        id: 'admin.rate.httpHeaderExample',
-        defaultMessage: 'Ex "X-Real-IP", "X-Forwarded-For"'
-    },
-    saving: {
-        id: 'admin.rate.saving',
-        defaultMessage: 'Saving Config...'
-    }
-});
+import AdminSettings from './admin_settings.jsx';
+import BooleanSetting from './boolean_setting.jsx';
+import {FormattedMessage} from 'react-intl';
+import SettingsGroup from './settings_group.jsx';
+import TextSetting from './text_setting.jsx';
 
-import React from 'react';
-
-class RateSettings extends React.Component {
+export default class RateSettings extends AdminSettings {
     constructor(props) {
         super(props);
 
-        this.handleChange = this.handleChange.bind(this);
-        this.handleSubmit = this.handleSubmit.bind(this);
-
-        this.state = {
-            EnableRateLimiter: this.props.config.RateLimitSettings.EnableRateLimiter,
-            VaryByRemoteAddr: this.props.config.RateLimitSettings.VaryByRemoteAddr,
-            saveNeeded: false,
-            serverError: null
-        };
-    }
-
-    handleChange(action) {
-        var s = {saveNeeded: true, serverError: this.state.serverError};
-
-        if (action === 'EnableRateLimiterTrue') {
-            s.EnableRateLimiter = true;
-        }
-
-        if (action === 'EnableRateLimiterFalse') {
-            s.EnableRateLimiter = false;
-        }
+        this.getConfigFromState = this.getConfigFromState.bind(this);
 
-        if (action === 'VaryByRemoteAddrTrue') {
-            s.VaryByRemoteAddr = true;
-        }
+        this.renderSettings = this.renderSettings.bind(this);
 
-        if (action === 'VaryByRemoteAddrFalse') {
-            s.VaryByRemoteAddr = false;
-        }
-
-        this.setState(s);
+        this.state = Object.assign(this.state, {
+            enableRateLimiter: props.config.RateLimitSettings.EnableRateLimiter,
+            perSec: props.config.RateLimitSettings.PerSec,
+            memoryStoreSize: props.config.RateLimitSettings.MemoryStoreSize,
+            varyByRemoteAddr: props.config.RateLimitSettings.VaryByRemoteAddr,
+            varyByHeader: props.config.RateLimitSettings.VaryByHeader
+        });
     }
 
-    handleSubmit(e) {
-        e.preventDefault();
-        $('#save-button').button('loading');
-
-        var config = this.props.config;
-        config.RateLimitSettings.EnableRateLimiter = ReactDOM.findDOMNode(this.refs.EnableRateLimiter).checked;
-        config.RateLimitSettings.VaryByRemoteAddr = ReactDOM.findDOMNode(this.refs.VaryByRemoteAddr).checked;
-        config.RateLimitSettings.VaryByHeader = ReactDOM.findDOMNode(this.refs.VaryByHeader).value.trim();
+    getConfigFromState(config) {
+        config.RateLimitSettings.EnableRateLimiter = this.state.enableRateLimiter;
+        config.RateLimitSettings.PerSec = this.parseIntNonZero(this.state.perSec);
+        config.RateLimitSettings.MemoryStoreSize = this.parseIntNonZero(this.state.memoryStoreSize);
+        config.RateLimitSettings.VaryByRemoteAddr = this.state.varyByRemoteAddr;
+        config.RateLimitSettings.VaryByHeader = this.state.varyByHeader;
 
-        var PerSec = 10;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.PerSec).value, 10))) {
-            PerSec = parseInt(ReactDOM.findDOMNode(this.refs.PerSec).value, 10);
-        }
-        config.RateLimitSettings.PerSec = PerSec;
-        ReactDOM.findDOMNode(this.refs.PerSec).value = PerSec;
-
-        var MemoryStoreSize = 10000;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.MemoryStoreSize).value, 10))) {
-            MemoryStoreSize = parseInt(ReactDOM.findDOMNode(this.refs.MemoryStoreSize).value, 10);
-        }
-        config.RateLimitSettings.MemoryStoreSize = MemoryStoreSize;
-        ReactDOM.findDOMNode(this.refs.MemoryStoreSize).value = MemoryStoreSize;
+        return config;
+    }
 
-        Client.saveConfig(
-            config,
-            () => {
-                AsyncClient.getConfig();
-                this.setState({
-                    serverError: null,
-                    saveNeeded: false
-                });
-                $('#save-button').button('reset');
-            },
-            (err) => {
-                this.setState({
-                    serverError: err.message,
-                    saveNeeded: true
-                });
-                $('#save-button').button('reset');
-            }
+    renderTitle() {
+        return (
+            <h3>
+                <FormattedMessage
+                    id='admin.rate.title'
+                    defaultMessage='Rate Limit Settings'
+                />
+            </h3>
         );
     }
 
-    render() {
-        const {formatMessage} = this.props.intl;
-        var serverError = '';
-        if (this.state.serverError) {
-            serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
-        }
-
-        var saveClass = 'btn';
-        if (this.state.saveNeeded) {
-            saveClass = 'btn btn-primary';
-        }
-
+    renderSettings() {
         return (
-            <div className='wrapper--fixed'>
-
+            <SettingsGroup>
                 <div className='banner'>
                     <div className='banner__content'>
-                        <h4 className='banner__heading'>
-                            <FormattedMessage
-                                id='admin.rate.noteTitle'
-                                defaultMessage='Note:'
-                            />
-                        </h4>
-                        <p>
-                            <FormattedMessage
-                                id='admin.rate.noteDescription'
-                                defaultMessage='Changing properties in this section will require a server restart before taking effect.'
-                            />
-                        </p>
+                        <FormattedMessage
+                            id='admin.rate.noteDescription'
+                            defaultMessage='Changing properties in this section will require a server restart before taking effect.'
+                        />
                     </div>
                 </div>
-
-                <h3>
-                    <FormattedMessage
-                        id='admin.rate.title'
-                        defaultMessage='Rate Limit Settings'
-                    />
-                </h3>
-                <form
-                    className='form-horizontal'
-                    role='form'
-                >
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='EnableRateLimiter'
-                        >
-                            <FormattedMessage
-                                id='admin.rate.enableLimiterTitle'
-                                defaultMessage='Enable Rate Limiter: '
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableRateLimiter'
-                                    value='true'
-                                    ref='EnableRateLimiter'
-                                    defaultChecked={this.props.config.RateLimitSettings.EnableRateLimiter}
-                                    onChange={this.handleChange.bind(this, 'EnableRateLimiterTrue')}
-                                />
-                                <FormattedMessage
-                                    id='admin.rate.true'
-                                    defaultMessage='true'
-                                />
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableRateLimiter'
-                                    value='false'
-                                    defaultChecked={!this.props.config.RateLimitSettings.EnableRateLimiter}
-                                    onChange={this.handleChange.bind(this, 'EnableRateLimiterFalse')}
-                                />
-                                <FormattedMessage
-                                    id='admin.rate.false'
-                                    defaultMessage='false'
-                                />
-                            </label>
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.rate.enableLimiterDescription'
-                                    defaultMessage='When true, APIs are throttled at rates specified below.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='PerSec'
-                        >
-                            <FormattedMessage
-                                id='admin.rate.queriesTitle'
-                                defaultMessage='Number Of Queries Per Second:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='PerSec'
-                                ref='PerSec'
-                                placeholder={formatMessage(holders.queriesExample)}
-                                defaultValue={this.props.config.RateLimitSettings.PerSec}
-                                onChange={this.handleChange}
-                                disabled={!this.state.EnableRateLimiter}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.rate.queriesDescription'
-                                    defaultMessage='Throttles API at this number of requests per second.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='MemoryStoreSize'
-                        >
-                            <FormattedMessage
-                                id='admin.rate.memoryTitle'
-                                defaultMessage='Memory Store Size:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='MemoryStoreSize'
-                                ref='MemoryStoreSize'
-                                placeholder={formatMessage(holders.memoryExample)}
-                                defaultValue={this.props.config.RateLimitSettings.MemoryStoreSize}
-                                onChange={this.handleChange}
-                                disabled={!this.state.EnableRateLimiter}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.rate.memoryDescription'
-                                    defaultMessage='Maximum number of users sessions connected to the system as determined by "Vary By Remote Address" and "Vary By Header" settings below.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='VaryByRemoteAddr'
-                        >
-                            <FormattedMessage
-                                id='admin.rate.remoteTitle'
-                                defaultMessage='Vary By Remote Address: '
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='VaryByRemoteAddr'
-                                    value='true'
-                                    ref='VaryByRemoteAddr'
-                                    defaultChecked={this.props.config.RateLimitSettings.VaryByRemoteAddr}
-                                    onChange={this.handleChange.bind(this, 'VaryByRemoteAddrTrue')}
-                                    disabled={!this.state.EnableRateLimiter}
-                                />
-                                <FormattedMessage
-                                    id='admin.rate.true'
-                                    defaultMessage='true'
-                                />
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='VaryByRemoteAddr'
-                                    value='false'
-                                    defaultChecked={!this.props.config.RateLimitSettings.VaryByRemoteAddr}
-                                    onChange={this.handleChange.bind(this, 'VaryByRemoteAddrFalse')}
-                                    disabled={!this.state.EnableRateLimiter}
-                                />
-                                <FormattedMessage
-                                    id='admin.rate.false'
-                                    defaultMessage='false'
-                                />
-                            </label>
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.rate.remoteDescription'
-                                    defaultMessage='When true, rate limit API access by IP address.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='VaryByHeader'
-                        >
-                            <FormattedMessage
-                                id='admin.rate.httpHeaderTitle'
-                                defaultMessage='Vary By HTTP Header:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='VaryByHeader'
-                                ref='VaryByHeader'
-                                placeholder={formatMessage(holders.httpHeaderExample)}
-                                defaultValue={this.props.config.RateLimitSettings.VaryByHeader}
-                                onChange={this.handleChange}
-                                disabled={!this.state.EnableRateLimiter || this.state.VaryByRemoteAddr}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.rate.httpHeaderDescription'
-                                    defaultMessage='When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <div className='col-sm-12'>
-                            {serverError}
-                            <button
-                                disabled={!this.state.saveNeeded}
-                                type='submit'
-                                className={saveClass}
-                                onClick={this.handleSubmit}
-                                id='save-button'
-                                data-loading-text={'<span class=\'glyphicon glyphicon-refresh glyphicon-refresh-animate\'></span> ' + formatMessage(holders.saving)}
-                            >
-                                <FormattedMessage
-                                    id='admin.rate.save'
-                                    defaultMessage='Save'
-                                />
-                            </button>
-                        </div>
-                    </div>
-
-                </form>
-            </div>
+                <BooleanSetting
+                    id='enableRateLimiter'
+                    label={
+                        <FormattedMessage
+                            id='admin.rate.enableLimiterTitle'
+                            defaultMessage='Enable Rate Limiter: '
+                        />
+                    }
+                    helpText={
+                        <FormattedMessage
+                            id='admin.rate.enableLimiterDescription'
+                            defaultMessage='When true, APIs are throttled at rates specified below.'
+                        />
+                    }
+                    value={this.state.enableRateLimiter}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='perSec'
+                    label={
+                        <FormattedMessage
+                            id='admin.rate.queriesTitle'
+                            defaultMessage='Number Of Queries Per Second:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'Ex "10"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.rate.queriesDescription'
+                            defaultMessage='Throttles API at this number of requests per second.'
+                        />
+                    }
+                    value={this.state.perSec}
+                    onChange={this.handleChange}
+                    disabled={!this.state.enableRateLimiter}
+                />
+                <TextSetting
+                    id='memoryStoreSize'
+                    label={
+                        <FormattedMessage
+                            id='admin.rate.memoryTitle'
+                            defaultMessage='Memory Store Size:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.rate.memoryExample', 'Ex "10000"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.rate.memoryDescription'
+                            defaultMessage='Maximum number of users sessions connected to the system as determined by "Vary By Remote Address" and "Vary By Header" settings below.'
+                        />
+                    }
+                    value={this.state.memoryStoreSize}
+                    onChange={this.handleChange}
+                    disabled={!this.state.enableRateLimiter}
+                />
+                <BooleanSetting
+                    id='varyByRemoteAddr'
+                    label={
+                        <FormattedMessage
+                            id='admin.rate.remoteTitle'
+                            defaultMessage='Vary By Remote Address: '
+                        />
+                    }
+                    helpText={
+                        <FormattedMessage
+                            id='admin.rate.remoteDescription'
+                            defaultMessage='When true, rate limit API access by IP address.'
+                        />
+                    }
+                    value={this.state.varyByRemoteAddr}
+                    onChange={this.handleChange}
+                    disabled={!this.state.enableRateLimiter}
+                />
+                <TextSetting
+                    id='varyByHeader'
+                    label={
+                        <FormattedMessage
+                            id='admin.rate.httpHeaderTitle'
+                            defaultMessage='Vary By HTTP Header:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.rate.httpHeaderExample', 'Ex "X-Real-IP", "X-Forwarded-For"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.rate.httpHeaderDescription'
+                            defaultMessage='When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'
+                        />
+                    }
+                    value={this.state.varyByHeader}
+                    onChange={this.handleChange}
+                    disabled={!this.state.enableRateLimiter || this.state.varyByRemoteAddr}
+                />
+            </SettingsGroup>
         );
     }
-}
-
-RateSettings.propTypes = {
-    intl: intlShape.isRequired,
-    config: React.PropTypes.object
-};
-
-export default injectIntl(RateSettings);
+}
\ No newline at end of file