Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supply fixed now to datemath caluclations #981

Merged
merged 9 commits into from
Dec 13, 2024
Merged

Supply fixed now to datemath caluclations #981

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f6e5af
Supply fixed now to datemath caluclations
oscarkilhed Nov 28, 2024
e4f17c5
Use new toDateTime function instead
oscarkilhed Dec 2, 2024
8d77bac
Merge branch 'main' into oscark/supply-fixed-now-to-datemath-calculat…
oscarkilhed Dec 12, 2024
bd28bb6
Use dateMath.parse if dateMath.toDateTime isn't present. Also switch …
oscarkilhed Dec 12, 2024
8eefbdc
Prettier
oscarkilhed Dec 12, 2024
c21c130
Fix comments
oscarkilhed Dec 12, 2024
4d644b6
make sure to return the parsed datetime...
oscarkilhed Dec 12, 2024
6ff749e
Ignore function that might be missing
oscarkilhed Dec 12, 2024
eae451b
Also ignore the other use of toDateTime
oscarkilhed Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/scenes/src/utils/evaluateTimeRange.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,20 @@ export function evaluateTimeRange(
delay?: string
): TimeRange {
const hasDelay = delay && to === 'now';

const now = Date.now();
return {
from: dateMath.parse(from, false, timeZone, fiscalYearStartMonth)!,
to: dateMath.parse(hasDelay ? 'now-' + delay : to, true, timeZone, fiscalYearStartMonth)!,
from: dateMath.toDateTime(from, {
roundUp: false,
timezone: timeZone,
fiscalYearStartMonth: fiscalYearStartMonth,
now: now,
})!,
to: dateMath.toDateTime(hasDelay ? 'now-' + delay : to, {
roundUp: true,
timezone: timeZone,
fiscalYearStartMonth: fiscalYearStartMonth,
now: now,
})!,
raw: {
from: from,
to: to,
Expand Down
Loading