From a20ec6659d5ca341fd46d062c0168b3271e5149a Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 22 Nov 2023 14:30:04 +0200 Subject: [PATCH] fix(site): use correct default insights time for day interval (#10837) --- .../TemplateInsightsPage.tsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index 4e07b1abaf..820b17aa4e 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -25,7 +25,14 @@ import { useId, } from "react"; import chroma from "chroma-js"; -import { subDays, addWeeks, format } from "date-fns"; +import { + subDays, + addWeeks, + format, + startOfDay, + startOfHour, + addHours, +} from "date-fns"; import { useSearchParams } from "react-router-dom"; import "react-date-range/dist/styles.css"; import "react-date-range/dist/theme/default.css"; @@ -146,9 +153,14 @@ const getDateRange = ( } if (interval === "day") { + // Only instantiate new Date once so that we don't get the wrong interval if + // start is 23:59:59.999 and the clock shifts to 00:00:00 before the second + // instantiation. + const today = new Date(); return { - startDate: subDays(new Date(), 6), - endDate: new Date(), + startDate: startOfDay(subDays(today, 6)), + // Add one hour to endDate to include real-time data for today. + endDate: addHours(startOfHour(today), 1), }; }