From 64f7d6a50b5e6ca77653aff2a3d8d1b19eb11ec4 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 20 Nov 2023 18:14:31 +0200 Subject: [PATCH 1/3] fix(site): correctly interpret timezone based on offset in `formatOffset` --- .../TemplateInsightsPage/TemplateInsightsPage.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index c875bbd576045..ea02334018610 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -791,14 +791,14 @@ function toISOLocal(d: Date, offset: number) { } function formatOffset(offset: number): string { - const isPositive = offset >= 0; + // A negative offset means the this is a positive timezone, e.g. GMT+2 = -120. + const isPositiveTimezone = 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 formattedHours = `${isPositiveTimezone ? "-" : "+"}${String( + hours, + ).padStart(2, "0")}`; const formattedMinutes = String(minutes).padStart(2, "0"); return `${formattedHours}:${formattedMinutes}`; } From e78b2112d1601d0c001180f3cef84d2ba45077c4 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 20 Nov 2023 19:00:58 +0200 Subject: [PATCH 2/3] Update site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx --- .../TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index ea02334018610..8f9865ba1b722 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -796,7 +796,7 @@ function formatOffset(offset: number): string { const absoluteOffset = Math.abs(offset); const hours = Math.floor(absoluteOffset / 60); const minutes = Math.abs(offset) % 60; - const formattedHours = `${isPositiveTimezone ? "-" : "+"}${String( + const formattedHours = `${isPositiveTimezone ? "+" : "-"}${String( hours, ).padStart(2, "0")}`; const formattedMinutes = String(minutes).padStart(2, "0"); From 215d39f1551b6ff66976e09039787438123edfd4 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 20 Nov 2023 19:02:15 +0200 Subject: [PATCH 3/3] Update site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx --- .../TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index 8f9865ba1b722..f5f6c4ca38e32 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -791,7 +791,7 @@ function toISOLocal(d: Date, offset: number) { } function formatOffset(offset: number): string { - // A negative offset means the this is a positive timezone, e.g. GMT+2 = -120. + // A negative offset means that this is a positive timezone, e.g. GMT+2 = -120. const isPositiveTimezone = offset <= 0; const absoluteOffset = Math.abs(offset); const hours = Math.floor(absoluteOffset / 60);