Merge pull request #434 from davidradl/git427

Git427 fix date formatting
odpi · Apr 29, 2022 · 3c17d05 · 3c17d05
2 parents a7f1bbb + 9740662
commit 3c17d05
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...client/src/components/RepositoryExplorer/components/instance-retrieval/DateTimePicker.jsx b/...client/src/components/RepositoryExplorer/components/instance-retrieval/DateTimePicker.jsx
@@ -42,7 +42,7 @@ export default function DateTimePicker(props) {
               placeholder={getDateFormatPlaceHolder()}
               labelText={props.dateLabel}
               id={props.dateLabel}
-              value={instancesContext.asOfDate}
+              value={instancesContext.asOfFormattedDate}
               invalid={instancesContext.invalidDate}
               invalidText={"Invalid Dates are not accepted"}
               type="text"

diff --git a/cra-client/src/components/RepositoryExplorer/contexts/InstancesContext.js b/cra-client/src/components/RepositoryExplorer/contexts/InstancesContext.js
@@ -115,6 +115,8 @@ const InstancesContextProvider = (props) => {
    */
   const [asOfDate, setAsOfDate] = useState();
 
+  const [asOfFormattedDate, setAsOfFormattedDate] = useState();
+
   /*
    * As of date time - the date and time as a date object.
    */
@@ -179,23 +181,36 @@ const InstancesContextProvider = (props) => {
             if (isValid(validatedDateTime)) {
               setInvalidTime(false);
               setAsOfDateTime(validatedDateTime);
+              setAsOfFormattedDate(getFormattedDate(validatedDateTime));
             } else {
               setInvalidTime(true);
               setAsOfDateTime(asOfDate);
+              setAsOfFormattedDate(getFormattedDate(asOfDate));
             }
           } else {
             setInvalidTime(true);
             setAsOfDateTime(asOfDate);
+            setAsOfFormattedDate(getFormattedDate(asOfDate));
           }
         }
       }
     } else {
       setAsOfDateTime(undefined);
       // no point in allowing time to be updated if there is no date
       setIsTimeDisabled(true);
+      setAsOfFormattedDate(undefined);
     }
   }, [asOfTimeStr, asOfDate]);
 
+  const getFormattedDate = (date) => {
+    // the value needs to be the date string using the date-fns format
+     let formattedDate = undefined;
+    if (date != undefined) {
+      formattedDate = format(date, "MM/dd/Y");
+    }
+    return formattedDate;
+  };
+
   useEffect(() => {
     // the clear the context if the date time has changed then existing content should be thrown 
     clear()
@@ -1536,7 +1551,8 @@ const InstancesContextProvider = (props) => {
         invalidDate,
         isTimeDisabled,
         useHistoricalQuery,
-        asOfDate,
+        asOfDate,       // TODO can we remove this and key off the formatted date?
+        asOfFormattedDate,   // needed for the widget 
         onHistoricalQueryChange,
         setGuidToGenId,
         setFocus,