From 682d3db8757d29ffa40e7c422306f9ebe06e48f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com>
Date: Wed, 31 May 2023 14:00:53 +0200
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..30b66237 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: number = today.getDate()
+ const currentMonth: number = today.getMonth()
+ const currentYear: number = today.getFullYear()
+
+ return currentDay < 3
+ ? new Date(currentYear, currentMonth - 1, 1)
+ : new Date(currentYear, currentMonth, 1)
}
const [date, setDate] = useState<Date>(getCurrentNewsletterDate())
--
GitLab