mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Explore: Add range option to internal data links (#64063)
* Add range option to internal data links * Add test for internal link time range
This commit is contained in:
parent
7562a8e472
commit
1e7c27e636
@ -1,4 +1,5 @@
|
|||||||
import { ArrayDataFrame, MutableDataFrame, toDataFrame } from '../dataframe';
|
import { ArrayDataFrame, MutableDataFrame, toDataFrame } from '../dataframe';
|
||||||
|
import { rangeUtil } from '../datetime';
|
||||||
import { createTheme } from '../themes';
|
import { createTheme } from '../themes';
|
||||||
import { FieldMatcherID } from '../transformations';
|
import { FieldMatcherID } from '../transformations';
|
||||||
import {
|
import {
|
||||||
@ -665,6 +666,65 @@ describe('getLinksSupplier', () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('handles time range on internal links', () => {
|
||||||
|
locationUtil.initialize({
|
||||||
|
config: { appSubUrl: '' } as GrafanaConfig,
|
||||||
|
getVariablesUrlParams: () => ({}),
|
||||||
|
getTimeRangeForUrl: () => ({ from: 'now-7d', to: 'now' }),
|
||||||
|
});
|
||||||
|
|
||||||
|
const datasourceUid = '1234';
|
||||||
|
const range = rangeUtil.relativeToTimeRange({ from: 600, to: 0 });
|
||||||
|
const f0 = new MutableDataFrame({
|
||||||
|
name: 'A',
|
||||||
|
fields: [
|
||||||
|
{
|
||||||
|
name: 'message',
|
||||||
|
type: FieldType.string,
|
||||||
|
values: [10, 20],
|
||||||
|
config: {
|
||||||
|
links: [
|
||||||
|
{
|
||||||
|
url: '',
|
||||||
|
title: '',
|
||||||
|
internal: {
|
||||||
|
datasourceUid: datasourceUid,
|
||||||
|
datasourceName: 'testDS',
|
||||||
|
query: '12345',
|
||||||
|
range,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
display: (v) => ({ numeric: v, text: String(v) }),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const supplier = getLinksSupplier(
|
||||||
|
f0,
|
||||||
|
f0.fields[0],
|
||||||
|
{},
|
||||||
|
// We do not need to interpolate anything for this test
|
||||||
|
(value, vars, format) => value
|
||||||
|
);
|
||||||
|
|
||||||
|
const links = supplier({ valueRowIndex: 0 });
|
||||||
|
const rangeStr = JSON.stringify({
|
||||||
|
from: range.from.toISOString(),
|
||||||
|
to: range.to.toISOString(),
|
||||||
|
});
|
||||||
|
const encodeURIParams = `{"range":${rangeStr},"datasource":"${datasourceUid}","queries":["12345"]}`;
|
||||||
|
expect(links.length).toBe(1);
|
||||||
|
expect(links[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
title: 'testDS',
|
||||||
|
href: `/explore?left=${encodeURIComponent(encodeURIParams)}`,
|
||||||
|
onClick: undefined,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
describe('dynamic links', () => {
|
describe('dynamic links', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
locationUtil.initialize({
|
locationUtil.initialize({
|
||||||
|
@ -451,7 +451,7 @@ export const getLinksSupplier =
|
|||||||
internalLink: link.internal,
|
internalLink: link.internal,
|
||||||
scopedVars: variables,
|
scopedVars: variables,
|
||||||
field,
|
field,
|
||||||
range: {} as any,
|
range: link.internal.range ?? ({} as any),
|
||||||
replaceVariables,
|
replaceVariables,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import { ExplorePanelsState } from './explore';
|
import { ExplorePanelsState } from './explore';
|
||||||
import { InterpolateFunction } from './panel';
|
import { InterpolateFunction } from './panel';
|
||||||
import { DataQuery } from './query';
|
import { DataQuery } from './query';
|
||||||
|
import { TimeRange } from './time';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback info for DataLink click events
|
* Callback info for DataLink click events
|
||||||
@ -61,6 +62,7 @@ export interface InternalDataLink<T extends DataQuery = any> {
|
|||||||
datasourceName: string; // used as a title if `DataLink.title` is empty
|
datasourceName: string; // used as a title if `DataLink.title` is empty
|
||||||
panelsState?: ExplorePanelsState;
|
panelsState?: ExplorePanelsState;
|
||||||
transformations?: DataLinkTransformationConfig[];
|
transformations?: DataLinkTransformationConfig[];
|
||||||
|
range?: TimeRange;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type LinkTarget = '_blank' | '_self' | undefined;
|
export type LinkTarget = '_blank' | '_self' | undefined;
|
||||||
|
Loading…
Reference in New Issue
Block a user