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

DataLinks: Fixed interpolation of series name, fixes #18250 (#18251)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-07-24 20:40:41 +02:00 committed by GitHub
parent c01bbf2058
commit 43543d5682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/panel/panellinks/link_srv.ts
View File

@ -91,22 +91,14 @@ export class LinkSrv implements LinkService {
} }
getDataPointVars = (seriesName: string, valueTime: DateTime) => { getDataPointVars = (seriesName: string, valueTime: DateTime) => {
// const valueTimeQuery = toUrlParams({
// time: dateTime(valueTime).valueOf(),
// });
const seriesQuery = toUrlParams({
series: seriesName,
});
return { return {
[DataLinkBuiltInVars.valueTime]: { [DataLinkBuiltInVars.valueTime]: {
text: valueTime.valueOf(), text: valueTime.valueOf(),
value: valueTime.valueOf(), value: valueTime.valueOf(),
}, },
[DataLinkBuiltInVars.seriesName]: { [DataLinkBuiltInVars.seriesName]: {
text: seriesQuery, text: seriesName,
value: seriesQuery, value: seriesName,
}, },
}; };
}; };

4
public/app/features/panel/panellinks/specs/link_srv.test.ts
View File

@ -102,12 +102,12 @@ describe('linkSrv', () => {
linkSrv.getDataLinkUIModel( linkSrv.getDataLinkUIModel(
{ {
title: 'Any title', title: 'Any title',
url: `/d/1?$${DataLinkBuiltInVars.seriesName}`, url: `/d/1?var-test=$${DataLinkBuiltInVars.seriesName}`,
}, },
{}, {},
dataPointMock dataPointMock
).href ).href
).toEqual('/d/1?series=A-series'); ).toEqual('/d/1?var-test=A-series');
}); });
it('should interpolate time range based on datapoint timestamp', () => { it('should interpolate time range based on datapoint timestamp', () => {
expect( expect(