From 789a8181eed54e54cfca69043039b68fe9156c57 Mon Sep 17 00:00:00 2001
From: Thomas Zemp <tom@dhis2.org>
Date: Tue, 16 Jan 2024 15:20:53 +0100
Subject: [PATCH] fix: adjust time zone for dateLimit [DHIS2-16470] (#366)

---
 .../use-date-limit.js                         | 12 +++++--
 .../use-date-limit.test.js                    | 31 ++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/context-selection/period-selector-bar-item/use-date-limit.js b/src/context-selection/period-selector-bar-item/use-date-limit.js
index 44e4ee814..91ab5c1d7 100644
--- a/src/context-selection/period-selector-bar-item/use-date-limit.js
+++ b/src/context-selection/period-selector-bar-item/use-date-limit.js
@@ -14,6 +14,14 @@ import {
     useClientServerDate,
 } from '../../shared/index.js'
 
+export const getDateInTimeZone = (dateString) => {
+    const [yyyy, mm, dd] = dateString.split('-')
+    if (isNaN(Number(yyyy)) || isNaN(Number(dd)) || isNaN(Number(mm))) {
+        return new Date(dateString)
+    }
+    return new Date(yyyy, Number(mm) - 1, dd)
+}
+
 export const computePeriodDateLimit = ({
     periodType,
     serverDate,
@@ -29,7 +37,7 @@ export const computePeriodDateLimit = ({
     })
 
     if (openFuturePeriods <= 0) {
-        return new Date(currentPeriod.startDate)
+        return getDateInTimeZone(currentPeriod.startDate)
     }
 
     const followingPeriods = getAdjacentFixedPeriods({
@@ -40,7 +48,7 @@ export const computePeriodDateLimit = ({
 
     const [lastFollowingPeriod] = followingPeriods.slice(-1)
 
-    return new Date(lastFollowingPeriod.startDate)
+    return getDateInTimeZone(lastFollowingPeriod.startDate)
 }
 
 /**
diff --git a/src/context-selection/period-selector-bar-item/use-date-limit.test.js b/src/context-selection/period-selector-bar-item/use-date-limit.test.js
index a655435fa..09463612f 100644
--- a/src/context-selection/period-selector-bar-item/use-date-limit.test.js
+++ b/src/context-selection/period-selector-bar-item/use-date-limit.test.js
@@ -5,7 +5,11 @@ import {
     useMetadata,
     periodTypesMapping,
 } from '../../shared/index.js'
-import { useDateLimit, computePeriodDateLimit } from './use-date-limit.js'
+import {
+    useDateLimit,
+    computePeriodDateLimit,
+    getDateInTimeZone,
+} from './use-date-limit.js'
 
 export const reversedPeriodTypesMapping = Object.fromEntries(
     Object.entries(periodTypesMapping).map(([key, value]) => [value, key])
@@ -42,6 +46,23 @@ jest.mock('../../shared/date/use-server-time-offset.js', () => ({
     default: jest.fn(() => 0),
 }))
 
+describe('getDateInTimeZone', () => {
+    it('should return a date corrected that corresponds to the browser time zone', () => {
+        // note that we are setting the time zone for tests to UTC, so new Date() and getDateInTimeZone() are equivalent
+        const dateString = '2024-01-01'
+        const actual = getDateInTimeZone(dateString)
+        const expected = new Date(dateString)
+        expect(actual).toEqual(expected)
+    })
+
+    it('should use Date constructor if date is not in format yyyy-mm-dd', () => {
+        const dateString = '2024-01-01T12:00:00'
+        const actual = getDateInTimeZone(dateString)
+        const expected = new Date(dateString)
+        expect(actual).toEqual(expected)
+    })
+})
+
 describe('computePeriodDateLimit', () => {
     const actualSystemTime = new Date()
     jest.useFakeTimers()
@@ -51,7 +72,7 @@ describe('computePeriodDateLimit', () => {
     })
 
     it('it should return the "2022-04-01" date', () => {
-        const currentDate = new Date('2023-03-01')
+        const currentDate = getDateInTimeZone('2023-03-01')
         jest.setSystemTime(currentDate)
 
         const actual = computePeriodDateLimit({
@@ -59,13 +80,13 @@ describe('computePeriodDateLimit', () => {
             serverDate: currentDate,
             openFuturePeriods: 0,
         })
-        const expected = new Date('2022-04-01')
+        const expected = getDateInTimeZone('2022-04-01')
 
         expect(actual).toEqual(expected)
     })
 
     it('it should return the "2023-04-01" period', () => {
-        const currentDate = new Date('2023-05-01')
+        const currentDate = getDateInTimeZone('2023-05-01')
         jest.setSystemTime(currentDate)
 
         const actual = computePeriodDateLimit({
@@ -73,7 +94,7 @@ describe('computePeriodDateLimit', () => {
             serverDate: currentDate,
             openFuturePeriods: 0,
         })
-        const expected = new Date('2023-04-01')
+        const expected = getDateInTimeZone('2023-04-01')
 
         expect(actual).toEqual(expected)
     })