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

fix template variable bug

Browse Source
This commit is contained in:
Erik Sundell 2019-01-03 09:15:49 +01:00
parent 93d2588c22
commit 3ce4287e8c
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/components/AliasBy.tsx
View File

@ -22,6 +22,12 @@ export class AliasBy extends Component<Props, State> {
this.setState({ value: this.props.value }); this.setState({ value: this.props.value });
} }
componentWillReceiveProps(nextProps: Props) {
if (nextProps.value !== this.props.value) {
this.setState({ value: nextProps.value });
}
}
handleChange(e) { handleChange(e) {
this.setState({ value: e.target.value }); this.setState({ value: e.target.value });
this.onChange(e.target.value); this.onChange(e.target.value);

10
public/app/plugins/datasource/stackdriver/components/Metrics.tsx
View File

@ -119,7 +119,7 @@ export class Metrics extends React.Component<Props, State> {
handleMetricTypeChange(value) { handleMetricTypeChange(value) {
const metricDescriptor = this.getSelectedMetricDescriptor(value); const metricDescriptor = this.getSelectedMetricDescriptor(value);
this.setState({ metricDescriptor }); this.setState({ metricDescriptor });
this.props.onChange(metricDescriptor); this.props.onChange({ ...metricDescriptor, type: value });
} }
getServicesList(metricDescriptors) { getServicesList(metricDescriptors) {
@ -170,7 +170,13 @@ export class Metrics extends React.Component<Props, State> {
onChange={value => this.handleMetricTypeChange(value)} onChange={value => this.handleMetricTypeChange(value)}
value={metricType} value={metricType}
variables={templateSrv.variables} variables={templateSrv.variables}
options={metrics} options={[
{
label: 'Metrics',
expanded: true,
options: metrics,
},
]}
placeholder="Select Metric" placeholder="Select Metric"
className="width-15" className="width-15"
/> />