Fix query param resolution in Data Explorer

pull/4654/head
Christopher Henn 2018-10-25 09:26:23 -07:00 committed by Chris Henn
parent 25b226cabf
commit 4ca315ada1
2 changed files with 14 additions and 7 deletions

View File

@ -97,8 +97,8 @@ interface ConnectedProps {
draftScript: string
script: string
onUpdateQueryDrafts: (queryDrafts: CellQuery[]) => void
onChangeScript: TimeMachineContainer['handleChangeScript']
onResetTimeMachine: TimeMachineContainer['reset']
onInitFluxScript: TimeMachineContainer['handleInitFluxScript']
}
type Props = PassedProps & ConnectedProps
@ -216,15 +216,12 @@ export class DataExplorer extends PureComponent<Props, State> {
sourceLink,
queryDrafts,
onUpdateQueryDrafts,
onChangeScript,
onInitFluxScript,
} = this.props
const {query, script} = this.readQueryParams()
if (script) {
const queryDraft = {...defaultQueryDraft(QueryType.Flux), query: script}
onUpdateQueryDrafts([queryDraft])
onChangeScript(script)
onInitFluxScript(script)
return
}
@ -446,7 +443,7 @@ const ConnectedDataExplorer = (props: PassedProps & WithRouterProps) => {
draftScript={state.draftScript}
timeRange={state.timeRange}
script={state.script}
onChangeScript={container.handleChangeScript}
onInitFluxScript={container.handleInitFluxScript}
onUpdateQueryDrafts={container.handleUpdateQueryDrafts}
onResetTimeMachine={container.reset}
/>

View File

@ -151,6 +151,16 @@ export class TimeMachineContainer extends Container<TimeMachineState> {
return this.setAndPersistState({draftScript})
}
public handleInitFluxScript = (script: string) => {
const queryDraft = {...defaultQueryDraft(QueryType.Flux), query: script}
this.setAndPersistState({
script,
draftScript: script,
queryDrafts: [queryDraft],
})
}
public handleUpdateTimeRange = (timeRange: TimeRange) => {
return this.setAndPersistState({timeRange})
}