flxes, beautifying, zone renaming, clean up

web/src/components/settings/ZoneEditPane.tsx

@@ -143,20 +143,6 @@ export default function ZoneEditPane({
         config?.cameras[polygon.camera]?.zones[polygon.name]?.loitering_time,
       isFinished: polygon?.isFinished ?? false,
       objects: polygon?.objects ?? [],
-      review_alerts:
-        (polygon?.camera &&
-          polygon?.name &&
-          config?.cameras[
-            polygon.camera
-          ]?.review.alerts.required_zones.includes(polygon.name)) ||
-        false,
-      review_detections:
-        (polygon?.camera &&
-          polygon?.name &&
-          config?.cameras[
-            polygon.camera
-          ]?.review.detections.required_zones.includes(polygon.name)) ||
-        false,
     },
   });
 
@@ -167,8 +153,6 @@ export default function ZoneEditPane({
         inertia,
         loitering_time,
         objects: form_objects,
-        review_alerts,
-        review_detections,
       }: ZoneFormValuesType, // values submitted via the form
       objects: string[],
     ) => {
@@ -176,11 +160,21 @@ export default function ZoneEditPane({
         return;
       }
       let mutatedConfig = config;
+      let alertQueries = "";
+      let detectionQueries = "";
 
       const renamingZone = zoneName != polygon.name && polygon.name != "";
 
       if (renamingZone) {
         // rename - delete old zone and replace with new
+        const zoneInAlerts =
+          cameraConfig?.review.alerts.required_zones.includes(polygon.name) ??
+          false;
+        const zoneInDetections =
+          cameraConfig?.review.detections.required_zones.includes(
+            polygon.name,
+          ) ?? false;
+
         const {
           alertQueries: renameAlertQueries,
           detectionQueries: renameDetectionQueries,
@@ -209,6 +203,18 @@ export default function ZoneEditPane({
           });
           return;
         }
+
+        // make sure new zone name is readded to review
+        ({ alertQueries, detectionQueries } = reviewQueries(
+          zoneName,
+          zoneInAlerts,
+          zoneInDetections,
+          polygon.camera,
+          mutatedConfig?.cameras[polygon.camera]?.review.alerts
+            .required_zones || [],
+          mutatedConfig?.cameras[polygon.camera]?.review.detections
+            .required_zones || [],
+        ));
       }
 
       const coordinates = flattenPoints(
@@ -233,17 +239,6 @@ export default function ZoneEditPane({
         objectQueries = `&cameras.${polygon?.camera}.zones.${zoneName}.objects`;
       }
 
-      const { alertQueries, detectionQueries } = reviewQueries(
-        zoneName,
-        review_alerts,
-        review_detections,
-        polygon.camera,
-        mutatedConfig?.cameras[polygon.camera]?.review.alerts.required_zones ||
-          [],
-        mutatedConfig?.cameras[polygon.camera]?.review.detections
-          .required_zones || [],
-      );
-
       let inertiaQuery = "";
       if (inertia) {
         inertiaQuery = `&cameras.${polygon?.camera}.zones.${zoneName}.inertia=${inertia}`;
@@ -449,52 +444,6 @@ export default function ZoneEditPane({
             />
           </FormItem>
 
-          <Separator className="my-2 flex bg-secondary" />
-
-          <FormField
-            control={form.control}
-            name="review_alerts"
-            render={({ field }) => (
-              <FormItem className="flex flex-row items-center justify-between">
-                <div className="space-y-0.5">
-                  <FormLabel>Alerts</FormLabel>
-                  <FormDescription>
-                    When an object enters this zone, ensure it is marked as an
-                    alert.
-                  </FormDescription>
-                </div>
-                <FormControl>
-                  <Switch
-                    checked={field.value}
-                    onCheckedChange={field.onChange}
-                    className="ml-3"
-                  />
-                </FormControl>
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="review_detections"
-            render={({ field }) => (
-              <FormItem className="flex flex-row items-center justify-between">
-                <div className="space-y-0.5">
-                  <FormLabel className="text-base">Detections</FormLabel>
-                  <FormDescription>
-                    When an object enters this zone, ensure it is marked as a
-                    detection.
-                  </FormDescription>
-                </div>
-                <FormControl>
-                  <Switch
-                    checked={field.value}
-                    onCheckedChange={field.onChange}
-                    className="ml-3"
-                  />
-                </FormControl>
-              </FormItem>
-            )}
-          />
           <FormField
             control={form.control}
             name="isFinished"

web/src/types/canvas.ts

@@ -18,8 +18,6 @@ export type ZoneFormValuesType = {
   loitering_time: number;
   isFinished: boolean;
   objects: string[];
-  review_alerts: boolean;
-  review_detections: boolean;
 };
 
 export type ObjectMaskFormValuesType = {

web/src/views/settings/CameraSettingsView.tsx

@@ -21,18 +21,23 @@ import { FrigateConfig } from "@/types/frigateConfig";
 import { Checkbox } from "@/components/ui/checkbox";
 import ActivityIndicator from "@/components/indicators/activity-indicator";
 import { StatusBarMessagesContext } from "@/context/statusbar-provider";
-import { reviewQueries } from "@/utils/zoneEdutUtil";
 import axios from "axios";
 import { Link } from "react-router-dom";
 import { LuExternalLink } from "react-icons/lu";
 import { capitalizeFirstLetter } from "@/utils/stringUtil";
 import { MdCircle } from "react-icons/md";
+import { cn } from "@/lib/utils";
 
 type CameraSettingsViewProps = {
   selectedCamera: string;
   setUnsavedChanges: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
+type CameraReviewSettingsValueType = {
+  alerts_zones: string[];
+  detections_zones: string[];
+};
+
 export default function CameraSettingsView({
   selectedCamera,
   setUnsavedChanges,
@@ -52,6 +57,8 @@ export default function CameraSettingsView({
 
   const { addMessage, removeMessage } = useContext(StatusBarMessagesContext)!;
 
+  // zones and labels
+
   const zones = useMemo(() => {
     if (cameraConfig) {
       return Object.entries(cameraConfig.zones).map(([name, zoneData]) => ({
@@ -63,6 +70,20 @@ export default function CameraSettingsView({
     }
   }, [cameraConfig]);
 
+  const alertsLabels = useMemo(() => {
+    return cameraConfig?.review.alerts.labels
+      ? cameraConfig.review.alerts.labels.join(", ")
+      : "";
+  }, [cameraConfig]);
+
+  const detectionsLabels = useMemo(() => {
+    return cameraConfig?.review.detections.labels
+      ? cameraConfig.review.detections.labels.join(", ")
+      : "";
+  }, [cameraConfig]);
+
+  // form
+
   const formSchema = z.object({
     alerts_zones: z.array(z.string()),
     detections_zones: z.array(z.string()),
@@ -80,16 +101,6 @@ export default function CameraSettingsView({
   const watchedAlertsZones = form.watch("alerts_zones");
   const watchedDetectionsZones = form.watch("detections_zones");
 
-  useEffect(() => {
-    form.reset({
-      alerts_zones: cameraConfig?.review.alerts.required_zones ?? [],
-      detections_zones: cameraConfig?.review.detections.required_zones || [],
-    });
-    setSelectDetections(
-      !!cameraConfig?.review.detections.required_zones?.length,
-    );
-  }, [cameraConfig, form]);
-
   const handleCheckedChange = useCallback(
     (isChecked: boolean) => {
       if (!isChecked) {
@@ -99,56 +110,38 @@ export default function CameraSettingsView({
             cameraConfig?.review.detections.required_zones || [],
         });
       }
+      setChangedValue(true);
       setSelectDetections(isChecked as boolean);
     },
     [watchedAlertsZones, cameraConfig, form],
   );
 
-  const alertsLabels = useMemo(() => {
-    return cameraConfig?.review.alerts.labels
-      ? cameraConfig.review.alerts.labels.join(", ")
-      : "";
-  }, [cameraConfig]);
-
-  const detectionsLabels = useMemo(() => {
-    return cameraConfig?.review.detections.labels
-      ? cameraConfig.review.detections.labels.join(", ")
-      : "";
-  }, [cameraConfig]);
-
   const saveToConfig = useCallback(
     async (
-      {
+      { alerts_zones, detections_zones }: CameraReviewSettingsValueType, // values submitted via the form
-        name: zoneName,
-        review_alerts,
-        review_detections,
-      }: CameraSettingsValuesType, // values submitted via the form
     ) => {
-      if (!zoneName) {
+      const alertQueries = [...alerts_zones]
-        return;
+        .map(
-      }
+          (zone) =>
-      let mutatedConfig = config;
+            `&cameras.${selectedCamera}.review.alerts.required_zones=${zone}`,
+        )
+        .join("");
 
-      const { alertQueries, detectionQueries } = reviewQueries(
+      const detectionQueries = [...detections_zones]
-        zoneName,
+        .map(
-        review_alerts,
+          (zone) =>
-        review_detections,
+            `&cameras.${selectedCamera}.review.detections.required_zones=${zone}`,
-        selectedCamera,
+        )
-        mutatedConfig?.cameras[selectedCamera]?.review.alerts.required_zones ||
+        .join("");
-          [],
-        mutatedConfig?.cameras[selectedCamera]?.review.detections
-          .required_zones || [],
-      );
 
       axios
-        .put(
+        .put(`config/set?${alertQueries}${detectionQueries}`, {
-          `config/set?cameras.${selectedCamera}.zones.${zoneName}?????${alertQueries}${detectionQueries}`,
+          requires_restart: 0,
-          { requires_restart: 0 },
+        })
-        )
         .then((res) => {
           if (res.status === 200) {
             toast.success(
-              `Zone (${zoneName}) has been saved. Restart Frigate to apply changes.`,
+              `Review classification configuration has been saved. Restart Frigate to apply changes.`,
               {
                 position: "top-center",
               },
@@ -170,29 +163,47 @@ export default function CameraSettingsView({
           setIsLoading(false);
         });
     },
-    [config, updateConfig, setIsLoading, selectedCamera],
+    [updateConfig, setIsLoading, selectedCamera],
   );
 
   const onCancel = useCallback(() => {
+    if (!cameraConfig) {
+      return;
+    }
+
     setChangedValue(false);
+    setUnsavedChanges(false);
     removeMessage(
       "camera_settings",
-      `alert_detection_settings_${selectedCamera}`,
+      `review_classification_settings_${selectedCamera}`,
     );
-  }, [removeMessage, selectedCamera]);
+    form.reset({
+      alerts_zones: cameraConfig?.review.alerts.required_zones ?? [],
+      detections_zones: cameraConfig?.review.detections.required_zones || [],
+    });
+    setSelectDetections(
+      !!cameraConfig?.review.detections.required_zones?.length,
+    );
+  }, [removeMessage, selectedCamera, setUnsavedChanges, form, cameraConfig]);
+
+  useEffect(() => {
+    onCancel();
+    // we know that these deps are correct
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedCamera]);
 
   useEffect(() => {
     if (changedValue) {
       addMessage(
-        "motion_tuner",
+        "camera_settings",
-        `Unsaved changes to alert/detection settings for (${selectedCamera})`,
+        `Unsaved review classification settings for ${capitalizeFirstLetter(selectedCamera)}`,
         undefined,
-        `alert_detection_settings_${selectedCamera}`,
+        `review_classification_settings_${selectedCamera}`,
       );
     } else {
       removeMessage(
         "camera_settings",
-        `alert_detection_settings_${selectedCamera}`,
+        `review_classification_settings_${selectedCamera}`,
       );
     }
     // we know that these deps are correct
@@ -202,7 +213,7 @@ export default function CameraSettingsView({
   function onSubmit(values: z.infer<typeof formSchema>) {
     setIsLoading(true);
 
-    saveToConfig(values as CameraSettingsValuesType);
+    saveToConfig(values as CameraReviewSettingsValueType);
   }
 
   useEffect(() => {
@@ -228,14 +239,13 @@ export default function CameraSettingsView({
             Review Classification
           </Heading>
 
-          <div className="mb-5 mt-2 flex flex-col gap-2 text-sm text-primary-variant">
+          <div className="max-w-6xl">
+            <div className="mb-5 mt-2 flex max-w-5xl flex-col gap-2 text-sm text-primary-variant">
               <p>
-              Not every segment of video captured by Frigate may be of the same
+                Frigate categorizes review items as Alerts and Detections. By
-              level of interest to you. Frigate categorizes review items as
+                default, all <em>person</em> and <em>car</em> objects are
-              alerts and detections. By default, all <em>person</em> and{" "}
+                considered Alerts. You can refine categorization of your review
-              <em>car</em> objects are considered alerts. You can refine
+                items by configuring required zones for them.
-              categorization of your review items by configuring required zones
-              for them.
               </p>
               <div className="flex items-center text-primary">
                 <Link
@@ -249,13 +259,21 @@ export default function CameraSettingsView({
                 </Link>
               </div>
             </div>
+          </div>
 
           <Form {...form}>
             <form
               onSubmit={form.handleSubmit(onSubmit)}
               className="mt-2 space-y-6"
             >
-              <div className="grid items-start gap-5 md:grid-cols-2">
+              <div
+                className={cn(
+                  "w-full max-w-5xl space-y-0",
+                  zones &&
+                    zones?.length > 0 &&
+                    "grid items-start gap-5 md:grid-cols-2",
+                )}
+              >
                 <FormField
                   control={form.control}
                   name="alerts_zones"
@@ -272,7 +290,7 @@ export default function CameraSettingsView({
                               Select zones for Alerts
                             </FormDescription>
                           </div>
-                          <div className="rounded-lg bg-secondary p-4">
+                          <div className="max-w-md rounded-lg bg-secondary p-4 md:max-w-full">
                             {zones?.map((zone) => (
                               <FormField
                                 key={zone.name}
@@ -282,15 +300,16 @@ export default function CameraSettingsView({
                                   return (
                                     <FormItem
                                       key={zone.name}
-                                      className="mb-3 flex flex-row items-start space-x-3 space-y-0 last:mb-0"
+                                      className="mb-3 flex flex-row items-center space-x-3 space-y-0 last:mb-0"
                                     >
                                       <FormControl>
                                         <Checkbox
-                                          className="data-[state=checked]:bg-selected data-[state=checked]:text-primary"
+                                          className="size-5 text-white accent-white data-[state=checked]:bg-selected data-[state=checked]:text-white"
                                           checked={field.value?.includes(
                                             zone.name,
                                           )}
                                           onCheckedChange={(checked) => {
+                                            setChangedValue(true);
                                             return checked
                                               ? field.onChange([
                                                   ...field.value,
@@ -316,12 +335,12 @@ export default function CameraSettingsView({
                           </div>
                         </>
                       ) : (
-                        <div className="font-normal">
+                        <div className="font-normal text-destructive">
                           No zones are defined for this camera.
                         </div>
                       )}
                       <FormMessage />
-                      <div className="flex flex-row text-sm">
+                      <div className="text-sm">
                         All {alertsLabels} objects
                         {watchedAlertsZones && watchedAlertsZones.length > 0
                           ? ` detected in ${watchedAlertsZones.map((zone) => capitalizeFirstLetter(zone)).join(", ")}`
@@ -341,43 +360,22 @@ export default function CameraSettingsView({
                   name="detections_zones"
                   render={() => (
                     <FormItem>
-                      {zones && zones?.length > 0 ? (
+                      {zones && zones?.length > 0 && (
                         <>
-                          <div className="items-top flex flex-col space-x-0">
+                          <div className="mb-2">
-                            <div className="mb-4">
                             <FormLabel className="flex flex-row items-center text-base">
                               Detections{" "}
                               <MdCircle className="ml-3 size-2 text-severity_detection" />
                             </FormLabel>
-                            </div>
-                            <div className="mb-1 flex flex-row gap-2">
-                              <Checkbox
-                                id="select-detections"
-                                className="data-[state=checked]:bg-selected data-[state=checked]:text-primary"
-                                checked={selectDetections}
-                                onCheckedChange={handleCheckedChange}
-                              />
-                              <div className="grid gap-1.5 leading-none">
-                                <label
-                                  htmlFor="select-detections"
-                                  className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                                >
-                                  Limit detections to specific zones
-                                </label>
-                              </div>
-                            </div>
-                          </div>
-
                             {selectDetections && (
-                            <div className="mb-4">
+                              <FormDescription>
-                              <FormDescription className="mb-2">
                                 Select zones for Detections
                               </FormDescription>
-                            </div>
                             )}
+                          </div>
 
                           {selectDetections && (
-                            <div className="rounded-lg bg-secondary p-4">
+                            <div className="max-w-md rounded-lg bg-secondary p-4 md:max-w-full">
                               {zones?.map((zone) => (
                                 <FormField
                                   key={zone.name}
@@ -387,11 +385,11 @@ export default function CameraSettingsView({
                                     return (
                                       <FormItem
                                         key={zone.name}
-                                        className="mb-3 flex flex-row items-start space-x-3 space-y-0 last:mb-0"
+                                        className="mb-3 flex flex-row items-center space-x-3 space-y-0 last:mb-0"
                                       >
                                         <FormControl>
                                           <Checkbox
-                                            className="data-[state=checked]:bg-selected data-[state=checked]:text-primary"
+                                            className="size-5 text-white accent-white data-[state=checked]:bg-selected data-[state=checked]:text-white"
                                             checked={field.value?.includes(
                                               zone.name,
                                             )}
@@ -421,13 +419,29 @@ export default function CameraSettingsView({
                             </div>
                           )}
                           <FormMessage />
+
+                          <div className="mb-0 flex flex-row items-center gap-2">
+                            <Checkbox
+                              id="select-detections"
+                              className="size-5 text-white accent-white data-[state=checked]:bg-selected data-[state=checked]:text-white"
+                              checked={selectDetections}
+                              onCheckedChange={handleCheckedChange}
+                            />
+                            <div className="grid gap-1.5 leading-none">
+                              <label
+                                htmlFor="select-detections"
+                                className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                              >
+                                Limit detections to specific zones
+                              </label>
+                            </div>
+                          </div>
                         </>
-                      ) : (
-                        ""
                       )}
 
-                      <div className="flex flex-row text-sm">
+                      <div className="text-sm">
-                        All {detectionsLabels} objects not classified as Alerts{" "}
+                        All {detectionsLabels} objects{" "}
+                        <em>not classified as Alerts</em>{" "}
                         {watchedDetectionsZones &&
                         watchedDetectionsZones.length > 0
                           ? ` that are detected in ${watchedDetectionsZones.map((zone) => capitalizeFirstLetter(zone)).join(", ")}`
@@ -437,15 +451,24 @@ export default function CameraSettingsView({
                           cameraConfig?.name ?? "",
                         ).replaceAll("_", " ")}{" "}
                         will be shown as Detections
-                        {!selectDetections && ", regardless of zone"}.
+                        {(!selectDetections ||
+                          (watchedDetectionsZones &&
+                            watchedDetectionsZones.length === 0)) &&
+                          ", regardless of zone"}
+                        .
                       </div>
                     </FormItem>
                   )}
                 />
               </div>
+              <Separator className="my-2 flex bg-secondary" />
 
-              <div className="flex flex-row gap-2 pt-5">
+              <div className="flex w-full flex-row items-center gap-2 pt-2 md:w-[25%]">
-                <Button className="flex flex-1" onClick={onCancel}>
+                <Button
+                  className="flex flex-1"
+                  onClick={onCancel}
+                  type="button"
+                >
                   Cancel
                 </Button>
                 <Button
@@ -466,8 +489,6 @@ export default function CameraSettingsView({
               </div>
             </form>
           </Form>
-
-          <Separator className="my-2 flex bg-secondary" />
         </div>
       </div>
     </>