- bumped version to 1.0.28

- bugfix Clamped numbers for sighting store

package.json

@@ -1,7 +1,7 @@
 {
   "name": "in-car-system-fe",
   "private": true,
-  "version": "1.0.25",
+  "version": "1.0.28",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/components/CameraSettings/CameraSettingFields.tsx

@@ -1,28 +1,22 @@
 import { Formik, Field, Form } from "formik";
 import type { CameraConfig, CameraSettingErrorValues, CameraSettingValues, ZoomInOptions } from "../../types/types";
-import { useEffect, useMemo, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faEye, faEyeSlash } from "@fortawesome/free-regular-svg-icons";
+import { useEffect, useMemo } from "react";
 import CardHeader from "../UI/CardHeader";
 import { useCameraMode, useCameraZoom } from "../../hooks/useCameraZoom";
 import { capitalize, parseRTSPUrl, reverseZoomMapping, zoomMapping } from "../../utils/utils";
+import { useIntegrationsContext } from "../../context/IntegrationsContext";
+import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
+import { toast } from "sonner";
 
 type CameraSettingsProps = {
   initialData: CameraConfig;
-  updateCameraConfig: (values: CameraSettingValues) => Promise<void> | void;
   zoomLevel?: number;
   onZoomLevelChange?: (level: number | undefined) => void;
-  updateCameraConfigError: null | Error;
 };
 
-const CameraSettingFields = ({
-  initialData,
-  updateCameraConfig,
-  zoomLevel,
-  onZoomLevelChange,
-}: CameraSettingsProps) => {
-  const [showPwd, setShowPwd] = useState(false);
+const CameraSettingFields = ({ initialData, zoomLevel, onZoomLevelChange }: CameraSettingsProps) => {
   const cameraControllerSide = initialData?.id === "CameraA" ? "CameraControllerA" : "CameraControllerB";
+  const { state, dispatch } = useIntegrationsContext();
   const { mutation, query } = useCameraZoom({ camera: cameraControllerSide });
   const { cameraModeQuery, cameraModeMutation } = useCameraMode({ camera: cameraControllerSide });
   const zoomOptions = [1, 2, 4];
@@ -30,6 +24,8 @@ const CameraSettingFields = ({
   const apiZoom = reverseZoomMapping(magnification);
   const parsed = parseRTSPUrl(initialData?.propURI?.value);
   const cameraMode = cameraModeQuery?.data?.propDayNightMode?.value;
+  const friendlyName = initialData?.id === "CameraA" ? state.cameraAFriendlyName : state.cameraBFriendlyName;
+  const { mutation: blackboardMutation } = useCameraBlackboard();
 
   useEffect(() => {
     if (!query?.data) return;
@@ -38,7 +34,7 @@ const CameraSettingFields = ({
 
   const initialValues = useMemo<CameraSettingValues>(
     () => ({
-      friendlyName: initialData?.id ?? "",
+      friendlyName: friendlyName,
       cameraAddress: initialData?.propURI?.value ?? "",
       userName: parsed?.username ?? "",
       password: parsed?.password ?? "",
@@ -47,7 +43,15 @@ const CameraSettingFields = ({
       zoom: apiZoom,
     }),
 
-    [initialData?.id, initialData?.propURI?.value, parsed?.username, parsed?.password, cameraMode, apiZoom]
+    [
+      friendlyName,
+      initialData?.propURI?.value,
+      initialData?.id,
+      parsed?.username,
+      parsed?.password,
+      cameraMode,
+      apiZoom,
+    ]
   );
 
   const validateValues = (values: CameraSettingValues) => {
@@ -57,8 +61,17 @@ const CameraSettingFields = ({
     return errors;
   };
 
-  const handleSubmit = (values: CameraSettingValues) => {
-    updateCameraConfig(values);
+  const handleSubmit = async (values: CameraSettingValues) => {
+    const cameraSide = initialData?.id === "CameraA" ? "UPDATE_FRIENDLYNAMEA" : "UPDATE_FRIENDLYNAMEB";
+    dispatch({ type: cameraSide, payload: values.friendlyName });
+    const result = await blackboardMutation.mutateAsync({
+      operation: "INSERT",
+      path: cameraSide,
+      value: values.friendlyName,
+    });
+    if (result.reason === "OK") {
+      toast.success("Camera settings updated successfully");
+    }
   };
 
   const handleRadioButtonChange = async (levelNumber: number) => {
@@ -101,54 +114,6 @@ const CameraSettingFields = ({
           </div>
 
           <div className="flex flex-col space-y-2 relative">
-            <label htmlFor="cameraAddress">Camera Address</label>
-            {touched.cameraAddress && errors.cameraAddress && (
-              <small className="absolute right-0 top-0 text-red-500">{errors.cameraAddress}</small>
-            )}
-            <Field
-              id="cameraAddress"
-              name="cameraAddress"
-              type="text"
-              className="p-2 border border-gray-400 rounded-lg"
-              placeholder="RTSP://..."
-            />
-          </div>
-
-          <div className="flex flex-col space-y-2 relative">
-            <label htmlFor="userName">User Name</label>
-            {touched.userName && errors.userName && (
-              <small className="absolute right-0 top-0 text-red-500">{errors.userName}</small>
-            )}
-            <Field
-              id="userName"
-              name="userName"
-              type="text"
-              className="p-2 border border-gray-400 rounded-lg"
-              placeholder="Enter user name"
-              autoComplete="username"
-            />
-          </div>
-
-          <div className="flex flex-col space-y-2 relative">
-            <label htmlFor="password">Password</label>
-            {touched.password && errors.password && (
-              <small className="absolute right-0 top-0 text-red-500">{errors.password}</small>
-            )}
-            <div className="flex gap-2 items-center relative mb-4">
-              <Field
-                id="password"
-                name="password"
-                type={showPwd ? "text" : "password"}
-                className="p-2 border border-gray-400 rounded-lg w-full "
-                placeholder="Enter password"
-              />
-              <FontAwesomeIcon
-                type="button"
-                className="absolute right-5 end-0"
-                onClick={() => setShowPwd((s) => !s)}
-                icon={showPwd ? faEyeSlash : faEye}
-              />
-            </div>
             <div className="my-3">
               <CardHeader title="Zoom settings" />
               <div className="mx-auto grid grid-cols-3 place-items-center">
@@ -212,8 +177,12 @@ const CameraSettingFields = ({
             </div>
             <div className="mt-3">
               {
-                <button type="submit" className="bg-green-700 text-white rounded-lg p-2 mx-auto w-full">
-                  {isSubmitting ? "Saving" : "Save settings"}
+                <button
+                  type="submit"
+                  disabled={isSubmitting}
+                  className="bg-green-700 text-white rounded-lg p-2 mx-auto w-full"
+                >
+                  {isSubmitting ? "Saving..." : "Save settings"}
                 </button>
               }
             </div>

src/components/CameraSettings/CameraSettings.tsx

@@ -15,21 +15,13 @@ const CameraSettings = ({
   zoomLevel?: number;
   onZoomLevelChange?: (level: number | undefined) => void;
 }) => {
-  const { data, updateCameraConfig, updateCameraConfigError } = useFetchCameraConfig(side);
+  const { data } = useFetchCameraConfig(side);
 
   return (
     <Card className="overflow-x-visible min-h-[40vh] md:min-h-[60vh] lg:w-[40%] p-4">
       <div className="relative flex flex-col space-y-3">
         <CardHeader title={title} icon={faWrench} />
-        {
-          <CameraSettingFields
-            initialData={data}
-            updateCameraConfig={updateCameraConfig}
-            zoomLevel={zoomLevel}
-            onZoomLevelChange={onZoomLevelChange}
-            updateCameraConfigError={updateCameraConfigError}
-          />
-        }
+        {<CameraSettingFields initialData={data} zoomLevel={zoomLevel} onZoomLevelChange={onZoomLevelChange} />}
       </div>
     </Card>
   );

src/components/SessionForm/SessionCard.tsx

@@ -18,17 +18,17 @@ const SessionCard = () => {
 
   const sightings = [...new Map(sessionList?.map((vehicle) => [vehicle.vrm, vehicle]))];
 
-  const dedupedSightings = sightings.map((sighting) => sighting[1]);
+  const dedupedSightings = sightings?.map((sighting) => sighting[1]);
 
-  const vehicles = dedupedSightings.reduce<Record<string, ReducedSightingType[]>>(
+  const vehicles = dedupedSightings?.reduce<Record<string, ReducedSightingType[]>>(
     (acc, item) => {
       const hotlisthit = Object.values(item.metadata?.hotlistMatches ?? {}).includes(true);
-      if (item.metadata?.npedJSON["NPED CATEGORY"] === "A") acc.npedCatA.push(item);
-      if (item.metadata?.npedJSON["NPED CATEGORY"] === "B") acc.npedCatB.push(item);
-      if (item.metadata?.npedJSON["NPED CATEGORY"] === "C") acc.npedCatC.push(item);
-      if (item.metadata?.npedJSON["NPED CATEGORY"] === "D") acc.npedCatD.push(item);
-      if (item.metadata?.npedJSON["TAX STATUS"] === false) acc.notTaxed.push(item);
-      if (item.metadata?.npedJSON["MOT STATUS"] === false) acc.notMOT.push(item);
+      if (item?.metadata?.npedJSON?.["NPED CATEGORY"] === "A") acc.npedCatA.push(item);
+      if (item?.metadata?.npedJSON?.["NPED CATEGORY"] === "B") acc.npedCatB.push(item);
+      if (item?.metadata?.npedJSON?.["NPED CATEGORY"] === "C") acc.npedCatC.push(item);
+      if (item?.metadata?.npedJSON?.["NPED CATEGORY"] === "D") acc.npedCatD.push(item);
+      if (item?.metadata?.npedJSON?.["TAX STATUS"] === false) acc.notTaxed.push(item);
+      if (item?.metadata?.npedJSON?.["MOT STATUS"] === false) acc.notMOT.push(item);
       if (hotlisthit) acc.hotlistHit.push(item);
       acc.vehicles.push(item);
       return acc;

src/components/SettingForms/Store/StoreFields.tsx

@@ -10,17 +10,35 @@ const StoreFields = () => {
   const totalReceived = storeQuery?.data?.totalReceived;
   const totalLost = storeQuery?.data?.totalLost;
 
+  const clampedTotalPending = totalPending !== undefined ? Math.max(0, totalPending) : 0;
+  const clampedTotalActive = totalActive !== undefined ? Math.max(0, totalActive) : 0;
+  const clampedTotalSent = totalSent !== undefined ? Math.max(0, totalSent) : 0;
+  const clampedTotalReceived = totalReceived !== undefined ? Math.max(0, totalReceived) : 0;
+  const clampedTotalLost = totalLost !== undefined ? Math.max(0, totalLost) : 0;
+
   if (storeQuery.isLoading) return <div className="p-4">Loading store data...</div>;
   if (storeQuery.error) return <div className="p-4">Error: {storeQuery.error.message}</div>;
 
   return (
     <div className="p-4">
       <ul className="text-white space-y-3">
-        <VehicleSessionItem sessionNumber={totalActive} textColour="text-gray-400" vehicleTag={"Total Active:"} />
-        <VehicleSessionItem sessionNumber={totalSent} textColour="text-blue-400" vehicleTag={"Total Sent:"} />
-        <VehicleSessionItem sessionNumber={totalReceived} textColour="text-green-400" vehicleTag={"Total Received:"} />
-        <VehicleSessionItem sessionNumber={totalPending} textColour="text-amber-400" vehicleTag={"Total Pending:"} />
-        <VehicleSessionItem sessionNumber={totalLost} textColour="text-red-400" vehicleTag={"Total Lost:"} />
+        <VehicleSessionItem
+          sessionNumber={clampedTotalActive}
+          textColour="text-gray-400"
+          vehicleTag={"Total Active:"}
+        />
+        <VehicleSessionItem sessionNumber={clampedTotalSent} textColour="text-blue-400" vehicleTag={"Total Sent:"} />
+        <VehicleSessionItem
+          sessionNumber={clampedTotalReceived}
+          textColour="text-green-400"
+          vehicleTag={"Total Received:"}
+        />
+        <VehicleSessionItem
+          sessionNumber={clampedTotalPending}
+          textColour="text-amber-400"
+          vehicleTag={"Total Pending:"}
+        />
+        <VehicleSessionItem sessionNumber={clampedTotalLost} textColour="text-red-400" vehicleTag={"Total Lost:"} />
       </ul>
     </div>
   );

src/components/SightingsWidget/SightingWidget.tsx

@@ -198,6 +198,7 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
     setSightingModalOpen(false);
     setModalQueue((q) => q.slice(1));
   };
+
   return (
     <>
       <Card className={clsx("overflow-y-auto min-h-[40vh] md:min-h-[60vh] max-h-[80vh] lg:w-[40%] p-4", className)}>
@@ -225,8 +226,13 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
                   onClick={() => onRowClick(obj)}
                 >
                   <div className={`flex items-center gap-3 mt-2 justify-between `}>
-                    <div className={`border p-1 `}>
-                      <img src={obj?.plateUrlColour || BLANK_IMG} height={48} width={200} alt="colour patch" />
+                    <div className={`hidden md:block border p-1 `}>
+                      <img
+                        src={obj?.plateUrlColour || BLANK_IMG}
+                        className="hidden md:block w-[200px] h-[48px]"
+                        style={{ objectFit: "cover" }}
+                        alt="colour patch"
+                      />
                     </div>
                     {isHotListHit && (
                       <img src={HotListImg} alt="hotlistHit" className="h-20 object-contain rounded-md" />

src/components/UI/ModalComponent.tsx

@@ -14,7 +14,7 @@ const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) =
       isOpen={isModalOpen}
       onRequestClose={close}
       className={clsx(
-        "bg-[#1e2a38] p-3 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[60%] h-[100%] md:h-[95%] lg:h-[80%] z-[100] overflow-y-hidden border border-gray-500"
+        "bg-[#1e2a38] p-3 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[65%] h-[100%] md:h-[98%] lg:h-[80%] z-[100] overflow-y-hidden border border-gray-500"
       )}
       overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100 "
       style={{

src/context/providers/IntegrationsContextProvider.tsx

@@ -68,6 +68,30 @@ export const IntegrationsProvider = ({ children }: IntegrationsProviderType) =>
     fetchHotlistData();
   }, [query?.data]);
 
+  useEffect(() => {
+    async function fetchCameraNames() {
+      const cameraAResult = await mutation.mutateAsync({
+        operation: "VIEW",
+        path: "UPDATE_FRIENDLYNAMEA",
+      });
+
+      const cameraBResult = await mutation.mutateAsync({
+        operation: "VIEW",
+        path: "UPDATE_FRIENDLYNAMEB",
+      });
+
+      if (cameraAResult?.result && typeof cameraAResult.result === "string") {
+        console.log(cameraAResult?.result);
+        dispatch({ type: "UPDATE_FRIENDLYNAMEA", payload: cameraAResult.result });
+      }
+      if (cameraBResult?.result && typeof cameraBResult.result === "string") {
+        console.log(cameraBResult?.result);
+        dispatch({ type: "UPDATE_FRIENDLYNAMEB", payload: cameraBResult.result });
+      }
+    }
+    fetchCameraNames();
+  }, []);
+
   return (
     <IntegrationsContext.Provider
       value={{

src/context/reducers/IntegrationsContextReducer.ts

@@ -13,6 +13,8 @@ export const initialState = {
     catD: false,
   },
   hotlistFiles: [],
+  cameraAFriendlyName: "Camera A",
+  cameraBFriendlyName: "Camera B",
 };
 
 export function reducer(state: NPEDSTATE, action: NPEDACTION) {
@@ -68,6 +70,18 @@ export function reducer(state: NPEDSTATE, action: NPEDACTION) {
         ...state,
         hotlistFiles: state.hotlistFiles.filter((hotlist) => hotlist.filename !== action.payload),
       };
+
+    case "UPDATE_FRIENDLYNAMEA":
+      return {
+        ...state,
+        cameraAFriendlyName: action.payload,
+      };
+
+    case "UPDATE_FRIENDLYNAMEB":
+      return {
+        ...state,
+        cameraBFriendlyName: action.payload,
+      };
     default:
       return { ...state };
   }

src/hooks/useCameraConfig.ts

@@ -31,7 +31,7 @@ const updateCamerasideConfig = async (data: { id: string | number; friendlyName:
     method: "POST",
     body: JSON.stringify(updateConfigPayload),
   });
-  if (!response.ok) throw new Error("Please make sure fields are filled in correctly");
+  if (!response.ok) throw new Error("Cannot update settings");
 };
 
 export const useFetchCameraConfig = (cameraSide: string) => {

src/pages/FrontCamera.tsx

@@ -2,19 +2,28 @@ import { useState } from "react";
 import CameraSettings from "../components/CameraSettings/CameraSettings";
 import OverviewVideoContainer from "../components/FrontCameraSettings/OverviewVideoContainer";
 import { Toaster } from "sonner";
+import { useIntegrationsContext } from "../context/IntegrationsContext";
 
 const FrontCamera = () => {
   const [zoomLevel, setZoomLevel] = useState<number | undefined>(1);
+  const { state } = useIntegrationsContext();
+
+  const friendlyName = state.cameraAFriendlyName || "Camera A";
   return (
     <div className="mx-auto flex flex-col lg:flex-row gap-2 px-1 sm:px-2 lg:px-0 w-full min-h-screen">
       <OverviewVideoContainer
-        title={"Camera A"}
+        title={friendlyName}
         side="CameraA"
         settingsPage={true}
         zoomLevel={zoomLevel}
         onZoomLevelChange={setZoomLevel}
       />
-      <CameraSettings title="Camera A Settings" side="CameraA" zoomLevel={zoomLevel} onZoomLevelChange={setZoomLevel} />
+      <CameraSettings
+        title={friendlyName + " Settings"}
+        side="CameraA"
+        zoomLevel={zoomLevel}
+        onZoomLevelChange={setZoomLevel}
+      />
       <Toaster />
     </div>
   );

src/pages/RearCamera.tsx

@@ -2,13 +2,16 @@ import OverviewVideoContainer from "../components/FrontCameraSettings/OverviewVi
 import CameraSettings from "../components/CameraSettings/CameraSettings";
 import { Toaster } from "sonner";
 import { useState } from "react";
+import { useIntegrationsContext } from "../context/IntegrationsContext";
 
 const RearCamera = () => {
   const [zoomLevel, setZoomLevel] = useState<number | undefined>(1);
+  const { state } = useIntegrationsContext();
+  const friendlyName = state.cameraBFriendlyName || "Camera B";
   return (
     <div className="mx-auto flex flex-col-reverse lg:flex-row gap-2 px-1 sm:px-2 lg:px-0 w-full min-h-screen">
       <CameraSettings
-        title="Camera B Settings"
+        title={friendlyName + " Settings"}
         side={"CameraB"}
         zoomLevel={zoomLevel}
         onZoomLevelChange={setZoomLevel}

src/types/types.ts

@@ -435,6 +435,8 @@ export type NPEDSTATE = {
   npedUser: NPEDUser;
   iscatEnabled: CategoryPopups;
   hotlistFiles: HotlistFile[];
+  cameraAFriendlyName: string;
+  cameraBFriendlyName: string;
 };
 
 export type NPEDACTION = {