fix conflict

1 files changed, 34 insertions, 12 deletions

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 68984c9e0..e82fe1b76 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -2,35 +2,58 @@
 // See License.txt for license information.
 
 var AdminSidebar = require('./admin_sidebar.jsx');
-var EmailTab = require('./email_settings.jsx');
-var JobsTab = require('./jobs_settings.jsx');
+var AdminStore = require('../../stores/admin_store.jsx');
+var AsyncClient = require('../../utils/async_client.jsx');
+var LoadingScreen = require('../loading_screen.jsx');
+
+var EmailSettingsTab = require('./email_settings.jsx');
+var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
-var Navbar = require('../../components/navbar.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
         super(props);
 
         this.selectTab = this.selectTab.bind(this);
+        this.onConfigListenerChange = this.onConfigListenerChange.bind(this);
 
         this.state = {
+            config: null,
             selected: 'email_settings'
         };
     }
 
+    componentDidMount() {
+        AdminStore.addConfigChangeListener(this.onConfigListenerChange);
+        AsyncClient.getConfig();
+    }
+
+    componentWillUnmount() {
+        AdminStore.removeConfigChangeListener(this.onConfigListenerChange);
+    }
+
+    onConfigListenerChange() {
+        this.setState({
+            config: AdminStore.getConfig(),
+            selected: this.state.selected
+        });
+    }
+
     selectTab(tab) {
         this.setState({selected: tab});
     }
 
     render() {
-        var tab = '';
-
-        if (this.state.selected === 'email_settings') {
-            tab = <EmailTab />;
-        } else if (this.state.selected === 'job_settings') {
-            tab = <JobsTab />;
-        } else if (this.state.selected === 'logs') {
-            tab = <LogsTab />;
+        var tab = <LoadingScreen />;
+
+        if (this.state.config != null) {
+            if (this.state.selected === 'email_settings') {
+                tab = <EmailSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'log_settings') {
+                tab = <LogSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'logs') {
+                tab = <LogsTab />;
+            }
         }
 
         return (
@@ -45,7 +68,6 @@ export default class AdminController extends React.Component {
                 />
                 <div className='inner__wrap channel__wrap'>
                     <div className='row header'>
-                        <Navbar teamDisplayName='Admin Console' />
                     </div>
                     <div className='row main'>
                         <div