From ad500753e1c77be5c4de5cb2b91bd5148ab16c75 Mon Sep 17 00:00:00 2001
From: Alexandre Brandizzi <alex_brandizzi@hotmail.com>
Date: Fri, 25 Sep 2026 12:36:16 -0300
Subject: [PATCH] fix(workorders): lock Site dialog contacts until the site
 record loads

---
 .../list/table/cells/site-dialog.tsx          | 33 +++++++++++--------
 .../list/table/cells/use-site-dialog-state.ts |  1 +
 .../site-dialog-site-record.test.tsx          | 23 +++++++++++++
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/app/(protected)/workorders/_components/list/table/cells/site-dialog.tsx b/src/app/(protected)/workorders/_components/list/table/cells/site-dialog.tsx
index 82f35a06..2187a33a 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/site-dialog.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/site-dialog.tsx
@@ -125,19 +125,26 @@ export function SiteDialog({
             />
           )}
 
-          <SiteDialogPocSection
-            pocName={s.pn}
-            pocPhone={s.pp}
-            pocNotes={s.notes}
-            additionalContacts={s.extraContacts}
-            showPrimaryErrors={s.requiresPoc && s.showErrors}
-            primaryRequired={s.requiresPoc}
-            editsSiteRecord={s.editsSiteRecord}
-            onPocNameChange={s.setPn}
-            onPocPhoneChange={s.setPp}
-            onPocNotesChange={s.setNotes}
-            onAdditionalContactsChange={s.setExtraContacts}
-          />
+          {/* Locked until the site record loads, so its values never replace typed input. */}
+          <fieldset
+            disabled={s.siteRecordLoading}
+            aria-busy={s.siteRecordLoading || undefined}
+            className="m-0 border-0 p-0"
+          >
+            <SiteDialogPocSection
+              pocName={s.pn}
+              pocPhone={s.pp}
+              pocNotes={s.notes}
+              additionalContacts={s.extraContacts}
+              showPrimaryErrors={s.requiresPoc && s.showErrors}
+              primaryRequired={s.requiresPoc}
+              editsSiteRecord={s.editsSiteRecord}
+              onPocNameChange={s.setPn}
+              onPocPhoneChange={s.setPp}
+              onPocNotesChange={s.setNotes}
+              onAdditionalContactsChange={s.setExtraContacts}
+            />
+          </fieldset>
         </fieldset>
 
         <SiteDialogFooter
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/use-site-dialog-state.ts b/src/app/(protected)/workorders/_components/list/table/cells/use-site-dialog-state.ts
index 0f7cfec1..e08a184e 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/use-site-dialog-state.ts
+++ b/src/app/(protected)/workorders/_components/list/table/cells/use-site-dialog-state.ts
@@ -164,6 +164,7 @@ export function useSiteDialogState({
     attemptSave,
     saveDisabled,
     saving: updateSite.isPending,
+    siteRecordLoading: siteRecord.loading,
     editsSiteRecord,
     requiresPoc,
     setPn: fields.setPnDirty,
diff --git a/src/test/app/(protected)/workorders/site-dialog-site-record.test.tsx b/src/test/app/(protected)/workorders/site-dialog-site-record.test.tsx
index c77f15d2..c3172331 100644
--- a/src/test/app/(protected)/workorders/site-dialog-site-record.test.tsx
+++ b/src/test/app/(protected)/workorders/site-dialog-site-record.test.tsx
@@ -88,6 +88,29 @@ describe("Work order Site dialog edits the site record", () => {
     expect(screen.getByText("dal1@acme.test")).toBeInTheDocument();
   });
 
+  it("locks the contact fields until the site loads, so typed input is never replaced", async () => {
+    let resolveSite: (site: Location) => void = () => {};
+    getById.mockReturnValue(
+      new Promise<Location>((resolve) => {
+        resolveSite = resolve;
+      }),
+    );
+    renderDialog();
+
+    await waitFor(() => expect(getById).toHaveBeenCalled());
+    expect(primaryField("POC name")).toBeDisabled();
+    expect(primaryField("POC phone")).toBeDisabled();
+    expect(primaryField("Notes…")).toBeDisabled();
+    expect(saveButton()).toBeDisabled();
+
+    resolveSite(dallas);
+
+    expect(await screen.findByDisplayValue("Jane")).toBeEnabled();
+    fireEvent.change(primaryField("POC phone"), { target: { value: "(421) 433-9999" } });
+    expect(primaryField("POC phone")).toHaveValue("(421) 433-9999");
+    expect(saveButton()).toBeEnabled();
+  });
+
   it("keeps Save disabled until something changes", async () => {
     renderDialog();
     await screen.findByDisplayValue("Jane");