From f8da71f0279a4f849a341725a244be4b2f2fe646 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Thu, 20 Apr 2017 12:12:02 -0700
Subject: [PATCH] Be the change, again

---
 .../components/RawQueryEditor.js              | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/ui/src/data_explorer/components/RawQueryEditor.js b/ui/src/data_explorer/components/RawQueryEditor.js
index 5ced519d2..8772f78a4 100644
--- a/ui/src/data_explorer/components/RawQueryEditor.js
+++ b/ui/src/data_explorer/components/RawQueryEditor.js
@@ -1,28 +1,28 @@
-import React, {PropTypes} from 'react'
+import React, {PropTypes, Component} from 'react'
 import classNames from 'classnames'
 import Dropdown from 'src/shared/components/Dropdown'
 import LoadingDots from 'src/shared/components/LoadingDots'
+import TemplateDrawer from 'src/shared/components/TemplateDrawer'
 import {QUERY_TEMPLATES} from 'src/data_explorer/constants'
 
-const {func, shape, string} = PropTypes
-const RawQueryEditor = React.createClass({
-  propTypes: {
-    query: string.isRequired,
-    onUpdate: func.isRequired,
-    config: shape().isRequired,
-  },
-
-  getInitialState() {
-    return {
+class RawQueryEditor extends Component {
+  constructor(props) {
+    super(props)
+    this.state = {
       value: this.props.query,
     }
-  },
+
+    this.handleKeyDown = ::this.handleKeyDown
+    this.handleChange = ::this.handleChange
+    this.handleUpdate = ::this.handleUpdate
+    this.handleChooseTemplate = ::this.handleChooseTemplate
+  }
 
   componentWillReceiveProps(nextProps) {
     if (this.props.query !== nextProps.query) {
       this.setState({value: nextProps.query})
     }
-  },
+  }
 
   handleKeyDown(e) {
     if (e.key === 'Enter') {
@@ -33,21 +33,21 @@ const RawQueryEditor = React.createClass({
         this.editor.blur()
       })
     }
-  },
+  }
 
   handleChange() {
     this.setState({
       value: this.editor.value,
     })
-  },
+  }
 
   handleUpdate() {
     this.props.onUpdate(this.state.value)
-  },
+  }
 
   handleChooseTemplate(template) {
     this.setState({value: template.query})
-  },
+  }
 
   render() {
     const {config: {status}} = this.props
@@ -60,7 +60,7 @@ const RawQueryEditor = React.createClass({
           onChange={this.handleChange}
           onKeyDown={this.handleKeyDown}
           onBlur={this.handleUpdate}
-          ref={editor => this.editor = editor}
+          ref={editor => (this.editor = editor)}
           value={value}
           placeholder="Enter a query or select database, measurement, and field below and have us build one for you..."
           autoComplete="off"
@@ -75,7 +75,7 @@ const RawQueryEditor = React.createClass({
         />
       </div>
     )
-  },
+  }
 
   renderStatus(status) {
     if (!status) {
@@ -108,7 +108,15 @@ const RawQueryEditor = React.createClass({
         {status.error || status.warn || status.success}
       </div>
     )
-  },
-})
+  }
+}
+
+const {func, shape, string} = PropTypes
+
+RawQueryEditor.propTypes = {
+  query: string.isRequired,
+  onUpdate: func.isRequired,
+  config: shape().isRequired,
+}
 
 export default RawQueryEditor