Merge branch 'feat/conditionally-query-cell' of github.com:influxdata…

…/influxdb into feat/conditionally-query-cell
influxdata · Jun 22, 2020 · 638733e · 638733e
2 parents db370b9 + 101f2e9
commit 638733e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 56 deletions.
diff --git a/ui/src/dashboards/components/EditVEO.tsx b/ui/src/dashboards/components/EditVEO.tsx
@@ -12,7 +12,7 @@ import VEOHeader from 'src/dashboards/components/VEOHeader'
 // Actions
 import {setName} from 'src/timeMachine/actions'
 import {saveVEOView} from 'src/dashboards/actions/thunks'
-import {setQueryResultsForCell} from 'src/views/actions/thunks'
+import {getViewAndResultsForVEO} from 'src/views/actions/thunks'
 
 // Utils
 import {getActiveTimeMachine} from 'src/timeMachine/selectors'
@@ -21,9 +21,9 @@ import {getActiveTimeMachine} from 'src/timeMachine/selectors'
 import {AppState, RemoteDataState, QueryView, TimeMachineID} from 'src/types'
 
 interface DispatchProps {
+  getViewAndResultsForVEO: typeof getViewAndResultsForVEO
   onSetName: typeof setName
   onSaveView: typeof saveVEOView
-  setQueryResultsForCell: typeof setQueryResultsForCell
 }
 
 interface StateProps {
@@ -35,18 +35,18 @@ type Props = DispatchProps & StateProps & WithRouterProps
 
 const EditViewVEO: FunctionComponent<Props> = ({
   activeTimeMachineID,
+  getViewAndResultsForVEO,
   onSaveView,
   onSetName,
   params: {orgID, cellID, dashboardID},
   router,
-  setQueryResultsForCell,
   view,
 }) => {
   useEffect(() => {
     // TODO split this up into "loadView" "setActiveTimeMachine"
     // and something to tell the component to pull from the context
     // of the dashboardID
-    setQueryResultsForCell(dashboardID, cellID, 'veo')
+    getViewAndResultsForVEO(dashboardID, cellID, 'veo')
   }, [])
 
   const handleClose = () => {
@@ -98,9 +98,9 @@ const mstp = (state: AppState): StateProps => {
 }
 
 const mdtp: DispatchProps = {
+  getViewAndResultsForVEO: getViewAndResultsForVEO,
   onSetName: setName,
   onSaveView: saveVEOView,
-  setQueryResultsForCell: setQueryResultsForCell,
 }
 
 export default connect<StateProps, DispatchProps, {}>(

diff --git a/ui/src/shared/components/TimeSeries.tsx b/ui/src/shared/components/TimeSeries.tsx
@@ -285,6 +285,12 @@ class TimeSeries extends Component<Props & WithRouterProps, State> {
         onSetQueryResultsByQueryID(queryID, files)
       }
 
+      const queryText = queries.map(({text}) => text).join('')
+      const queryID = hashCode(queryText)
+      if (queryID && files.length) {
+        onSetQueryResultsByQueryID(queryID, files)
+      }
+
       this.setState({
         giraffeResult,
         errorMessage,

diff --git a/ui/src/views/actions/thunks.ts b/ui/src/views/actions/thunks.ts
@@ -95,7 +95,7 @@ export const updateViewAndVariables = (
   }
 }
 
-export const getViewForTimeMachine = (
+export const getViewAndResultsForVEO = (
   dashboardID: string,
   cellID: string,
   timeMachineID: TimeMachineID
@@ -115,61 +115,21 @@ export const getViewForTimeMachine = (
         view,
       })
     )
-  } catch (error) {
-    console.error(error)
-    dispatch(notify(copy.getViewFailed(error.message)))
-    dispatch(setView(cellID, RemoteDataState.Error))
-  }
-}
-
-export const setQueryResultsByQueryID = (queryID: string) => (
-  dispatch,
-  getState: GetState
-): Promise<void> => {
-  try {
-    const state = getState()
-    const files = state.queryCache.queryResultsByQueryID[queryID]
-    if (files) {
-      dispatch(setQueryResults(RemoteDataState.Done, files, null, null))
-      return
-    }
-    dispatch(executeQueries())
-  } catch (error) {
-    // if the files don't exist in the cache, we want to execute the query
-    dispatch(executeQueries())
-  }
-}
-
-export const setQueryResultsForCell = (
-  dashboardID: string,
-  cellID: string,
-  timeMachineID: TimeMachineID
-) => async (dispatch, getState: GetState): Promise<void> => {
-  try {
-    const state = getState()
-
-    let view = getByID<View>(state, ResourceType.Views, cellID) as QueryView
-
-    if (!view) {
-      dispatch(setView(cellID, RemoteDataState.Loading))
-      view = (await getViewAJAX(dashboardID, cellID)) as QueryView
-    }
-
-    dispatch(
-      setActiveTimeMachine(timeMachineID, {
-        contextID: dashboardID,
-        view,
-      })
-    )
-    const {view} = getActiveTimeMachine(state)
     const queries = view.properties.queries.filter(({text}) => !!text.trim())
+    if (!queries.length) {
+      dispatch(setQueryResults(RemoteDataState.Done, [], null))
+    }
     const queryText = queries.map(({text}) => text).join('')
     const queryID = hashCode(queryText)
-    if (queryID) {
-      dispatch(setQueryResultsByQueryID(queryID))
+    const files = get(
+      state,
+      ['queryCache', 'queryResultsByQueryID', queryID],
+      undefined
+    )
+    if (files) {
+      dispatch(setQueryResults(RemoteDataState.Done, files, null, null))
       return
     }
-    dispatch(executeQueries())
   } catch (error) {
     console.error(error)
     dispatch(notify(copy.getViewFailed(error.message)))