From fcbaac302b49dca3aea813f608133fd901a0fb97 Mon Sep 17 00:00:00 2001
From: Halla Moore <halla@nylas.com>
Date: Wed, 13 Jul 2016 16:31:08 -0700
Subject: [PATCH] Change dashboard error appearances

---
 packages/nylas-dashboard/public/css/app.css | 14 ++++--
 packages/nylas-dashboard/public/js/app.jsx  | 51 +++++++++++----------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/packages/nylas-dashboard/public/css/app.css b/packages/nylas-dashboard/public/css/app.css
index 27c272722..065c8232a 100644
--- a/packages/nylas-dashboard/public/css/app.css
+++ b/packages/nylas-dashboard/public/css/app.css
@@ -43,13 +43,16 @@ pre {
 .account.errored {
   color: #a94442;
   border-radius: 4px;
-  background-color: rgba(231, 195, 195, 0.6);
+  background-color: rgb(231, 195, 195);
 }
 
-.account .error pre {
-  text-overflow: ellipsis;
-  width: inherit;
-  overflow: hidden;
+.error-link {
+  font-weight: bold;
+}
+
+.error-link:hover {
+  cursor: pointer;
+  color: #702726;
 }
 
 #open-all-sync {
@@ -94,6 +97,7 @@ pre {
   left: 0;
   top: 0;
   background-color: rgba(0, 0, 0, 0.3);
+  z-index: 10;
 }
 
 .modal-close-wrapper {
diff --git a/packages/nylas-dashboard/public/js/app.jsx b/packages/nylas-dashboard/public/js/app.jsx
index 18bc942f4..ee2c0aa50 100644
--- a/packages/nylas-dashboard/public/js/app.jsx
+++ b/packages/nylas-dashboard/public/js/app.jsx
@@ -10,6 +10,7 @@ const {
   SyncGraph,
   SyncbackRequestDetails,
   ElapsedTime,
+  Modal,
 } = window;
 
 function calcAcctPosition(count) {
@@ -63,28 +64,32 @@ class Account extends React.Component {
     req.send();
   }
 
-  renderError() {
-    const {account} = this.props;
-
+  renderPolicyOrError() {
+    const account = this.props.account;
     if (account.sync_error != null) {
-      const {message, stack} = account.sync_error
-      const error = {
-        message,
-        stack: stack.slice(0, 4),
-      }
-      return (
-        <div>
-          <div className="section">Error</div>
-          <div className="action-link" onClick={() => this.clearError()}>Clear Error</div>
-          <div className="error">
-            <pre>
-              {JSON.stringify(error, null, 2)}
-            </pre>
-          </div>
-        </div>
-      )
+      return this.renderError();
     }
-    return <span />
+    return (
+      <SyncPolicy
+        accountId={account.id}
+        stringifiedSyncPolicy={JSON.stringify(account.sync_policy, null, 2)}
+      />
+    );
+  }
+
+  renderError() {
+    const {message, stack} = this.props.account.sync_error
+    return (
+      <div>
+        <div className="section">Error</div>
+        <Modal
+          openLink={{text: message, className: 'error-link'}}
+        >
+          <pre>{JSON.stringify(stack, null, 2)}</pre>
+        </Modal>
+        <div className="action-link" onClick={() => this.clearError()}>Clear Error</div>
+      </div>
+    )
   }
 
   render() {
@@ -111,10 +116,6 @@ class Account extends React.Component {
         <h3>{account.email_address} [{account.id}] {active ? '🌕' : '🌑'}</h3>
         <strong>{assignment}</strong>
         <SyncbackRequestDetails accountId={account.id} />
-        <SyncPolicy
-          accountId={account.id}
-          stringifiedSyncPolicy={JSON.stringify(account.sync_policy, null, 2)}
-        />
         <div className="section">Sync Cycles</div>
         <div className="stats">
           <b>First Sync Duration (seconds)</b>:
@@ -128,7 +129,7 @@ class Account extends React.Component {
           <b>Recent Syncs</b>:
           <SyncGraph id={account.last_sync_completions.length} syncTimestamps={account.last_sync_completions} />
         </div>
-        {this.renderError()}
+        {this.renderPolicyOrError()}
       </div>
     );
   }