mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 07:42:23 +00:00
fix(dates): read date-only lab and document dates as calendar dates
A date-only value is stored at 12:00 UTC. The lab list and history, the document cards and pickers, the document date suggestion, extracted fact dates, source-picker rows and the compliance and mood heatmaps formatted that instant in the reader's zone, which is the next day from UTC+12 to UTC+14. `useCalendarDate` formats such a value through the UTC-pinned calendar formatter the vaccination list already uses, with the same field order and locale as instant dates. Lab readings hold both kinds, so `useLabDate` reads a noon-UTC anchor as its calendar date and a reading typed with its time of day in the reader's zone. A document without a filing date shows its upload day, an instant, in the reader's zone.
This commit is contained in:
1 parent
fe13fa966b
commit
801295f55a
18 files changed
+372
-53
No files matched your search
@@ -0,0 +1,106 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { renderToStaticMarkup } from "react-dom/server";
|
||||
|
||||
import { makeFormatters } from "@/lib/format-locale";
|
||||
import { I18nProvider } from "@/lib/i18n/context";
|
||||
import type { InboundDocumentDto } from "@/lib/validations/inbound-documents";
|
||||
|
||||
/**
|
||||
* A document's filing date is a calendar date. The card used to anchor it at
|
||||
* 12:00 UTC and format that instant in the reader's zone, which shows the
|
||||
* next day from UTC+12 to UTC+14. A document without a filing date shows its
|
||||
* upload day, an instant, in the reader's zone.
|
||||
*
|
||||
* Server rendering cannot see the reader's profile zone, so the formatter
|
||||
* hook is handed one.
|
||||
*/
|
||||
const zone = vi.hoisted(() => ({ current: "UTC" }));
|
||||
|
||||
vi.mock("@/lib/i18n/context", async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import("@/lib/i18n/context")>();
|
||||
return {
|
||||
...actual,
|
||||
useFormatters: () => makeFormatters("en", zone.current, "AUTO", "AUTO"),
|
||||
};
|
||||
});
|
||||
|
||||
const { DocumentCard } = await import("../document-card");
|
||||
|
||||
function doc(overrides: Partial<InboundDocumentDto>): InboundDocumentDto {
|
||||
return {
|
||||
id: "doc-1",
|
||||
kind: "IMAGING",
|
||||
title: "Scan",
|
||||
filename: "scan.pdf",
|
||||
mimeType: "application/pdf",
|
||||
byteSize: 1000,
|
||||
status: "STORED",
|
||||
providerType: null,
|
||||
reportDate: null,
|
||||
documentDate: null,
|
||||
errorReason: null,
|
||||
factCount: 0,
|
||||
pendingCount: 0,
|
||||
conditionLinks: [],
|
||||
encounterLinks: [],
|
||||
servingClass: "inline",
|
||||
hasContentIndex: false,
|
||||
contentIndexSource: null,
|
||||
lastIndexAttemptAt: null,
|
||||
lastIndexOutcome: null,
|
||||
hasThumbnail: false,
|
||||
sourceSystem: null,
|
||||
sourceId: null,
|
||||
createdAt: "2025-10-04T20:30:00.000Z",
|
||||
updatedAt: "2025-10-04T20:30:00.000Z",
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
function render(document: InboundDocumentDto) {
|
||||
const noop = () => {};
|
||||
return renderToStaticMarkup(
|
||||
<I18nProvider initialLocale="en">
|
||||
<DocumentCard
|
||||
document={document}
|
||||
selected={false}
|
||||
onToggleSelected={noop}
|
||||
onOpen={noop}
|
||||
highlighted={false}
|
||||
/>
|
||||
</I18nProvider>,
|
||||
);
|
||||
}
|
||||
|
||||
const previousTz = process.env.TZ;
|
||||
|
||||
describe("document card dates across zones", () => {
|
||||
afterEach(() => {
|
||||
process.env.TZ = previousTz;
|
||||
zone.current = "UTC";
|
||||
});
|
||||
|
||||
describe.each(["Pacific/Kiritimati", "America/Los_Angeles"])(
|
||||
"in %s",
|
||||
(tz) => {
|
||||
beforeEach(() => {
|
||||
process.env.TZ = tz;
|
||||
zone.current = tz;
|
||||
});
|
||||
|
||||
it("shows the filing date as stated", () => {
|
||||
const html = render(doc({ documentDate: "2025-10-04" }));
|
||||
expect(html).toContain("10/04/2025");
|
||||
expect(html).not.toContain("10/05/2025");
|
||||
expect(html).not.toContain("10/03/2025");
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it("shows the upload day in the reader's zone when no filing date is set", () => {
|
||||
// 20:30 UTC on 4 October is 10:30 on 5 October in Kiritimati.
|
||||
process.env.TZ = "Pacific/Kiritimati";
|
||||
zone.current = "Pacific/Kiritimati";
|
||||
expect(render(doc({ documentDate: null }))).toContain("10/05/2025");
|
||||
});
|
||||
});
|
||||
@@ -16,6 +16,7 @@
|
||||
* whole card is clickable through an invisible overlay button; the checkbox
|
||||
* floats above it.
|
||||
*/
|
||||
import { useDocumentDate } from "@/components/documents/use-document-date";
|
||||
import { Check, Download, Loader2, X } from "lucide-react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
|
||||
@@ -24,14 +25,13 @@ import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Checkbox } from "@/components/ui/checkbox";
|
||||
import { useFencedObjectUrl } from "@/hooks/use-fenced-object-url";
|
||||
import { useFormatters, useTranslations } from "@/lib/i18n/context";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { InboundDocumentDto } from "@/lib/validations/inbound-documents";
|
||||
import { DOCUMENT_KIND_ICONS } from "./document-kind-meta";
|
||||
import type { UploadQueueItem } from "./use-document-upload";
|
||||
import {
|
||||
documentCardKeyAction,
|
||||
documentDateKey,
|
||||
formatBytes,
|
||||
isDocumentProcessing,
|
||||
} from "./vault-utils";
|
||||
@@ -71,7 +71,7 @@ export function DocumentCard({
|
||||
onPrefetch?: (id: string) => void;
|
||||
}) {
|
||||
const { t, locale } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const documentDate = useDocumentDate();
|
||||
|
||||
// A preview thumbnail that fails to load (still rendering, decrypt error,
|
||||
// 404) falls back to the kind icon — never a broken image.
|
||||
@@ -101,7 +101,7 @@ export function DocumentCard({
|
||||
const title =
|
||||
document.title ?? document.filename ?? t("documents.card.untitled");
|
||||
const Icon = DOCUMENT_KIND_ICONS[document.kind];
|
||||
const date = format.date(`${documentDateKey(document)}T12:00:00.000Z`);
|
||||
const date = documentDate(document);
|
||||
const size = formatBytes(document.byteSize, locale);
|
||||
const showFilename =
|
||||
document.filename !== null && document.filename !== title;
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
* copy. A Share action in the footer opens the clinician share-link create
|
||||
* flow (shared `ShareLinkCreateForm`) with this document pre-attached.
|
||||
*/
|
||||
import { useCalendarDate } from "@/hooks/use-calendar-date";
|
||||
import { useRecordCapabilities } from "@/hooks/use-record-capabilities";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import {
|
||||
@@ -344,6 +345,7 @@ export function DocumentDetailSheet({
|
||||
}) {
|
||||
const { t, tCount, locale } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const calendarDate = useCalendarDate();
|
||||
const queryClient = useQueryClient();
|
||||
// v1.28.52 (Documents R3) — the vault "Ask the Coach" action opens the REAL
|
||||
// fenced coach conversation in the shared side drawer (scoped to this
|
||||
@@ -695,7 +697,7 @@ export function DocumentDetailSheet({
|
||||
? t(`documents.kind.${suggestion.kind}`)
|
||||
: null;
|
||||
const suggestionDateLabel = suggestion?.documentDate
|
||||
? format.date(`${suggestion.documentDate}T12:00:00.000Z`)
|
||||
? calendarDate(suggestion.documentDate)
|
||||
: null;
|
||||
|
||||
const title = doc?.title ?? doc?.filename ?? t("documents.card.untitled");
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
* rejected (stated in the copy); an unverified low-confidence fact gets NO
|
||||
* decision and stays pending rather than being silently discarded.
|
||||
*/
|
||||
import { useCalendarDate } from "@/hooks/use-calendar-date";
|
||||
import { useState } from "react";
|
||||
import { FlaskConical, Loader2, ScanSearch } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
@@ -34,7 +35,7 @@ import { Checkbox } from "@/components/ui/checkbox";
|
||||
import { DateField } from "@/components/ui/date-field";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { useFormatters, useTranslations } from "@/lib/i18n/context";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type {
|
||||
ConditionFactData,
|
||||
@@ -209,7 +210,7 @@ function FactRow({
|
||||
failure: string | null;
|
||||
}) {
|
||||
const { t } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const calendarDate = useCalendarDate();
|
||||
const editFact = useEditFact();
|
||||
const [verifying, setVerifying] = useState(false);
|
||||
const [draft, setDraft] = useState<VerifyDraft>(() => draftFor(fact));
|
||||
@@ -260,7 +261,7 @@ function FactRow({
|
||||
</p>
|
||||
<p className="text-muted-foreground text-xs">
|
||||
{typeLabel}
|
||||
{date ? ` · ${format.date(`${date}T12:00:00.000Z`)}` : ""}
|
||||
{date ? ` · ${calendarDate(date)}` : ""}
|
||||
{isObservation &&
|
||||
(fact.data as ObservationFactData).referenceText ? (
|
||||
<>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
* Shows one page (50) of matches — the search input is the way to reach an
|
||||
* older document, mirroring the vault's own recall model.
|
||||
*/
|
||||
import { useDocumentDate } from "@/components/documents/use-document-date";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { Check, Search } from "lucide-react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
@@ -22,7 +23,7 @@ import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { QueryErrorRow } from "@/components/ui/query-error-row";
|
||||
import { apiGet, apiPost } from "@/lib/api/api-fetch";
|
||||
import { useFormatters, useTranslations } from "@/lib/i18n/context";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { invalidateKeys, queryKeys } from "@/lib/query-keys";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type {
|
||||
@@ -30,7 +31,6 @@ import type {
|
||||
InboundDocumentDto,
|
||||
} from "@/lib/validations/inbound-documents";
|
||||
import { DOCUMENT_KIND_ICONS } from "./document-kind-meta";
|
||||
import { documentDateKey } from "./vault-utils";
|
||||
|
||||
interface ListPage {
|
||||
documents: InboundDocumentDto[];
|
||||
@@ -47,7 +47,7 @@ export function DocumentLinkPicker({
|
||||
onOpenChange: (open: boolean) => void;
|
||||
}) {
|
||||
const { t } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const documentDate = useDocumentDate();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
const [searchDraft, setSearchDraft] = useState("");
|
||||
@@ -174,7 +174,7 @@ export function DocumentLinkPicker({
|
||||
{title}
|
||||
</span>
|
||||
<span className="text-muted-foreground block text-xs">
|
||||
{format.date(`${documentDateKey(doc)}T12:00:00.000Z`)}
|
||||
{documentDate(doc)}
|
||||
</span>
|
||||
</span>
|
||||
<Check
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
* module-gated surfaces never leak. An episode without documents shows a
|
||||
* quiet one-line affordance, not a teaching empty state.
|
||||
*/
|
||||
import { useDocumentDate } from "@/components/documents/use-document-date";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { FolderOpen, Link2, Upload } from "lucide-react";
|
||||
import Link from "next/link";
|
||||
@@ -28,13 +29,12 @@ import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { useAuth } from "@/hooks/use-auth";
|
||||
import { useRecordCapabilities } from "@/hooks/use-record-capabilities";
|
||||
import { apiGet } from "@/lib/api/api-fetch";
|
||||
import { useFormatters, useTranslations } from "@/lib/i18n/context";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { queryKeys } from "@/lib/query-keys";
|
||||
import type { InboundDocumentDto } from "@/lib/validations/inbound-documents";
|
||||
import { DocumentLinkPicker } from "./document-link-picker";
|
||||
import { ImportFromSourceButton } from "./sources/import-from-source-button";
|
||||
import { DOCUMENT_KIND_ICONS } from "./document-kind-meta";
|
||||
import { documentDateKey } from "./vault-utils";
|
||||
|
||||
/** Compact preview size — "Alle anzeigen" carries the long tail. */
|
||||
const PREVIEW_LIMIT = 5;
|
||||
@@ -46,7 +46,7 @@ interface ListPage {
|
||||
|
||||
export function EpisodeDocumentsCard({ episodeId }: { episodeId: string }) {
|
||||
const { t } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const documentDate = useDocumentDate();
|
||||
const { user } = useAuth();
|
||||
// Linking a document to an episode writes through
|
||||
// `POST /api/documents/inbound/bulk`, the same endpoint the vault gates on
|
||||
@@ -137,7 +137,7 @@ export function EpisodeDocumentsCard({ episodeId }: { episodeId: string }) {
|
||||
{title}
|
||||
</span>
|
||||
<span className="text-muted-foreground shrink-0 text-xs">
|
||||
{format.date(`${documentDateKey(doc)}T12:00:00.000Z`)}
|
||||
{documentDate(doc)}
|
||||
</span>
|
||||
</Link>
|
||||
</ListRow>
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
* With either, a document already in HealthLog can be picked too: it is not
|
||||
* stored twice, it is linked or handed to the form.
|
||||
*/
|
||||
import { useCalendarDate } from "@/hooks/use-calendar-date";
|
||||
import {
|
||||
useInfiniteQuery,
|
||||
useQuery,
|
||||
@@ -66,7 +67,7 @@ import {
|
||||
type DocumentSourceSearchDto,
|
||||
type DocumentSourceTagDto,
|
||||
} from "@/lib/documents/sources/types";
|
||||
import { useFormatters, useTranslations } from "@/lib/i18n/context";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { invalidateKeys, queryKeys } from "@/lib/query-keys";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { InboundDocumentKindValue } from "@/lib/validations/inbound-documents";
|
||||
@@ -119,7 +120,7 @@ export function DocumentSourcePicker({
|
||||
onImported,
|
||||
}: DocumentSourcePickerProps) {
|
||||
const { t, locale } = useTranslations();
|
||||
const format = useFormatters();
|
||||
const calendarDate = useCalendarDate();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
const [system, setSystem] = useState<DocumentPickerSystem | null>(null);
|
||||
@@ -581,7 +582,7 @@ export function DocumentSourcePicker({
|
||||
const run = runs.get(row.sourceId);
|
||||
const allowed = selectable(row);
|
||||
const meta = [
|
||||
row.date ? format.date(`${row.date}T12:00:00.000Z`) : null,
|
||||
row.date ? calendarDate(row.date) : null,
|
||||
row.sizeBytes !== null
|
||||
? formatBytes(row.sizeBytes, locale)
|
||||
: null,
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback } from "react";
|
||||
|
||||
import { useCalendarDate } from "@/hooks/use-calendar-date";
|
||||
import { useFormatters } from "@/lib/i18n/context";
|
||||
import type { InboundDocumentDto } from "@/lib/validations/inbound-documents";
|
||||
|
||||
/**
|
||||
* The date a document files under, as a reader sees it. A filing date is a
|
||||
* calendar date and reads the same in every zone; a document without one
|
||||
* shows the day it was uploaded, which is an instant and reads in the
|
||||
* reader's zone.
|
||||
*/
|
||||
export function useDocumentDate(): (
|
||||
doc: Pick<InboundDocumentDto, "documentDate" | "createdAt">,
|
||||
) => string {
|
||||
const fmt = useFormatters();
|
||||
const calendarDate = useCalendarDate();
|
||||
return useCallback(
|
||||
(doc) =>
|
||||
doc.documentDate
|
||||
? calendarDate(doc.documentDate)
|
||||
: fmt.date(doc.createdAt),
|
||||
[fmt, calendarDate],
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user