From 8977f6f14f92b598ca19991aff1c2646a3713536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Mon, 5 Jun 2023 12:30:30 +0000
Subject: [PATCH] fix: open correct month for newsletter editing
---
src/components/Newsletter/Newsletter.tsx | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/Newsletter/Newsletter.tsx b/src/components/Newsletter/Newsletter.tsx
index 774fe1dd..410ca999 100644
--- a/src/components/Newsletter/Newsletter.tsx
+++ b/src/components/Newsletter/Newsletter.tsx
@@ -30,14 +30,18 @@ export type ContentItems =
| ''
const Newsletter: React.FC = () => {
- // Functional rule :
- // Display next month after the 3rd of the current month
+ /**
+ * Display previous month until the newsletter is sent on the 3rd day of the month
+ */
const getCurrentNewsletterDate = (): Date => {
- const newsletterDate = new Date()
- if (newsletterDate.getDate() >= 3) {
- newsletterDate.setMonth(newsletterDate.getMonth() + 1)
- }
- return newsletterDate
+ const today = new Date()
+ const currentDay = today.getDate()
+ const currentMonth = today.getMonth()
+ const currentYear = today.getFullYear()
+
+ return currentDay < 3
+ ? new Date(currentYear, currentMonth, 1)
+ : new Date(currentYear, currentMonth + 1, 1)
}
const [date, setDate] = useState<Date>(getCurrentNewsletterDate())
--
GitLab