Commit 60b5e6ca by Erik Sundell Committed by GitHub

CloudMonitoring: Prevent resource type variable function from crashing (#30901)

* check if label response has resource type prop

* use nullish coalescing operator
parent e2e61878
...@@ -112,7 +112,7 @@ export default class CloudMonitoringMetricFindQuery { ...@@ -112,7 +112,7 @@ export default class CloudMonitoringMetricFindQuery {
} }
const refId = 'handleResourceTypeQueryQueryType'; const refId = 'handleResourceTypeQueryQueryType';
const labels = await this.datasource.getLabels(selectedMetricType, refId, projectName); const labels = await this.datasource.getLabels(selectedMetricType, refId, projectName);
return labels['resource.type'].map(this.toFindQueryResult); return labels['resource.type']?.map(this.toFindQueryResult) ?? [];
} }
async handleAlignersQuery({ selectedMetricType, projectName }: CloudMonitoringVariableQuery) { async handleAlignersQuery({ selectedMetricType, projectName }: CloudMonitoringVariableQuery) {
......
...@@ -150,7 +150,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var ...@@ -150,7 +150,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
selectedMetricType, selectedMetricType,
...(await this.getLabels(selectedMetricType, this.state.projectName)), ...(await this.getLabels(selectedMetricType, this.state.projectName)),
}; };
this.setState(state); this.setState(state, () => this.onPropsChange());
} }
async onMetricTypeChange(metricType: string) { async onMetricTypeChange(metricType: string) {
...@@ -158,7 +158,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var ...@@ -158,7 +158,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
selectedMetricType: metricType, selectedMetricType: metricType,
...(await this.getLabels(metricType, this.state.projectName)), ...(await this.getLabels(metricType, this.state.projectName)),
}; };
this.setState(state); this.setState(state, () => this.onPropsChange());
} }
onLabelKeyChange(labelKey: string) { onLabelKeyChange(labelKey: string) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment