fix: prevent moment from using arabic numerals for dates [DHIS2-15277] (

#322)
dhis2 · Jun 19, 2023 · d822b8c · d822b8c · dhis2-bot · Jun 19, 2023
1 parent dc69176
commit d822b8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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
@@ -2,7 +2,6 @@ import {
     getAdjacentFixedPeriods,
     getFixedPeriodByDate,
 } from '@dhis2/multi-calendar-dates'
-import moment from 'moment'
 import { useMemo } from 'react'
 import {
     selectors,
@@ -21,7 +20,8 @@ export const computePeriodDateLimit = ({
     openFuturePeriods = 0,
 }) => {
     const calendar = 'gregory'
-    const date = moment(serverDate).format('yyyy-MM-DD')
+    // serverDate is converted to YYYY-MM-DD string named date before being passed
+    const date = serverDate.toLocaleDateString('sv')
     const currentPeriod = getFixedPeriodByDate({
         periodType,
         date,

diff --git a/src/context-selection/period-selector-bar-item/use-periods.js b/src/context-selection/period-selector-bar-item/use-periods.js
@@ -1,5 +1,4 @@
 import { generateFixedPeriods } from '@dhis2/multi-calendar-dates'
-import moment from 'moment'
 import { useMemo } from 'react'
 import {
     formatJsDateToDateString,
@@ -35,7 +34,8 @@ export default function usePeriods({
         const yearForGenerating = isYearlyPeriodType
             ? year + openFuturePeriods
             : year
-        const endsBefore = moment(dateLimit).format('yyyy-MM-DD')
+        // dateLimit is converted to YYYY-MM-DD string named endsBefore before being passed
+        const endsBefore = dateLimit.toLocaleDateString('sv')
 
         const generateFixedPeriodsPayload = {
             calendar,