@propriety/court-calendar 1.0.131 → 1.0.135

package/C/357/200/272UsersOptiplex-BFHNAppDataLocalTempreview_diff.txt

@@ -0,0 +1,1245 @@
+diff --git a/.gitignore b/.gitignore
+index d907ddc..b612261 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -29,3 +29,5 @@ dist-ssr
+ */.env
+ */.env.*.local
+ */.env.local
++
++nul
+diff --git a/src/__tests__/hooks/UseModalActions.test.ts b/src/__tests__/hooks/UseModalActions.test.ts
+index e2059a0..0048701 100644
+--- a/src/__tests__/hooks/UseModalActions.test.ts
++++ b/src/__tests__/hooks/UseModalActions.test.ts
+@@ -129,6 +129,8 @@ describe('handleSave — EDIT mode', () => {
+             expect.anything(),
+             MOCK_USER_ID,
+             DateType.SCAR,
++            undefined,
++            undefined,
+         );
+     });
+ 
+@@ -143,6 +145,8 @@ describe('handleSave — EDIT mode', () => {
+             ['SC-007'],
+             expect.anything(),
+             expect.anything(),
++            undefined,
++            undefined,
+         );
+     });
+ 
+@@ -229,6 +233,7 @@ describe('handleSave — CREATE mode (delegates to handleCreate)', () => {
+             '10:00',
+             undefined,
+             DateType.SCAR,
++            undefined,
+         );
+     });
+ 
+diff --git a/src/_components/Modal/DateDetails/DateDetails.tsx b/src/_components/Modal/DateDetails/DateDetails.tsx
+index 0b65580..b369958 100644
+--- a/src/_components/Modal/DateDetails/DateDetails.tsx
++++ b/src/_components/Modal/DateDetails/DateDetails.tsx
+@@ -232,7 +232,7 @@ export default function DateDetails({
+                             />
+                         </FormRow>
+                         <div>
+-                            <NoticeFileLink fileKey={selectedCourtDate.NoticeFile} />
++                            <NoticeFileLink fileKeys={selectedCourtDate.NoticeFile} />
+                         </div>
+                         <FormRow gap={3}>
+                             <StatusTimeline
+diff --git a/src/_components/Modal/DateDetails/NoticeFileLink.tsx b/src/_components/Modal/DateDetails/NoticeFileLink.tsx
+index 673fcc6..f8a36e4 100644
+--- a/src/_components/Modal/DateDetails/NoticeFileLink.tsx
++++ b/src/_components/Modal/DateDetails/NoticeFileLink.tsx
+@@ -4,41 +4,57 @@ import DescriptionIcon from '@mui/icons-material/Description';
+ import InsertDriveFileOutlinedIcon from '@mui/icons-material/InsertDriveFileOutlined';
+ import { S3_NOTICES_URL } from '@/constants';
+ 
+-export default function NoticeFileLink({ fileKey }: { fileKey: string | null }) {
+-    const hasFile = Boolean(fileKey);
++export default function NoticeFileLink({ fileKeys }: { fileKeys: string[] | null }) {
++    const files = fileKeys && fileKeys.length > 0 ? fileKeys : null;
+ 
+-    function handleClick() {
+-        if (!fileKey) return;
+-        const url = fileKey.startsWith('http') ? fileKey : `${S3_NOTICES_URL}/${fileKey}`;
+-        window.open(url, '_blank', 'noopener,noreferrer');
++    if (!files) {
++        return (
++            <Box
++                mt={1}
++                mb={1}
++                display='flex'
++                alignItems='center'
++                justifyContent='center'
++                gap={1}
++                borderRadius={2}
++                p={1.5}
++                sx={{ border: '2px solid', borderColor: 'divider', opacity: 0.5 }}
++            >
++                <InsertDriveFileOutlinedIcon sx={{ color: 'text.primary' }} />
++                <Typography variant='subtitle1'>No Notice Files</Typography>
++            </Box>
++        );
+     }
+ 
+     return (
+-        <Box
+-            mt={1}
+-            mb={1}
+-            display='flex'
+-            alignItems='center'
+-            justifyContent='center'
+-            gap={1}
+-            borderRadius={2}
+-            p={1.5}
+-            sx={{
+-                border: '2px solid',
+-                borderColor: 'divider',
+-                cursor: hasFile ? 'pointer' : 'default',
+-                opacity: hasFile ? 1 : 0.5,
+-                transition: 'opacity 0.2s',
+-                '&:hover': hasFile ? { opacity: 0.8 } : undefined,
+-            }}
+-            onClick={handleClick}
+-        >
+-            {hasFile ? (
+-                <DescriptionIcon sx={{ color: '#66bb6a' }} />
+-            ) : (
+-                <InsertDriveFileOutlinedIcon sx={{ color: 'text.primary' }} />
+-            )}
+-            <Typography variant='subtitle1'>{hasFile ? 'View Notice File' : 'No Notice File'}</Typography>
++        <Box mt={1} mb={1} display='flex' flexDirection='column' gap={0.75}>
++            {files.map((key, i) => {
++                const url = key.startsWith('http') ? key : `${S3_NOTICES_URL}/${key}`;
++                const label = key.split('/').pop() || `Notice File ${i + 1}`;
++                return (
++                    <Box
++                        key={i}
++                        display='flex'
++                        alignItems='center'
++                        gap={1}
++                        borderRadius={2}
++                        p={1.5}
++                        sx={{
++                            border: '2px solid',
++                            borderColor: 'divider',
++                            cursor: 'pointer',
++                            transition: 'opacity 0.2s',
++                            '&:hover': { opacity: 0.8 },
++                        }}
++                        onClick={() => window.open(url, '_blank', 'noopener,noreferrer')}
++                    >
++                        <DescriptionIcon sx={{ color: '#66bb6a', flexShrink: 0 }} />
++                        <Typography variant='subtitle1' noWrap title={key}>
++                            {label}
++                        </Typography>
++                    </Box>
++                );
++            })}
+         </Box>
+     );
+ }
+diff --git a/src/_components/Modal/DateEdit/CreateEditCase.tsx b/src/_components/Modal/DateEdit/CreateEditCase.tsx
+index 52f857f..ab2ebab 100644
+--- a/src/_components/Modal/DateEdit/CreateEditCase.tsx
++++ b/src/_components/Modal/DateEdit/CreateEditCase.tsx
+@@ -8,7 +8,10 @@ import MenuItem from '@mui/material/MenuItem';
+ import Select from '@mui/material/Select';
+ import IconButton from '@mui/material/IconButton';
+ import Button from '@mui/material/Button';
++import Typography from '@mui/material/Typography';
+ import DeleteIcon from '@mui/icons-material/Delete';
++import OpenInNewIcon from '@mui/icons-material/OpenInNew';
++import { S3_NOTICES_URL } from '@/constants';
+ import { DatePicker } from '@mui/x-date-pickers';
+ import { DateType, HearingType, Lifecycle, type Case, type CourtDate } from '@/types';
+ import { ModalMode } from '../types';
+@@ -33,6 +36,8 @@ const CreateEditCase = memo(function CreateEditCase({
+     setEditedCases,
+     modalMode,
+     activeUser,
++    pendingNoticeFiles,
++    setPendingNoticeFiles,
+ }: {
+     edited: CourtDate | undefined;
+     setEdited: (data: CourtDate) => void;
+@@ -40,6 +45,8 @@ const CreateEditCase = memo(function CreateEditCase({
+     setEditedCases: (cases: Case[]) => void;
+     modalMode: ModalMode;
+     activeUser: number;
++    pendingNoticeFiles: File[];
++    setPendingNoticeFiles: (files: File[]) => void;
+ }) {
+     const { allUsers, isAdmin } = useReferenceData();
+     const { filterCtx } = useFilter();
+@@ -158,6 +165,66 @@ const CreateEditCase = memo(function CreateEditCase({
+                         onChange={(notes) => setEditedInterrupt({ ...edited, Notes: notes })}
+                     />
+                 </FormRow>
++                <FormRow gap={7} header='Notice Files' subheader='Attach court notice PDFs to this date.'>
++                    <Stack direction='column' spacing={1} width='100%'>
++                        {(edited.NoticeFile || []).map((key, i) => (
++                            <Stack key={i} direction='row' alignItems='center' spacing={1}>
++                                <Typography variant='body2' sx={{ flex: 1 }} noWrap title={key}>
++                                    {key.split('/').pop() ?? key}
++                                </Typography>
++                                <IconButton
++                                    size='small'
++                                    component='a'
++                                    href={key.startsWith('http') ? key : `${S3_NOTICES_URL}/${key}`}
++                                    target='_blank'
++                                    rel='noopener noreferrer'
++                                >
++                                    <OpenInNewIcon fontSize='small' />
++                                </IconButton>
++                                <IconButton
++                                    size='small'
++                                    onClick={() => {
++                                        const updated = (edited.NoticeFile || []).filter((_, j) => j !== i);
++                                        setEditedInterrupt({ ...edited, NoticeFile: updated.length ? updated : null });
++                                    }}
++                                >
++                                    <DeleteIcon fontSize='small' />
++                                </IconButton>
++                            </Stack>
++                        ))}
++                        {pendingNoticeFiles.map((file, i) => (
++                            <Stack key={`pending-${i}`} direction='row' alignItems='center' spacing={1}>
++                                <Typography variant='body2' sx={{ flex: 1, color: 'text.secondary' }} noWrap>
++                                    {file.name} <em>(pending)</em>
++                                </Typography>
++                                <IconButton
++                                    size='small'
++                                    onClick={() => setPendingNoticeFiles(pendingNoticeFiles.filter((_, j) => j !== i))}
++                                >
++                                    <DeleteIcon fontSize='small' />
++                                </IconButton>
++                            </Stack>
++                        ))}
++                        <Button
++                            variant='outlined'
++                            size='small'
++                            component='label'
++                            sx={{ alignSelf: 'flex-start' }}
++                        >
++                            + Attach Notice File
++                            <input
++                                type='file'
++                                accept='application/pdf'
++                                hidden
++                                onChange={(e) => {
++                                    const file = e.target.files?.[0];
++                                    if (file) setPendingNoticeFiles([...pendingNoticeFiles, file]);
++                                    e.target.value = '';
++                                }}
++                            />
++                        </Button>
++                    </Stack>
++                </FormRow>
+             </Box>
+ 
+             <Divider />
+diff --git a/src/_components/Modal/Modal.tsx b/src/_components/Modal/Modal.tsx
+index 15cfb54..c8478bd 100644
+--- a/src/_components/Modal/Modal.tsx
++++ b/src/_components/Modal/Modal.tsx
+@@ -106,6 +106,11 @@ export default function CCModal({
+ }) {
+     const { getTownshipName, isAdmin, activeUser } = useReferenceData();
+     const [savedSnack, setSavedSnack] = useState(false);
++    const [pendingNoticeFiles, setPendingNoticeFiles] = useState<File[]>([]);
++
++    useEffect(() => {
++        if (!modalIsOpen) setPendingNoticeFiles([]);
++    }, [modalIsOpen]);
+ 
+     useEffect(() => {
+         if (!modalIsOpen) return;
+@@ -128,6 +133,7 @@ export default function CCModal({
+         editedCases,
+         setEditedData,
+         setIsOpen,
++        pendingNoticeFiles,
+     });
+ 
+     async function handleSave() {
+@@ -214,6 +220,8 @@ export default function CCModal({
+                                 setEditedCases={setEditedCases}
+                                 modalMode={modalMode}
+                                 activeUser={activeUser}
++                                pendingNoticeFiles={pendingNoticeFiles}
++                                setPendingNoticeFiles={setPendingNoticeFiles}
+                             />
+                         </ModalPanel>
+                     )}
+diff --git a/src/helpers/api/courtDates.ts b/src/helpers/api/courtDates.ts
+index fe5a85a..617e67c 100644
+--- a/src/helpers/api/courtDates.ts
++++ b/src/helpers/api/courtDates.ts
+@@ -2,6 +2,58 @@ import { DateType, HearingType, Lifecycle, SourceType, type CourtDate, type Date
+ import { formatDateForAPI, formatDateTimeForAPI } from '../formatter';
+ import { API_BASE_URL } from '../../constants';
+ 
++// raw is a loosely-typed API response object being normalized in place
++function normalizeDateFromApi(raw: CourtDate & { NegDateID?: number | string; court_date_id?: number | string; Date?: string; Time?: string; skip_motion?: boolean | null; motion_date?: string | null }, type: DateType): CourtDate {
++    if (raw.court_date_id !== undefined && raw.CourtDateID == null) raw.CourtDateID = Number(raw.court_date_id);
++    if (raw.NegDateID !== undefined && raw.CourtDateID == null) raw.CourtDateID = Number(raw.NegDateID);
++    if (raw.CourtDateID != null) raw.CourtDateID = Number(raw.CourtDateID);
++    if (raw.Date !== undefined && raw.CourtDate == null) raw.CourtDate = new Date(raw.Date);
++    if (raw.Time !== undefined && raw.HearingTime == null) raw.HearingTime = raw.Time;
++    if (!raw.Lifecycle) raw.Lifecycle = Lifecycle.SCHEDULED;
++    if (!raw.Type) raw.Type = HearingType.UNKNOWN;
++    if (!raw.DateType) raw.DateType = type;
++    if (raw.skip_motion !== undefined && raw.SkipMotion == null) raw.SkipMotion = raw.skip_motion;
++    if (raw.motion_date !== undefined && raw.MotionDate == null) raw.MotionDate = raw.motion_date ? new Date(raw.motion_date) : null;
++
++    const rawMD = raw.MultipleDates as unknown;
++    const mdArray: string[] | null = Array.isArray(rawMD)
++        ? rawMD as string[]
++        : typeof rawMD === 'string'
++          ? (() => {
++                try {
++                    let parsed: unknown = rawMD;
++                    while (typeof parsed === 'string') parsed = JSON.parse(parsed);
++                    return Array.isArray(parsed) ? (parsed as string[]) : null;
++                } catch {
++                    return null;
++                }
++            })()
++          : null;
++    if (mdArray == null && rawMD != null) {
++        console.warn(`⚠️ CourtDate #${raw.CourtDateID} — unrecognized MultipleDates format:`, rawMD);
++    }
++    raw.MultipleDates = Array.isArray(mdArray)
++        ? mdArray.map((d: string) => {
++              const [year, month, day] = d.split('T')[0].split('-').map(Number);
++              return new Date(year, month - 1, day);
++          })
++        : null;
++
++    const rawNF = raw.NoticeFile as unknown;
++    raw.NoticeFile = Array.isArray(rawNF) ? rawNF as string[] : typeof rawNF === 'string' && rawNF ? [rawNF] : null;
++
++    if (typeof raw.Notes === 'string') {
++        try {
++            const parsed: unknown = JSON.parse(raw.Notes);
++            raw.Notes = Array.isArray(parsed) ? parsed as import('../../types').Notes[] : null;
++        } catch {
++            raw.Notes = null;
++        }
++    }
++
++    return raw;
++}
++
+ export async function getAllDates(apiKey: string, type?: DateType): Promise<Array<CourtDate>> {
+     if (!apiKey) return [];
+ 
+@@ -15,55 +67,7 @@ export async function getAllDates(apiKey: string, type?: DateType): Promise<Arra
+     if (!type) type = DateType.SCAR; // default to SCAR if no type provided
+ 
+     for (const date of data.dates) {
+-        if (date.NegDateID !== undefined && date.CourtDateID == null) {
+-            date.CourtDateID = date.NegDateID;
+-        }
+-        if (date.Date !== undefined && date.CourtDate == null) {
+-            date.CourtDate = new Date(date.Date);
+-        }
+-        if (date.Time !== undefined && date.HearingTime == null) {
+-            date.HearingTime = date.Time;
+-        }
+-        if (!date.Lifecycle) {
+-            date.Lifecycle = Lifecycle.SCHEDULED;
+-        }
+-        if (!date.Type) {
+-            date.Type = HearingType.UNKNOWN;
+-        }
+-        if (!date.DateType) {
+-            date.DateType = type;
+-        }
+-        if (date.skip_motion !== undefined && date.SkipMotion == null) {
+-            date.SkipMotion = date.skip_motion;
+-        }
+-        if (date.motion_date !== undefined && date.MotionDate == null) {
+-            date.MotionDate = date.motion_date;
+-        }
+-        const rawMD = date.MultipleDates;
+-        const mdArray: string[] | null = Array.isArray(rawMD)
+-            ? rawMD
+-            : typeof rawMD === 'string'
+-              ? (() => {
+-                    try {
+-                        let parsed: unknown = rawMD;
+-                        while (typeof parsed === 'string') {
+-                            parsed = JSON.parse(parsed);
+-                        }
+-                        return Array.isArray(parsed) ? (parsed as string[]) : null;
+-                    } catch {
+-                        return null;
+-                    }
+-                })()
+-              : null;
+-        if (mdArray == null && rawMD != null) {
+-            console.warn(`⚠️ CourtDate #${date.CourtDateID} — unrecognized MultipleDates format:`, rawMD);
+-        }
+-        date.MultipleDates = Array.isArray(mdArray)
+-            ? mdArray.map((d: string) => {
+-                  const [year, month, day] = d.split('T')[0].split('-').map(Number);
+-                  return new Date(year, month - 1, day);
+-              })
+-            : null;
++        normalizeDateFromApi(date, type);
+     }
+ 
+     const dates: CourtDate[] = data.dates || [];
+@@ -91,34 +95,55 @@ export async function updateCourtDate(
+     user?: number,
+     type?: DateType,
+     skipMotion?: boolean,
++    noticeFiles?: File[],
+ ): Promise<boolean> {
+     if (!apiKey) return false;
++
++    const fields: Record<string, unknown> = {
++        court_date: updatedData.CourtDate
++            ? formatDateTimeForAPI(new Date(updatedData.CourtDate), updatedData.HearingTime || undefined)
++            : undefined,
++        hearing_link: updatedData.HearingLink !== '' ? updatedData.HearingLink : undefined,
++        hearing_officer: updatedData.HearingOfficer !== undefined ? updatedData.HearingOfficer : undefined,
++        hearing_time: updatedData.HearingTime !== '' ? updatedData.HearingTime : undefined,
++        hearing_type: updatedData.Type !== HearingType.UNKNOWN ? updatedData.Type : undefined,
++        muni: updatedData.MuniCode,
++        first_chair: updatedData.FirstChair !== undefined ? updatedData.FirstChair : undefined,
++        second_chair: updatedData.SecondChair !== undefined ? updatedData.SecondChair : undefined,
++        lifecycle: updatedData.Lifecycle !== Lifecycle.SCHEDULED ? updatedData.Lifecycle : undefined,
++        court_cases: courtCases || undefined,
++        notes: updatedData.Notes !== null ? updatedData.Notes : undefined,
++        edit_user: user !== undefined ? user : undefined,
++        multiple_dates: updatedData.MultipleDates?.map((d) => formatDateForAPI(new Date(d))) ?? undefined,
++        type: type !== DateType.SCAR ? type : undefined,
++        skip_motion: skipMotion !== undefined ? skipMotion : undefined,
++        notice_files: updatedData.NoticeFile ?? undefined,
++    };
++
++    const hasNewFiles = noticeFiles && noticeFiles.length > 0;
++    let body: BodyInit;
++    const headers: Record<string, string> = { 'x-api-key': apiKey };
++
++    if (hasNewFiles) {
++        const form = new FormData();
++        for (const [key, val] of Object.entries(fields)) {
++            if (val === undefined) continue;
++            form.append(key, typeof val === 'string' ? val : JSON.stringify(val));
++        }
++        for (const file of noticeFiles!) {
++            form.append('notice_file', file);
++        }
++        body = form;
++    } else {
++        headers['Content-Type'] = 'application/json';
++        body = JSON.stringify(fields);
++    }
++
+     const res = await fetch(`${API_BASE_URL}/court-dates/${courtDateId}/update`, {
+         method: 'PUT',
+         mode: 'cors',
+-        headers: {
+-            'Content-Type': 'application/json',
+-            'x-api-key': apiKey,
+-        },
+-        body: JSON.stringify({
+-            court_date: updatedData.CourtDate
+-                ? formatDateTimeForAPI(new Date(updatedData.CourtDate), updatedData.HearingTime || undefined)
+-                : undefined,
+-            hearing_link: updatedData.HearingLink !== '' ? updatedData.HearingLink : undefined,
+-            hearing_officer: updatedData.HearingOfficer !== undefined ? updatedData.HearingOfficer : undefined,
+-            hearing_time: updatedData.HearingTime !== '' ? updatedData.HearingTime : undefined,
+-            hearing_type: updatedData.Type !== HearingType.UNKNOWN ? updatedData.Type : undefined,
+-            muni: updatedData.MuniCode,
+-            first_chair: updatedData.FirstChair !== undefined ? updatedData.FirstChair : undefined,
+-            second_chair: updatedData.SecondChair !== undefined ? updatedData.SecondChair : undefined,
+-            lifecycle: updatedData.Lifecycle !== Lifecycle.SCHEDULED ? updatedData.Lifecycle : undefined,
+-            court_cases: courtCases || undefined,
+-            notes: updatedData.Notes !== null ? updatedData.Notes : undefined,
+-            edit_user: user !== undefined ? user : undefined,
+-            multiple_dates: updatedData.MultipleDates?.map((d) => formatDateForAPI(new Date(d))) ?? undefined,
+-            type: type !== DateType.SCAR ? type : undefined,
+-            skip_motion: skipMotion !== undefined ? skipMotion : undefined,
+-        }),
++        headers,
++        body,
+     });
+     if (res.ok) {
+         return true;
+@@ -128,6 +153,18 @@ export async function updateCourtDate(
+     }
+ }
+ 
++export async function getCourtDate(courtDateId: number, apiKey: string, type?: DateType): Promise<CourtDate | null> {
++    if (!apiKey) return null;
++    const res = await fetch(`${API_BASE_URL}/court-dates/${courtDateId}${type ? `?type=${type}` : ''}`, {
++        mode: 'cors',
++        headers: { 'x-api-key': apiKey },
++    });
++    if (!res.ok) return null;
++    const data = await res.json();
++    const raw = data.court_date ?? data.date ?? data;
++    return normalizeDateFromApi(raw, type ?? DateType.SCAR);
++}
++
+ export async function deleteCourtDate(courtDateId: number, apiKey: string, type?: DateType): Promise<boolean> {
+     if (!apiKey) return false;
+     const res = await fetch(`${API_BASE_URL}/court-dates/${courtDateId}${type ? `?type=${type}` : ''}`, {
+@@ -154,24 +191,46 @@ export async function createCourtDate(
+     hearingTime?: string,
+     multipleDates?: Date[],
+     type?: DateType,
++    noticeFiles?: File[],
+ ): Promise<number | null> {
+     if (!apiKey) return null;
+     if (!type) type = DateType.SCAR; // default to SCAR if no type provided
+-    const res = await fetch(`${API_BASE_URL}/court-dates/create`, {
+-        method: 'POST',
+-        mode: 'cors',
+-        headers: {
+-            'Content-Type': 'application/json',
+-            'x-api-key': apiKey,
+-        },
+-        body: JSON.stringify({
++
++    const hasNewFiles = noticeFiles && noticeFiles.length > 0;
++    let body: BodyInit;
++    const headers: Record<string, string> = { 'x-api-key': apiKey };
++
++    if (hasNewFiles) {
++        const form = new FormData();
++        form.append('court_date', formatDateTimeForAPI(new Date(courtDate), hearingTime || undefined));
++        form.append('muni', muniCode);
++        form.append('source', SourceType.MANUAL);
++        form.append('court_cases', JSON.stringify(courtCases || []));
++        if (multipleDates?.length) {
++            form.append('multiple_dates', JSON.stringify(multipleDates.map((d) => formatDateForAPI(new Date(d)))));
++        }
++        form.append('type', type);
++        for (const file of noticeFiles!) {
++            form.append('notice_file', file);
++        }
++        body = form;
++    } else {
++        headers['Content-Type'] = 'application/json';
++        body = JSON.stringify({
+             court_date: formatDateTimeForAPI(new Date(courtDate), hearingTime || undefined),
+             muni: muniCode,
+             source: SourceType.MANUAL,
+             court_cases: courtCases || [],
+             multiple_dates: multipleDates?.map((d) => formatDateForAPI(new Date(d))) ?? undefined,
+             type: type,
+-        }),
++        });
++    }
++
++    const res = await fetch(`${API_BASE_URL}/court-dates/create`, {
++        method: 'POST',
++        mode: 'cors',
++        headers,
++        body,
+     });
+     if (res.ok) {
+         const data = await res.json();
+diff --git a/src/hooks/UseModalActions.ts b/src/hooks/UseModalActions.ts
+index 25bead5..133918f 100644
+--- a/src/hooks/UseModalActions.ts
++++ b/src/hooks/UseModalActions.ts
+@@ -1,7 +1,7 @@
+-import { type Case, type CourtDate } from '@/types';
++import { DateType, type Case, type CourtDate } from '@/types';
+ import { caseKey } from '@/helpers/courtDates';
+ import { ModalMode } from '@/_components/Modal/types';
+-import { createCourtDate, deleteCourtDate, updateCourtDate } from '@/helpers/api/courtDates';
++import { createCourtDate, deleteCourtDate, getCourtDate, updateCourtDate } from '@/helpers/api/courtDates';
+ import { adjournCases } from '@/helpers/api/cases';
+ import { useReferenceData } from '@/context/ReferenceDataContext';
+ import { useCalendar } from '@/context/CalendarContext';
+@@ -35,6 +35,7 @@ export function useModalActions({
+     editedCases,
+     setEditedData,
+     setIsOpen,
++    pendingNoticeFiles,
+ }: {
+     modalMode: ModalMode;
+     selectedCourtDate: CourtDate | null;
+@@ -43,9 +44,17 @@ export function useModalActions({
+     editedCases: Case[];
+     setEditedData: (data: CourtDate) => void;
+     setIsOpen: (isOpen: boolean) => void;
++    pendingNoticeFiles?: File[];
+ }) {
+     const { apiKey, activeUser } = useReferenceData();
+     const { updateCourtDateInMemory, updateCases, deleteCases } = useCalendar();
++    const files = pendingNoticeFiles ?? [];
++
++    function refreshNoticeFiles(courtDateId: number, type?: DateType) {
++        getCourtDate(courtDateId, apiKey, type).then((fresh) => {
++            if (fresh?.CourtDateID) updateCourtDateInMemory(fresh);
++        });
++    }
+     function validateEditedData(): { valid: boolean; message?: string } {
+         if (!editedData) return { valid: false, message: 'No data to validate' };
+         if (!editedData.CourtDate) return { valid: false, message: 'CourtDate is required' };
+@@ -102,6 +111,7 @@ export function useModalActions({
+             editedData.HearingTime || undefined,
+             undefined,
+             editedData.DateType ?? undefined,
++            files.length > 0 ? files : undefined,
+         );
+         if (id) {
+             const updatedData = { ...editedData, CourtDateID: id };
+@@ -109,6 +119,7 @@ export function useModalActions({
+             await updateCourtDate(id, updatedData, apiKey, undefined, undefined, updatedData.DateType ?? undefined);
+             updateCourtDateInMemory(updatedData);
+             updateCases({ [caseKey(updatedData)]: editedCases });
++            if (files.length > 0) refreshNoticeFiles(id, editedData.DateType ?? undefined);
+         }
+         setIsOpen(false);
+         return true;
+@@ -131,6 +142,8 @@ export function useModalActions({
+             editedCases.map((c) => c.SCARIndexNumber),
+             activeUser,
+             editedData.DateType ?? undefined,
++            undefined,
++            files.length > 0 ? files : undefined,
+         );
+         const courtDateId = editedData.CourtDateID;
+         if (courtDateId) {
+@@ -138,6 +151,7 @@ export function useModalActions({
+         }
+         setIsOpen(false);
+         updateCourtDateInMemory(editedData);
++        if (files.length > 0) refreshNoticeFiles(editedData.CourtDateID, editedData.DateType ?? undefined);
+         return true;
+     }
+ 
+diff --git a/src/types.ts b/src/types.ts
+index 23138cb..964d6bf 100644
+--- a/src/types.ts
++++ b/src/types.ts
+@@ -20,7 +20,7 @@ export interface CourtDate {
+     LastUpdateDate: Date | null;
+ 
+     Notes: Notes[] | null;
+-    NoticeFile: string | null;
++    NoticeFile: string[] | null;
+     MultipleDates: Date[] | null;
+ 
+     // in person specific
+warning: in the working copy of 'src/_components/Modal/DateDetails/NoticeFileLink.tsx', LF will be replaced by CRLF the next time Git touches it
+diff --git a/src/__tests__/helpers/api/courtDates.test.ts b/src/__tests__/helpers/api/courtDates.test.ts
+index 0f61ca1..4ecad6d 100644
+--- a/src/__tests__/helpers/api/courtDates.test.ts
++++ b/src/__tests__/helpers/api/courtDates.test.ts
+@@ -118,11 +118,11 @@ describe('createCourtDate', () => {
+         expect(id).toBeNull();
+     });
+ 
+-    it('defaults type to SCAR when not provided', async () => {
++    it('omits type from body when type is SCAR (default)', async () => {
+         vi.stubGlobal('fetch', mockFetch({ court_date_id: 1 }));
+         await createCourtDate(new Date(2025, 5, 15), '3100', MOCK_API_KEY);
+         const body = JSON.parse((fetch as ReturnType<typeof vi.fn>).mock.calls[0][1].body);
+-        expect(body.type).toBe(DateType.SCAR);
++        expect(body.type).toBeUndefined();
+     });
+ 
+     it('passes DateType.NEGOTIATIONS in body when specified', async () => {
+diff --git a/src/_components/CCalendar.tsx b/src/_components/CCalendar.tsx
+index ea27258..1ef0b35 100644
+--- a/src/_components/CCalendar.tsx
++++ b/src/_components/CCalendar.tsx
+@@ -146,6 +146,7 @@ function CCalendarInner({
+         forceRefreshDates,
+         updateCourtDateInMemory,
+         handleUpdateChair,
++        loadRange,
+     } = useCourtDates({ apiKey, activeUser, modalIsOpen, setSelectedCourtDate });
+     const allDates = useMemo(
+         () => [...courtDates, ...negotiations, ...collections],
+@@ -471,9 +472,10 @@ function CCalendarInner({
+                             events={events}
+                             eventClick={handleEventClickWithDebug}
+                             dateClick={handleDateClick}
+-                            datesSet={(dateInfo) =>
+-                                setCurrentDate(dateInfo.view.currentStart)
+-                            }
++                            datesSet={(dateInfo) => {
++                                setCurrentDate(dateInfo.view.currentStart);
++                                loadRange(dateInfo.view.activeStart, dateInfo.view.activeEnd);
++                            }}
+                             eventDidMount={(info) =>
+                                 handleEventMount(info, calendarApi)
+                             }
+diff --git a/src/_components/Modal/DateDetails/NoticeFileLink.tsx b/src/_components/Modal/DateDetails/NoticeFileLink.tsx
+index f8a36e4..57253f5 100644
+--- a/src/_components/Modal/DateDetails/NoticeFileLink.tsx
++++ b/src/_components/Modal/DateDetails/NoticeFileLink.tsx
+@@ -33,7 +33,7 @@ export default function NoticeFileLink({ fileKeys }: { fileKeys: string[] | null
+                 const label = key.split('/').pop() || `Notice File ${i + 1}`;
+                 return (
+                     <Box
+-                        key={i}
++                        key={key}
+                         display='flex'
+                         alignItems='center'
+                         gap={1}
+diff --git a/src/_components/Modal/DateEdit/CreateEditCase.tsx b/src/_components/Modal/DateEdit/CreateEditCase.tsx
+index ab2ebab..b558dc0 100644
+--- a/src/_components/Modal/DateEdit/CreateEditCase.tsx
++++ b/src/_components/Modal/DateEdit/CreateEditCase.tsx
+@@ -168,7 +168,7 @@ const CreateEditCase = memo(function CreateEditCase({
+                 <FormRow gap={7} header='Notice Files' subheader='Attach court notice PDFs to this date.'>
+                     <Stack direction='column' spacing={1} width='100%'>
+                         {(edited.NoticeFile || []).map((key, i) => (
+-                            <Stack key={i} direction='row' alignItems='center' spacing={1}>
++                            <Stack key={key} direction='row' alignItems='center' spacing={1}>
+                                 <Typography variant='body2' sx={{ flex: 1 }} noWrap title={key}>
+                                     {key.split('/').pop() ?? key}
+                                 </Typography>
+@@ -193,7 +193,7 @@ const CreateEditCase = memo(function CreateEditCase({
+                             </Stack>
+                         ))}
+                         {pendingNoticeFiles.map((file, i) => (
+-                            <Stack key={`pending-${i}`} direction='row' alignItems='center' spacing={1}>
++                            <Stack key={`${file.name}-${file.lastModified}`} direction='row' alignItems='center' spacing={1}>
+                                 <Typography variant='body2' sx={{ flex: 1, color: 'text.secondary' }} noWrap>
+                                     {file.name} <em>(pending)</em>
+                                 </Typography>
+diff --git a/src/constants.ts b/src/constants.ts
+index 26edfef..563883e 100644
+--- a/src/constants.ts
++++ b/src/constants.ts
+@@ -16,6 +16,8 @@ export const COURT_DATES_CACHE_EXPIRY = 1000 * 60 * 1; // 1 minute
+ export const NEGOTIATIONS_CACHE_EXPIRY = 1000 * 60 * 1; // 1 minute
+ export const COLLECTIONS_CACHE_EXPIRY = 1000 * 60 * 1; // 1 minute
+ export const COURT_DATES_POLL_INTERVAL = 1000 * 60 * 5; // 5 minutes
++export const WARM_CACHE_TTL_MS = 1000 * 60 * 10; // 10 minutes — for on-demand loaded months (change infrequently)
++export const HOT_WINDOW_DAYS = 90; // days back from today included in initial fetch
+ 
+ export const DEFAULT_FILTER_CTX: CalendarFilterCtx = {
+     showInPerson: true,
+diff --git a/src/helpers/CalEvent.ts b/src/helpers/CalEvent.ts
+index 1d03a4e..aa36405 100644
+--- a/src/helpers/CalEvent.ts
++++ b/src/helpers/CalEvent.ts
+@@ -120,7 +120,9 @@ export function buildCalEvents(
+             notes: cd.Notes ?? null,
+             originalDate: new Date(cd.CourtDate),
+             uploadDeadline: cd.UploadDeadline ? parseLocalDate(String(cd.UploadDeadline)) : null,
+-            motionDate: cd.MotionDate ? parseLocalDate(String(cd.MotionDate)) : null,
++            motionDate: cd.MotionDate
++                ? (cd.MotionDate instanceof Date ? cd.MotionDate : parseLocalDate(String(cd.MotionDate)))
++                : null,
+             source: cd,
+         };
+ 
+diff --git a/src/helpers/api/cases.ts b/src/helpers/api/cases.ts
+index c2f39fb..348a5ae 100644
+--- a/src/helpers/api/cases.ts
++++ b/src/helpers/api/cases.ts
+@@ -50,12 +50,14 @@ export async function fetchCasesByCourtDate(id: string, apiKey: string, type?: D
+     return cases;
+ }
+ 
+-export async function* fetchAllCasesPaginated(apiKey: string, pageSize = 20) {
++export async function* fetchAllCasesPaginated(apiKey: string, pageSize = 20, dateFrom?: string) {
+     if (!apiKey) return;
+     let page = 1;
+     let totalPages = 1;
+     do {
+-        const res = await fetch(`${API_BASE_URL}/court-cases/filtering?page=${page}&page_size=${pageSize}`, {
++        const params = new URLSearchParams({ page: String(page), page_size: String(pageSize) });
++        if (dateFrom) params.set('date_from', dateFrom);
++        const res = await fetch(`${API_BASE_URL}/court-cases/filtering?${params}`, {
+             mode: 'cors',
+             headers: { 'x-api-key': apiKey },
+             method: 'GET',
+diff --git a/src/helpers/api/courtDates.ts b/src/helpers/api/courtDates.ts
+index 617e67c..7414ae3 100644
+--- a/src/helpers/api/courtDates.ts
++++ b/src/helpers/api/courtDates.ts
+@@ -54,16 +54,23 @@ function normalizeDateFromApi(raw: CourtDate & { NegDateID?: number | string; co
+     return raw;
+ }
+ 
+-export async function getAllDates(apiKey: string, type?: DateType): Promise<Array<CourtDate>> {
++export async function getAllDates(apiKey: string, type?: DateType, dateFrom?: string, dateTo?: string): Promise<Array<CourtDate>> {
+     if (!apiKey) return [];
+ 
+-    const res = await fetch(`${API_BASE_URL}/court-dates/all${type ? `?type=${type}` : ''}`, {
++    const params = new URLSearchParams();
++    if (type) params.set('type', type);
++    if (dateFrom) params.set('date_from', dateFrom);
++    if (dateTo) params.set('date_to', dateTo);
++    const qs = params.toString();
++
++    const res = await fetch(`${API_BASE_URL}/court-dates/all${qs ? `?${qs}` : ''}`, {
+         mode: 'cors',
+         headers: {
+             'x-api-key': apiKey,
+         },
+     });
+     const data = await res.json();
++    if (!res.ok) throw new Error(`HTTP ${res.status}: ${data?.error ?? data?.message ?? 'unknown error'}`);
+     if (!type) type = DateType.SCAR; // default to SCAR if no type provided
+ 
+     for (const date of data.dates) {
+@@ -161,7 +168,8 @@ export async function getCourtDate(courtDateId: number, apiKey: string, type?: D
+     });
+     if (!res.ok) return null;
+     const data = await res.json();
+-    const raw = data.court_date ?? data.date ?? data;
++    const raw = data.court_date ?? data.date ?? null;
++    if (!raw) return null;
+     return normalizeDateFromApi(raw, type ?? DateType.SCAR);
+ }
+ 
+@@ -209,7 +217,7 @@ export async function createCourtDate(
+         if (multipleDates?.length) {
+             form.append('multiple_dates', JSON.stringify(multipleDates.map((d) => formatDateForAPI(new Date(d)))));
+         }
+-        form.append('type', type);
++        if (type !== DateType.SCAR) form.append('type', type);
+         for (const file of noticeFiles!) {
+             form.append('notice_file', file);
+         }
+@@ -222,7 +230,7 @@ export async function createCourtDate(
+             source: SourceType.MANUAL,
+             court_cases: courtCases || [],
+             multiple_dates: multipleDates?.map((d) => formatDateForAPI(new Date(d))) ?? undefined,
+-            type: type,
++            type: type !== DateType.SCAR ? type : undefined,
+         });
+     }
+ 
+diff --git a/src/helpers/cache.ts b/src/helpers/cache.ts
+index 95cde57..6f4c582 100644
+--- a/src/helpers/cache.ts
++++ b/src/helpers/cache.ts
+@@ -5,9 +5,9 @@ import { CASES_CACHE_EXPIRY, COURT_DATES_CACHE_EXPIRY, NEGOTIATIONS_CACHE_EXPIRY
+ // Define Dexie database
+ class CasesDB extends Dexie {
+     cases!: Table<{ courtDateId: string; data: Case[]; timestamp: number }, string>;
+-    courtDates!: Table<{ id: string; data: CourtDate[]; timestamp: number }, string>;
+-    negotiations!: Table<{ id: string; data: CourtDate[]; timestamp: number }, string>;
+-    collections!: Table<{ id: string; data: CourtDate[]; timestamp: number }, string>;
++    courtDates!: Table<{ id: string; data: CourtDate[]; timestamp: number; ttl?: number }, string>;
++    negotiations!: Table<{ id: string; data: CourtDate[]; timestamp: number; ttl?: number }, string>;
++    collections!: Table<{ id: string; data: CourtDate[]; timestamp: number; ttl?: number }, string>;
+     constructor() {
+         super('CourtCasesDB');
+         this.version(1).stores({
+@@ -40,6 +40,17 @@ class CasesDB extends Dexie {
+             negotiations: 'id',
+             collections: 'id',
+         });
++        // v7: evict court-date caches to coerce NoticeFile string → string[] after type change
++        this.version(7).stores({
++            cases: 'courtDateId',
++            courtDates: 'id',
++            negotiations: 'id',
++            collections: 'id',
++        }).upgrade(tx => Promise.all([
++            tx.table('courtDates').clear(),
++            tx.table('negotiations').clear(),
++            tx.table('collections').clear(),
++        ]));
+     }
+ }
+ 
+@@ -109,15 +120,15 @@ export async function clearAllCache() {
+ export async function getCourtDatesCache(): Promise<CourtDate[] | null> {
+     const entry = await db.courtDates.get('all');
+     const now = Date.now();
+-    if (entry && Array.isArray(entry.data) && now - entry.timestamp < COURT_DATES_CACHE_EXPIRY) {
++    if (entry && Array.isArray(entry.data) && now - entry.timestamp < (entry.ttl ?? COURT_DATES_CACHE_EXPIRY)) {
+         return entry.data;
+     }
+     return null;
+ }
+ 
+-export async function setCourtDatesCache(data: CourtDate[]) {
++export async function setCourtDatesCache(data: CourtDate[], ttl?: number) {
+     try {
+-        await db.courtDates.put({ id: 'all', data, timestamp: Date.now() });
++        await db.courtDates.put({ id: 'all', data, timestamp: Date.now(), ...(ttl !== undefined && { ttl }) });
+     } catch (e) {
+         console.warn('⚠️ Cache write failed for court dates:', e);
+     }
+@@ -127,15 +138,15 @@ export async function setCourtDatesCache(data: CourtDate[]) {
+ export async function getNegotiationsCache(): Promise<CourtDate[] | null> {
+     const entry = await db.negotiations.get('all');
+     const now = Date.now();
+-    if (entry && Array.isArray(entry.data) && now - entry.timestamp < NEGOTIATIONS_CACHE_EXPIRY) {
++    if (entry && Array.isArray(entry.data) && now - entry.timestamp < (entry.ttl ?? NEGOTIATIONS_CACHE_EXPIRY)) {
+         return entry.data;
+     }
+     return null;
+ }
+ 
+-export async function setNegotiationsCache(data: CourtDate[]) {
++export async function setNegotiationsCache(data: CourtDate[], ttl?: number) {
+     try {
+-        await db.negotiations.put({ id: 'all', data, timestamp: Date.now() });
++        await db.negotiations.put({ id: 'all', data, timestamp: Date.now(), ...(ttl !== undefined && { ttl }) });
+     } catch (e) {
+         console.warn('⚠️ Cache write failed for negotiations:', e);
+     }
+@@ -145,15 +156,15 @@ export async function setNegotiationsCache(data: CourtDate[]) {
+ export async function getCollectionsCache(): Promise<CourtDate[] | null> {
+     const entry = await db.collections.get('all');
+     const now = Date.now();
+-    if (entry && Array.isArray(entry.data) && now - entry.timestamp < COLLECTIONS_CACHE_EXPIRY) {
++    if (entry && Array.isArray(entry.data) && now - entry.timestamp < (entry.ttl ?? COLLECTIONS_CACHE_EXPIRY)) {
+         return entry.data;
+     }
+     return null;
+ }
+ 
+-export async function setCollectionsCache(data: CourtDate[]) {
++export async function setCollectionsCache(data: CourtDate[], ttl?: number) {
+     try {
+-        await db.collections.put({ id: 'all', data, timestamp: Date.now() });
++        await db.collections.put({ id: 'all', data, timestamp: Date.now(), ...(ttl !== undefined && { ttl }) });
+     } catch (e) {
+         console.warn('⚠️ Cache write failed for collections:', e);
+     }
+diff --git a/src/hooks/UseCalendarEvents.ts b/src/hooks/UseCalendarEvents.ts
+index 3011249..42171b0 100644
+--- a/src/hooks/UseCalendarEvents.ts
++++ b/src/hooks/UseCalendarEvents.ts
+@@ -497,9 +497,11 @@ export function useCalendarEvents({
+         const formattedDeadline = rawDeadline
+             ? parseLocalDate(String(rawDeadline)).toLocaleDateString()
+             : "None";
+-        const rawMotionDate = props.MotionDate as string | null;
++        const rawMotionDate = props.MotionDate as Date | string | null;
+         const formattedMotionDate = rawMotionDate
+-            ? parseLocalDate(String(rawMotionDate)).toLocaleDateString()
++            ? (rawMotionDate instanceof Date
++                ? rawMotionDate.toLocaleDateString()
++                : parseLocalDate(String(rawMotionDate)).toLocaleDateString())
+             : null;
+         const isExtraDay = props._isExtraDay as boolean;
+         const isMultiDay = props._isMultiDay as boolean;
+diff --git a/src/hooks/UseCaseData.ts b/src/hooks/UseCaseData.ts
+index ccc2890..f155f57 100644
+--- a/src/hooks/UseCaseData.ts
++++ b/src/hooks/UseCaseData.ts
+@@ -3,6 +3,7 @@ import { DateType, type Case, type CourtDate } from '@/types';
+ import { fetchAllCasesPaginated, fetchCasesByCourtDate } from '@/helpers/api/cases';
+ import { getCachedCases, removeCasesCache, updateCasesCache } from '@/helpers/cache';
+ import { caseKey } from '@/helpers/courtDates';
++import { HOT_WINDOW_DAYS } from '@/constants';
+ 
+ /**
+  * Manages fetching, caching, and in-memory storage of cases for court dates.
+@@ -39,6 +40,12 @@ export function useCaseData({
+     const [selectedCases, setSelectedCases] = useState<Case[]>([]);
+     const [isFetchingCases, setIsFetchingCases] = useState(false);
+ 
++    const windowStart = useMemo(() => {
++        const d = new Date();
++        d.setDate(d.getDate() - HOT_WINDOW_DAYS);
++        return d.toISOString().slice(0, 10);
++    }, []);
++
+     async function getCases(
+         dates: CourtDate[],
+         skipMemory: boolean,
+@@ -79,14 +86,29 @@ export function useCaseData({
+         const colMissingKeys = cachedMissingKeys.filter((key) => key.startsWith('col_'));
+ 
+         if (scarMissingKeys.length > 10) {
+-            for await (const fetched of fetchAllCasesPaginated(apiKey)) {
++            const foundKeys = new Set<string>();
++            const scarMissingKeysSet = new Set(scarMissingKeys);
++            for await (const fetched of fetchAllCasesPaginated(apiKey, 20, windowStart)) {
+                 Object.entries(fetched).forEach(([courtDateIDStr, cases]) => {
+-                    if (scarMissingKeys.includes(courtDateIDStr)) {
++                    if (scarMissingKeysSet.has(courtDateIDStr)) {
+                         fetchedCasesByCourtDate[courtDateIDStr] = cases;
++                        foundKeys.add(courtDateIDStr);
+                     }
+                 });
+                 await addPartialCasesToMemoryAndCache(fetchedCasesByCourtDate, false);
+             }
++            // Fallback: old-month court dates excluded by the windowed bulk query
++            const unfound = scarMissingKeys.filter((k) => !foundKeys.has(k));
++            if (unfound.length > 0) {
++                await Promise.all(
++                    unfound.map(async (key) => {
++                        const date = dateByKey.get(key)!;
++                        const fetched = await fetchCasesByCourtDate(date.CourtDateID.toString(), apiKey);
++                        fetchedCasesByCourtDate[key] = fetched ?? [];
++                    }),
++                );
++                await addPartialCasesToMemoryAndCache(fetchedCasesByCourtDate, false);
++            }
+         } else {
+             await Promise.all(
+                 scarMissingKeys.map(async (key) => {
+diff --git a/src/hooks/UseCourtDates.ts b/src/hooks/UseCourtDates.ts
+index 5fe7e37..175ce07 100644
+--- a/src/hooks/UseCourtDates.ts
++++ b/src/hooks/UseCourtDates.ts
+@@ -1,8 +1,8 @@
+-import { useState, useEffect, useRef, useCallback, type Dispatch, type SetStateAction } from 'react';
++import { useState, useEffect, useRef, useCallback, useMemo, type Dispatch, type SetStateAction } from 'react';
+ import { DateType, type CourtDate } from '@/types';
+ import { getAllDates, updateCourtDate } from '@/helpers/api/courtDates';
+ import { getCourtDatesCache, setCourtDatesCache, getNegotiationsCache, setNegotiationsCache, getCollectionsCache, setCollectionsCache, clearAllCache } from '@/helpers/cache';
+-import { COURT_DATES_POLL_INTERVAL } from '@/constants';
++import { COURT_DATES_POLL_INTERVAL, HOT_WINDOW_DAYS, WARM_CACHE_TTL_MS } from '@/constants';
+ 
+ /**
+  * Loads, caches, and mutates the full list of court dates.
+@@ -45,6 +45,20 @@ export function useCourtDates({
+     const pollSkippedRef = useRef(false);
+     const fetchCountRef = useRef(0);
+ 
++    // Rolling window: only fetch dates from HOT_WINDOW_DAYS ago onward on initial load / polls.
++    // Older months are loaded on demand via loadRange() when the user navigates back.
++    const windowStart = useMemo(() => {
++        const d = new Date();
++        d.setDate(d.getDate() - HOT_WINDOW_DAYS);
++        return d.toISOString().slice(0, 10);
++    }, []);
++    // YYYY-MM of the earliest month covered by the hot window — months before this need loadRange
++    const windowStartMonth = useMemo(() => windowStart.slice(0, 7), [windowStart]);
++    // Track which out-of-window months have already been fetched this session
++    const loadedMonthsRef = useRef<Set<string>>(new Set());
++    // Track months currently being fetched — prevents duplicate in-flight requests
++    const fetchingMonthsRef = useRef<Set<string>>(new Set());
++
+     const normalizeDates = useCallback((dates: CourtDate[]): CourtDate[] => {
+         return dates.map((d: CourtDate & { Date?: string; Time?: string; NegDateID?: number }) => ({
+             ...d,
+@@ -54,6 +68,11 @@ export function useCourtDates({
+             MultipleDates: Array.isArray(d.MultipleDates)
+                 ? d.MultipleDates.map((md: Date | string) => (md instanceof Date ? md : new Date(md as string)))
+                 : null,
++            NoticeFile: Array.isArray(d.NoticeFile)
++                ? d.NoticeFile
++                : typeof d.NoticeFile === 'string' && d.NoticeFile
++                  ? [d.NoticeFile]
++                  : null,
+         }));
+     }, []);
+ 
+@@ -73,13 +92,20 @@ export function useCourtDates({
+     const getAllCourtDates = useCallback(async (skipCache = false) => {
+         const cachedDates = skipCache ? null : await getCourtDatesCache();
+         if (cachedDates && cachedDates.length > 0) {
+-            setCourtDates(normalizeDates(cachedDates));
++            setCourtDates((prev) => {
++                const normalized = normalizeDates(cachedDates);
++                const newIds = new Set(normalized.map((d) => d.CourtDateID));
++                return [...normalized, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++            });
+             console.log('%c📅 CourtDates', 'font-weight:bold', `💾 ${cachedDates.length} from cache`);
+         } else {
+             startFetch();
+-            getAllDates(apiKey)
++            getAllDates(apiKey, undefined, windowStart)
+                 .then(async (dates) => {
+-                    setCourtDates(dates);
++                    setCourtDates((prev) => {
++                        const newIds = new Set(dates.map((d) => d.CourtDateID));
++                        return [...dates, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++                    });
+                     await setCourtDatesCache(dates);
+                     console.log('%c📅 CourtDates', 'font-weight:bold', `🌐 ${dates.length} from API`);
+                 })
+@@ -88,18 +114,25 @@ export function useCourtDates({
+                 })
+                 .finally(endFetch);
+         }
+-    }, [apiKey, normalizeDates, startFetch, endFetch]);
++    }, [apiKey, windowStart, normalizeDates, startFetch, endFetch]);
+ 
+     const getAllNegotiations = useCallback(async (skipCache = false) => {
+         const cachedDates = skipCache ? null : await getNegotiationsCache();
+         if (cachedDates && cachedDates.length > 0) {
+-            setNegotiations(normalizeDates(cachedDates));
++            setNegotiations((prev) => {
++                const normalized = normalizeDates(cachedDates);
++                const newIds = new Set(normalized.map((d) => d.CourtDateID));
++                return [...normalized, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++            });
+             console.log('%c🤝 Negotiations', 'font-weight:bold', `💾 ${cachedDates.length} from cache`);
+         } else {
+             startFetch();
+-            getAllDates(apiKey, DateType.NEGOTIATIONS)
++            getAllDates(apiKey, DateType.NEGOTIATIONS, windowStart)
+                 .then(async (dates) => {
+-                    setNegotiations(dates);
++                    setNegotiations((prev) => {
++                        const newIds = new Set(dates.map((d) => d.CourtDateID));
++                        return [...dates, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++                    });
+                     await setNegotiationsCache(dates);
+                     console.log('%c🤝 Negotiations', 'font-weight:bold', `🌐 ${dates.length} from API`);
+                 })
+@@ -108,18 +141,25 @@ export function useCourtDates({
+                 })
+                 .finally(endFetch);
+         }
+-    }, [apiKey, normalizeDates, startFetch, endFetch]);
++    }, [apiKey, windowStart, normalizeDates, startFetch, endFetch]);
+ 
+     const getAllCollections = useCallback(async (skipCache = false) => {
+         const cachedDates = skipCache ? null : await getCollectionsCache();
+         if (cachedDates && cachedDates.length > 0) {
+-            setCollections(normalizeDates(cachedDates));
++            setCollections((prev) => {
++                const normalized = normalizeDates(cachedDates);
++                const newIds = new Set(normalized.map((d) => d.CourtDateID));
++                return [...normalized, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++            });
+             console.log('%c📋 Collections', 'font-weight:bold', `💾 ${cachedDates.length} from cache`);
+         } else {
+             startFetch();
+-            getAllDates(apiKey, DateType.COLLECTIONS)
++            getAllDates(apiKey, DateType.COLLECTIONS, windowStart)
+                 .then(async (dates) => {
+-                    setCollections(dates);
++                    setCollections((prev) => {
++                        const newIds = new Set(dates.map((d) => d.CourtDateID));
++                        return [...dates, ...prev.filter((d) => !newIds.has(d.CourtDateID))];
++                    });
+                     await setCollectionsCache(dates);
+                     console.log('%c📋 Collections', 'font-weight:bold', `🌐 ${dates.length} from API`);
+                 })
+@@ -128,7 +168,69 @@ export function useCourtDates({
+                 })
+                 .finally(endFetch);
+         }
+-    }, [apiKey, normalizeDates, startFetch, endFetch]);
++    }, [apiKey, windowStart, normalizeDates, startFetch, endFetch]);
++
++    // Load a specific date range on demand — called when the user navigates the calendar
++    // backward past the hot window. Merges results into state without replacing it.
++    const loadRange = useCallback(async (from: Date, to: Date) => {
++        const toLoad: string[] = [];
++        const cursor = new Date(from.getFullYear(), from.getMonth(), 1);
++        const end = new Date(to.getFullYear(), to.getMonth(), 1);
++        while (cursor <= end) {
++            const key = `${cursor.getFullYear()}-${String(cursor.getMonth() + 1).padStart(2, '0')}`;
++            // Skip months already covered by the hot window, successfully loaded, or in-flight
++            if (key >= windowStartMonth || loadedMonthsRef.current.has(key) || fetchingMonthsRef.current.has(key)) {
++                cursor.setMonth(cursor.getMonth() + 1);
++                continue;
++            }
++            toLoad.push(key);
++            cursor.setMonth(cursor.getMonth() + 1);
++        }
++        if (toLoad.length === 0) return;
++
++        // Mark in-flight before the await so concurrent calls skip these months
++        toLoad.forEach((k) => fetchingMonthsRef.current.add(k));
++
++        const dateFrom = `${toLoad[0]}-01`;
++        const [ly, lm] = toLoad[toLoad.length - 1].split('-').map(Number);
++        const dateTo = new Date(ly, lm, 0).toISOString().slice(0, 10); // last day of last month
++
++        try {
++            const [newDates, newNegs, newCols] = await Promise.all([
++                getAllDates(apiKey, undefined, dateFrom, dateTo),
++                getAllDates(apiKey, DateType.NEGOTIATIONS, dateFrom, dateTo),
++                getAllDates(apiKey, DateType.COLLECTIONS, dateFrom, dateTo),
++            ]);
++            const merge = (prev: CourtDate[], incoming: CourtDate[]) => {
++                if (incoming.length === 0) return prev;
++                const seen = new Set(prev.map((d) => d.CourtDateID));
++                return [...prev, ...normalizeDates(incoming).filter((d) => !seen.has(d.CourtDateID))];
++            };
++            setCourtDates((prev) => {
++                const merged = merge(prev, newDates);
++                queueMicrotask(() => setCourtDatesCache(merged, WARM_CACHE_TTL_MS));
++                return merged;
++            });
++            setNegotiations((prev) => {
++                const merged = merge(prev, newNegs);
++                queueMicrotask(() => setNegotiationsCache(merged, WARM_CACHE_TTL_MS));
++                return merged;
++            });
++            setCollections((prev) => {
++                const merged = merge(prev, newCols);
++                queueMicrotask(() => setCollectionsCache(merged, WARM_CACHE_TTL_MS));
++                return merged;
++            });
++            toLoad.forEach((k) => {
++                loadedMonthsRef.current.add(k);
++                fetchingMonthsRef.current.delete(k);
++            });
++            console.log('%c🔙 loadRange', 'font-weight:bold', `${dateFrom} → ${dateTo} | +${newDates.length}/${newNegs.length}/${newCols.length}`);
++        } catch (error) {
++            toLoad.forEach((k) => fetchingMonthsRef.current.delete(k)); // allow retry
++            console.error('❌ loadRange failed:', error);
++        }
++    }, [apiKey, windowStartMonth, normalizeDates]);
+ 
+     useEffect(() => {
+         getAllCourtDates();
+@@ -238,9 +340,11 @@ export function useCourtDates({
+     }
+ 
+     async function forceRefreshDates() {
++        loadedMonthsRef.current.clear();
++        fetchingMonthsRef.current.clear();
+         await clearAllCache();
+-        await Promise.all([getAllCourtDates(), getAllNegotiations(), getAllCollections()]);
++        await Promise.all([getAllCourtDates(true), getAllNegotiations(true), getAllCollections(true)]);
+     }
+ 
+-    return { courtDates, negotiations, collections, isFetchingDates, lastFetchedAt, forceRefreshDates, updateCourtDateInMemory, handleUpdateChair };
++    return { courtDates, negotiations, collections, isFetchingDates, lastFetchedAt, forceRefreshDates, updateCourtDateInMemory, handleUpdateChair, loadRange };
+ }
+diff --git a/src/hooks/UseModalActions.ts b/src/hooks/UseModalActions.ts
+index 133918f..935174a 100644
+--- a/src/hooks/UseModalActions.ts
++++ b/src/hooks/UseModalActions.ts
+@@ -51,9 +51,18 @@ export function useModalActions({
+     const files = pendingNoticeFiles ?? [];
+ 
+     function refreshNoticeFiles(courtDateId: number, type?: DateType) {
+-        getCourtDate(courtDateId, apiKey, type).then((fresh) => {
+-            if (fresh?.CourtDateID) updateCourtDateInMemory(fresh);
+-        });
++        getCourtDate(courtDateId, apiKey, type)
++            .then((fresh) => {
++                if (fresh?.CourtDateID) {
++                    updateCourtDateInMemory({
++                        ...fresh,
++                        NoticeFile: fresh.NoticeFile ?? selectedCourtDate?.NoticeFile ?? null,
++                    });
++                }
++            })
++            .catch((err) => {
++                console.error('❌ Failed to refresh notice files after upload:', err);
++            });
+     }
+     function validateEditedData(): { valid: boolean; message?: string } {
+         if (!editedData) return { valid: false, message: 'No data to validate' };
+@@ -116,7 +125,7 @@ export function useModalActions({
+         if (id) {
+             const updatedData = { ...editedData, CourtDateID: id };
+             setEditedData(updatedData);
+-            await updateCourtDate(id, updatedData, apiKey, undefined, undefined, updatedData.DateType ?? undefined);
++            await updateCourtDate(id, { ...updatedData, NoticeFile: undefined }, apiKey, undefined, undefined, updatedData.DateType ?? undefined);
+             updateCourtDateInMemory(updatedData);
+             updateCases({ [caseKey(updatedData)]: editedCases });
+             if (files.length > 0) refreshNoticeFiles(id, editedData.DateType ?? undefined);