Fix broken upper time range tempvar.

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,
-        ]
-      }
     } else {
       templatesIncludingDashTime = []
     }

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)