mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-21 06:26:26 +00:00
6c63a9bb60
* refactor(client): opt into the v7 router behaviour while still on v6 Turning the behaviour on separately from the version bump keeps the two failure modes apart: red here means a behaviour change, red on the bump means the import rewrite. The suite is unchanged either way — 527 files, 11099 tests. Only the two flags a non-data router understands are set; the rest belong to createBrowserRouter, which this app doesn't use. Both are applied at all six router mounts, so the tests exercise the same behaviour as production rather than validating v6 while prod runs v7. * fix(client): move to react-router 7.18.2 6.30.4 is affected by GHSA-wrjc-x8rr-h8h6 — open redirect through a backslash in Link and useNavigate, which this app uses in 41 places — and the 6.x line has no fix: react-router-dom 6.30.2 to 6.30.4 carries GHSA-jjmj-jmhj-qwj2 with no patched version at all. Staying is not an option, and 7.0 to 7.17 only swaps it for GHSA-chx6-hx7r-mcp5. The package rename comes with it: react-router-dom is a re-export shim in v7, so using it would only defer the same rewrite to the v8 jump. 77 occurrences across 60 files, all of them import specifiers and vi.mock strings. The surface is small — useNavigate, useParams, useSearchParams, useLocation, Routes, Route, Link, Navigate, useMatch, MemoryRouter, BrowserRouter — no data router, no loaders or actions. Nothing else had to change; the future flags from the previous commit are simply how v7 behaves, so they come back out. npm audit still reports GHSA-qwww-vcr4-c8h2 on react-router (RSC mode CSRF, fixed in 8.3.0). It needs RSC mode, which needs a server; this is a static SPA. Closing it means the v8 major, which is its own piece of work.
212 lines
10 KiB
TypeScript
212 lines
10 KiB
TypeScript
import ReactDOM from 'react-dom'
|
|
import { useEffect, useRef, useState } from 'react'
|
|
import { useNavigate } from 'react-router'
|
|
import { Loader2, CheckCircle2, AlertCircle, X } from 'lucide-react'
|
|
import { useTranslation } from '../../i18n'
|
|
import { addListener, removeListener } from '../../api/websocket'
|
|
import { reservationsApi, healthApi } from '../../api/client'
|
|
import { saveImportFiles } from '../../db/offlineDb'
|
|
import { useBackgroundTasksStore, type BackgroundImportTask } from '../../store/backgroundTasksStore'
|
|
|
|
/**
|
|
* Global, route-independent widget (bottom-right) that tracks background booking
|
|
* imports. Mounted once at the app root so it survives navigation. It listens to the
|
|
* user's WebSocket for import:progress / import:done / import:error and reflects each
|
|
* job; a finished job offers a "review" action that takes the user to the trip, where
|
|
* the per-item review flow opens. Polls running jobs as a backstop for missed pushes.
|
|
*/
|
|
export default function BackgroundTasksWidget() {
|
|
const { t } = useTranslation()
|
|
const navigate = useNavigate()
|
|
const tasks = useBackgroundTasksStore((s) => s.tasks)
|
|
const setProgress = useBackgroundTasksStore((s) => s.setProgress)
|
|
const setDone = useBackgroundTasksStore((s) => s.setDone)
|
|
const setError = useBackgroundTasksStore((s) => s.setError)
|
|
const requestReview = useBackgroundTasksStore((s) => s.requestReview)
|
|
const dismiss = useBackgroundTasksStore((s) => s.dismiss)
|
|
const addTask = useBackgroundTasksStore((s) => s.addTask)
|
|
|
|
const [aiParsing, setAiParsing] = useState(false)
|
|
useEffect(() => {
|
|
healthApi.features().then((f) => setAiParsing(!!f.aiParsing)).catch(() => setAiParsing(false))
|
|
}, [])
|
|
|
|
// Re-runs the same files with force-ai: the LLM sees every file, kitinerary is skipped.
|
|
const [retrying, setRetrying] = useState<string | null>(null)
|
|
const retryWithAi = async (task: BackgroundImportTask) => {
|
|
const files = task.sourceFiles
|
|
if (!files || files.length === 0 || retrying === task.id) return
|
|
setRetrying(task.id)
|
|
try {
|
|
const { jobId } = await reservationsApi.importBookingAsync(task.tripId, files, 'force-ai')
|
|
// Same as the modal's first submit: the review attaches each source document to the
|
|
// booking it created, and only IndexedDB survives a reload mid-parse.
|
|
await saveImportFiles(jobId, files)
|
|
dismiss(task.id)
|
|
addTask({ id: jobId, tripId: task.tripId, label: task.label, total: files.length, files, mode: 'force-ai' })
|
|
} catch (err) {
|
|
// 409 when the addon is enabled but this user has no model configured.
|
|
const message = (err as { response?: { data?: { error?: string } } })?.response?.data?.error
|
|
setError(task.id, task.tripId, message ?? t('reservations.import.error'))
|
|
} finally {
|
|
setRetrying(null)
|
|
}
|
|
}
|
|
|
|
// On (re)load, reconcile tasks restored from localStorage with the server: a parse
|
|
// that was still running when the page reloaded must keep its widget, so re-fetch each
|
|
// job's real status (and its parsed items) once. A job the server has since dropped
|
|
// (404, expired) is removed so no stale card lingers.
|
|
const didRehydrate = useRef(false)
|
|
useEffect(() => {
|
|
if (didRehydrate.current) return
|
|
didRehydrate.current = true
|
|
const restored = useBackgroundTasksStore.getState().tasks
|
|
for (const task of restored) {
|
|
reservationsApi
|
|
.importJobStatus(task.tripId, task.id)
|
|
.then((s) => {
|
|
if (s.status === 'done') setDone(task.id, task.tripId, (s.result?.items ?? []) as never, s.result?.warnings ?? [])
|
|
else if (s.status === 'error') setError(task.id, task.tripId, s.error ?? 'error')
|
|
else setProgress(task.id, task.tripId, s.done, s.total)
|
|
})
|
|
.catch((err: { response?: { status?: number } }) => {
|
|
if (err?.response?.status === 404) dismiss(task.id)
|
|
})
|
|
}
|
|
// run once on mount against whatever was rehydrated from storage
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [])
|
|
|
|
// Server pushes import:* to the user on whatever page they're on.
|
|
useEffect(() => {
|
|
const handler = (e: Record<string, unknown>) => {
|
|
const type = typeof e.type === 'string' ? e.type : ''
|
|
if (!type.startsWith('import:')) return
|
|
const id = String(e.jobId ?? '')
|
|
const tripId = String(e.tripId ?? '')
|
|
if (!id) return
|
|
if (type === 'import:progress') setProgress(id, tripId, Number(e.done ?? 0), Number(e.total ?? 1))
|
|
else if (type === 'import:done') {
|
|
const result = e.result as { items?: unknown[]; warnings?: string[] } | undefined
|
|
setDone(id, tripId, (result?.items ?? []) as never, result?.warnings ?? [])
|
|
} else if (type === 'import:error') setError(id, tripId, String(e.message ?? 'error'))
|
|
}
|
|
addListener(handler)
|
|
return () => removeListener(handler)
|
|
}, [setProgress, setDone, setError])
|
|
|
|
// Backstop: poll jobs whose state we still need — running ones (in case a WebSocket push
|
|
// was missed) and a restored 'done' task whose items haven't been re-fetched yet (so a
|
|
// failed one-shot rehydrate self-heals instead of getting stuck on "preview empty").
|
|
useEffect(() => {
|
|
const pending = tasks.filter((task) => task.status === 'running' || (task.status === 'done' && task.items === undefined))
|
|
if (pending.length === 0) return
|
|
const iv = setInterval(() => {
|
|
for (const task of pending) {
|
|
reservationsApi
|
|
.importJobStatus(task.tripId, task.id)
|
|
.then((s) => {
|
|
if (s.status === 'done') setDone(task.id, task.tripId, (s.result?.items ?? []) as never, s.result?.warnings ?? [])
|
|
else if (s.status === 'error') setError(task.id, task.tripId, s.error ?? 'error')
|
|
else setProgress(task.id, task.tripId, s.done, s.total)
|
|
})
|
|
.catch(() => {})
|
|
}
|
|
}, 5000)
|
|
return () => clearInterval(iv)
|
|
}, [tasks, setProgress, setDone, setError])
|
|
|
|
if (tasks.length === 0) return null
|
|
|
|
const review = (task: BackgroundImportTask) => {
|
|
requestReview(task.id)
|
|
navigate(`/trips/${task.tripId}`)
|
|
}
|
|
|
|
return ReactDOM.createPortal(
|
|
<div
|
|
style={{ position: 'fixed', right: 16, bottom: 16, zIndex: 50000, display: 'flex', flexDirection: 'column', gap: 8, width: 380, maxWidth: 'calc(100vw - 32px)', fontFamily: 'var(--font-system)' }}
|
|
>
|
|
{tasks.map((task) => (
|
|
<div
|
|
key={task.id}
|
|
className="bg-surface-card"
|
|
style={{ borderRadius: 12, border: '1px solid var(--border-primary)', boxShadow: '0 8px 24px rgba(0,0,0,0.18)', padding: '11px 13px', backdropFilter: 'blur(8px)', display: 'flex', gap: 10, alignItems: 'flex-start' }}
|
|
>
|
|
<div style={{ flexShrink: 0, marginTop: 1 }}>
|
|
{(task.status === 'running' || (task.status === 'done' && task.items === undefined)) && <Loader2 size={16} className="animate-spin" color="var(--accent)" />}
|
|
{task.status === 'done' && task.items !== undefined && <CheckCircle2 size={16} color="#10b981" />}
|
|
{task.status === 'error' && <AlertCircle size={16} color="#ef4444" />}
|
|
</div>
|
|
|
|
<div style={{ flex: 1, minWidth: 0 }}>
|
|
<div style={{ fontSize: 'calc(12.5px * var(--fs-scale-body, 1))', fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
|
|
{task.label}
|
|
</div>
|
|
|
|
{task.status === 'running' && (
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', color: 'var(--text-faint)', marginTop: 1 }}>
|
|
{t('reservations.import.parsing')}
|
|
{task.total > 1 ? ` · ${task.done}/${task.total}` : ''}
|
|
</div>
|
|
)}
|
|
|
|
{task.status === 'done' && (
|
|
task.items === undefined ? (
|
|
// Restored from a reload; items are being re-fetched (see the poll backstop).
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', color: 'var(--text-faint)', marginTop: 1 }}>{t('reservations.import.parsing')}</div>
|
|
) : task.items.length > 0 ? (
|
|
<button
|
|
onClick={() => review(task)}
|
|
className="bg-accent text-accent-text"
|
|
style={{ marginTop: 4, border: 'none', borderRadius: 8, padding: '4px 12px', fontSize: 'calc(11.5px * var(--fs-scale-caption, 1))', fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit' }}
|
|
>
|
|
{t('common.import')}
|
|
</button>
|
|
) : (
|
|
<div>
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', color: 'var(--text-faint)', marginTop: 1 }}>
|
|
{t('reservations.import.previewEmpty')}
|
|
{(task.warnings?.length ?? 0) > 0 && (
|
|
<div style={{ color: '#b45309', marginTop: 3, whiteSpace: 'pre-wrap', wordBreak: 'break-word', maxHeight: 96, overflowY: 'auto' }}>
|
|
{task.warnings!.join('\n')}
|
|
</div>
|
|
)}
|
|
</div>
|
|
{aiParsing && task.mode !== 'force-ai' && task.sourceFiles && task.sourceFiles.length > 0 && (
|
|
<button
|
|
onClick={() => retryWithAi(task)}
|
|
disabled={retrying === task.id}
|
|
className="bg-surface-tertiary text-content"
|
|
style={{ marginTop: 4, border: 'none', borderRadius: 8, padding: '4px 12px', fontSize: 'calc(11.5px * var(--fs-scale-caption, 1))', fontWeight: 600, cursor: retrying === task.id ? 'default' : 'pointer', opacity: retrying === task.id ? 0.6 : 1, fontFamily: 'inherit' }}
|
|
>
|
|
{t('reservations.import.tryAi')}
|
|
</button>
|
|
)}
|
|
</div>
|
|
)
|
|
)}
|
|
|
|
{task.status === 'error' && (
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', color: '#b91c1c', marginTop: 1, whiteSpace: 'pre-wrap' }}>{task.error}</div>
|
|
)}
|
|
</div>
|
|
|
|
{task.status !== 'running' && (
|
|
<button
|
|
onClick={() => dismiss(task.id)}
|
|
className="bg-transparent text-content-faint"
|
|
style={{ flexShrink: 0, border: 'none', cursor: 'pointer', padding: 2, borderRadius: 6, display: 'flex', alignItems: 'center' }}
|
|
aria-label={t('common.close')}
|
|
>
|
|
<X size={13} />
|
|
</button>
|
|
)}
|
|
</div>
|
|
))}
|
|
</div>,
|
|
document.body
|
|
)
|
|
}
|