Frontend redesign chunk 3: type layer honesty and the duplicate fix
Declare the fields the backend already writes and the UI was discarding: CallRecord gains location_coords, units, vehicles, cleared_units, duplicate_of, srcaddr (intelligence.py ~315-327); IncidentRecord gains units_active, units_cleared, location_mentions, last_thin_at (incident_correlator.py _attach, ~1270-1300). Filter duplicate_of client-side in useCalls.ts's three hooks (useCalls, useCallsByIncident, useActiveCalls) so a call flagged as a second node's recording of the same transmission no longer renders twice. Client-side rather than a where() clause to avoid a new composite index. Removes the two now-resolved DEFERRED.md entries (dedup/useCalls, lib/types.ts field gaps). Per UI_REDESIGN.md chunk 3.
This commit is contained in:
@@ -52,10 +52,17 @@ export function useCalls(limitCount = 50, dateFrom?: Date, dateTo?: Date) {
|
||||
const toISO = (v: any): string | null =>
|
||||
v?.toDate?.()?.toISOString?.() ?? (typeof v === "string" ? v : null);
|
||||
unsubFirestore = onSnapshot(q, (snap) => {
|
||||
setCalls(snap.docs.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
}));
|
||||
const docs = snap.docs
|
||||
.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
})
|
||||
// dedup.py flags a second node's recording of the same transmission
|
||||
// with duplicate_of set to the canonical call_id — filtered client-
|
||||
// side (not a where() clause) so this doesn't need a new composite
|
||||
// index alongside the existing org_id/started_at query.
|
||||
.filter((c) => !c.duplicate_of);
|
||||
setCalls(docs);
|
||||
setLoading(false);
|
||||
}, (err: FirestoreError) => { console.error("useCalls:", err); setError(err.message); setLoading(false); });
|
||||
});
|
||||
@@ -92,10 +99,12 @@ export function useCallsByIncident(incidentId: string | null) {
|
||||
where("incident_ids", "array-contains", incidentId)
|
||||
);
|
||||
unsubFirestore = onSnapshot(q, (snap) => {
|
||||
const docs = snap.docs.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
});
|
||||
const docs = snap.docs
|
||||
.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
})
|
||||
.filter((c) => !c.duplicate_of);
|
||||
docs.sort((a, b) => a.started_at.localeCompare(b.started_at));
|
||||
setCalls(docs);
|
||||
setLoading(false);
|
||||
@@ -131,10 +140,14 @@ export function useActiveCalls() {
|
||||
const toISO = (v: any): string | null =>
|
||||
v?.toDate?.()?.toISOString?.() ?? (typeof v === "string" ? v : null);
|
||||
unsubFirestore = onSnapshot(q, (snap) => {
|
||||
setCalls(snap.docs.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
}));
|
||||
setCalls(
|
||||
snap.docs
|
||||
.map((d) => {
|
||||
const data = d.data();
|
||||
return { ...data, started_at: toISO(data.started_at) ?? "", ended_at: toISO(data.ended_at) } as CallRecord;
|
||||
})
|
||||
.filter((c) => !c.duplicate_of)
|
||||
);
|
||||
}, (err: FirestoreError) => { console.error("useActiveCalls:", err); });
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user