mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Loki: Fix missing timerange in query builder values request (#80829)
Loki: Fix missing timerange in query builder values
This commit is contained in:
parent
b8cf8ec8d7
commit
ded941eb84
@ -57,6 +57,26 @@ describe('LokiQueryBuilder', () => {
|
||||
await waitFor(() => expect(screen.getByText('job')).toBeInTheDocument());
|
||||
});
|
||||
|
||||
it('does refetch label values with the correct timerange', async () => {
|
||||
const props = createDefaultProps();
|
||||
props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
|
||||
props.datasource.languageProvider.fetchSeriesLabels = jest
|
||||
.fn()
|
||||
.mockReturnValue({ job: ['a'], instance: ['b'], baz: ['bar'] });
|
||||
|
||||
render(<LokiQueryBuilder {...props} query={defaultQuery} />);
|
||||
await userEvent.click(screen.getByLabelText('Add'));
|
||||
const labels = screen.getByText(/Label filters/);
|
||||
const selects = getAllByRole(getSelectParent(labels)!, 'combobox');
|
||||
await userEvent.click(selects[3]);
|
||||
await waitFor(() => expect(screen.getByText('job')).toBeInTheDocument());
|
||||
await userEvent.click(screen.getByText('job'));
|
||||
await userEvent.click(selects[5]);
|
||||
expect(props.datasource.languageProvider.fetchSeriesLabels).toHaveBeenNthCalledWith(2, '{baz="bar"}', {
|
||||
timeRange: mockTimeRange,
|
||||
});
|
||||
});
|
||||
|
||||
it('does not show already existing label names as option in label filter', async () => {
|
||||
const props = createDefaultProps();
|
||||
props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
|
||||
|
@ -78,7 +78,7 @@ export const LokiQueryBuilder = React.memo<Props>(
|
||||
values = await datasource.languageProvider.fetchLabelValues(forLabel.label, { timeRange });
|
||||
} else {
|
||||
const expr = lokiQueryModeller.renderLabels(labelsToConsider);
|
||||
const result = await datasource.languageProvider.fetchSeriesLabels(expr);
|
||||
const result = await datasource.languageProvider.fetchSeriesLabels(expr, { timeRange });
|
||||
values = result[datasource.interpolateString(forLabel.label)];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user