opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 11:32:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Avoid swapping time range when from value is after to value (#79520)

Browse Source
This commit is contained in:
Laura Fernández
2023-12-15 13:09:38 +01:00
committed by GitHub
parent db81216240
commit d1c6da7b64
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/utils/explore.test.ts
View File

@ -187,7 +187,7 @@ describe('hasNonEmptyQuery', () => {
});
describe('getTimeRange', () => {
describe('should flip from and to when from is after to', () => {
describe('should not flip from and to when from is after to', () => {
const rawRange = {
from: 'now',
to: 'now-6h',
@ -195,7 +195,7 @@ describe('getTimeRange', () => {
const range = getTimeRange('utc', rawRange, 0);
expect(range.from.isBefore(range.to)).toBe(true);
expect(range.from.isBefore(range.to)).toBe(false);
});
});

4
public/app/core/utils/explore.ts
View File

@ -317,10 +317,6 @@ export const getQueryKeys = (queries: DataQuery[]): string[] => {
export const getTimeRange = (timeZone: TimeZone, rawRange: RawTimeRange, fiscalYearStartMonth: number): TimeRange => {
let range = rangeUtil.convertRawToRange(rawRange, timeZone, fiscalYearStartMonth);
if (range.to.isBefore(range.from)) {
range = rangeUtil.convertRawToRange({ from: range.raw.to, to: range.raw.from }, timeZone, fiscalYearStartMonth);
}
return range;
};