From 1f2f4f9e48a2ad630fa59e0996bc96378fe009fc Mon Sep 17 00:00:00 2001
From: Delmer Reed <delmer814+1@gmail.com>
Date: Wed, 11 Jul 2018 17:14:26 -0400
Subject: [PATCH] Add handler for fetching query status

---
 ui/src/shared/apis/query.ts | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/ui/src/shared/apis/query.ts b/ui/src/shared/apis/query.ts
index 416e5ec6c5..3106e38601 100644
--- a/ui/src/shared/apis/query.ts
+++ b/ui/src/shared/apis/query.ts
@@ -31,27 +31,11 @@ export const fetchTimeSeries = async (
   editQueryStatus: () => any = noop
 ) => {
   const timeSeriesPromises = queries.map(async query => {
-    const {database, rp} = query
-    const db = _.get(query, 'db', database)
-
     try {
       const text = await replace(query.text, source, templates, resolution)
-
-      handleLoading({...query, text}, editQueryStatus)
-
-      const payload = {
-        source: source.links.proxy,
-        db,
-        rp,
-        query: text,
-      }
-
-      const {data} = await proxy(payload)
-
-      return handleSuccess(data, query, editQueryStatus)
+      return handleQueryFetchStatus({...query, text}, source, editQueryStatus)
     } catch (error) {
       console.error(error)
-      handleError(error, query, editQueryStatus)
       throw error
     }
   })
@@ -59,6 +43,34 @@ export const fetchTimeSeries = async (
   return Promise.all(timeSeriesPromises)
 }
 
+const handleQueryFetchStatus = async (
+  query: Query,
+  source: Source,
+  editQueryStatus: () => any
+) => {
+  const {database, rp} = query
+  const db = _.get(query, 'db', database)
+
+  try {
+    handleLoading(query, editQueryStatus)
+
+    const payload = {
+      source: source.links.proxy,
+      db,
+      rp,
+      query: query.text,
+    }
+
+    const {data} = await proxy(payload)
+
+    return handleSuccess(data, query, editQueryStatus)
+  } catch (error) {
+    console.error(error)
+    handleError(error, query, editQueryStatus)
+    throw error
+  }
+}
+
 const replace = async (
   query: string,
   source: Source,