From 49cfa8b76665221596f29da245f09e2a567a02ac Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Mon, 8 Apr 2024 22:38:09 -0500
Subject: [PATCH] Generate missing dates on client to avoid timezone issues

---
 src/photo/UploadPageClient.tsx | 11 +++++++++--
 src/photo/server.ts            |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/photo/UploadPageClient.tsx b/src/photo/UploadPageClient.tsx
index 8f00719e..ca5d50ab 100644
--- a/src/photo/UploadPageClient.tsx
+++ b/src/photo/UploadPageClient.tsx
@@ -2,12 +2,13 @@
 
 import AdminChildPage from '@/components/AdminChildPage';
 import { PATH_ADMIN_UPLOADS } from '@/site/paths';
-import { PhotoFormData } from './form';
+import { PhotoFormData, generateTakenAtFields } from './form';
 import { Tags } from '@/tag';
 import PhotoForm from './form/PhotoForm';
 import usePhotoFormParent from './form/usePhotoFormParent';
 import AiButton from './ai/AiButton';
 import { AiAutoGeneratedField } from './ai';
+import { useMemo } from 'react';
 
 export default function UploadPageClient({
   blobId,
@@ -32,6 +33,12 @@ export default function UploadPageClient({
     aiContent,
   } = usePhotoFormParent({ textFieldsToAutoGenerate });
 
+  const initialPhotoForm = useMemo(() => ({
+    ...photoFormExif,
+    // Generate missing dates on client to avoid timezone issues
+    ...generateTakenAtFields(photoFormExif),
+  }), [photoFormExif]);
+
   return (
     <AdminChildPage
       backPath={PATH_ADMIN_UPLOADS}
@@ -45,7 +52,7 @@ export default function UploadPageClient({
       isLoading={pending}
     >
       <PhotoForm
-        initialPhotoForm={photoFormExif}
+        initialPhotoForm={initialPhotoForm}
         uniqueTags={uniqueTags}
         aiContent={hasAiTextGeneration ? aiContent : undefined}
         onTitleChange={setUpdatedTitle}
diff --git a/src/photo/server.ts b/src/photo/server.ts
index 3a606a06..96fae675 100644
--- a/src/photo/server.ts
+++ b/src/photo/server.ts
@@ -2,7 +2,7 @@ import {
   getExtensionFromStorageUrl,
   getIdFromStorageUrl,
 } from '@/services/storage';
-import { convertExifToFormData, generateTakenAtFields } from '@/photo/form';
+import { convertExifToFormData } from '@/photo/form';
 import {
   getFujifilmSimulationFromMakerNote,
   isExifForFujifilm,
@@ -57,7 +57,6 @@ export const extractExifDataFromBlobPath = async (
     ...exifData && {
       photoFormExif: {
         ...includeInitialPhotoFields && {
-          ...generateTakenAtFields(),
           hidden: 'false',
           favorite: 'false',
           extension,