Fix consuming source from context in FieldList
parent
eb73b090cd
commit
7dd3741b5c
|
@ -7,6 +7,8 @@ import FieldList from 'src/shared/components/FieldList'
|
|||
|
||||
import {defaultEveryFrequency} from 'src/kapacitor/constants'
|
||||
|
||||
import {SourceContext} from 'src/CheckSources'
|
||||
|
||||
const makeQueryHandlers = (actions, query) => ({
|
||||
handleChooseNamespace: namespace => {
|
||||
actions.chooseNamespace(query.id, namespace)
|
||||
|
@ -66,28 +68,36 @@ const DataSection = ({
|
|||
} = makeQueryHandlers(actions, query)
|
||||
|
||||
return (
|
||||
<div className="rule-section">
|
||||
<div className="query-builder">
|
||||
<DatabaseList query={query} onChooseNamespace={handleChooseNamespace} />
|
||||
<MeasurementList
|
||||
query={query}
|
||||
onChooseMeasurement={handleChooseMeasurement}
|
||||
onChooseTag={handleChooseTag}
|
||||
onGroupByTag={handleGroupByTag}
|
||||
onToggleTagAcceptance={handleToggleTagAcceptance}
|
||||
/>
|
||||
{isDeadman ? null : (
|
||||
<FieldList
|
||||
query={query}
|
||||
onToggleField={handleToggleField}
|
||||
isKapacitorRule={isKapacitorRule}
|
||||
onGroupByTime={handleGroupByTime}
|
||||
removeFuncs={handleRemoveFuncs}
|
||||
applyFuncsToField={handleApplyFuncsToField(onAddEvery)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<SourceContext.Consumer>
|
||||
{source => (
|
||||
<div className="rule-section">
|
||||
<div className="query-builder">
|
||||
<DatabaseList
|
||||
query={query}
|
||||
onChooseNamespace={handleChooseNamespace}
|
||||
/>
|
||||
<MeasurementList
|
||||
query={query}
|
||||
onChooseMeasurement={handleChooseMeasurement}
|
||||
onChooseTag={handleChooseTag}
|
||||
onGroupByTag={handleGroupByTag}
|
||||
onToggleTagAcceptance={handleToggleTagAcceptance}
|
||||
/>
|
||||
{isDeadman ? null : (
|
||||
<FieldList
|
||||
query={query}
|
||||
onToggleField={handleToggleField}
|
||||
isKapacitorRule={isKapacitorRule}
|
||||
onGroupByTime={handleGroupByTime}
|
||||
removeFuncs={handleRemoveFuncs}
|
||||
applyFuncsToField={handleApplyFuncsToField(onAddEvery)}
|
||||
source={source}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</SourceContext.Consumer>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -61,18 +61,15 @@ interface Props {
|
|||
addInitialField: (field: Field, groupBy: GroupBy) => void
|
||||
initialGroupByTime: string | null
|
||||
isQuerySupportedByExplorer: boolean
|
||||
source: Source
|
||||
}
|
||||
|
||||
interface State {
|
||||
fields: Field[]
|
||||
}
|
||||
|
||||
interface Context {
|
||||
source: Source
|
||||
}
|
||||
@ErrorHandling
|
||||
class FieldList extends PureComponent<Props, State> {
|
||||
public static context: Context
|
||||
public static defaultProps: Partial<Props> = {
|
||||
isKapacitorRule: false,
|
||||
initialGroupByTime: null,
|
||||
|
@ -249,8 +246,7 @@ class FieldList extends PureComponent<Props, State> {
|
|||
|
||||
private getFields = (): void => {
|
||||
const {database, measurement, retentionPolicy} = this.props.query
|
||||
const {source} = this.context
|
||||
const {querySource} = this.props
|
||||
const {querySource, source} = this.props
|
||||
|
||||
const proxy =
|
||||
_.get(querySource, ['links', 'proxy'], null) || source.links.proxy
|
||||
|
|
Loading…
Reference in New Issue