Field setups often relay through a phone/gateway that owns the MQTT connection, so the publishing credential and the instrument are now separate concepts: - Points messages carry a "serial" identifying the locator receiver; unknown serials are auto-registered as devices in the publisher's org (name "Locator <serial>"). Device.mqttUsername is now optional and serialNumber is unique per org. - LocatePoint gains standard receiver telemetry: frequencyHz, currentMa, signalDb, gainDb, locateMode (PEAK/NULL/BROAD_PEAK/SONDE), phaseDeg, compassDeg, distortionPct, plus GPS quality columns vAccuracy, satellites, hdop. All optional; raw payload still kept. - Migration hand-edited to preserve the generated geom column and its GIST index (Prisma diff wanted to drop both). - REST create/point DTOs, map tooltips, job-detail latest-point readout, devices settings form, seed, and the sample publisher all carry the new fields. - Added .dockerignore for backend/web: COPY . . was clobbering the image's freshly generated Prisma client with the host's stale node_modules, breaking image builds after schema changes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
119 lines
4.0 KiB
TypeScript
119 lines
4.0 KiB
TypeScript
import { useRouter } from 'next/router';
|
|
import { useCallback, useEffect, useState } from 'react';
|
|
import Layout from '../../components/Layout';
|
|
import JobMap from '../../components/map/JobMap';
|
|
import { pointSummary, type MapPoint } from '../../components/map/types';
|
|
import { api } from '../../lib/api';
|
|
import { useRequireAuth } from '../../lib/auth-context';
|
|
import { useJobStream } from '../../lib/use-job-stream';
|
|
|
|
interface JobDetail {
|
|
id: string;
|
|
ticketNumber: string;
|
|
title: string;
|
|
description: string | null;
|
|
address: string | null;
|
|
status: string;
|
|
source: string;
|
|
dueAt: string | null;
|
|
createdAt: string;
|
|
assignedTo: { id: string; name: string; email: string } | null;
|
|
_count: { points: number };
|
|
}
|
|
|
|
const STATUSES = ['OPEN', 'IN_PROGRESS', 'COMPLETED', 'CANCELLED'];
|
|
|
|
export default function JobDetailPage() {
|
|
const { user, activeOrg, loading } = useRequireAuth();
|
|
const router = useRouter();
|
|
const jobId = typeof router.query.jobId === 'string' ? router.query.jobId : null;
|
|
const orgId = activeOrg?.org.id ?? null;
|
|
|
|
const [job, setJob] = useState<JobDetail | null>(null);
|
|
const [points, setPoints] = useState<MapPoint[]>([]);
|
|
const [live, setLive] = useState(0);
|
|
const [error, setError] = useState<string | null>(null);
|
|
|
|
useEffect(() => {
|
|
if (!orgId || !jobId) {
|
|
return;
|
|
}
|
|
api
|
|
.get<JobDetail>(`/api/orgs/${orgId}/jobs/${jobId}`)
|
|
.then(setJob)
|
|
.catch((err) => setError(err.message));
|
|
api
|
|
.get<{ points: MapPoint[] }>(`/api/orgs/${orgId}/jobs/${jobId}/points`)
|
|
.then((res) => setPoints(res.points))
|
|
.catch((err) => setError(err.message));
|
|
}, [orgId, jobId]);
|
|
|
|
const onLivePoints = useCallback((incoming: MapPoint[]) => {
|
|
setPoints((prev) => {
|
|
const seen = new Set(prev.map((p) => p.id));
|
|
const fresh = incoming.filter((p) => !seen.has(p.id));
|
|
return fresh.length > 0 ? [...prev, ...fresh] : prev;
|
|
});
|
|
setLive((n) => n + incoming.length);
|
|
}, []);
|
|
|
|
useJobStream(jobId, onLivePoints);
|
|
|
|
const updateStatus = async (status: string) => {
|
|
if (!orgId || !jobId) {
|
|
return;
|
|
}
|
|
try {
|
|
setJob(await api.patch<JobDetail>(`/api/orgs/${orgId}/jobs/${jobId}`, { status }));
|
|
} catch (err: any) {
|
|
setError(err.message);
|
|
}
|
|
};
|
|
|
|
if (loading || !user) {
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<Layout title={job ? job.ticketNumber : 'Job'}>
|
|
{error && <p style={{ color: '#c62828' }}>{error}</p>}
|
|
{job && (
|
|
<>
|
|
<div style={{ display: 'flex', alignItems: 'baseline', gap: '1rem', flexWrap: 'wrap' }}>
|
|
<h1 style={{ margin: 0 }}>{job.ticketNumber}</h1>
|
|
<span style={{ fontSize: '1.1rem' }}>{job.title}</span>
|
|
<select value={job.status} onChange={(e) => updateStatus(e.target.value)} style={{ marginLeft: 'auto' }}>
|
|
{STATUSES.map((s) => (
|
|
<option key={s} value={s}>
|
|
{s}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</div>
|
|
<p style={{ color: '#666' }}>
|
|
{job.address && <>{job.address} · </>}
|
|
source {job.source} · created {new Date(job.createdAt).toLocaleString()}
|
|
{job.assignedTo && <> · assigned to {job.assignedTo.name}</>}
|
|
{job.dueAt && <> · locate by {new Date(job.dueAt).toLocaleString()}</>}
|
|
</p>
|
|
{job.description && <p>{job.description}</p>}
|
|
|
|
<div style={{ margin: '1rem 0', display: 'flex', gap: '1rem', color: '#555', flexWrap: 'wrap' }}>
|
|
<span>
|
|
<strong>{points.length}</strong> points
|
|
</span>
|
|
<span style={{ color: live > 0 ? '#388e3c' : '#999' }}>
|
|
● live{live > 0 ? ` (+${live} this session)` : ''}
|
|
</span>
|
|
{points.length > 0 && (
|
|
<span style={{ color: '#777' }}>latest: {pointSummary(points[points.length - 1])}</span>
|
|
)}
|
|
</div>
|
|
|
|
<JobMap points={points} heightPx={520} />
|
|
</>
|
|
)}
|
|
</Layout>
|
|
);
|
|
}
|