From ffd5e0a76902bc8d4813a31740377289fc0f5587 Mon Sep 17 00:00:00 2001
From: Carter <carter@adaptiveagriculture.ca>
Date: Thu, 25 Jun 2026 12:33:14 -0600
Subject: [PATCH] preventing form updates when settings dialog is open

---
 src/component/ComponentSettings.tsx      | 3 ++-
 src/device/DeviceSettings.tsx            | 6 ++++--
 src/interactions/InteractionSettings.tsx | 9 +++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/component/ComponentSettings.tsx b/src/component/ComponentSettings.tsx
index db0e5ad..c703393 100644
--- a/src/component/ComponentSettings.tsx
+++ b/src/component/ComponentSettings.tsx
@@ -213,7 +213,8 @@ export default function ComponentSettings(props: Props) {
   }, [props.component, componentTypeOptions]);
 
   useEffect(() => {
-    if (props.component !== prevComponent || (!isDialogOpen && prevIsDialogOpen)) {
+    if (isDialogOpen && prevIsDialogOpen) return;
+    if (props.component !== prevComponent || isDialogOpen !== prevIsDialogOpen) {
       init();
     }
   }, [props.component, prevComponent, init, isDialogOpen, prevIsDialogOpen]);
diff --git a/src/device/DeviceSettings.tsx b/src/device/DeviceSettings.tsx
index a9277f5..26ca591 100644
--- a/src/device/DeviceSettings.tsx
+++ b/src/device/DeviceSettings.tsx
@@ -95,6 +95,7 @@ export default function DeviceSettings(props: Props) {
   const deviceAPI = useDeviceAPI();
   const { device, isDialogOpen, closeDialogCallback, canEdit, refreshCallback, components } = props;
   const prevDevice = usePrevious(device);
+  const prevIsDialogOpen = usePrevious(isDialogOpen);
   const [deviceForm, setDeviceForm] = useState<Device>(deviceFromForm(Device.clone(device)));
   const [isRemoveDeviceDialogOpen, setIsRemoveDeviceDialogOpen] = useState<boolean>(false);
   const [sleeps, setSleeps] = useState<boolean>(device.settings.sleepDurationS > 0);
@@ -110,7 +111,8 @@ export default function DeviceSettings(props: Props) {
   const [existingMutation, setExistingMutation] = useState<pond.LinearMutation>();
 
   useEffect(() => {
-    if (prevDevice !== device) {
+    if (isDialogOpen && prevIsDialogOpen) return;
+    if (prevDevice !== device || isDialogOpen !== prevIsDialogOpen) {
       setDeviceForm(deviceFromForm(Device.clone(props.device)));
       if (device.settings.extensionComponents[0]) {
         setCompExtOne(device.settings.extensionComponents[0]);
@@ -130,7 +132,7 @@ export default function DeviceSettings(props: Props) {
         setComponentsByDevice(cbd);
       }
     }
-  }, [device, prevDevice, props.device, components]);
+  }, [device, prevDevice, props.device, components, isDialogOpen, prevIsDialogOpen]);
 
   const close = () => {
     closeDialogCallback();
diff --git a/src/interactions/InteractionSettings.tsx b/src/interactions/InteractionSettings.tsx
index 4f2a2d3..c98742f 100644
--- a/src/interactions/InteractionSettings.tsx
+++ b/src/interactions/InteractionSettings.tsx
@@ -133,6 +133,7 @@ export default function InteractionSettings(props: Props) {
   const prevInitialInteraction = usePrevious(initialInteraction);
   const prevComponents = usePrevious(components);
   const prevInitialComponent = usePrevious(initialComponent);
+  const prevIsDialogOpen = usePrevious(isDialogOpen);
   const classes = useStyles();
   const [{ user, as }] = useGlobalState();
   const interactionsAPI = useInteractionsAPI();
@@ -232,10 +233,12 @@ export default function InteractionSettings(props: Props) {
     if (user && user.settings.timezone) {
       setTimezone(user.settings.timezone);
     }
+    if (isDialogOpen && prevIsDialogOpen) return;
     if (
       prevInitialInteraction !== initialInteraction ||
       (prevComponents && prevComponents.length !== components.length) ||
-      getComponentIDString(prevInitialComponent) !== getComponentIDString(initialComponent)
+      getComponentIDString(prevInitialComponent) !== getComponentIDString(initialComponent) ||
+      isDialogOpen !== prevIsDialogOpen
     ) {
       setDefaultState();
     }
@@ -247,7 +250,9 @@ export default function InteractionSettings(props: Props) {
     prevInitialComponent,
     prevInitialInteraction,
     setDefaultState,
-    user
+    user,
+    isDialogOpen,
+    prevIsDialogOpen
   ]);
 
   const getAvailableSinks = () => {