fix(multiple_queries): handling the case where multiple queries resul…

…t in the output file
influxdata · Jun 18, 2020 · cec9b0d · cec9b0d
1 parent 50932e9
commit cec9b0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ui/src/queryCache/actions/index.ts b/ui/src/queryCache/actions/index.ts
@@ -23,7 +23,7 @@ export const hashCode = (queryText: string): string => {
 export const setQueryResultsByQueryID = (queryID: string, files: string[]) =>
   ({
     type: 'SET_QUERY_RESULTS_BY_QUERY',
-    queryID: hashCode(queryID),
+    queryID,
     files,
   } as const)
 

diff --git a/ui/src/shared/components/TimeSeries.tsx b/ui/src/shared/components/TimeSeries.tsx
@@ -280,7 +280,7 @@ class TimeSeries extends Component<Props & WithRouterProps, State> {
 
       this.pendingReload = false
 
-      const queryText = queries[0].text
+      const queryText = queries.map(({text}) => text).join('')
       const queryID = hashCode(queryText)
       if (queryID && files.length) {
         onSetQueryResultsByQueryID(queryID, files)

diff --git a/ui/src/views/actions/thunks.ts b/ui/src/views/actions/thunks.ts
@@ -1,6 +1,6 @@
 // Libraries
 import {normalize} from 'normalizr'
-import {get} from 'lodash'
+
 // APIs
 import {
   getView as getViewAJAX,
@@ -150,7 +150,7 @@ export const setQueryResultsForCell = (
     const state = getState()
     const {view} = getActiveTimeMachine(state)
     const queries = view.properties.queries.filter(({text}) => !!text.trim())
-    const queryText = get(queries, '[0].text', '')
+    const queryText = queries.map(({text}) => text).join('')
     const queryID = hashCode(queryText)
     if (queryID) {
       dispatch(setQueryResultsByQueryID(queryID))