From ce3305fabdd908bda801c8bf90f89cfc64c216e0 Mon Sep 17 00:00:00 2001
From: Hunter Trujillo <cryptoquick@gmail.com>
Date: Fri, 7 Jul 2017 08:34:03 -0600
Subject: [PATCH] Fix broken upper time range tempvar.

---
 ui/src/dashboards/containers/DashboardPage.js | 22 ++++++-------------
 ui/src/shared/components/LayoutRenderer.js    |  7 ++++--
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ui/src/dashboards/containers/DashboardPage.js b/ui/src/dashboards/containers/DashboardPage.js
index 6a6833422a..f541b4fd40 100644
--- a/ui/src/dashboards/containers/DashboardPage.js
+++ b/ui/src/dashboards/containers/DashboardPage.js
@@ -280,7 +280,7 @@ class DashboardPage extends Component {
       type: 'constant',
       values: [
         {
-          value: upper,
+          value: upper || 'now()',
           type: 'constant',
           selected: true,
         },
@@ -301,20 +301,12 @@ class DashboardPage extends Component {
 
     let templatesIncludingDashTime
     if (dashboard) {
-      if (upper) {
-        templatesIncludingDashTime = [
-          ...dashboard.templates,
-          dashboardTime,
-          upperDashboardTime,
-          interval,
-        ]
-      } else {
-        templatesIncludingDashTime = [
-          ...dashboard.templates,
-          dashboardTime,
-          interval,
-        ]
-      }
+      templatesIncludingDashTime = [
+        ...dashboard.templates,
+        dashboardTime,
+        upperDashboardTime,
+        interval,
+      ]
     } else {
       templatesIncludingDashTime = []
     }
diff --git a/ui/src/shared/components/LayoutRenderer.js b/ui/src/shared/components/LayoutRenderer.js
index 7e0aef58b7..c4dc00725c 100644
--- a/ui/src/shared/components/LayoutRenderer.js
+++ b/ui/src/shared/components/LayoutRenderer.js
@@ -88,7 +88,10 @@ class LayoutRenderer extends Component {
       let queryText
       if (query.queryConfig) {
         const {queryConfig: {rawText, range}} = query
-        const timeRange = range || {upper: null, lower: ':dashboardTime:'}
+        const timeRange = range || {
+          upper: ':upperDashboardTime:',
+          lower: ':dashboardTime:',
+        }
         queryText = rawText || buildInfluxQLQuery(timeRange, query.queryConfig)
       } else {
         queryText = this.buildQueryForOldQuerySchema(query)
@@ -210,7 +213,7 @@ class LayoutRenderer extends Component {
           PAGE_HEADER_HEIGHT -
           PAGE_CONTAINER_MARGIN -
           PAGE_CONTAINER_MARGIN) /
-          STATUS_PAGE_ROW_COUNT
+        STATUS_PAGE_ROW_COUNT
       : DASHBOARD_LAYOUT_ROW_HEIGHT
   }