diff --git a/next.config.js b/next.config.js index f47a136..6088217 100644 --- a/next.config.js +++ b/next.config.js @@ -9,6 +9,7 @@ const nextConfig = { ], }, allowedDevOrigins: ['local-origin.dev', '*.local-origin.dev'], + reactStrictMode: true, }; // use next-axiom for full stack monitoring diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentSection.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentSection.tsx index 7d8a1e4..0436020 100644 --- a/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentSection.tsx +++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentSection.tsx @@ -17,27 +17,47 @@ export const DocumentSection: React.FC = ({ reportType, uprn, files }) => const [showUploadModal, setShowUploadModal] = React.useState(false); const router = useRouter(); - const latestFile = React.useMemo(() => { - if (!files?.length) return null; - return files.reduce((acc, cur) => { - const accTime = new Date(acc.s3FileUploadTimestamp as any).getTime(); - const curTime = new Date(cur.s3FileUploadTimestamp as any).getTime(); - return curTime > accTime ? cur : acc; - }, files[0]); - }, [files]); + console.log("files", files) + + // const latestFile = React.useMemo(() => { + // if (!files?.length) return null; + // return files.reduce((acc, cur) => { + // const accTime = new Date(acc.s3FileUploadTimestamp as any).getTime(); + // const curTime = new Date(cur.s3FileUploadTimestamp as any).getTime(); + // return curTime > accTime ? cur : acc; + // }, files[0]); + // }, [files]); + +// const latestFile = React.useMemo(() => { +// console.log("Recomputing latestFile from", files); +// if (!Array.isArray(files) || files.length === 0) return null; + +// return files.reduce((acc, cur) => { +// const accTime = new Date(acc.s3FileUploadTimestamp).getTime(); +// const curTime = new Date(cur.s3FileUploadTimestamp).getTime(); +// return curTime > accTime ? cur : acc; +// }, files[0]); +// }, [JSON.stringify(files)]); + +const latestFile = files.length > 0 ? files.reduce((acc, cur) => { + return new Date(cur.s3FileUploadTimestamp).getTime() > new Date(acc.s3FileUploadTimestamp).getTime() ? cur : acc; +}) : null; const formatWhen = (d: string | Date) => - new Intl.DateTimeFormat(undefined, { - year: "numeric", - month: "short", - day: "2-digit", - hour: "2-digit", - minute: "2-digit", - }).format(new Date(d)); + new Intl.DateTimeFormat(undefined, { + year: "numeric", + month: "short", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + timeZone: "UTC" + }).format(new Date(d)); const title = documentTypeTitles[reportType]; const count = files.length; - + + const latestUpload = latestFile ? String(formatWhen(latestFile.s3FileUploadTimestamp)) : ""; + // console.log("latestFile", latestFile) return ( <> @@ -57,9 +77,9 @@ export const DocumentSection: React.FC = ({ reportType, uprn, files }) => > View latest file - - uploaded {formatWhen(latestFile.s3FileUploadTimestamp)} - + {/*
+ uploaded {latestUpload} +
*/} {count} file{count !== 1 && "s"} on record diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentsTable.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentsTable.tsx index d81acab..53c9cd9 100644 --- a/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentsTable.tsx +++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/documents/DocumentsTable.tsx @@ -42,6 +42,7 @@ export const DocumentsTable: React.FC = ({ uprn, uploadedFilesData }) => {REPORT_TYPES.map((reportType) => { const filesForType = filesByType[reportType] ?? []; + console.log("reportType", reportType) return ( { - console.log("Triggered"); await triggerAssessment(data); form.reset(); setIsOpen(false);