From bd48d304c34bbf999dc8c458630397718eed5d6a Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Wed, 1 Jun 2016 15:11:19 -0300
Subject: PLT-3152 Fix System Console scroll (#3198)

* PLT-3152 Fix System Console scroll

* Fix direct url access
---
 webapp/components/admin_console/admin_console.jsx | 8 +++++---
 webapp/sass/routes/_admin-console.scss            | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'webapp')

diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx
index 33868950b..682dbdeda 100644
--- a/webapp/components/admin_console/admin_console.jsx
+++ b/webapp/components/admin_console/admin_console.jsx
@@ -43,9 +43,12 @@ export default class AdminConsole extends React.Component {
 
     render() {
         const config = this.state.config;
+        if (!config) {
+            return <div/>;
+        }
         if (config && Object.keys(config).length === 0 && config.constructor === 'Object') {
             return (
-                <div>
+                <div className='admin-console__wrapper'>
                     <ErrorBar/>
                     <div className='admin-console'/>
                 </div>
@@ -56,9 +59,8 @@ export default class AdminConsole extends React.Component {
         const children = React.cloneElement(this.props.children, {
             config: this.state.config
         });
-
         return (
-            <div>
+            <div className='admin-console__wrapper'>
                 <ErrorBar/>
                 <div className='admin-console'>
                     <AdminSidebar/>
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 06db93ec5..86170ffce 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -1,5 +1,10 @@
 @charset 'UTF-8';
 
+.admin-console__wrapper {
+    height: 100%;
+    overflow: auto;
+}
+
 .admin-console {
     color: #333;
     height: 100%;
-- 
cgit v1.2.3-1-g7c22