3 files changed, 50 insertions, 25 deletions

diff --git a/webapp/components/admin_console/admin_controller.jsx b/webapp/components/admin_console/admin_controller.jsx
index e4a4e28fc..aea2a0197 100644
--- a/webapp/components/admin_console/admin_controller.jsx
+++ b/webapp/components/admin_console/admin_controller.jsx
@@ -23,6 +23,7 @@ import LegalAndSupportSettingsTab from './legal_and_support_settings.jsx';
 import TeamUsersTab from './team_users.jsx';
 import TeamAnalyticsTab from '../analytics/team_analytics.jsx';
 import LdapSettingsTab from './ldap_settings.jsx';
+import ComplianceSettingsTab from './compliance_settings.jsx';
 import LicenseSettingsTab from './license_settings.jsx';
 import SystemAnalyticsTab from '../analytics/system_analytics.jsx';
 
@@ -159,6 +160,8 @@ export default class AdminController extends React.Component {
                 tab = <LegalAndSupportSettingsTab config={this.state.config}/>;
             } else if (this.state.selected === 'ldap_settings') {
                 tab = <LdapSettingsTab config={this.state.config}/>;
+            } else if (this.state.selected === 'compliance_settings') {
+                tab = <ComplianceSettingsTab config={this.state.config}/>;
             } else if (this.state.selected === 'license') {
                 tab = <LicenseSettingsTab config={this.state.config}/>;
             } else if (this.state.selected === 'team_users') {
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index 27d4a4112..8ee75e2ef 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -171,6 +171,7 @@ export default class AdminSidebar extends React.Component {
         }
 
         let ldapSettings;
+        let complianceSettings;
         let licenseSettings;
         if (global.window.mm_config.BuildEnterpriseReady === 'true') {
             if (global.window.mm_license.IsLicensed === 'true') {
@@ -188,6 +189,21 @@ export default class AdminSidebar extends React.Component {
                         </a>
                     </li>
                 );
+
+                complianceSettings = (
+                    <li>
+                        <a
+                            href='#'
+                            className={this.isSelected('compliance_settings')}
+                            onClick={this.handleClick.bind(this, 'compliance_settings', null)}
+                        >
+                            <FormattedMessage
+                                id='admin.sidebar.compliance'
+                                defaultMessage='Compliance Settings'
+                            />
+                        </a>
+                    </li>
+                );
             }
 
             licenseSettings = (
@@ -381,6 +397,7 @@ export default class AdminSidebar extends React.Component {
                                         </a>
                                     </li>
                                     {ldapSettings}
+                                    {complianceSettings}
                                     <li>
                                         <a
                                             href='#'
diff --git a/webapp/components/admin_console/audits.jsx b/webapp/components/admin_console/audits.jsx
index 28503d783..1f94de7da 100644
--- a/webapp/components/admin_console/audits.jsx
+++ b/webapp/components/admin_console/audits.jsx
@@ -3,6 +3,7 @@
 
 import LoadingScreen from '../loading_screen.jsx';
 import AuditTable from '../audit_table.jsx';
+import ComplianceReports from './compliance_reports.jsx';
 
 import AdminStore from 'stores/admin_store.jsx';
 
@@ -60,36 +61,40 @@ export default class Audits extends React.Component {
         } else {
             content = (
                 <div style={{margin: '10px'}}>
-                <AuditTable
-                    audits={this.state.audits}
-                    showUserId={true}
-                    showIp={true}
-                    showSession={true}
-                />
+                    <AuditTable
+                        audits={this.state.audits}
+                        showUserId={true}
+                        showIp={true}
+                        showSession={true}
+                    />
                 </div>
             );
         }
 
         return (
-            <div className='panel'>
-                <h3>
-                    <FormattedMessage
-                        id='admin.audits.title'
-                        defaultMessage='User Activity'
-                    />
-                </h3>
-                <button
-                    type='submit'
-                    className='btn btn-primary'
-                    onClick={this.reload}
-                >
-                    <FormattedMessage
-                        id='admin.audits.reload'
-                        defaultMessage='Reload'
-                    />
-                </button>
-                <div className='log__panel'>
-                    {content}
+            <div>
+                <ComplianceReports/>
+
+                <div className='panel'>
+                    <h3>
+                        <FormattedMessage
+                            id='admin.audits.title'
+                            defaultMessage='User Activity'
+                        />
+                    </h3>
+                    <button
+                        type='submit'
+                        className='btn btn-primary'
+                        onClick={this.reload}
+                    >
+                        <FormattedMessage
+                            id='admin.audits.reload'
+                            defaultMessage='Reload'
+                        />
+                    </button>
+                    <div className='audit__panel'>
+                        {content}
+                    </div>
                 </div>
             </div>
         );