From 1d3df7ae10b7cc79e6d7ba3a0b8ed6eb4c359f60 Mon Sep 17 00:00:00 2001
From: Jared Scheib <jared.scheib@gmail.com>
Date: Mon, 21 May 2018 11:18:40 -0700
Subject: [PATCH] Correct QueryConfig to Query type in Visualization & VisView

---
 ui/src/data_explorer/components/VisView.tsx       |  6 +++---
 ui/src/data_explorer/components/Visualization.tsx |  6 +++---
 ui/src/shared/components/AutoRefresh.tsx          |  1 -
 ui/src/types/index.ts                             |  2 ++
 ui/src/types/query.ts                             |  8 ++++++++
 ui/src/utils/buildQueriesForGraphs.ts             | 11 ++---------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ui/src/data_explorer/components/VisView.tsx b/ui/src/data_explorer/components/VisView.tsx
index f15fdd4db..c31112861 100644
--- a/ui/src/data_explorer/components/VisView.tsx
+++ b/ui/src/data_explorer/components/VisView.tsx
@@ -4,12 +4,12 @@ import Table from './Table'
 import RefreshingGraph from 'src/shared/components/RefreshingGraph'
 import {DEFAULT_LINE_COLORS} from 'src/shared/constants/graphColorPalettes'
 
-import {QueryConfig, Template} from 'src/types'
+import {Query, Template} from 'src/types'
 
 interface Props {
   view: string
-  query?: QueryConfig
-  queries: QueryConfig[]
+  query?: Query
+  queries: Query[]
   templates: Template[]
   autoRefresh: number
   editQueryStatus: () => void
diff --git a/ui/src/data_explorer/components/Visualization.tsx b/ui/src/data_explorer/components/Visualization.tsx
index 3c308e848..25d11a458 100644
--- a/ui/src/data_explorer/components/Visualization.tsx
+++ b/ui/src/data_explorer/components/Visualization.tsx
@@ -9,7 +9,7 @@ import {GRAPH, TABLE} from 'src/shared/constants'
 import buildQueries from 'src/utils/buildQueriesForGraphs'
 import {ErrorHandling} from 'src/shared/decorators/errors'
 
-import {Source, QueryConfig, Template, TimeRange} from 'src/types'
+import {Source, Query, QueryConfig, Template, TimeRange} from 'src/types'
 
 const META_QUERY_REGEX = /^(show|create|drop)/i
 
@@ -101,12 +101,12 @@ class DataExplorerVisualization extends PureComponent<Props, State> {
     })
   }
 
-  private get queries(): QueryConfig[] {
+  private get queries(): Query[] {
     const {source, queryConfigs, timeRange} = this.props
     return buildQueries(source.links.proxy, queryConfigs, timeRange)
   }
 
-  private get query(): QueryConfig {
+  private get query(): Query {
     const {activeQueryIndex} = this.props
     const activeQuery = this.queries[activeQueryIndex]
     const defaultQuery = this.queries[0]
diff --git a/ui/src/shared/components/AutoRefresh.tsx b/ui/src/shared/components/AutoRefresh.tsx
index 570a5acff..98b8234b7 100644
--- a/ui/src/shared/components/AutoRefresh.tsx
+++ b/ui/src/shared/components/AutoRefresh.tsx
@@ -117,7 +117,6 @@ const AutoRefresh = (
           queries,
           resolution,
           templates,
-          // TODO: how is sourceLink being used? or do we need to be setting db & rp on query?
           editQueryStatus
         )
         const newSeries = timeSeries.map((response: TimeSeriesResponse) => ({
diff --git a/ui/src/types/index.ts b/ui/src/types/index.ts
index 7813be32c..68d256ce8 100644
--- a/ui/src/types/index.ts
+++ b/ui/src/types/index.ts
@@ -2,6 +2,7 @@ import {AuthLinks, Organization, Role, User, Me} from './auth'
 import {Template, Cell, CellQuery, Legend, Axes} from './dashboard'
 import {
   GroupBy,
+  Query,
   QueryConfig,
   Status,
   TimeRange,
@@ -31,6 +32,7 @@ export {
   CellQuery,
   Legend,
   Status,
+  Query,
   QueryConfig,
   TimeShift,
   ApplyFuncsToFieldArgs,
diff --git a/ui/src/types/query.ts b/ui/src/types/query.ts
index 5ba15c63e..3e507a921 100644
--- a/ui/src/types/query.ts
+++ b/ui/src/types/query.ts
@@ -1,4 +1,12 @@
 import {Source} from 'src/types'
+
+export interface Query {
+  host: string[]
+  text: string
+  id: string
+  queryConfig: QueryConfig
+}
+
 export interface QueryConfig {
   id?: string
   database?: string
diff --git a/ui/src/utils/buildQueriesForGraphs.ts b/ui/src/utils/buildQueriesForGraphs.ts
index 8511240f3..b6b8ee1d8 100644
--- a/ui/src/utils/buildQueriesForGraphs.ts
+++ b/ui/src/utils/buildQueriesForGraphs.ts
@@ -2,7 +2,7 @@ import _ from 'lodash'
 import {buildQuery} from 'src/utils/influxql'
 import {TYPE_QUERY_CONFIG, TYPE_SHIFTED} from 'src/dashboards/constants'
 
-import {QueryConfig, TimeRange} from 'src/types'
+import {Query, QueryConfig, TimeRange} from 'src/types'
 
 interface Statement {
   queryConfig: QueryConfig
@@ -10,19 +10,12 @@ interface Statement {
   text: string
 }
 
-interface Query {
-  host: string[]
-  text: string
-  id: string
-  queryConfig: QueryConfig
-}
-
 const buildQueries = (
   proxy: string,
   queryConfigs: QueryConfig[],
   tR: TimeRange
 ): Query[] => {
-  const statements: Statement[] = queryConfigs.map(query => {
+  const statements: Statement[] = queryConfigs.map((query: QueryConfig) => {
     const {rawText, range, id, shifts, database, measurement, fields} = query
     const timeRange: TimeRange = range || tR
     const text: string =