From bb292f3ec80d4cc995ada3174249b7b9a8d42f0d Mon Sep 17 00:00:00 2001
From: dakota002 <dakota.d@live.com>
Date: Tue, 21 May 2024 11:12:47 -0400
Subject: [PATCH] rename fields for consistency, add hidden field to fix time
 not getting set correctly

---
 .../circulars._archive._index/route.tsx       |  2 +
 .../circulars.correction.$circularId.tsx      |  6 +--
 .../CircularEditForm.tsx                      | 42 +++++++++++--------
 .../circulars.edit.$circularId/route.tsx      |  2 +-
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index 9e65d83df7..84dd42d588 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -102,7 +102,9 @@ export async function action({ request }: ActionFunctionArgs) {
       if (user.groups.includes(moderatorGroup)) {
         submitter = getFormDataString(data, 'submitter')
         createdOnDate = getFormDataString(data, 'createdOnDate')
+        console.log(createdOnDate)
         createdOnTime = getFormDataString(data, 'createdOnTime')
+        console.log(createdOnTime)
         createdOn = Date.parse(`${createdOnDate} ${createdOnTime} UTC`)
       }
       await createChangeRequest(
diff --git a/app/routes/circulars.correction.$circularId.tsx b/app/routes/circulars.correction.$circularId.tsx
index a711360eb5..3893477b2f 100644
--- a/app/routes/circulars.correction.$circularId.tsx
+++ b/app/routes/circulars.correction.$circularId.tsx
@@ -39,9 +39,9 @@ export async function loader({
     defaultSubject: circular.subject,
     defaultFormat: circular.format,
     circularId: circular.circularId,
-    submitter: circular.submitter,
-    createdOnDate: defaultDateTime[0],
-    createdOnTime: defaultDateTime[1].substring(0, 5),
+    defaultSubmitter: circular.submitter,
+    defaultCreatedOnDate: defaultDateTime[0],
+    defaultCreatedOnTime: defaultDateTime[1].substring(0, 5),
     searchString: '',
   }
 }
diff --git a/app/routes/circulars.edit.$circularId/CircularEditForm.tsx b/app/routes/circulars.edit.$circularId/CircularEditForm.tsx
index 725f938eaa..4c454a3e9b 100644
--- a/app/routes/circulars.edit.$circularId/CircularEditForm.tsx
+++ b/app/routes/circulars.edit.$circularId/CircularEditForm.tsx
@@ -111,24 +111,24 @@ export function SyntaxReference() {
 export function CircularEditForm({
   formattedContributor,
   circularId,
-  submitter,
+  defaultSubmitter,
   defaultFormat,
   defaultBody,
   defaultSubject,
   searchString,
-  createdOnDate,
-  createdOnTime,
+  defaultCreatedOnDate,
+  defaultCreatedOnTime,
   intent,
 }: {
   formattedContributor: string
   circularId?: number
-  submitter?: string
+  defaultSubmitter?: string
   defaultFormat?: CircularFormat
   defaultBody: string
   defaultSubject: string
   searchString: string
-  createdOnDate?: string
-  createdOnTime?: string
+  defaultCreatedOnDate?: string
+  defaultCreatedOnTime?: string
   intent: 'correction' | 'edit' | 'new'
 }) {
   let formSearchString = '?index'
@@ -142,12 +142,12 @@ export function CircularEditForm({
   const [body, setBody] = useState(defaultBody)
   const [subject, setSubject] = useState(defaultSubject)
   const [format, setFormat] = useState(defaultFormat)
-  const [date, setDate] = useState(createdOnDate)
-  const [time, setTime] = useState(createdOnTime ?? '12:00')
+  const [date, setDate] = useState(defaultCreatedOnDate)
+  const [time, setTime] = useState(defaultCreatedOnTime ?? '12:00')
   const dateValid = circularId ? dateIsValid(date, time) : true
 
-  const [updatedSubmitter, setUpdatedSubmitter] = useState(submitter)
-  const submitterValid = circularId ? submitterIsValid(updatedSubmitter) : true
+  const [submitter, setUpdatedSubmitter] = useState(defaultSubmitter)
+  const submitterValid = circularId ? submitterIsValid(submitter) : true
   const bodyValid = bodyIsValid(body)
   const sending = Boolean(useNavigation().formData)
   const valid = subjectValid && bodyValid && dateValid && submitterValid
@@ -176,10 +176,10 @@ export function CircularEditForm({
     body.trim() !== defaultBody.trim() ||
     subject.trim() !== defaultSubject.trim() ||
     format !== defaultFormat ||
-    submitter !== updatedSubmitter?.trim() ||
+    defaultSubmitter !== submitter?.trim() ||
     (date && date.replace(/(\d{2})\/(\d{2})\/(\d{4})/, '$3-$1-$2')) !==
-      createdOnDate ||
-    time !== createdOnTime
+      defaultCreatedOnDate ||
+    time !== defaultCreatedOnTime
 
   const userIsModerator = useModStatus()
 
@@ -201,7 +201,7 @@ export function CircularEditForm({
                     name="submitter"
                     id="submitter"
                     type="text"
-                    defaultValue={submitter}
+                    defaultValue={defaultSubmitter}
                     onChange={(event) =>
                       setUpdatedSubmitter(event.target.value)
                     }
@@ -233,7 +233,7 @@ export function CircularEditForm({
               <InputGroup className="border-0">
                 <InputPrefix className="wide-input-prefix">Date</InputPrefix>
                 <DatePicker
-                  defaultValue={createdOnDate}
+                  defaultValue={defaultCreatedOnDate}
                   className={classnames(styles.DatePicker, 'border-1px ')}
                   onChange={(value) => {
                     setDate(value ?? '')
@@ -243,11 +243,17 @@ export function CircularEditForm({
                 />
               </InputGroup>
               <InputGroup className="tablet:grid-col-auto">
-                <InputPrefix className="wide-input-prefix">Time</InputPrefix>
-                <TimePicker
+                <input
+                  type="hidden"
                   id="createdOnTime"
                   name="createdOnTime"
-                  defaultValue={time}
+                  value={time}
+                />
+                <InputPrefix className="wide-input-prefix">Time</InputPrefix>
+                <TimePicker
+                  id="createdOnTimeSetter"
+                  name="createdOnTimeSetter"
+                  defaultValue={defaultCreatedOnTime}
                   className="margin-top-neg-3"
                   onChange={(value) => {
                     setTime(value ?? '')
diff --git a/app/routes/circulars.edit.$circularId/route.tsx b/app/routes/circulars.edit.$circularId/route.tsx
index c9788cb8b3..58a659e368 100644
--- a/app/routes/circulars.edit.$circularId/route.tsx
+++ b/app/routes/circulars.edit.$circularId/route.tsx
@@ -37,7 +37,7 @@ export async function loader({
     defaultSubject: circular.subject,
     defaultFormat: circular.format,
     circularId: circular.circularId,
-    submitter: circular.submitter,
+    defaultSubmitter: circular.submitter,
     searchString: '',
   }
 }