diff options
Diffstat (limited to 'webapp/components/admin_console/admin_sidebar.jsx')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 129 |
1 files changed, 73 insertions, 56 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 5c02f419e..d812b83fd 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -175,6 +175,7 @@ export default class AdminSidebar extends React.Component { } render() { + let oauthSettings = null; let ldapSettings = null; let samlSettings = null; let complianceSettings = null; @@ -184,69 +185,93 @@ export default class AdminSidebar extends React.Component { let policy = null; if (window.mm_config.BuildEnterpriseReady === 'true') { - if (window.mm_license.IsLicensed === 'true') { - if (global.window.mm_license.LDAP === 'true') { - ldapSettings = ( - <AdminSidebarSection - name='ldap' - title={ - <FormattedMessage - id='admin.sidebar.ldap' - defaultMessage='LDAP' - /> - } + license = ( + <AdminSidebarSection + name='license' + title={ + <FormattedMessage + id='admin.sidebar.license' + defaultMessage='Edition and License' /> - ); - } + } + /> + ); + } - if (global.window.mm_license.SAML === 'true') { - samlSettings = ( - <AdminSidebarSection - name='saml' - title={ - <FormattedMessage - id='admin.sidebar.saml' - defaultMessage='SAML' - /> - } - /> - ); - } + if (window.mm_license.IsLicensed === 'true') { + if (global.window.mm_license.LDAP === 'true') { + ldapSettings = ( + <AdminSidebarSection + name='ldap' + title={ + <FormattedMessage + id='admin.sidebar.ldap' + defaultMessage='LDAP' + /> + } + /> + ); + } - if (global.window.mm_license.Compliance === 'true') { - complianceSettings = ( - <AdminSidebarSection - name='compliance' - title={ - <FormattedMessage - id='admin.sidebar.compliance' - defaultMessage='Compliance' - /> - } - /> - ); - } + if (global.window.mm_license.SAML === 'true') { + samlSettings = ( + <AdminSidebarSection + name='saml' + title={ + <FormattedMessage + id='admin.sidebar.saml' + defaultMessage='SAML' + /> + } + /> + ); + } - policy = ( + if (global.window.mm_license.Compliance === 'true') { + complianceSettings = ( <AdminSidebarSection - name='policy' + name='compliance' title={ <FormattedMessage - id='admin.sidebar.policy' - defaultMessage='Policy' + id='admin.sidebar.compliance' + defaultMessage='Compliance' /> } /> ); } - license = ( + oauthSettings = ( <AdminSidebarSection - name='license' + name='oauth' title={ <FormattedMessage - id='admin.sidebar.license' - defaultMessage='Edition and License' + id='admin.sidebar.oauth' + defaultMessage='OAuth 2.0' + /> + } + /> + ); + + policy = ( + <AdminSidebarSection + name='policy' + title={ + <FormattedMessage + id='admin.sidebar.policy' + defaultMessage='Policy' + /> + } + /> + ); + } else { + oauthSettings = ( + <AdminSidebarSection + name='gitlab' + title={ + <FormattedMessage + id='admin.sidebar.gitlab' + defaultMessage='GitLab' /> } /> @@ -396,15 +421,7 @@ export default class AdminSidebar extends React.Component { /> } /> - <AdminSidebarSection - name='gitlab' - title={ - <FormattedMessage - id='admin.sidebar.gitlab' - defaultMessage='GitLab' - /> - } - /> + {oauthSettings} {ldapSettings} {samlSettings} </AdminSidebarSection> |