diff options
author | enahum <nahumhbl@gmail.com> | 2016-06-01 09:32:43 -0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-06-01 08:32:43 -0400 |
commit | a163f8d9849393b9ff3fa33e94b76054071b03d7 (patch) | |
tree | 35ae18ca4c32a734665f9a0637ed48f918cdddde | |
parent | c7fcb4e25db78746ec34716abe07ff61804a3785 (diff) | |
download | chat-a163f8d9849393b9ff3fa33e94b76054071b03d7.tar.gz chat-a163f8d9849393b9ff3fa33e94b76054071b03d7.tar.bz2 chat-a163f8d9849393b9ff3fa33e94b76054071b03d7.zip |
PLT-3064 Add ErrorBar to System Console (#3189)
-rw-r--r-- | webapp/components/admin_console/admin_console.jsx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx index e5c528614..33868950b 100644 --- a/webapp/components/admin_console/admin_console.jsx +++ b/webapp/components/admin_console/admin_console.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import $ from 'jquery'; import React from 'react'; +import ErrorBar from 'components/error_bar.jsx'; import AdminStore from 'stores/admin_store.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; @@ -42,8 +42,14 @@ export default class AdminConsole extends React.Component { } render() { - if ($.isEmptyObject(this.state.config)) { - return <div className='admin-console'/>; + const config = this.state.config; + if (config && Object.keys(config).length === 0 && config.constructor === 'Object') { + return ( + <div> + <ErrorBar/> + <div className='admin-console'/> + </div> + ); } // not every page in the system console will need the config, but the vast majority will @@ -52,9 +58,12 @@ export default class AdminConsole extends React.Component { }); return ( - <div className='admin-console'> - <AdminSidebar/> - {children} + <div> + <ErrorBar/> + <div className='admin-console'> + <AdminSidebar/> + {children} + </div> </div> ); } |