From 83ecf31fee228c540e2aa5479b2efabc0b85602d Mon Sep 17 00:00:00 2001
From: Kristine Norris <kris.norris@vistronix.com>
Date: Tue, 18 Oct 2016 16:05:51 +0000
Subject: [PATCH] Closes #267. Show error message from queries

---
 src/js/components/Search.jsx                  | 29 +++++++-
 .../visualization/Visualization.jsx           | 74 +++++++++++++------
 src/js/modules/utilities.jsx                  | 26 +++++++
 3 files changed, 106 insertions(+), 23 deletions(-)

diff --git a/src/js/components/Search.jsx b/src/js/components/Search.jsx
index d83e7b0..1516472 100644
--- a/src/js/components/Search.jsx
+++ b/src/js/components/Search.jsx
@@ -13,10 +13,11 @@ import {
   filtersToArray,
   getDefaultFilters,
   getNameByID,
+  renderError,
   validateFilters
 } from '../modules/utilities'
 import {fetchSearchResults, resetSearchResults} from '../modules/search-results'
-import {grey300, white} from 'material-ui/styles/colors'
+import {grey300, red500, white} from 'material-ui/styles/colors'
 import {header, headerAppName, main, verticalTop} from '../styles/common'
 import React, {Component, PropTypes} from 'react'
 
@@ -173,11 +174,35 @@ class Search extends Component {
         </div>
       )
     }
+    
+    if (searchResults.error) {
+      const {message} = searchResults.error
+      const spanStyle = {...style.span, color: red500}
+      let text = {}
+       
+      try {
+        text = JSON.parse(message)
+      } catch (err) {
+        text.label = message
+        text.data = {}
+      }
+      
+      return (
+        renderError(text, style.wrapper, spanStyle)
+      )
+    }
 
     const {data = []} = searchResults
 
     if (data.length === 0) {
-      return <div />
+      const message = {
+        label: 'No data',
+        data: {}
+      }
+      
+      return (
+        renderError(message, style.wrapper, style.span)
+      )
     }
 
     const visualization = {
diff --git a/src/js/components/visualization/Visualization.jsx b/src/js/components/visualization/Visualization.jsx
index e28fc5e..29b9b42 100644
--- a/src/js/components/visualization/Visualization.jsx
+++ b/src/js/components/visualization/Visualization.jsx
@@ -8,8 +8,8 @@ import {MapComponent} from './MapComponent'
 import {SummaryComponent} from './SummaryComponent'
 import {TableComponent} from './TableComponent'
 import VisualizationToolbar from './VisualizationToolbar'
-import {excludeEmptyFilters, filtersToArray, generateMenuItems} from '../../modules/utilities'
-import {grey300, white} from 'material-ui/styles/colors'
+import {excludeEmptyFilters, filtersToArray, generateMenuItems, renderError} from '../../modules/utilities'
+import {grey300, red500, white} from 'material-ui/styles/colors'
 import React, {Component, PropTypes} from 'react'
 
 const components = {ChartComponent, MapComponent, SummaryComponent, TableComponent}
@@ -21,6 +21,16 @@ const style = {
     flexDirection: 'column',
     height: '100%',
     overflow: 'hidden'
+  },
+  flex: {
+    flex: 1,
+    position: 'relative'
+  },
+  span: {
+    left: '50%',
+    position: 'absolute',
+    top: '50%',
+    transform: 'translate(-50%, -50%)'
   }
 }
 const getTypeGroup = (type) => {
@@ -93,6 +103,23 @@ class Visualization extends Component {
       typeGroup
     }
   }
+  
+  renderError (message) {
+    const {visualization} = this.props
+    const {name} = visualization
+    const spanStyle = {...style.span, color: red500}
+    const error = renderError(message, style.flex, spanStyle)
+     
+    return (
+      <div style={style.container}>
+        <VisualizationToolbar
+          title={name}
+          onClose={this.onClose}
+        />
+        {error}
+      </div>
+    )
+  }
 
   renderLoading () {
     const {visualization} = this.props
@@ -103,15 +130,10 @@ class Visualization extends Component {
         <VisualizationToolbar
           title={name}
         />
-        <div style={{flex: 1, position: 'relative'}}>
+        <div style={style.flex}>
           <CircularProgress
             size={0.5}
-            spanStyle={{
-              left: '50%',
-              position: 'absolute',
-              top: '50%',
-              transform: 'translate(-50%, -50%)'
-            }}
+            spanStyle={style.span}
             style={{
               verticalAlign: 'middle'
             }}
@@ -124,27 +146,23 @@ class Visualization extends Component {
   renderNoData () {
     const {visualization} = this.props
     const {name} = visualization
-
+    const message = {
+      label: 'No data',
+      data: {}
+    }
+    const error = renderError(message, style.flex, style.span)
+    
     return (
       <div style={style.container}>
         <VisualizationToolbar
           title={name}
           onClose={this.onClose}
         />
-        <div style={{flex: 1, position: 'relative'}}>
-          <span
-            style={{
-              left: '50%',
-              position: 'absolute',
-              top: '50%',
-              transform: 'translate(-50%, -50%)'
-            }}
-          >No data</span>
-        </div>
+        {error}
       </div>
     )
   }
-
+  
   renderVisualization () {
     const {results, visualization} = this.props
     const {data = []} = results
@@ -185,6 +203,20 @@ class Visualization extends Component {
     if (results.isFetching) {
       return this.renderLoading()
     }
+    
+    if (results.error) {
+      const {message} = results.error
+      let text = {}
+       
+      try {
+        text = JSON.parse(message)
+      } catch (err) {
+        text.label = message
+        text.data = {}
+      }
+     
+      return this.renderError(text)
+    }
 
     if (data.length === 0) {
       return this.renderNoData()
diff --git a/src/js/modules/utilities.jsx b/src/js/modules/utilities.jsx
index 28e3085..0ccebf7 100644
--- a/src/js/modules/utilities.jsx
+++ b/src/js/modules/utilities.jsx
@@ -213,4 +213,30 @@ export const getOptionalFilters = (requiredFilters, dashboardFilters) => {
   }
 
   return optional
+}
+
+export const renderError = (message, style, spanStyle) => {
+  const {data, label} = message
+  
+  return (
+    <div style={style}>
+      <span
+        style={spanStyle}
+      >
+        {label}
+        {
+          Object.keys(data).map((key) => {
+            return (
+              <p key={key}>
+                <span>
+                  {key}:
+                  {data[key].toString()}
+                </span>
+              </p>
+            )
+          })
+        }
+      </span>
+    </div>
+  )
 }
\ No newline at end of file