RN-850 Date param use UTC timezone (#4437)

beyondessential · Apr 12, 2023 · 67d3e50 · 67d3e50
1 parent b7445bf
commit 67d3e50
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/admin-panel/src/dataTables/components/PreviewFilters/filters/DatePicker.js b/packages/admin-panel/src/dataTables/components/PreviewFilters/filters/DatePicker.js
@@ -31,11 +31,21 @@ const getDateValue = value => {
 export const DatePicker = ({ name, value, onChange, config }) => {
   const dateValue = getDateValue(value);
   const defaultDateValue = getDateValue(config?.hasDefaultValue && config?.defaultValue);
+  // Convert date to UTC as server uses UTC timezone
+  const onChangeDate = localDate => {
+    if (!localDate) {
+      return;
+    }
+    const UTCDate = new Date(
+      Date.UTC(localDate.getFullYear(), localDate.getMonth(), localDate.getDate()),
+    );
+    onChange(UTCDate);
+  };
 
   return (
     <BaseDatePicker
       label={name || ''}
-      onChange={onChange}
+      onChange={onChangeDate}
       value={dateValue}
       placeholder={defaultDateValue && format(defaultDateValue, 'dd/MM/yyyy')}
     />