From 4b13bf5c3733ec691e3722b7633525da85ebfc0f Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Mon, 4 Mar 2024 21:22:25 +0100
Subject: [PATCH] Do not include timezone in datepickers only displaying date

We must not include timezone information when storing date
columns. It would lead to wrongly stored dates otherwise.

(cherry picked from commit 3575840060149474f0d91b9f827d5b3dd30b65bc)
---
 app/javascript/alchemy_admin/datepicker.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/javascript/alchemy_admin/datepicker.js b/app/javascript/alchemy_admin/datepicker.js
index 50b6bc4c66..cca457712b 100644
--- a/app/javascript/alchemy_admin/datepicker.js
+++ b/app/javascript/alchemy_admin/datepicker.js
@@ -12,6 +12,8 @@ export default function Datepicker(scope = document) {
   // Initializes the datepickers
   datepickerInputs.forEach((input) => {
     const type = input.dataset.datepickerType
+    const enableTime = /time/.test(type)
+
     const options = {
       // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
       locale: Alchemy.locale.slice(0, 2),
@@ -19,7 +21,7 @@ export default function Datepicker(scope = document) {
       altFormat: Alchemy.t(`formats.${type}`),
       altInputClass: "flatpickr-input",
       dateFormat: "Z",
-      enableTime: /time/.test(type),
+      enableTime,
       noCalendar: type === "time",
       time_24hr: Alchemy.t("formats.time_24hr"),
       onValueUpdate(_selectedDates, _dateStr, instance) {
@@ -28,6 +30,11 @@ export default function Datepicker(scope = document) {
         )
       }
     }
+
+    if (enableTime) {
+      options.dateFormat = "Z"
+    }
+
     flatpickr(input, options)
   })
 }