6 Commits

Author SHA1 Message Date
266def727b - added AUTO setting to mode 2025-12-12 09:24:13 +00:00
dcc58d527a - minor fix to spelling 2025-12-12 09:14:03 +00:00
dbaeffe246 - minor fixe on hotlist
- minor fix on secondary ip address in modem settings
2025-11-25 11:38:29 +00:00
12cd0f9f37 - minor adjustments to modal 2025-11-19 15:03:20 +00:00
0b3dcbb265 - added hotlists being displayed
- functionality to delete hotlist
2025-11-19 13:55:21 +00:00
ea93053dd3 - sesstions start by default
- added restart session button
2025-11-19 11:52:37 +00:00
15 changed files with 195 additions and 58 deletions

View File

@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faEye, faEyeSlash } from "@fortawesome/free-regular-svg-icons";
import CardHeader from "../UI/CardHeader";
import { useCameraMode, useCameraZoom } from "../../hooks/useCameraZoom";
import { parseRTSPUrl, reverseZoomMapping, zoomMapping } from "../../utils/utils";
import { capitalize, parseRTSPUrl, reverseZoomMapping, zoomMapping } from "../../utils/utils";
type CameraSettingsProps = {
initialData: CameraConfig;
@@ -181,9 +181,9 @@ const CameraSettingFields = ({
<div
role="radiogroup"
aria-label="Camera mode"
className="mx-auto grid grid-cols-2 place-items-center gap-3"
className="mx-auto grid grid-cols-3 place-items-center gap-3"
>
{["day", "night"].map((el) => (
{["day", "night", "auto"].map((el) => (
<div key={el} className="my-3">
<Field
type="radio"
@@ -205,7 +205,7 @@ const CameraSettingFields = ({
peer-checked:text-blue-600 peer-checked:bg-gray-100
${cameraModeMutation.isPending ? "opacity-60 cursor-not-allowed" : "cursor-pointer"}`}
>
{el === "day" ? "Day" : "Night"}
{capitalize(el)}
</label>
</div>
))}

View File

@@ -0,0 +1,67 @@
import { useHotlistData } from "../../hooks/useHotListData";
import { useIntegrationsContext } from "../../context/IntegrationsContext";
import Card from "../UI/Card";
import CardHeader from "../UI/CardHeader";
import { toast } from "sonner";
import { faTrash } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
const HotlistList = () => {
const { state, dispatch } = useIntegrationsContext();
const { mutation } = useHotlistData();
const hotlists = state?.hotlistFiles;
const handleDeleteClick = async (filename: string) => {
await mutation.mutateAsync(filename);
dispatch({ type: "DELETEHOTLIST", payload: filename });
toast.success(`${filename} successfully deleted`);
};
return (
<Card className="p-4">
<CardHeader title="Uploaded hotlists" />
{hotlists?.length > 0 ? (
<ul className="px-2">
{hotlists?.map((hotlist) => (
<li
key={hotlist.filename}
className="flex flex-row justify-between my-3 items-center border-b border-gray-700"
>
<div>
<p className="text-xl">{hotlist.filename}</p>
<div className="flex flex-row gap-3">
<div>
<p className="text-gray-400">
Number of records: <span>{hotlist.rowCount}</span>
</p>
</div>
<div>
<p className="text-gray-400">
File Size (bytes): <span>{hotlist.fileSizeBytes}</span>
</p>
</div>
</div>
</div>
<button onClick={() => handleDeleteClick(hotlist.filename)}>
<FontAwesomeIcon icon={faTrash} />
</button>
</li>
))}
</ul>
) : (
<div className="mt-4 flex flex-col items-center justify-center rounded-2xl border border-slate-800 bg-slate-900/40 p-10 text-center">
<div className="mb-3 rounded-xl bg-slate-800 px-3 py-1 text-xs uppercase tracking-wider text-slate-400">
No Uploaded Hotlists
</div>
<p className="max-w-md text-slate-300">
<span className="text-emerald-400">Hotlists</span> will appear here once there are uploaded.
</p>
</div>
)}
</Card>
);
};
export default HotlistList;

View File

@@ -4,7 +4,7 @@ import { useIntegrationsContext } from "../../context/IntegrationsContext";
import type { ReducedSightingType } from "../../types/types";
import { toast } from "sonner";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faFloppyDisk, faPause, faPlay, faStop } from "@fortawesome/free-solid-svg-icons";
import { faFloppyDisk, faPause, faPlay, faStop, faArrowRotateRight } from "@fortawesome/free-solid-svg-icons";
import VehicleSessionItem from "../UI/VehicleSessionItem";
import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
@@ -70,6 +70,21 @@ const SessionCard = () => {
if (result.reason === "OK") toast.success("Session saved");
};
const handleRestartClick = async () => {
const result = await mutation.mutateAsync({
operation: "INSERT",
path: "sessionStats",
value: [],
});
await mutation.mutateAsync({
operation: "SAVE",
path: "",
value: null,
});
if (result.reason === "OK") toast.success("Session restarted");
dispatch({ type: "SESSIONRESTART", payload: [] });
};
return (
<Card className="p-4 col-span-3">
<CardHeader title="Session" />
@@ -85,6 +100,17 @@ const SessionCard = () => {
<p>{sessionStarted ? "End Session" : "Start Session"}</p>
</div>
</button>
{sessionStarted && (
<button
className={`bg-none text-white px-4 py-2 rounded transition w-full border border-gray-500 hover:bg-gray-500 hover:text-gray-900`}
onClick={handleRestartClick}
>
<div className="flex flex-row gap-3 items-center justify-self-center">
<FontAwesomeIcon icon={faArrowRotateRight} />
<p>Restart Session</p>
</div>
</button>
)}
<div className="flex flex-col lg:flex-row gap-5">
{sessionStarted && (
<button

View File

@@ -183,7 +183,7 @@ const ChannelFields = ({ touched, isSubmitting, format }: ChannelFieldsProps) =>
className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
>
<option value={"UTC"}>UTC</option>
<option value={"local"}>Local</option>
<option value={"LOCAL"}>Local</option>
</Field>
</FormGroup>
<FormGroup>

View File

@@ -5,6 +5,7 @@ import { CAM_BASE } from "../../../utils/config";
const NPEDHotlist = () => {
const { uploadSettings } = useSystemConfig();
const initialValue = {
file: null,
};

View File

@@ -37,41 +37,32 @@ const ModemSettings = () => {
const handleSubmit = async (values: ModemSettingsType) => {
const invalidPrimary = ValidateIPaddress(values.serverPrimary);
const invalidSecondary = ValidateIPaddress(values.serverSecondary);
if (invalidPrimary || invalidSecondary) {
toast.error(invalidPrimary || invalidSecondary, {
id: "invalid-ip",
});
return;
}
const fields = [
{ property: "propAPN", value: values.apn },
{ property: "propPassword", value: values.password },
{ property: "propUsername", value: values.username },
{ property: "propMode", value: showSettings ? "AUTO" : "MANUAL" },
{ property: "propNameServerPrimary", value: values.serverPrimary },
];
if (values.serverSecondary?.trim()) {
fields.push({
property: "propNameServerSecondary",
value: values.serverSecondary.trim(),
});
}
const modemConfig = {
id: "ModemAndWifiManager-modem",
fields: [
{
property: "propAPN",
value: values.apn,
},
{
property: "propPassword",
value: values.password,
},
{
property: "propUsername",
value: values.username,
},
{
property: "propMode",
value: showSettings ? "AUTO" : "MANUAL",
},
{
property: "propNameServerPrimary",
value: values.serverPrimary,
},
{
property: "propNameServerSecondary",
value: values.serverSecondary,
},
],
fields,
};
const response = await modemMutation.mutateAsync(modemConfig);

View File

@@ -83,7 +83,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
return (
<>
<ModalComponent isModalOpen={isSightingModalOpen} close={handleClose}>
<div className="max-w-screen-lg mx-auto py-4 px-2">
<div className="mx-auto py-4 px-6 overflow-y-scroll">
<div className="border-b border-gray-600 mb-4">
<h2 className="text-lg md:text-xl font-semibold">Sighting Details</h2>
</div>
@@ -134,7 +134,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
{isNPEDHitB && <img src={NPED_CAT_B} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
{isNPEDHitC && <img src={NPED_CAT_C} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
</div>
{hotlistNames && (
{hotlistNames && hotlistNames.length > 0 && (
<div className="flex flex-col border-b border-gray-600 mb-4">
<p className="text-gray-300">Hotlists</p>
<div className="grid grid-cols-1 md:grid-cols-2 gap-x-[90%] lg:gap-x-[15%] w-[50%]">
@@ -148,11 +148,11 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
</div>
</div>
)}
<div className="flex flex-col lg:flex-row items-center gap-3">
<div className="flex flex-col lg:flex-row items-center gap-3 ">
<img
src={sighting?.overviewUrl}
alt="overview patch"
className="w-full h-56 sm:h-72 md:h-96 rounded-lg object-cover border border-gray-700"
className="w-full h-56 sm:h-72 md:h-72 rounded-lg object-cover border border-gray-700"
/>
<aside className="w-full lg:w-80 bg-gray-800/70 text-white rounded-xl py-4 px-2 border h-[70%] border-gray-700">
<h3 className="text-base md:text-lg font-semibold pb-2 border-b border-gray-700">Vehicle Info</h3>

View File

@@ -12,7 +12,7 @@ const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) =
<Modal
isOpen={isModalOpen}
onRequestClose={close}
className="bg-[#1e2a38] p-6 rounded-lg shadow-lg max-w-[80%] mx-auto mt-[1%] md:w-[70%] md:h-[95%] z-[100] overflow-y-auto max-h-screen"
className="bg-[#1e2a38] p-3 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[60%] h-[100%] md:h-[95%] lg:h-[85%] z-[100] overflow-y-auto"
overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100"
>
{children}

View File

@@ -2,6 +2,7 @@ import { useEffect, useReducer, type ReactNode } from "react";
import { IntegrationsContext } from "../IntegrationsContext";
import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
import { initialState, reducer } from "../reducers/IntegrationsContextReducer";
import { useHotlistData } from "../../hooks/useHotListData";
type IntegrationsProviderType = {
children: ReactNode;
@@ -10,6 +11,7 @@ type IntegrationsProviderType = {
export const IntegrationsProvider = ({ children }: IntegrationsProviderType) => {
const [state, dispatch] = useReducer(reducer, initialState);
const { mutation } = useCameraBlackboard();
const { query } = useHotlistData();
useEffect(() => {
let isMounted = true;
@@ -50,6 +52,13 @@ export const IntegrationsProvider = ({ children }: IntegrationsProviderType) =>
};
}, []);
useEffect(() => {
const fetchHotlistData = async () => {
dispatch({ type: "SETHOTLISTS", payload: query?.data?.hotlists });
};
fetchHotlistData();
}, [query?.data]);
return (
<IntegrationsContext.Provider
value={{

View File

@@ -1,7 +1,7 @@
import type { NPEDACTION, NPEDSTATE } from "../../types/types";
export const initialState = {
sessionStarted: false,
sessionStarted: true,
sessionList: [],
sessionPaused: false,
savedSightings: [],
@@ -12,6 +12,7 @@ export const initialState = {
catC: true,
catD: false,
},
hotlistFiles: [],
};
export function reducer(state: NPEDSTATE, action: NPEDACTION) {
@@ -36,6 +37,11 @@ export function reducer(state: NPEDSTATE, action: NPEDACTION) {
...state,
sessionPaused: action.payload,
};
case "SESSIONRESTART":
return {
...state,
sessionList: action.payload,
};
case "ADD":
return {
...state,
@@ -51,6 +57,17 @@ export function reducer(state: NPEDSTATE, action: NPEDACTION) {
...state,
iscatEnabled: action.payload,
};
case "SETHOTLISTS":
return {
...state,
hotlistFiles: action.payload,
};
case "DELETEHOTLIST":
return {
...state,
hotlistFiles: state.hotlistFiles.filter((hotlist) => hotlist.filename !== action.payload),
};
default:
return { ...state };
}

View File

@@ -11,6 +11,7 @@ const getCameraMode = async (options: { camera: string }) => {
};
const updateCameraMode = async (options: { camera: string; mode: string }) => {
console.log(options.mode);
const dayNightPayload = {
id: options.camera,
fields: [

View File

@@ -15,7 +15,6 @@ async function fetchSnapshot(cameraSide: string): Promise<Blob> {
return response.blob();
}
/** Draw an ImageBitmap to canvas with aspect-fill (like object-fit: cover) */
function drawBitmapToCanvas(canvas: HTMLCanvasElement, bitmap: ImageBitmap) {
const ctx = canvas.getContext("2d");
if (!ctx) return;
@@ -42,18 +41,14 @@ function drawBitmapToCanvas(canvas: HTMLCanvasElement, bitmap: ImageBitmap) {
let drawWidth = width;
let drawHeight = height;
// aspect-fit calculation (no cropping)
if (srcAspect > dstAspect) {
// image is wider → fit to canvas width
drawWidth = width;
drawHeight = width / srcAspect;
} else {
// image is taller → fit to canvas height
drawHeight = height;
drawWidth = height * srcAspect;
}
// center image (adds black borders if aspect ratios differ)
const dx = (width - drawWidth) / 50;
const dy = (height - drawHeight) / 2;
@@ -66,7 +61,6 @@ export function useGetOverviewSnapshot(side: string) {
const canvasRef = useRef<HTMLCanvasElement | null>(null);
const latestBitmapRef = useRef<ImageBitmap | null>(null);
// Redraw helper; always draws the current bitmap if available
const draw = useCallback(() => {
const canvas = canvasRef.current;
const bmp = latestBitmapRef.current;
@@ -82,16 +76,15 @@ export function useGetOverviewSnapshot(side: string) {
} = useQuery({
queryKey: ["overviewSnapshot", side],
queryFn: () => fetchSnapshot(side),
// Poll ~4 fps when visible; pause when tab hidden
refetchInterval: () => (document.visibilityState === "visible" ? 250 : false),
refetchOnWindowFocus: false,
// Avoid keeping lots of blobs around in cache
gcTime: 0, // v5 name (cacheTime in v4)
gcTime: 0,
staleTime: 0,
retry: false, // or a small number if you prefer retries
retry: false,
});
// Convert Blob -> ImageBitmap and draw
useEffect(() => {
let cancelled = false;
if (!snapshotBlob) return;
@@ -104,13 +97,11 @@ export function useGetOverviewSnapshot(side: string) {
return;
}
// Dispose previous bitmap to free memory
if (latestBitmapRef.current) {
latestBitmapRef.current.close();
}
latestBitmapRef.current = bitmap;
// Draw now (and again on next resize)
draw();
} catch {
// noop — fetch handler surfaces the main error path
@@ -122,12 +113,11 @@ export function useGetOverviewSnapshot(side: string) {
};
}, [snapshotBlob, draw]);
// Redraw on resize & DPR changes
useEffect(() => {
const onResize = () => draw();
const onDPR = () => draw();
window.addEventListener("resize", onResize);
// Listen for DPR changes (some browsers support this)
const mql = window.matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`);
mql.addEventListener?.("change", onDPR);
return () => {
@@ -137,14 +127,13 @@ export function useGetOverviewSnapshot(side: string) {
}, [draw]);
useEffect(() => {
const el = canvasRef.current?.parentElement; // the box
const el = canvasRef.current?.parentElement;
if (!el) return;
const ro = new ResizeObserver(() => draw()); // your draw() calls aspect-fit logic
const ro = new ResizeObserver(() => draw());
ro.observe(el);
return () => ro.disconnect();
}, [draw]);
// Cleanup on unmount
useEffect(() => {
return () => {
if (latestBitmapRef.current) {
@@ -154,7 +143,6 @@ export function useGetOverviewSnapshot(side: string) {
};
}, []);
// Optional: normalize error type
const typedError = error instanceof Error ? error : undefined;
return { canvasRef, isError, error: typedError, isPending };

View File

@@ -0,0 +1,28 @@
import { useMutation, useQuery } from "@tanstack/react-query";
import { CAM_BASE } from "../utils/config";
const fetchHotlists = async () => {
const response = await fetch(`${CAM_BASE}/Hotlist-csv-metadata`);
if (!response.ok) throw new Error("Cannot reach hotlist endpoint");
return response.json();
};
const deleteHotlist = async (filename: string) => {
const response = await fetch(`${CAM_BASE}/Hotlist-csv-delete?filename=${filename}`);
if (!response.ok) throw new Error(`Cannot delte hotlist: ${filename}`);
return response.json();
};
export const useHotlistData = () => {
const query = useQuery({
queryKey: ["fetchHotlists"],
queryFn: fetchHotlists,
});
const mutation = useMutation({
mutationKey: ["deleteHotlist"],
mutationFn: (filename: string) => deleteHotlist(filename),
});
return { query, mutation };
};

View File

@@ -11,6 +11,7 @@ import { useNPEDAuth } from "../hooks/useNPEDAuth";
import SoundSettingsCard from "../components/SettingForms/Sound/SoundSettingsCard";
import SoundUploadCard from "../components/SettingForms/Sound/SoundUploadCard";
import NPEDCategoryPopup from "../components/PopupSettings/NPEDCategoryPopup";
import HotlistList from "../components/HotlistList/HotlistList";
const SystemSettings = () => {
useNPEDAuth();
@@ -40,6 +41,7 @@ const SystemSettings = () => {
<NPEDCard />
<NPEDHotlistCard />
<NPEDCategoryPopup />
<HotlistList />
</div>
</TabPanel>
<TabPanel>

View File

@@ -417,6 +417,12 @@ export type QueuedHit = {
export type DedupedSightings = ReducedSightingType[];
export type HotlistFile = {
fileSizeBytes: number;
filename: string;
rowCount: number;
};
export type NPEDSTATE = {
sessionStarted: boolean;
sessionList: ReducedSightingType[];
@@ -424,6 +430,7 @@ export type NPEDSTATE = {
savedSightings: DedupedSightings;
npedUser: NPEDUser;
iscatEnabled: CategoryPopups;
hotlistFiles: HotlistFile[];
};
export type NPEDACTION = {