From 3cdb40610fbff3f60d75f839eea8f52f470da6d1 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Wed, 11 Mar 2026 12:04:35 -0500
Subject: [PATCH] fix profile save diff, masksAndZones delete, and config sync

---
 .../settings/ProfileSectionDropdown.tsx       |  2 +-
 web/src/pages/Settings.tsx                    | 27 +++++++++++++++----
 web/src/utils/configUtil.ts                   | 27 ++++++++++++++++++-
 web/src/views/settings/ProfilesView.tsx       |  1 +
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/web/src/components/settings/ProfileSectionDropdown.tsx b/web/src/components/settings/ProfileSectionDropdown.tsx
index e3f81bb79..f8e72b234 100644
--- a/web/src/components/settings/ProfileSectionDropdown.tsx
+++ b/web/src/components/settings/ProfileSectionDropdown.tsx
@@ -112,7 +112,7 @@ export function ProfileSectionDropdown({
 
   return (
     <>
-      <DropdownMenu>
+      <DropdownMenu modal={false}>
         <DropdownMenuTrigger asChild>
           <Button variant="outline" className="h-9 gap-2 font-normal">
             {editingProfile ? (
diff --git a/web/src/pages/Settings.tsx b/web/src/pages/Settings.tsx
index 54a9de362..a06b28edf 100644
--- a/web/src/pages/Settings.tsx
+++ b/web/src/pages/Settings.tsx
@@ -1098,6 +1098,7 @@ export default function Settings() {
     async (camera: string, section: string, profile: string) => {
       try {
         await axios.put("config/set", {
+          requires_restart: 0,
           config_data: {
             cameras: {
               [camera]: {
@@ -1197,16 +1198,31 @@ export default function Settings() {
 
       if (currentSectionKey === "masksAndZones") {
         try {
+          const profileData =
+            config?.cameras?.[selectedCamera]?.profiles?.[profileName];
+          if (!profileData) return;
+
+          // Only delete top-level keys that exist in the profile
+          const deletePayload: Record<string, string> = {};
+          if (profileData.zones !== undefined) {
+            deletePayload.zones = "";
+          }
+          if (profileData.motion !== undefined) {
+            deletePayload.motion = "";
+          }
+          if (profileData.objects !== undefined) {
+            deletePayload.objects = "";
+          }
+
+          if (Object.keys(deletePayload).length === 0) return;
+
           await axios.put("config/set", {
+            requires_restart: 0,
             config_data: {
               cameras: {
                 [selectedCamera]: {
                   profiles: {
-                    [profileName]: {
-                      zones: "",
-                      motion: { mask: "" },
-                      objects: { mask: "", filters: "" },
-                    },
+                    [profileName]: deletePayload,
                   },
                 },
               },
@@ -1229,6 +1245,7 @@ export default function Settings() {
     [
       selectedCamera,
       currentSectionKey,
+      config,
       handleSelectProfile,
       handleDeleteProfileSection,
       t,
diff --git a/web/src/utils/configUtil.ts b/web/src/utils/configUtil.ts
index 980095696..3fa4affda 100644
--- a/web/src/utils/configUtil.ts
+++ b/web/src/utils/configUtil.ts
@@ -6,6 +6,7 @@
 
 import get from "lodash/get";
 import cloneDeep from "lodash/cloneDeep";
+import merge from "lodash/merge";
 import unset from "lodash/unset";
 import isEqual from "lodash/isEqual";
 import mergeWith from "lodash/mergeWith";
@@ -497,9 +498,33 @@ export function prepareSectionSavePayload(opts: {
   );
 
   // Compute rawFormData (the current stored value for this section)
+  // For profiles, merge base camera config with profile overrides (matching
+  // what BaseSection displays in the form) so the diff only contains actual
+  // user changes, not every field from the merged view.
   let rawSectionValue: unknown;
   if (level === "camera" && cameraName) {
-    rawSectionValue = get(config.cameras?.[cameraName], sectionPath);
+    if (profileInfo.isProfile) {
+      const baseValue = get(
+        config.cameras?.[cameraName],
+        profileInfo.actualSection,
+      );
+      const profileOverrides = get(config.cameras?.[cameraName], sectionPath);
+      if (
+        profileOverrides &&
+        typeof profileOverrides === "object" &&
+        baseValue &&
+        typeof baseValue === "object"
+      ) {
+        rawSectionValue = merge(
+          cloneDeep(baseValue),
+          cloneDeep(profileOverrides),
+        );
+      } else {
+        rawSectionValue = baseValue;
+      }
+    } else {
+      rawSectionValue = get(config.cameras?.[cameraName], sectionPath);
+    }
   } else {
     rawSectionValue = get(config, sectionPath);
   }
diff --git a/web/src/views/settings/ProfilesView.tsx b/web/src/views/settings/ProfilesView.tsx
index cc63619d2..83c6221b4 100644
--- a/web/src/views/settings/ProfilesView.tsx
+++ b/web/src/views/settings/ProfilesView.tsx
@@ -171,6 +171,7 @@ export default function ProfilesView({
 
       if (Object.keys(configData).length > 0) {
         await axios.put("config/set", {
+          requires_restart: 0,
           config_data: { cameras: configData },
         });
       }