From 8771ee563dfd94fb3cf73a70ad66842bda3b6c32 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Mon, 8 May 2017 17:15:34 -0700
Subject: [PATCH] Fixes bugs #1424,#1425

---
 .../components/MeasurementList.js             | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/ui/src/data_explorer/components/MeasurementList.js b/ui/src/data_explorer/components/MeasurementList.js
index 9841b4b81..737cca904 100644
--- a/ui/src/data_explorer/components/MeasurementList.js
+++ b/ui/src/data_explorer/components/MeasurementList.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react'
 import classnames from 'classnames'
-import _ from 'lodash'
 
 import {showMeasurements} from 'shared/apis/metaQuery'
 import showMeasurementsParser from 'shared/parsing/showMeasurements'
@@ -125,31 +124,44 @@ const MeasurementList = React.createClass({
           const numTagsActive = Object.keys(this.props.query.tags).length
 
           return (
-            <div key={measurement}>
-              <div className={classnames('query-builder--list-item', {active: isActive})}>
-                <span onClick={isActive ? _.wrap(null, this.props.onChooseMeasurement) : _.wrap(measurement, this.props.onChooseMeasurement)}>
-                  <div className="query-builder--caret icon caret-right"></div>
+            <div
+              key={measurement}
+              onClick={
+                isActive
+                  ? () => {}
+                  : () => this.props.onChooseMeasurement(measurement)
+              }
+            >
+              <div
+                className={classnames('query-builder--list-item', {
+                  active: isActive,
+                })}
+              >
+                <span>
+                  <div className="query-builder--caret icon caret-right" />
                   {measurement}
                 </span>
-                {(isActive && numTagsActive >= 1)
-                  ? <div className={classnames('flip-toggle', {flipped: this.props.query.areTagsAccepted})} onClick={this.handleAcceptReject}>
+                {isActive && numTagsActive >= 1
+                  ? <div
+                      className={classnames('flip-toggle', {
+                        flipped: this.props.query.areTagsAccepted,
+                      })}
+                      onClick={this.handleAcceptReject}
+                    >
                       <div className="flip-toggle--container">
                         <div className="flip-toggle--front">!=</div>
                         <div className="flip-toggle--back">=</div>
                       </div>
                     </div>
-                  : null
-                }
+                  : null}
               </div>
-              {
-                isActive ?
-                <TagList
-                  query={this.props.query}
-                  onChooseTag={this.props.onChooseTag}
-                  onGroupByTag={this.props.onGroupByTag}
-                />
-                : null
-              }
+              {isActive
+                ? <TagList
+                    query={this.props.query}
+                    onChooseTag={this.props.onChooseTag}
+                    onGroupByTag={this.props.onGroupByTag}
+                  />
+                : null}
             </div>
           )
         })}