Skip to content

fix(site): fix daylight savings date range issue #10595

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

Merged
merged 1 commit into from
Nov 8, 2023
Merged

fix(site): fix daylight savings date range issue #10595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,13 @@ export default function TemplateInsightsPage() {
setSearchParams(searchParams);
};

// date ranges can have different offsets because of daylight savings so to
// avoid that we are going to use a common offset
const baseOffset = dateRange.endDate.getTimezoneOffset();
const commonFilters = {
template_ids: template.id,
start_time: toISOLocal(dateRange.startDate),
end_time: toISOLocal(dateRange.endDate),
start_time: toISOLocal(dateRange.startDate, baseOffset),
end_time: toISOLocal(dateRange.endDate, baseOffset),
};

const insightsFilter = { ...commonFilters, interval };
Expand Down Expand Up @@ -782,6 +785,19 @@ function formatTime(seconds: number): string {
}
}

function toISOLocal(d: Date) {
return format(d, "yyyy-MM-dd'T'HH:mm:ssxxx");
function toISOLocal(d: Date, offset: number) {
return format(d, `yyyy-MM-dd'T'HH:mm:ss${formatOffset(offset)}`);
}

function formatOffset(offset: number): string {
const isPositive = offset >= 0;
const absoluteOffset = Math.abs(offset);
const hours = Math.floor(absoluteOffset / 60);
const minutes = Math.abs(offset) % 60;
const formattedHours = `${isPositive ? "+" : "-"}${String(hours).padStart(
2,
"0",
)}`;
const formattedMinutes = String(minutes).padStart(2, "0");
return `${formattedHours}:${formattedMinutes}`;
}