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: Removes getDataSourceSettingsByUid from applyFieldOverrides (#29447)

Browse Source 
* DataLinks: Removes getDataSourceSettingsByUid from applyFieldOverrides and data linking code

* Fixed test

* Fixed a few tests

* Fixed unit tests

* Removed old getDataSourceSettingsByUid from interface, still there for runtime backward compatability
This commit is contained in:
Torkel Ödegaard
2020-12-01 19:10:23 +01:00
committed by GitHub
parent 9913ac73fb
commit 34f2a72ff2
26 changed files with 143 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/plugins/datasource/loki/result_transformer.test.ts
View File

@@ -33,6 +33,18 @@ const lokiResponse: LokiStreamResponse = {
},
};
jest.mock('@grafana/runtime', () => ({
// @ts-ignore
...jest.requireActual('@grafana/runtime'),
getDataSourceSrv: () => {
return {
getInstanceSettings: () => {
return { name: 'Loki1' };
},
};
},
}));
describe('loki result transformer', () => {
beforeAll(() => {
setTemplateSrv(new TemplateSrv());
@@ -167,12 +179,12 @@ describe('enhanceDataFrame', () => {
expect(fc.getFieldByName('trace2')!.config.links!.length).toBe(2);
expect(fc.getFieldByName('trace2')!.config.links![0]).toEqual({
title: '',
internal: { datasourceUid: 'uid', query: { query: 'test' } },
internal: { datasourceName: 'Loki1', datasourceUid: 'uid', query: { query: 'test' } },
url: '',
});
expect(fc.getFieldByName('trace2')!.config.links![1]).toEqual({
title: '',
internal: { datasourceUid: 'uid2', query: { query: 'test' } },
internal: { datasourceName: 'Loki1', datasourceUid: 'uid2', query: { query: 'test' } },
url: '',
});
});