IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

QueryEditor: Clean-up interface to only have one PanelData (#19249)

Browse Source 
* QueryEditor: Clean-up interface to only have one PanelData

* Renamed to prop name to data
This commit is contained in:
Torkel Ödegaard
2019-09-23 11:13:33 +02:00
committed by GitHub
parent fd7e2a21a1
commit bbf2bd18fd
9 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
View File

@@ -92,7 +92,7 @@ export class PromQueryEditor extends PureComponent<Props, State> {
};
render() {
const { datasource, query, panelData, queryResponse } = this.props;
const { datasource, query, data } = this.props;
const { formatOption, instant, interval, intervalFactorOption, legendFormat } = this.state;
return (
@@ -103,8 +103,7 @@ export class PromQueryEditor extends PureComponent<Props, State> {
onRunQuery={this.onRunQuery}
onChange={this.onFieldChange}
history={[]}
panelData={panelData}
queryResponse={queryResponse}
data={data}
datasourceStatus={DataSourceStatus.Connected} // TODO: replace with real DataSourceStatus
/>
@@ -165,7 +164,7 @@ export class PromQueryEditor extends PureComponent<Props, State> {
<PromLink
datasource={datasource}
query={this.query} // Use modified query
panelData={panelData}
panelData={data}
/>
</FormLabel>
</div>

18
public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
View File

@@ -152,9 +152,9 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
}
componentDidUpdate(prevProps: PromQueryFieldProps) {
const { queryResponse } = this.props;
const { data } = this.props;
if (queryResponse && prevProps.queryResponse && prevProps.queryResponse.series !== queryResponse.series) {
if (data && prevProps.data && prevProps.data.series !== data.series) {
this.refreshHint();
}
@@ -175,16 +175,14 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
}
refreshHint = () => {
const { datasource, query, queryResponse } = this.props;
const { datasource, query, data } = this.props;
if (!queryResponse || queryResponse.series.length === 0) {
if (!data || data.series.length === 0) {
this.setState({ hint: null });
return;
}
const result = isDataFrame(queryResponse.series[0])
? queryResponse.series.map(toLegacyResponseData)
: queryResponse.series;
const result = isDataFrame(data.series[0]) ? data.series.map(toLegacyResponseData) : data.series;
const hints = datasource.getQueryHints(query, result);
const hint = hints && hints.length > 0 ? hints[0] : null;
this.setState({ hint });
@@ -297,12 +295,12 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
};
render() {
const { queryResponse, query, datasourceStatus } = this.props;
const { data, query, datasourceStatus } = this.props;
const { metricsOptions, syntaxLoaded, hint } = this.state;
const cleanText = this.languageProvider ? this.languageProvider.cleanText : undefined;
const chooserText = getChooserText(syntaxLoaded, datasourceStatus);
const buttonDisabled = !syntaxLoaded || datasourceStatus === DataSourceStatus.Disconnected;
const showError = queryResponse && queryResponse.error && queryResponse.error.refId === query.refId;
const showError = data && data.error && data.error.refId === query.refId;
return (
<>
@@ -329,7 +327,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
/>
</div>
</div>
{showError ? <div className="prom-query-field-info text-error">{queryResponse.error.message}</div> : null}
{showError ? <div className="prom-query-field-info text-error">{data.error.message}</div> : null}
{hint ? (
<div className="prom-query-field-info text-warning">
{hint.label}{' '}