From 48e46c0f3105453b13595712b4a373ea9e24980b Mon Sep 17 00:00:00 2001
From: Deniz Kusefoglu <denizk@gmail.com>
Date: Fri, 1 Jun 2018 15:34:56 -0700
Subject: [PATCH] Validate URL query for zoomed time range input & notify if
 invalid

Co-authored-by: Jared Scheib <jared.scheib@gmail.com>
Co-authored-by: Deniz Kusefoglu <denizk@gmail.com>
---
 ui/src/dashboards/containers/DashboardPage.js | 34 +++++++++++++------
 ui/src/dashboards/utils/time.ts               |  4 +--
 ui/src/shared/copy/notifications.ts           |  6 ++++
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/ui/src/dashboards/containers/DashboardPage.js b/ui/src/dashboards/containers/DashboardPage.js
index 2798cf69af..c657d680c9 100644
--- a/ui/src/dashboards/containers/DashboardPage.js
+++ b/ui/src/dashboards/containers/DashboardPage.js
@@ -50,9 +50,11 @@ import {
   TEMP_VAR_UPPER_DASHBOARD_TIME,
 } from 'shared/constants'
 import {FORMAT_INFLUXQL, defaultTimeRange} from 'src/shared/data/timeRanges'
+import {validAbsoluteTimeRange} from 'src/dashboards/utils/time'
 import {
   notifyDashboardNotFound,
   notifyInvalidTempVarValueInURLQuery,
+  notifyInvalidZoomedTimeRangeValueInURLQuery,
 } from 'shared/copy/notifications'
 import {colorsStringSchema, colorsNumberSchema} from 'shared/schemas'
 import {ErrorHandling} from 'src/shared/decorators/errors'
@@ -64,12 +66,21 @@ class DashboardPage extends Component {
     super(props)
 
     const urlQueries = queryString.parse(window.location.search)
-    const {zoomedLower = null, zoomedUpper = null} = urlQueries
+    let {zoomedLower, zoomedUpper} = urlQueries
+
+    if (!validAbsoluteTimeRange({lower: zoomedLower, upper: zoomedUpper})) {
+      if (zoomedLower || zoomedUpper) {
+        props.notify(notifyInvalidZoomedTimeRangeValueInURLQuery())
+      }
+      zoomedLower = null
+      zoomedUpper = null
+    }
 
     this.state = {
       isEditMode: false,
       selectedCell: null,
-      zoomedTimeRange: {zoomedLower, zoomedUpper},
+      zoomedLower,
+      zoomedUpper,
       scrollTop: 0,
       windowHeight: window.innerHeight,
     }
@@ -91,9 +102,11 @@ class DashboardPage extends Component {
       notify,
       getAnnotationsAsync,
       timeRange,
+      timeRange: {upper, lower},
       autoRefresh,
       location,
     } = this.props
+    const {zoomedUpper, zoomedLower} = this.state
 
     const annotationRange = millisecondTimeRange(timeRange)
     getAnnotationsAsync(source.links.annotations, annotationRange)
@@ -122,8 +135,12 @@ class DashboardPage extends Component {
       notify(notifyInvalidTempVarValueInURLQuery(invalidURLQuery))
     })
 
-    const {upper, lower} = timeRange
-    syncURLQueryFromTempVars(location, dashboard.templates, [], {upper, lower})
+    syncURLQueryFromTempVars(location, dashboard.templates, [], {
+      upper,
+      lower,
+      zoomedUpper,
+      zoomedLower,
+    })
 
     // Refresh and persists influxql generated template variable values.
     // If using auth and role is Viewer, temp vars will be stale until dashboard
@@ -343,7 +360,7 @@ class DashboardPage extends Component {
   }
 
   handleZoomedTimeRange = (zoomedLower, zoomedUpper) => {
-    this.setState({zoomedTimeRange: {zoomedLower, zoomedUpper}})
+    this.setState({zoomedLower, zoomedUpper})
     const {dashboardActions, location} = this.props
     dashboardActions.syncURLQueryFromQueriesObject(location, {
       zoomedLower,
@@ -356,10 +373,6 @@ class DashboardPage extends Component {
   }
 
   render() {
-    const {
-      zoomedTimeRange,
-      zoomedTimeRange: {zoomedLower, zoomedUpper},
-    } = this.state
     const {
       isUsingAuth,
       meRole,
@@ -387,6 +400,7 @@ class DashboardPage extends Component {
       handleClickPresentationButton,
       params: {sourceID, dashboardID},
     } = this.props
+    const {zoomedLower, zoomedUpper} = this.state
 
     const low = zoomedLower || lower
     const up = zoomedUpper || upper
@@ -469,7 +483,7 @@ class DashboardPage extends Component {
           isHidden={inPresentationMode}
           onAddCell={this.handleAddCell}
           onManualRefresh={onManualRefresh}
-          zoomedTimeRange={zoomedTimeRange}
+          zoomedTimeRange={{zoomedUpper, zoomedLower}}
           onSave={this.handleRenameDashboard}
           onCancel={this.handleCancelEditDashboard}
           onEditDashboard={this.handleEditDashboard}
diff --git a/ui/src/dashboards/utils/time.ts b/ui/src/dashboards/utils/time.ts
index befb27fe43..dcd79b4667 100644
--- a/ui/src/dashboards/utils/time.ts
+++ b/ui/src/dashboards/utils/time.ts
@@ -34,9 +34,7 @@ export const millisecondTimeRange = ({
   return {since, until}
 }
 
-export const validRelativeTimeRange = (
-  timeRange: TimeRange
-): TimeRange | null => {
+const validRelativeTimeRange = (timeRange: TimeRange): TimeRange | null => {
   const matchedRange = timeRanges.find(t => t.lower === timeRange.lower)
 
   if (matchedRange) {
diff --git a/ui/src/shared/copy/notifications.ts b/ui/src/shared/copy/notifications.ts
index 319f7dd22f..e868817edf 100644
--- a/ui/src/shared/copy/notifications.ts
+++ b/ui/src/shared/copy/notifications.ts
@@ -452,6 +452,12 @@ export const notifyInvalidTimeRangeValueInURLQuery = () => ({
   message: `Invalid URL query value supplied for lower or upper time range.`,
 })
 
+export const notifyInvalidZoomedTimeRangeValueInURLQuery = () => ({
+  ...defaultErrorNotification,
+  icon: 'cube',
+  message: `Invalid URL query value supplied for zoomed lower or zoomed upper time range.`,
+})
+
 //  Rule Builder Notifications
 //  ----------------------------------------------------------------------------
 export const notifyAlertRuleCreated = () => ({