mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 21:46:49 +00:00
Maurice
1ad2e92142
The bulk of what SonarQube still had open on the reliability side, read site by
site rather than swept. Two clusters are worth calling out because they are
defects, not lint.
**Four regexes could be made to hang the process.** The worst is
`/.+@.+\..+/` in the forgot-password path: three unbounded `.+` that all
overlap, unanchored, on an endpoint that needs no login and whose schema is a
bare z.string() under a 100kb body cap. A thousand '@' characters had not
finished after 100 seconds — one request pins the event loop, and Node has one.
EMAIL_REGEX in auth.helpers is the same shape on register and profile update
(310ms for 8kb). The two tag strippers over an uploaded KML description and over
Commons metadata took 0.52s on a 16k run of '<'. Each rewrite was proven
equivalent by brute force against the original — millions of strings for the
coordinate patterns, 671,876 for the tag stripper — because a subtly different
regex on a parsing path is worse than the finding.
`<[^>]+>` could not be fixed in the pattern: `[^>]` matches `<` too, so the only
unambiguous form changes what happens to malformed markup. It is now a scan in
common/stripHtmlTags.ts, quirks included — `<>` is left alone, `<a<b>` is one
tag — with the equivalence pinned by a test that compares against the old regex
over every string up to length six.
**And roughly 500 places could only be reached with a mouse.** Clickable divs
became real buttons where the markup allowed (52 of them), took
role + tabIndex + Enter/Space where they had to stay divs, and modal backdrops
took role="presentation" — the honest role, since a backdrop is a mouse shortcut
for a Cancel control that is already in the tab order, and making it a button
plants a nameless full-screen tab stop around its own contents.
Alongside those: `.sort()` calls that now say the order they always had, `{n &&
<X/>}` guards that rendered a literal "0" for a zero-byte file and for a place at
latitude 0, an optimistic budget write that stored a boolean where the contract
and both transports use 0/1, and the Number statics.
sonar-project.properties documents the six that were deliberately left: two wiki
patterns with no overlapping quantifier pair whose "fix" would stop parsing
`[see [1]](url)`, four tar header fields bounded at 12-155 bytes by the format,
two djb2 hashes where the 32-bit wrap is the algorithm, two `| 0` that are also
coercing undefined to 0 on a path where the API sends no user_id, and the MCP
session maps Sonar reads as empty because they are filled from another module.
394 lines
16 KiB
TypeScript
394 lines
16 KiB
TypeScript
import React from 'react'
|
|
import { createPortal } from 'react-dom'
|
|
import { useState, useRef, useEffect } from 'react'
|
|
import { Upload } from 'lucide-react'
|
|
import { useTranslation } from '../../i18n'
|
|
import { useToast } from '../shared/Toast'
|
|
import { placesApi } from '../../api/client'
|
|
import { useTripStore } from '../../store/tripStore'
|
|
|
|
interface PlacesImportSummary {
|
|
totalPlacemarks: number
|
|
createdCount: number
|
|
skippedCount: number
|
|
warnings: string[]
|
|
errors: string[]
|
|
}
|
|
|
|
interface FileImportModalProps {
|
|
isOpen: boolean
|
|
onClose: () => void
|
|
tripId: number
|
|
pushUndo?: (label: string, undoFn: () => Promise<void> | void) => void
|
|
initialFile?: File | null
|
|
}
|
|
|
|
const MAX_FILE_BYTES = 10 * 1024 * 1024
|
|
|
|
export default function FileImportModal({ isOpen, onClose, tripId, pushUndo, initialFile }: FileImportModalProps) {
|
|
const { t } = useTranslation()
|
|
const toast = useToast()
|
|
const loadTrip = useTripStore((s) => s.loadTrip)
|
|
const fileInputRef = useRef<HTMLInputElement>(null)
|
|
|
|
const [files, setFiles] = useState<File[]>([])
|
|
const [isDragOver, setIsDragOver] = useState(false)
|
|
const [loading, setLoading] = useState(false)
|
|
const [error, setError] = useState('')
|
|
const [summary, setSummary] = useState<PlacesImportSummary | null>(null)
|
|
const [gpxOpts, setGpxOpts] = useState({ waypoints: true, routes: true, tracks: true })
|
|
const [kmlOpts, setKmlOpts] = useState({ points: true, paths: true })
|
|
|
|
const validateFile = (f: File): string | null => {
|
|
const ext = f.name.toLowerCase().split('.').pop()
|
|
if (ext !== 'gpx' && ext !== 'kml' && ext !== 'kmz') {
|
|
return t('places.importFileUnsupported')
|
|
}
|
|
if (f.size > MAX_FILE_BYTES) {
|
|
return t('places.importFileTooLarge', { maxMb: 10 })
|
|
}
|
|
return null
|
|
}
|
|
|
|
const reset = () => {
|
|
setFiles([])
|
|
setIsDragOver(false)
|
|
setLoading(false)
|
|
setError('')
|
|
setSummary(null)
|
|
}
|
|
|
|
// When the modal opens, reset state and pre-load any file dropped from the sidebar.
|
|
useEffect(() => {
|
|
if (!isOpen) return
|
|
setIsDragOver(false)
|
|
setLoading(false)
|
|
setSummary(null)
|
|
if (initialFile) {
|
|
const err = validateFile(initialFile)
|
|
if (err) {
|
|
setFiles([])
|
|
setError(err)
|
|
} else {
|
|
setFiles([initialFile])
|
|
setError('')
|
|
}
|
|
} else {
|
|
setFiles([])
|
|
setError('')
|
|
}
|
|
// validateFile uses t() which is stable — intentionally omitted from deps
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [isOpen, initialFile])
|
|
|
|
const handleClose = () => {
|
|
reset()
|
|
onClose()
|
|
}
|
|
|
|
const selectFiles = (incoming: File[]) => {
|
|
if (incoming.length === 0) return
|
|
const valid: File[] = []
|
|
let firstError: string | null = null
|
|
for (const f of incoming) {
|
|
const validationError = validateFile(f)
|
|
if (validationError) {
|
|
firstError = firstError ?? validationError
|
|
continue
|
|
}
|
|
valid.push(f)
|
|
}
|
|
if (valid.length === 0) {
|
|
setError(firstError ?? '')
|
|
setFiles([])
|
|
return
|
|
}
|
|
setFiles(valid)
|
|
setError(firstError ?? '')
|
|
setSummary(null)
|
|
}
|
|
|
|
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
const list = e.target.files ? Array.from(e.target.files) : []
|
|
e.target.value = ''
|
|
if (list.length) selectFiles(list)
|
|
}
|
|
|
|
const handleDragOver = (e: React.DragEvent) => {
|
|
e.preventDefault()
|
|
setIsDragOver(true)
|
|
}
|
|
|
|
const handleDragLeave = (e: React.DragEvent) => {
|
|
if (e.target === e.currentTarget) setIsDragOver(false)
|
|
}
|
|
|
|
const handleDrop = (e: React.DragEvent) => {
|
|
e.preventDefault()
|
|
setIsDragOver(false)
|
|
const list = Array.from(e.dataTransfer.files)
|
|
if (list.length) selectFiles(list)
|
|
}
|
|
|
|
const handleImport = async () => {
|
|
if (files.length === 0 || loading) return
|
|
setLoading(true)
|
|
setError('')
|
|
setSummary(null)
|
|
|
|
let totalCreated = 0
|
|
let totalSkipped = 0
|
|
const createdIds: number[] = []
|
|
const errors: string[] = []
|
|
let mergedSummary: PlacesImportSummary | null = null
|
|
let importedGpx = false
|
|
let importedKml = false
|
|
|
|
for (const f of files) {
|
|
const ext = f.name.toLowerCase().split('.').pop()
|
|
try {
|
|
if (ext === 'gpx') {
|
|
importedGpx = true
|
|
const result = await placesApi.importGpx(tripId, f, gpxOpts)
|
|
totalCreated += result.count ?? 0
|
|
totalSkipped += result.skipped ?? 0
|
|
if (result.places?.length > 0) createdIds.push(...result.places.map((p: { id: number }) => p.id))
|
|
} else {
|
|
importedKml = true
|
|
const result = await placesApi.importMapFile(tripId, f, kmlOpts)
|
|
totalCreated += result.count ?? 0
|
|
if (result.places?.length > 0) createdIds.push(...result.places.map((p: { id: number }) => p.id))
|
|
const s = result.summary as PlacesImportSummary | undefined
|
|
if (s) {
|
|
mergedSummary = mergedSummary
|
|
? {
|
|
totalPlacemarks: mergedSummary.totalPlacemarks + s.totalPlacemarks,
|
|
createdCount: mergedSummary.createdCount + s.createdCount,
|
|
skippedCount: mergedSummary.skippedCount + s.skippedCount,
|
|
warnings: [...mergedSummary.warnings, ...(s.warnings ?? [])],
|
|
errors: [...mergedSummary.errors, ...(s.errors ?? [])],
|
|
}
|
|
: s
|
|
totalSkipped += s.skippedCount ?? 0
|
|
}
|
|
}
|
|
} catch (err: any) {
|
|
const message = err?.response?.data?.error || t('places.importFileError')
|
|
errors.push(files.length > 1 ? `${f.name}: ${message}` : message)
|
|
}
|
|
}
|
|
|
|
await loadTrip(tripId)
|
|
|
|
if (createdIds.length > 0) {
|
|
pushUndo?.(importedGpx && !importedKml ? t('undo.importGpx') : t('undo.importKeyholeMarkup'), async () => {
|
|
try { await placesApi.bulkDelete(tripId, createdIds) } catch {}
|
|
await loadTrip(tripId)
|
|
})
|
|
}
|
|
|
|
if (totalCreated > 0) {
|
|
const key = importedKml && !importedGpx ? 'places.kmlKmzImported' : 'places.gpxImported'
|
|
toast.success(t(key, { count: totalCreated }))
|
|
} else if (totalSkipped > 0 && errors.length === 0) {
|
|
toast.warning(t('places.importAllSkipped'))
|
|
}
|
|
|
|
if (mergedSummary) setSummary(mergedSummary)
|
|
if (errors.length > 0) {
|
|
setError(errors.join('\n'))
|
|
toast.error(errors[0])
|
|
}
|
|
|
|
setLoading(false)
|
|
|
|
// Close once everything succeeded and there's no KML summary left to surface.
|
|
if (errors.length === 0 && !mergedSummary) handleClose()
|
|
}
|
|
|
|
const exts = files.map(f => f.name.toLowerCase().split('.').pop() ?? '')
|
|
const isGpx = exts.includes('gpx')
|
|
const isKml = exts.some(e => e === 'kml' || e === 'kmz')
|
|
const gpxNoneSelected = isGpx && !gpxOpts.waypoints && !gpxOpts.routes && !gpxOpts.tracks
|
|
const kmlNoneSelected = isKml && !kmlOpts.points && !kmlOpts.paths
|
|
const canImport = files.length > 0 && !loading && !gpxNoneSelected && !kmlNoneSelected
|
|
|
|
if (!isOpen) return null
|
|
|
|
return createPortal(
|
|
<div
|
|
role="presentation"
|
|
onClick={handleClose}
|
|
className="bg-[rgba(0,0,0,0.4)]"
|
|
style={{ position: 'fixed', inset: 0, zIndex: 99999, display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }}
|
|
>
|
|
<div
|
|
role="presentation"
|
|
onClick={e => e.stopPropagation()}
|
|
className="bg-surface-card"
|
|
style={{ borderRadius: 16, width: '100%', maxWidth: 520, padding: 24, boxShadow: '0 8px 32px rgba(0,0,0,0.2)', fontFamily: "var(--font-system)" }}
|
|
>
|
|
<div style={{ fontSize: 'calc(15px * var(--fs-scale-subtitle, 1))', fontWeight: 700, color: 'var(--text-primary)', marginBottom: 6 }}>
|
|
{t('places.importFile')}
|
|
</div>
|
|
<div style={{ fontSize: 'calc(12px * var(--fs-scale-body, 1))', color: 'var(--text-faint)', marginBottom: 14, lineHeight: 1.45 }}>
|
|
{t('places.importFileHint')}
|
|
</div>
|
|
|
|
<input
|
|
ref={fileInputRef}
|
|
type="file"
|
|
accept=".gpx,.kml,.kmz"
|
|
multiple
|
|
style={{ display: 'none' }}
|
|
onChange={handleInputChange}
|
|
/>
|
|
|
|
<button
|
|
type="button"
|
|
onClick={() => fileInputRef.current?.click()}
|
|
onDragOver={handleDragOver}
|
|
onDragEnter={handleDragOver}
|
|
onDragLeave={handleDragLeave}
|
|
onDrop={handleDrop}
|
|
className={isDragOver ? 'bg-surface-tertiary' : 'bg-transparent'}
|
|
style={{
|
|
width: '100%',
|
|
minHeight: 88,
|
|
borderRadius: 12,
|
|
border: `2px dashed ${isDragOver ? 'var(--accent)' : 'var(--border-primary)'}`,
|
|
display: 'flex',
|
|
flexDirection: 'column',
|
|
alignItems: 'center',
|
|
justifyContent: 'center',
|
|
gap: 6,
|
|
fontSize: 'calc(13px * var(--fs-scale-body, 1))',
|
|
fontWeight: 500,
|
|
cursor: 'pointer',
|
|
marginBottom: 12,
|
|
fontFamily: 'inherit',
|
|
transition: 'border-color 0.15s, background 0.15s',
|
|
boxSizing: 'border-box',
|
|
padding: 16,
|
|
}}
|
|
>
|
|
<Upload size={18} strokeWidth={1.8} color={isDragOver ? 'var(--accent)' : 'var(--text-faint)'} style={{ pointerEvents: 'none' }} />
|
|
{isDragOver ? (
|
|
<span className="text-accent" style={{ pointerEvents: 'none' }}>{t('places.importFileDropActive')}</span>
|
|
) : files.length > 0 ? (
|
|
<span style={{ color: 'var(--text-primary)', textAlign: 'center', wordBreak: 'break-all', pointerEvents: 'none' }}>{files.map(f => f.name).join(', ')}</span>
|
|
) : (
|
|
<span style={{ color: 'var(--text-faint)', textAlign: 'center', pointerEvents: 'none' }}>{t('places.importFileDropHere')}</span>
|
|
)}
|
|
</button>
|
|
|
|
{isGpx && (
|
|
<div style={{ marginBottom: 12 }}>
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', fontWeight: 600, color: 'var(--text-muted)', marginBottom: 6, textTransform: 'uppercase', letterSpacing: '0.05em' }}>
|
|
{t('places.gpxImportTypes')}
|
|
</div>
|
|
{(['waypoints', 'routes', 'tracks'] as const).map(key => (
|
|
<button type="button" key={key} role="checkbox" aria-checked={gpxOpts[key]} onClick={() => setGpxOpts(prev => ({ ...prev, [key]: !prev[key] }))} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '4px 0', cursor: 'pointer', width: '100%', border: 'none', background: 'transparent', fontFamily: 'inherit', textAlign: 'left' }}>
|
|
<div className={gpxOpts[key] ? 'bg-accent' : 'bg-transparent'} style={{
|
|
width: 16, height: 16, borderRadius: 4, flexShrink: 0,
|
|
border: gpxOpts[key] ? 'none' : '1.5px solid var(--border-primary)',
|
|
display: 'flex', alignItems: 'center', justifyContent: 'center',
|
|
}}>
|
|
{gpxOpts[key] && <svg width="10" height="10" viewBox="0 0 10 10"><polyline points="1.5,5 4,7.5 8.5,2" stroke="white" strokeWidth="1.8" fill="none" strokeLinecap="round" strokeLinejoin="round" /></svg>}
|
|
</div>
|
|
<span style={{ fontSize: 'calc(12px * var(--fs-scale-body, 1))', color: 'var(--text-primary)', userSelect: 'none' }}>
|
|
{t(key === 'waypoints' ? 'places.gpxImportWaypoints' : key === 'routes' ? 'places.gpxImportRoutes' : 'places.gpxImportTracks')}
|
|
</span>
|
|
</button>
|
|
))}
|
|
{gpxNoneSelected && (
|
|
<div className="text-[#b45309]" style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', marginTop: 4 }}>{t('places.gpxImportNoneSelected')}</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{isKml && (
|
|
<div style={{ marginBottom: 12 }}>
|
|
<div style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', fontWeight: 600, color: 'var(--text-muted)', marginBottom: 6, textTransform: 'uppercase', letterSpacing: '0.05em' }}>
|
|
{t('places.kmlImportTypes')}
|
|
</div>
|
|
{(['points', 'paths'] as const).map(key => (
|
|
<button type="button" key={key} role="checkbox" aria-checked={kmlOpts[key]} onClick={() => setKmlOpts(prev => ({ ...prev, [key]: !prev[key] }))} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '4px 0', cursor: 'pointer', width: '100%', border: 'none', background: 'transparent', fontFamily: 'inherit', textAlign: 'left' }}>
|
|
<div className={kmlOpts[key] ? 'bg-accent' : 'bg-transparent'} style={{
|
|
width: 16, height: 16, borderRadius: 4, flexShrink: 0,
|
|
border: kmlOpts[key] ? 'none' : '1.5px solid var(--border-primary)',
|
|
display: 'flex', alignItems: 'center', justifyContent: 'center',
|
|
}}>
|
|
{kmlOpts[key] && <svg width="10" height="10" viewBox="0 0 10 10"><polyline points="1.5,5 4,7.5 8.5,2" stroke="white" strokeWidth="1.8" fill="none" strokeLinecap="round" strokeLinejoin="round" /></svg>}
|
|
</div>
|
|
<span style={{ fontSize: 'calc(12px * var(--fs-scale-body, 1))', color: 'var(--text-primary)', userSelect: 'none' }}>
|
|
{t(key === 'points' ? 'places.kmlImportPoints' : 'places.kmlImportPaths')}
|
|
</span>
|
|
</button>
|
|
))}
|
|
{kmlNoneSelected && (
|
|
<div className="text-[#b45309]" style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', marginTop: 4 }}>{t('places.kmlImportNoneSelected')}</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{summary && (
|
|
<div style={{
|
|
border: '1px solid var(--border-primary)', borderRadius: 10,
|
|
background: 'var(--bg-tertiary)', padding: 10, marginBottom: 10,
|
|
}}>
|
|
<div style={{ fontSize: 'calc(12px * var(--fs-scale-body, 1))', color: 'var(--text-muted)' }}>
|
|
{t('places.kmlKmzSummaryValues', {
|
|
total: summary.totalPlacemarks,
|
|
created: summary.createdCount,
|
|
skipped: summary.skippedCount,
|
|
})}
|
|
</div>
|
|
{summary.warnings?.length > 0 && (
|
|
<div className="text-[#b45309]" style={{ marginTop: 8, fontSize: 'calc(12px * var(--fs-scale-body, 1))', whiteSpace: 'pre-wrap' }}>
|
|
{summary.warnings.join('\n')}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{error && (
|
|
<div className="bg-[rgba(239,68,68,0.08)] text-[#b91c1c]" style={{
|
|
border: '1px solid rgba(239,68,68,0.35)', borderRadius: 10,
|
|
padding: '8px 10px',
|
|
fontSize: 'calc(12px * var(--fs-scale-body, 1))', whiteSpace: 'pre-wrap', marginBottom: 10,
|
|
}}>
|
|
{error}
|
|
</div>
|
|
)}
|
|
|
|
<div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
|
|
<button type="button"
|
|
onClick={handleClose}
|
|
style={{
|
|
padding: '8px 16px', borderRadius: 10, border: '1px solid var(--border-primary)',
|
|
background: 'none', color: 'var(--text-primary)', fontSize: 'calc(13px * var(--fs-scale-body, 1))', fontWeight: 500,
|
|
cursor: 'pointer', fontFamily: 'inherit',
|
|
}}
|
|
>
|
|
{t('common.cancel')}
|
|
</button>
|
|
<button type="button"
|
|
onClick={handleImport}
|
|
disabled={!canImport}
|
|
className={canImport ? 'bg-accent text-accent-text' : 'bg-surface-tertiary text-content-faint'}
|
|
style={{
|
|
padding: '8px 16px', borderRadius: 10, border: 'none',
|
|
fontSize: 'calc(13px * var(--fs-scale-body, 1))', fontWeight: 500, cursor: canImport ? 'pointer' : 'default',
|
|
fontFamily: 'inherit',
|
|
}}
|
|
>
|
|
{loading ? t('common.loading') : t('common.import')}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>,
|
|
document.body
|
|
)
|
|
}
|