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

Revert "Explore: Show log line if there is an interpolated link" (#65315)

Browse Source 
Revert "Explore: Show log line if there is an interpolated link (#62926)"

This reverts commit aa857e2a4f.
This commit is contained in:
Torkel Ödegaard
2023-03-27 19:19:42 +02:00
committed by GitHub
parent 21ede347cb
commit f43ef18732
18 changed files with 762 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/templating/template_srv.mock.ts
View File

@@ -40,21 +40,6 @@ export class TemplateSrvMock implements TemplateSrv {
});
}
getAllVariablesInTarget(target: string, scopedVars: ScopedVars): Record<string, string> {
const regexp = new RegExp(this.regex);
const values: Record<string, string> = {};
target.replace(regexp, (match, var1, var2, fmt2, var3, fieldPath) => {
const variableName = var1 || var2 || var3;
values[variableName] = this.variables[variableName];
// Don't care about the result anyway
return '';
});
return values;
}
getVariableName(expression: string) {
this.regex.lastIndex = 0;
const match = this.regex.exec(expression);

46
public/app/features/templating/template_srv.ts
View File

@@ -7,7 +7,6 @@ import {
AdHocVariableFilter,
AdHocVariableModel,
TypedVariableModel,
VariableMap,
} from '@grafana/data';
import { getDataSourceSrv, setTemplateSrv, TemplateSrv as BaseTemplateSrv } from '@grafana/runtime';
import { sceneGraph, FormatRegistryID, formatRegistry, VariableCustomFormatterFn } from '@grafana/scenes';
@@ -352,51 +351,6 @@ export class TemplateSrv implements BaseTemplateSrv {
});
}
getAllVariablesInTarget(target: string, scopedVars: ScopedVars, format?: string | Function): VariableMap {
const values: VariableMap = {};
this.replaceInVariableRegex(target, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
const variableName = var1 || var2 || var3;
const variableDisplayName =
var1 || var2 || (var3 !== undefined && fieldPath !== undefined) ? `${var3}.${fieldPath}` : var3;
const fmt = fmt2 || fmt3 || format;
const value = this.getVariableValue(variableName, fieldPath, scopedVars);
if (value !== null && value !== undefined) {
const variable = this.getVariableAtIndex(variableName);
const text = this.getVariableText(variableName, value, scopedVars);
values[variableDisplayName] = this.formatValue(value, fmt, variable, text);
} else {
values[variableDisplayName] = undefined;
}
// Don't care about the result anyway
return '';
});
return values;
}
/**
* The replace function, for every match, will return a function that has the full match as a param
* followed by one param per capture group of the variable regex.
*
* See the definition of this.regex for further comments on the variable definitions.
*/
private replaceInVariableRegex(
text: string,
replace: (
fullMatch: string, // $simpleVarName [[squareVarName:squareFormat]] ${curlyVarName.curlyPath:curlyFormat}
simpleVarName: string, // simpleVarName - -
squareVarName: string, // - squareVarName -
squareFormat: string, // - squareFormat -
curlyVarName: string, // - - curlyVarName
curlyPath: string, // - - curlyPath
curlyFormat: string // - - curlyFormat
) => string
) {
return text.replace(this.regex, replace);
}
isAllValue(value: any) {
return value === ALL_VARIABLE_VALUE || (Array.isArray(value) && value[0] === ALL_VARIABLE_VALUE);
}