fix(de): cancel button cancels all running queries (#299)

* fix(de): update logic for cancel button to cancel all running queries * chore(de): remove unused thunk to get query status Co-authored-by: Palak Bhojani <palak@palaks-mbp-2.lan>
influxdata · Nov 11, 2020 · 72d97c5 · 72d97c5
1 parent b9fb345
commit 72d97c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/src/flows/components/header/Submit.tsx b/src/flows/components/header/Submit.tsx
@@ -24,6 +24,7 @@ import {notify} from 'src/shared/actions/notifications'
 
 // Utils
 import {event} from 'src/cloud/utils/reporting'
+import {cancelAllRunningQueries} from 'src/timeMachine/actions/queries'
 
 // Types
 import {RemoteDataState} from 'src/types'
@@ -122,6 +123,7 @@ export const Submit: FC = () => {
           onSubmit={submit}
           onNotify={fakeNotify}
           queryID=""
+          cancelAllRunningQueries={cancelAllRunningQueries}
         />
         <SquareButton
           active={active}

diff --git a/src/timeMachine/actions/queries.ts b/src/timeMachine/actions/queries.ts
@@ -220,8 +220,9 @@ const cancelQuerysByHashIDs = (queryIDs?: string[]): void => {
   })
 }
 
-export const cancelAllRunningQueries = (): void => {
+export const cancelAllRunningQueries = () => dispatch => {
   cancelQuerysByHashIDs(Object.keys(queryReference))
+  dispatch(setQueryResults(RemoteDataState.Done, null, null))
 }
 
 export const setQueryByHashID = (queryID: string, result: any): void => {
@@ -244,18 +245,6 @@ export const setQueryByHashID = (queryID: string, result: any): void => {
     })
 }
 
-export const getQueryStatusByID = (queryID: string): any => {
-  if (queryID in queryReference) {
-    return queryReference[queryID]
-  }
-  return {
-    cancel: new AbortController(),
-    issuedAt: Date.now(),
-    promise: Promise.resolve(),
-    status: RemoteDataState.NotStarted,
-  }
-}
-
 export const executeQueries = (abortController?: AbortController) => async (
   dispatch,
   getState: GetState

diff --git a/src/timeMachine/components/SubmitQueryButton.tsx b/src/timeMachine/components/SubmitQueryButton.tsx
@@ -20,7 +20,6 @@ import {getActiveTimeMachine, getActiveQuery} from 'src/timeMachine/selectors'
 import {event} from 'src/cloud/utils/reporting'
 import {queryCancelRequest} from 'src/shared/copy/notifications'
 import {
-  cancelQueryByHashID,
   cancelAllRunningQueries,
   generateHashedQueryID,
 } from 'src/timeMachine/actions/queries'
@@ -78,7 +77,7 @@ class SubmitQueryButton extends PureComponent<Props> {
   }
 
   componentWillUnmount() {
-    cancelAllRunningQueries()
+    this.props.cancelAllRunningQueries()
   }
 
   public render() {
@@ -136,11 +135,7 @@ class SubmitQueryButton extends PureComponent<Props> {
     if (this.props.onNotify) {
       this.props.onNotify(queryCancelRequest())
     }
-    if (this.props.queryID) {
-      cancelQueryByHashID(this.props.queryID)
-    } else {
-      cancelAllRunningQueries()
-    }
+    this.props.cancelAllRunningQueries()
   }
 }
 
@@ -162,6 +157,7 @@ const mstp = (state: AppState) => {
 const mdtp = {
   onSubmit: saveAndExecuteQueries,
   onNotify: notify,
+  cancelAllRunningQueries: cancelAllRunningQueries,
 }
 
 const connector = connect(mstp, mdtp)