From 803875c1bbb7a8d117dd518225fb7cdf63a38135 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Thu, 10 May 2018 16:20:22 -0700
Subject: [PATCH] Cleanup

---
 ui/src/ifql/components/FilterPreview.tsx      |  4 +-
 ui/src/ifql/components/TimeMachineEditor.tsx  |  4 +-
 .../components/time-machine/ifql-builder.scss | 69 +++++--------------
 3 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/ui/src/ifql/components/FilterPreview.tsx b/ui/src/ifql/components/FilterPreview.tsx
index 91ec55a25..e7a485cc8 100644
--- a/ui/src/ifql/components/FilterPreview.tsx
+++ b/ui/src/ifql/components/FilterPreview.tsx
@@ -1,7 +1,7 @@
 import React, {PureComponent} from 'react'
 import {BinaryExpressionNode, MemberExpressionNode} from 'src/types/ifql'
 
-type FilterNode = BinaryExpressionNode | MemberExpressionNode
+type FilterNode = BinaryExpressionNode & MemberExpressionNode
 
 interface Props {
   nodes: FilterNode[]
@@ -57,7 +57,7 @@ class FilterPreviewNode extends PureComponent<FilterPreviewNodeProps> {
         return <div className="ifql-filter--operator">{node.source}</div>
       }
       default: {
-        return ''
+        return <div />
       }
     }
   }
diff --git a/ui/src/ifql/components/TimeMachineEditor.tsx b/ui/src/ifql/components/TimeMachineEditor.tsx
index 052bfced3..f5caa40a2 100644
--- a/ui/src/ifql/components/TimeMachineEditor.tsx
+++ b/ui/src/ifql/components/TimeMachineEditor.tsx
@@ -30,7 +30,7 @@ class TimeMachineEditor extends PureComponent<Props> {
     }
 
     if (this.props.visibility === 'visible') {
-      this.editor.refresh()
+      setTimeout(() => this.editor.refresh(), 60)
     }
   }
 
@@ -54,9 +54,9 @@ class TimeMachineEditor extends PureComponent<Props> {
           autoCursor={true}
           value={script}
           options={options}
+          onKeyUp={this.handleKeyUp}
           onBeforeChange={this.updateCode}
           onTouchStart={this.onTouchStart}
-          onKeyUp={this.handleKeyUp}
           editorDidMount={this.handleMount}
         />
       </div>
diff --git a/ui/src/style/components/time-machine/ifql-builder.scss b/ui/src/style/components/time-machine/ifql-builder.scss
index fdc770300..2bfd0306e 100644
--- a/ui/src/style/components/time-machine/ifql-builder.scss
+++ b/ui/src/style/components/time-machine/ifql-builder.scss
@@ -3,16 +3,10 @@ $ifql-node-tooltip-gap: 4px;
 $ifql-node-gap: 5px;
 $ifql-node-padding: 10px;
 $ifql-arg-min-width: 120px;
-<<<<<<< Updated upstream
-=======
-
 $ifql-number-color: $c-neutrino;
 $ifql-string-color: $c-honeydew;
 $ifql-boolean-color: $c-viridian;
 $ifql-invalid-color: $c-viridian;
-
-
->>>>>>> Stashed changes
 /*
   Shared Node styles
   ------------------
@@ -232,26 +226,11 @@ $ifql-invalid-color: $c-viridian;
   ------------------------------------------------------------------------------
 */
 
-<<<<<<< Updated upstream
-.ifql-filter--expression {
-  min-height: 26px;
-  padding: 5px;
-  background-color: $g2-kevlar;
-  display: flex;
-  align-items: center;
-  border-radius: $radius - 1px;
-  transition: background-color 0.25s ease;
-  >.ifql-filter--expression {
-    background-color: $g4-onyx;
-    border-radius: $radius - 2px;
-  }
-=======
 $ifql-filter-gap: 6px;
 $ifql-filter-unit: 26px;
 $ifql-filter-unit-wrapped: 34px;
 $ifql-filter-expression: $g3-castle;
 $ifql-filter-parens: $g5-pepper;
-
 %ifql-filter-style {
   height: $ifql-filter-unit;
   line-height: $ifql-filter-unit;
@@ -264,7 +243,6 @@ $ifql-filter-parens: $g5-pepper;
   background-color: $ifql-filter-expression;
   border-radius: 3px 0 0 3px;
   padding-left: $ifql-filter-gap;
->>>>>>> Stashed changes
 }
 
 .ifql-filter--operator {
@@ -273,32 +251,23 @@ $ifql-filter-parens: $g5-pepper;
   padding: 0 ($ifql-filter-gap / 2);
 }
 
-<<<<<<< Updated upstream
-.func-node:hover {
-  .ifql-filter--expression {
-    background-color: $g4-onyx;
-    >.ifql-filter--expression {
-      background-color: $g6-smoke;
-    }
-=======
-.ifql-filter--value + .ifql-filter--operator,
-.ifql-filter--paren-close + .ifql-filter--operator {
+.ifql-filter--value+.ifql-filter--operator,
+.ifql-filter--paren-close+.ifql-filter--operator {
   padding: 0 $ifql-filter-gap;
 }
 
-.ifql-filter--key + .ifql-filter--operator {
+.ifql-filter--key+.ifql-filter--operator {
   background-color: $ifql-filter-expression;
 }
 
-.ifql-filter--key + .ifql-filter--operator + .ifql-filter--value {
+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value {
   background-color: $ifql-filter-expression;
-  border-radius: 0 3px 3px 0;  
+  border-radius: 0 3px 3px 0;
 }
 
 .ifql-filter--value {
   @extend %ifql-filter-style;
   padding-right: $ifql-filter-gap;
-
   &.number {
     color: $ifql-number-color;
   }
@@ -318,10 +287,12 @@ $ifql-filter-parens: $g5-pepper;
   background-color: $ifql-filter-parens;
   border: (($ifql-filter-unit-wrapped - $ifql-filter-unit) / 2) solid $ifql-filter-expression;
 }
+
 .ifql-filter--paren-open {
   border-right: 0;
   border-radius: 3px 0 0 3px;
 }
+
 .ifql-filter--paren-close {
   border-left: 0;
   border-radius: 0 3px 3px 0;
@@ -331,7 +302,6 @@ $ifql-filter-parens: $g5-pepper;
   position: relative;
   z-index: 2;
   background-color: $ifql-filter-parens;
-
   &:before {
     content: '';
     width: 100%;
@@ -344,25 +314,24 @@ $ifql-filter-parens: $g5-pepper;
     border-color: $ifql-filter-expression;
     z-index: -1;
     box-sizing: border-box;
->>>>>>> Stashed changes
   }
 }
 
-.ifql-filter--paren-open + .ifql-filter--key,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator, 
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value {
+.ifql-filter--paren-open+.ifql-filter--key,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value {
   @extend %ifql-filter-wrapped;
 }
 
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator,
-.ifql-filter--paren-open + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator + .ifql-filter--key + .ifql-filter--operator + .ifql-filter--value + .ifql-filter--operator {
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator,
+.ifql-filter--paren-open+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator+.ifql-filter--key+.ifql-filter--operator+.ifql-filter--value+.ifql-filter--operator {
   background-color: $ifql-filter-expression;
   height: $ifql-filter-unit-wrapped;
   line-height: $ifql-filter-unit-wrapped;
-}
+}
\ No newline at end of file