From b86761e83d19e5ca64e094c70401de4d13e27a13 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 17 Oct 2018 18:53:33 -0400
Subject: [PATCH] restrict logs; switch order in dashboard; don't limit height
 in contracts box

---
 embark-ui/src/components/Console.js       |  4 +--
 embark-ui/src/components/Processes.js     |  2 --
 embark-ui/src/containers/HomeContainer.js | 30 +++++++++++------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/embark-ui/src/components/Console.js b/embark-ui/src/components/Console.js
index 0119697a0..4f56f7da2 100644
--- a/embark-ui/src/components/Console.js
+++ b/embark-ui/src/components/Console.js
@@ -42,7 +42,7 @@ class Console extends Component {
   renderNav() {
     return (
       <Nav tabs>
-        {this.props.processes.map((process) => (
+        {this.props.processes.filter((p) => ["embark", "blockchain"].indexOf(p.name) >= 0).map((process) => (
           <NavItem key={process.name}>
             <NavLink
               className={classnames({ active: this.state.activeTab === process.name })}
@@ -79,7 +79,7 @@ class Console extends Component {
 
     return (
       <TabContent activeTab={this.state.activeTab}>
-        {processes.map(process => (
+        {processes.filter((p) => ["embark", "blockchain"].indexOf(p.name) >= 0).map(process => (
           <TabPane key={process.name} tabId={process.name}>
             <Logs>
               {processLogs
diff --git a/embark-ui/src/components/Processes.js b/embark-ui/src/components/Processes.js
index 9701db555..fc4389f27 100644
--- a/embark-ui/src/components/Processes.js
+++ b/embark-ui/src/components/Processes.js
@@ -18,8 +18,6 @@ function iconClasses(state){
   });
 }
 
-// processList.push({state: service.status, name: serviceName, description: service.name})
-
 const Process = ({process}) => (
   <Col sm={6} lg={2}>
     <Widget02 header={process.name} mainText={process.description} icon={iconClasses(process.state)} color={colorClasses(process.state)} variant="1" />
diff --git a/embark-ui/src/containers/HomeContainer.js b/embark-ui/src/containers/HomeContainer.js
index 840b8d34d..eab24794a 100644
--- a/embark-ui/src/containers/HomeContainer.js
+++ b/embark-ui/src/containers/HomeContainer.js
@@ -5,6 +5,7 @@ import {connect} from 'react-redux';
 import {
   Card,
   CardHeader,
+  CardTitle,
   CardBody
 } from 'reactstrap';
 
@@ -62,25 +63,11 @@ class HomeContainer extends Component {
         <DataWrapper shouldRender={this.props.services.length > 0 } {...this.props} render={({services}) => (
           <Processes processes={services} />
         )} />
-        <DataWrapper shouldRender={this.props.contracts.length > 0} {...this.props} render={({contracts}) => (
-          <Card>
-            <CardHeader>
-              Deployed Contracts
-            </CardHeader>
-            <CardBody>
-              <div style={{maxHeight: '227px', marginBottom: '1.5rem', overflow: 'auto'}}>
-                <ContractsList contracts={contracts} />
-              </div>
-            </CardBody>
-          </Card>
-        )} />
 
         <DataWrapper shouldRender={this.props.processes.length > 0 } {...this.props} render={({processes, postCommand, postCommandSuggestions, processLogs, commandSuggestions}) => (
           <Card>
-            <CardHeader>
-              Console
-            </CardHeader>
             <CardBody>
+              <CardTitle>Console</CardTitle>
               <Console activeProcess={this.state.activeProcess}
                        postCommand={postCommand}
                        postCommandSuggestions={postCommandSuggestions}
@@ -92,6 +79,19 @@ class HomeContainer extends Component {
             </CardBody>
           </Card>
         )} />
+
+        <DataWrapper shouldRender={this.props.contracts.length > 0} {...this.props} render={({contracts}) => (
+          <Card>
+            <CardBody>
+              <CardTitle>Deployed Contracts</CardTitle>
+              <div style={{marginBottom: '1.5rem', overflow: 'auto'}}>
+                <ContractsList contracts={contracts} />
+              </div>
+            </CardBody>
+          </Card>
+        )} />
+
+
       </React.Fragment>
     );
   }