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

Variables: Filters out builtin variables from unknown list (#33933)

Browse Source
This commit is contained in:
Hugo Häggmark
2021-05-12 08:28:24 +02:00
committed by GitHub
parent 8fe7da5183
commit f61328af2d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/variables/inspect/utils.ts
View File

@@ -3,7 +3,7 @@ import { DashboardModel } from '../../dashboard/state';
import { isAdHoc } from '../guard';
import { safeStringifyValue } from '../../../core/utils/explore';
import { VariableModel } from '../types';
import { containsVariable, variableRegex } from '../utils';
import { containsVariable, variableRegex, variableRegexExec } from '../utils';
export interface GraphNode {
id: string;
@@ -50,8 +50,7 @@ export const createDependencyEdges = (variables: VariableModel[]): GraphEdge[] =
};
function getVariableName(expression: string) {
variableRegex.lastIndex = 0;
const match = variableRegex.exec(expression);
const match = variableRegexExec(expression);
if (!match) {
return null;
}
@@ -60,6 +59,7 @@ function getVariableName(expression: string) {
}
export const getUnknownVariableStrings = (variables: VariableModel[], model: any) => {
variableRegex.lastIndex = 0;
const unknownVariableNames: string[] = [];
const modelAsString = safeStringifyValue(model, 2);
const matches = modelAsString.match(variableRegex);
@@ -78,6 +78,11 @@ export const getUnknownVariableStrings = (variables: VariableModel[], model: any
continue;
}
if (match.indexOf('${__') !== -1) {
// ignore builtin variables
continue;
}
if (match.indexOf('$hashKey') !== -1) {
// ignore Angular props
continue;