From 6ea81293ec2a32909040e8796f8189d7f3b7023f Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Thu, 19 Apr 2018 09:59:48 -0400
Subject: [PATCH] Handling errors and UI reorganization / features

- UI shows error screen if contract doesn't exist or fails fetching data
- Menu shows selected state and icons can be specified
- Component created for card alerts
---
 .../contracts/components/account-list.js       | 10 +---------
 .../backend/contracts/components/card-alert.js | 13 +++++++++++++
 .../contracts/components/contract-ui.js        |  7 +++----
 .../contracts/components/function-form.js      | 13 ++++---------
 .../backend/contracts/components/function.js   |  2 +-
 .../backend/contracts/components/menu-item.js  | 11 +++++++++--
 .../webserver/backend/contracts/view.html      |  4 +++-
 .../webserver/backend/contracts/view.js        | 18 ++++++++++++++++--
 8 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 lib/modules/webserver/backend/contracts/components/card-alert.js

diff --git a/lib/modules/webserver/backend/contracts/components/account-list.js b/lib/modules/webserver/backend/contracts/components/account-list.js
index 10328b93..abb3b96a 100644
--- a/lib/modules/webserver/backend/contracts/components/account-list.js
+++ b/lib/modules/webserver/backend/contracts/components/account-list.js
@@ -33,15 +33,7 @@ class AccountList extends React.Component {
                 <div className="card-header">
                     <h3 className="card-title">Get Accounts</h3>
                 </div>
-                {
-                    this.state.error 
-                    ? 
-                    <div className="card-alert alert alert-danger mb-0">
-                    {this.state.errorMessage}
-                    </div> 
-                    : 
-                    ''
-                }
+                <CardAlert show={this.state.error} message={this.state.errorMessage} />
                 <div className="card-body row">
                     <div className="col-md-11">
                         <code>
diff --git a/lib/modules/webserver/backend/contracts/components/card-alert.js b/lib/modules/webserver/backend/contracts/components/card-alert.js
new file mode 100644
index 00000000..890f4fe9
--- /dev/null
+++ b/lib/modules/webserver/backend/contracts/components/card-alert.js
@@ -0,0 +1,13 @@
+class CardAlert extends React.Component {    
+    render(){
+        return this.props.show ? 
+            <div className="card-alert alert alert-danger mb-0">
+            {this.props.message}
+            </div>
+            : 
+            '';
+    }
+}
+
+
+
diff --git a/lib/modules/webserver/backend/contracts/components/contract-ui.js b/lib/modules/webserver/backend/contracts/components/contract-ui.js
index 707e7788..164e06db 100644
--- a/lib/modules/webserver/backend/contracts/components/contract-ui.js
+++ b/lib/modules/webserver/backend/contracts/components/contract-ui.js
@@ -27,7 +27,6 @@ class ContractUI extends React.Component {
     }
 
     handleMenuClick(e){
-        console.log(e.target);
         e.preventDefault();
         this.setState({
             selectedTab: e.target.getAttribute('data-target')
@@ -66,9 +65,9 @@ class ContractUI extends React.Component {
                     <h3 className="page-title mb-5">{this.props.name}</h3>
                     <div>
                         <div className="list-group list-group-transparent mb-0">
-                            <MenuItem click={this.handleMenuClick} target="deploy" text="Deployment / Utils" />
-                            <MenuItem click={this.handleMenuClick} target="functions" text="Functions" />
-                            <MenuItem click={this.handleMenuClick} target="contract" text="Source Code" />
+                            <MenuItem icon="fe-file-plus" click={this.handleMenuClick} selectedTab={this.state.selectedTab} target="deploy" text="Deployment / Utils" />
+                            <MenuItem icon="fe-list" click={this.handleMenuClick} selectedTab={this.state.selectedTab} target="functions" text="Functions" />
+                            <MenuItem icon="fe-file-text" click={this.handleMenuClick} selectedTab={this.state.selectedTab} target="contract" text="Source Code" />
                         </div>
                     </div>
                 </div>
diff --git a/lib/modules/webserver/backend/contracts/components/function-form.js b/lib/modules/webserver/backend/contracts/components/function-form.js
index 6fcb8139..9e557b1e 100644
--- a/lib/modules/webserver/backend/contracts/components/function-form.js
+++ b/lib/modules/webserver/backend/contracts/components/function-form.js
@@ -39,15 +39,10 @@ class FunctionForm extends React.Component {
                 : 
                 ""
             }
-            {
-                this.state.error 
-                ? 
-                <div className="card-alert alert alert-danger mb-0">
-                {this.state.message}
-                </div>
-                : 
-                '' 
-            }
+            
+            
+            <CardAlert show={this.state.error} message={this.state.message} />
+
             <div className="card-body row">
                 <Function contract={this.props.contract} contractName={this.props.contractName} duplicated={isDuplicated} abi={this.props.abi} resultHandler={this.showResults} />
            </div>
diff --git a/lib/modules/webserver/backend/contracts/components/function.js b/lib/modules/webserver/backend/contracts/components/function.js
index 030f477a..dffd6aaf 100644
--- a/lib/modules/webserver/backend/contracts/components/function.js
+++ b/lib/modules/webserver/backend/contracts/components/function.js
@@ -162,7 +162,7 @@ class Function extends React.Component {
         return <React.Fragment>
                 { 
                     this.props.abi.inputs
-                        .map((input, i) => <input key={i} type="text" data-var-type={input.type} data-type="inputParam" data-name={input.name} placeholder={input.name} title={input.type + ' ' + input.name} size={input.name.length + 2} value={this.state.fields[input.name] || ''}  onChange={this.handleParameterChange} />)
+                        .map((input, i) => <input key={i} type="text" data-var-type={input.type} data-type="inputParam" data-name={input.name} placeholder={input.name} title={input.type + ' ' + input.name} size={input.name.length} value={this.state.fields[input.name] || ''}  onChange={this.handleParameterChange} />)
                         .reduce((accu, elem) => {
                             return accu === null ? [elem] : [...accu, ', ', elem]
                         }, null)
diff --git a/lib/modules/webserver/backend/contracts/components/menu-item.js b/lib/modules/webserver/backend/contracts/components/menu-item.js
index f975e79e..1224d13c 100644
--- a/lib/modules/webserver/backend/contracts/components/menu-item.js
+++ b/lib/modules/webserver/backend/contracts/components/menu-item.js
@@ -1,7 +1,14 @@
 class MenuItem extends React.Component {    
     render(){
-        return <a href="#" onClick={this.props.click} data-target={this.props.target} className="list-group-item list-group-item-action d-flex align-items-center">
-                <span className="icon mr-3"><i className="fe fe-file"></i></span>{this.props.text}
+
+        let classNames = "list-group-item list-group-item-action d-flex align-items-center ";
+        let icon = "fe " + this.props.icon;
+        if(this.props.target == this.props.selectedTab){
+            classNames += "active";
+        }
+
+        return <a href="#" onClick={this.props.click} data-target={this.props.target} className={classNames}>
+                <span className="icon mr-3"><i className={icon}></i></span>{this.props.text}
             </a>;
     }
 }
diff --git a/lib/modules/webserver/backend/contracts/view.html b/lib/modules/webserver/backend/contracts/view.html
index 71cf91d8..34371d55 100644
--- a/lib/modules/webserver/backend/contracts/view.html
+++ b/lib/modules/webserver/backend/contracts/view.html
@@ -54,6 +54,7 @@
     <script src="./components/source-area.js" type="text/babel"></script>
     <script src="./components/tab.js" type="text/babel"></script>
     <script src="./components/menu-item.js" type="text/babel"></script>
+    <script src="./components/card-alert.js" type="text/babel"></script>
     <script src="./view.js" type="text/babel"></script>
 
 
@@ -172,10 +173,11 @@
         </div>
         <div class="page-content">
             <div class="container">
+                            
+              
               <div id="contracts-area"></div>
 
 
-
               </div>
             </div>
         </div>
diff --git a/lib/modules/webserver/backend/contracts/view.js b/lib/modules/webserver/backend/contracts/view.js
index d989dc83..d0332774 100644
--- a/lib/modules/webserver/backend/contracts/view.js
+++ b/lib/modules/webserver/backend/contracts/view.js
@@ -25,8 +25,8 @@ fetch("/embark/console", {
     window.web3 = web3;
 
     let contractObj = new web3.eth.Contract(contractDefinition.abiDefinition);
-    contractObj.options.data = "0x" + contractDefinition.code;
-    contractObj.options.address = contractDefinition.deployedAddress;
+        contractObj.options.data    = "0x" + contractDefinition.code;
+        contractObj.options.address = contractDefinition.deployedAddress;
 
     window[contractDefinition.className] = contractObj;
 
@@ -34,4 +34,18 @@ fetch("/embark/console", {
         <ContractUI name={contractDefinition.className} definition={contractDefinition} contract={contractObj} source={contractSource} />,
         document.getElementById('contracts-area')
     );
+    })
+.catch(function(err) {
+    console.log('%cError while rendering UI', 'font-weight: bold');
+    console.error(err);
+
+    ReactDOM.render(
+        <div>
+            <h1 className="h2 mb-3">Error rendering the UI</h1>
+            <p className="h4 text-muted font-weight-normal mb-7">UI for "{contractName}" cannot be generated</p>
+        </div>,
+        document.getElementById('contracts-area')
+    );
+
+
 });