IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Variables: Fixes error with: cannot read property length of undefined (#31458)

Browse Source 
* Variables: Fixes error with: cannot read property length of undefined

* A different fix
This commit is contained in:
Torkel Ödegaard 2021-02-27 18:03:31 +01:00 committed by GitHub
parent aeabaee2da
commit e9d2592481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/variables/query/operators.ts
View File

@ -9,6 +9,7 @@ import { DataSourceApi, FieldType, getFieldDisplayName, isDataFrame, MetricFindV
import { updateVariableOptions, updateVariableTags } from './reducer'; import { updateVariableOptions, updateVariableTags } from './reducer';
import { getTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv'; import { getTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv';
import { getLegacyQueryOptions, getTemplatedRegex } from '../utils'; import { getLegacyQueryOptions, getTemplatedRegex } from '../utils';
import { getProcessedDataFrames } from 'app/features/query/state/runRequest';
export function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValue[]> { export function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValue[]> {
return (source) => return (source) =>
@ -23,6 +24,7 @@ export function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValu
return frames; return frames;
} }
const processedDataFrames = getProcessedDataFrames(frames);
const metrics: MetricFindValue[] = []; const metrics: MetricFindValue[] = [];
let valueIndex = -1; let valueIndex = -1;
@ -30,7 +32,7 @@ export function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValu
let stringIndex = -1; let stringIndex = -1;
let expandableIndex = -1; let expandableIndex = -1;
for (const frame of frames) { for (const frame of processedDataFrames) {
for (let index = 0; index < frame.fields.length; index++) { for (let index = 0; index < frame.fields.length; index++) {
const field = frame.fields[index]; const field = frame.fields[index];
const fieldName = getFieldDisplayName(field, frame, frames).toLowerCase(); const fieldName = getFieldDisplayName(field, frame, frames).toLowerCase();
@ -181,6 +183,7 @@ export function areMetricFindValues(data: any[]): data is MetricFindValue[] {
} }
const firstValue: any = data[0]; const firstValue: any = data[0];
if (isDataFrame(firstValue)) { if (isDataFrame(firstValue)) {
return false; return false;
} }