From 27ddeb29037ab2fb6d52589025f11c19586d5d0a Mon Sep 17 00:00:00 2001
From: Arthur Bassi <arthur.bassi@luby.com.br>
Date: Thu, 3 Sep 2026 16:10:59 -0300
Subject: [PATCH 1/2] feat(work-orders): align inline type correction with the
 board AAP

Keep type correction on the board: Type & severity, SEV toast, and audit copy.
---
 .../table/cells/severity-options-list.tsx     |   4 +
 .../list/table/cells/type-cell.tsx            |   4 +-
 .../list/table/cells/type-severity-modal.tsx  |  21 +++-
 .../list/table/save-existing-row-type.ts      |  20 ++++
 .../list/table/wo-table-row-cells.tsx         |   3 +-
 .../utils/board-audit-action-rules.ts         |  35 ++++++
 .../work-orders/utils/severity-escalation.ts  |  20 ++++
 .../workorders/save-existing-row-type.test.ts |  42 +++++++
 .../(protected)/workorders/type-cell.test.tsx |  96 ++++++++++++++++
 .../use-work-order-table-mutations.test.tsx   | 108 ++++++++++++++++++
 .../utils/format-board-audit-action.test.ts   |  22 ++++
 .../utils/severity-escalation.test.ts         |  32 ++++++
 .../utils/table-filter-utils.test.ts          |  16 +++
 .../work-orders/utils/work-order-lock.test.ts |   5 +
 14 files changed, 425 insertions(+), 3 deletions(-)
 create mode 100644 src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
 create mode 100644 src/domain/work-orders/utils/severity-escalation.ts
 create mode 100644 src/test/app/(protected)/workorders/save-existing-row-type.test.ts
 create mode 100644 src/test/app/(protected)/workorders/type-cell.test.tsx
 create mode 100644 src/test/domain/work-orders/utils/severity-escalation.test.ts

diff --git a/src/app/(protected)/workorders/_components/list/table/cells/severity-options-list.tsx b/src/app/(protected)/workorders/_components/list/table/cells/severity-options-list.tsx
index d78961af..656b5baf 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/severity-options-list.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/severity-options-list.tsx
@@ -71,6 +71,10 @@ export function SeverityField({ value, onSelect }: SeverityFieldProps) {
         sx={{ fontSize: 12, fontWeight: 600, marginBottom: "4px" }}
       >
         Severity (from APM)
+        <Text as="span" variant="label" tone="error">
+          {" "}
+          *
+        </Text>
       </Text>
       <Text
         as="p"
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx b/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
index 7421cfac..4cf14290 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
@@ -49,6 +49,8 @@ export function TypeCell({ value, severity = null, q, onSave }: TypeCellProps) {
     <>
       <button
         type="button"
+        aria-label={value ? `Type of WO, ${value}` : "Select type of WO"}
+        title={value ? undefined : "Select type of WO"}
         onClick={(e) => {
           e.stopPropagation();
           setAnchorEl(e.currentTarget);
@@ -58,7 +60,7 @@ export function TypeCell({ value, severity = null, q, onSave }: TypeCellProps) {
         {value ? (
           <WoTableTypeLabel type={value} q={q} />
         ) : (
-          <span className="text-[13px] text-[var(--color-text-muted)]">Select …</span>
+          <span className="text-[13px] text-[var(--color-text-muted)]">Select type of WO</span>
         )}
         {Boolean(showSeverityBadge && severity != null) && (
           <SeverityBadge
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/type-severity-modal.tsx b/src/app/(protected)/workorders/_components/list/table/cells/type-severity-modal.tsx
index 1d9ded63..f1ecde6b 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/type-severity-modal.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/type-severity-modal.tsx
@@ -1,6 +1,14 @@
 import { useEffect, useState } from "react";
 
-import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from "@mui/material";
+import CloseIcon from "@mui/icons-material/Close";
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  IconButton,
+} from "@mui/material";
 
 import { Text } from "@/components/ui/text";
 import {
@@ -76,6 +84,10 @@ export function TypeSeverityModal({
     >
       <DialogTitle
         sx={{
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          paddingRight: 1,
           fontFamily: "var(--font-display)",
           fontSize: 18,
           fontWeight: 600,
@@ -83,6 +95,9 @@ export function TypeSeverityModal({
         }}
       >
         Type &amp; severity
+        <IconButton aria-label="Close" onClick={() => onOpenChange(false)} size="small">
+          <CloseIcon fontSize="small" />
+        </IconButton>
       </DialogTitle>
       <DialogContent>
         <div className="space-y-3">
@@ -93,6 +108,10 @@ export function TypeSeverityModal({
               sx={{ fontSize: 12, fontWeight: 600, marginBottom: "6px" }}
             >
               Type
+              <Text as="span" variant="label" tone="error">
+                {" "}
+                *
+              </Text>
             </Text>
             <div className="flex flex-wrap gap-1.5">
               {WO_TYPES.map((t) => (
diff --git a/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts b/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
new file mode 100644
index 00000000..0a83db69
--- /dev/null
+++ b/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
@@ -0,0 +1,20 @@
+import { toast } from "react-toastify";
+import type { WorkOrderSeverity } from "@/domain/work-orders/types/work-order-severity";
+import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
+import type { WOType } from "@/domain/work-orders/types/work-order-wizard";
+import {
+  formatSeverityEscalationToast,
+  shouldAnnounceSeverityEscalation,
+} from "@/domain/work-orders/utils/severity-escalation";
+
+export function saveExistingRowType(
+  row: Pick<WorkOrderTableRow, "woNumber" | "severity">,
+  type: WOType,
+  severity: WorkOrderSeverity | null,
+  onPatchRow: (patch: Partial<WorkOrderTableRow>) => void,
+) {
+  if (shouldAnnounceSeverityEscalation(row.severity, severity)) {
+    toast.warn(formatSeverityEscalationToast(row.woNumber, severity));
+  }
+  onPatchRow({ type, severity });
+}
diff --git a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
index c17deae3..ed818025 100644
--- a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
@@ -2,6 +2,7 @@ import type { CSSProperties } from "react";
 import type { LocationOption, WorkOrderUser } from "@/domain/work-orders/types/work-order";
 import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
 import { applyAssignedToTableSave } from "@/domain/work-orders/utils/work-order-feedback-toasts";
+import { saveExistingRowType } from "./save-existing-row-type";
 import { AssignedToCell } from "./cells/assigned-to-cell";
 import { DateCell } from "./cells/date-cell";
 import { DueDateCell } from "./cells/due-date-cell";
@@ -100,7 +101,7 @@ export function WoTableRowCells({
           value={row.type}
           severity={row.severity}
           q={search}
-          onSave={(t, sev) => onPatchRow({ type: t, severity: sev })}
+          onSave={(t, sev) => saveExistingRowType(row, t, sev, onPatchRow)}
         />
       </td>
       <td
diff --git a/src/domain/work-orders/utils/board-audit-action-rules.ts b/src/domain/work-orders/utils/board-audit-action-rules.ts
index bae79b4b..c288bdee 100644
--- a/src/domain/work-orders/utils/board-audit-action-rules.ts
+++ b/src/domain/work-orders/utils/board-audit-action-rules.ts
@@ -1,3 +1,4 @@
+import { SEVERITY_LEVELS } from "@/domain/work-orders/types/work-order-severity";
 import type { WorkOrderAuditEntry } from "@/domain/work-orders/types/work-order-detail";
 
 export type AuditActionSource = Pick<
@@ -26,6 +27,38 @@ export type AuditActionRuleContext = {
 
 export type AuditActionRule = (ctx: AuditActionRuleContext) => string | null;
 
+function formatSeverityAuditLabel(raw: string): string {
+  const n = Number(raw.trim());
+  if (n === 1 || n === 2 || n === 3 || n === 4 || n === 5) {
+    return SEVERITY_LEVELS[n].label;
+  }
+  const sevMatch = raw.trim().match(/^sev\s*([1-5])$/i);
+  if (sevMatch) {
+    return `SEV ${sevMatch[1]}`;
+  }
+  return raw;
+}
+
+function tryTypeRule({ fieldKey, actionKey, newValue }: AuditActionRuleContext): string | null {
+  const matches =
+    fieldKey === "type" ||
+    fieldKey === "workordertype" ||
+    fieldKey === "wotype" ||
+    actionKey === "typechanged" ||
+    actionKey.includes("workordertype");
+  if (!matches || !newValue.text) return null;
+
+  return `Changed Type to ${wrapAuditValue(newValue)}`;
+}
+
+function trySeverityRule({ fieldKey, actionKey, newValue }: AuditActionRuleContext): string | null {
+  const matches = fieldKey.includes("severity") || actionKey.includes("severity");
+  if (!matches || !newValue.text) return null;
+
+  const labeled = { text: formatSeverityAuditLabel(newValue.text), isQuotedList: false };
+  return `Changed Severity to ${wrapAuditValue(labeled)}`;
+}
+
 function tryStatusRule({ fieldKey, actionKey, newValue }: AuditActionRuleContext): string | null {
   const matches =
     fieldKey.includes("status") || fieldKey === "lifecyclestatus" || actionKey.includes("status");
@@ -119,6 +152,8 @@ function tryAssignedToRule({
 /** Applied in order; the first non-null result wins. */
 export const BOARD_AUDIT_ACTION_RULES: AuditActionRule[] = [
   tryStatusRule,
+  tryTypeRule,
+  trySeverityRule,
   tryApptRule,
   tryScheduleRule,
   tryCarriedOverRule,
diff --git a/src/domain/work-orders/utils/severity-escalation.ts b/src/domain/work-orders/utils/severity-escalation.ts
new file mode 100644
index 00000000..6bf4f243
--- /dev/null
+++ b/src/domain/work-orders/utils/severity-escalation.ts
@@ -0,0 +1,20 @@
+import {
+  SEVERITY_LEVELS,
+  type WorkOrderSeverity,
+} from "@/domain/work-orders/types/work-order-severity";
+
+function isCriticalSeverity(severity: WorkOrderSeverity | null | undefined): severity is 1 | 2 {
+  return severity === 1 || severity === 2;
+}
+
+/** AAP: toast only when severity newly enters SEV 1/2 — not on re-save of the same value. */
+export function shouldAnnounceSeverityEscalation(
+  previous: WorkOrderSeverity | null | undefined,
+  next: WorkOrderSeverity | null | undefined,
+): next is 1 | 2 {
+  return isCriticalSeverity(next) && !isCriticalSeverity(previous);
+}
+
+export function formatSeverityEscalationToast(woNumber: string, severity: 1 | 2): string {
+  return `WO #${woNumber} escalated to ${SEVERITY_LEVELS[severity].label}.`;
+}
diff --git a/src/test/app/(protected)/workorders/save-existing-row-type.test.ts b/src/test/app/(protected)/workorders/save-existing-row-type.test.ts
new file mode 100644
index 00000000..57e81ff3
--- /dev/null
+++ b/src/test/app/(protected)/workorders/save-existing-row-type.test.ts
@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const toastWarn = vi.fn();
+
+vi.mock("react-toastify", () => ({
+  toast: { warn: (...args: unknown[]) => toastWarn(...args) },
+}));
+
+import { saveExistingRowType } from "@/app/(protected)/workorders/_components/list/table/save-existing-row-type";
+
+describe("saveExistingRowType", () => {
+  beforeEach(() => {
+    toastWarn.mockReset();
+  });
+
+  it("warns when severity newly enters SEV 1 and still patches the row", () => {
+    const onPatchRow = vi.fn();
+
+    saveExistingRowType({ woNumber: "00000024965", severity: 3 }, "Emergency", 1, onPatchRow);
+
+    expect(toastWarn).toHaveBeenCalledWith("WO #00000024965 escalated to SEV 1.");
+    expect(onPatchRow).toHaveBeenCalledWith({ type: "Emergency", severity: 1 });
+  });
+
+  it("does not warn when staying on a critical severity", () => {
+    const onPatchRow = vi.fn();
+
+    saveExistingRowType({ woNumber: "00000024965", severity: 1 }, "Emergency", 1, onPatchRow);
+
+    expect(toastWarn).not.toHaveBeenCalled();
+    expect(onPatchRow).toHaveBeenCalledWith({ type: "Emergency", severity: 1 });
+  });
+
+  it("does not warn when clearing severity on a PM correction", () => {
+    const onPatchRow = vi.fn();
+
+    saveExistingRowType({ woNumber: "00000024965", severity: 2 }, "PM", null, onPatchRow);
+
+    expect(toastWarn).not.toHaveBeenCalled();
+    expect(onPatchRow).toHaveBeenCalledWith({ type: "PM", severity: null });
+  });
+});
diff --git a/src/test/app/(protected)/workorders/type-cell.test.tsx b/src/test/app/(protected)/workorders/type-cell.test.tsx
new file mode 100644
index 00000000..64f6b02a
--- /dev/null
+++ b/src/test/app/(protected)/workorders/type-cell.test.tsx
@@ -0,0 +1,96 @@
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it, vi } from "vitest";
+import { TypeCell } from "@/app/(protected)/workorders/_components/list/table/cells/type-cell";
+
+describe("TypeCell", () => {
+  it("shows the AAP empty placeholder", () => {
+    render(<TypeCell value="" onSave={vi.fn()} />);
+    expect(screen.getByRole("button", { name: "Select type of WO" })).toBeInTheDocument();
+  });
+
+  it("lists PM, Reactive, Emergency, and Overdue in the popover", async () => {
+    const user = userEvent.setup();
+    render(<TypeCell value="PM" onSave={vi.fn()} />);
+
+    await user.click(screen.getByRole("button", { name: "Type of WO, PM" }));
+
+    expect(screen.getByRole("button", { name: /^Reactive$/ })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: /^Emergency$/ })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: /^Overdue$/ })).toBeInTheDocument();
+  });
+
+  it("saves PM from the popover without opening the modal", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="Emergency" severity={2} onSave={onSave} />);
+
+    await user.click(screen.getByRole("button", { name: "Type of WO, Emergency" }));
+    await user.click(screen.getByRole("button", { name: /^PM$/ }));
+
+    expect(onSave).toHaveBeenCalledWith("PM", null);
+    expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+  });
+
+  it("opens Type & severity when changing PM to Emergency and saves after SEV", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="PM" onSave={onSave} />);
+
+    await user.click(screen.getByRole("button", { name: "Type of WO, PM" }));
+    await user.click(screen.getByRole("button", { name: /^Emergency$/ }));
+
+    expect(onSave).not.toHaveBeenCalled();
+    expect(screen.getByRole("dialog", { name: /Type & severity/i })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Close" })).toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: /SEV 1/ }));
+    await user.click(screen.getByRole("button", { name: /^Save$/ }));
+
+    expect(onSave).toHaveBeenCalledWith("Emergency", 1);
+  });
+
+  it("does not save when Cancel is clicked on the modal", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="PM" onSave={onSave} />);
+
+    await user.click(screen.getByRole("button", { name: "Type of WO, PM" }));
+    await user.click(screen.getByRole("button", { name: /^Emergency$/ }));
+    await user.click(screen.getByRole("button", { name: /^Cancel$/ }));
+
+    expect(onSave).not.toHaveBeenCalled();
+    await waitFor(() => {
+      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+    });
+  });
+
+  it("clears previous severity when switching Emergency to Reactive", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="Emergency" severity={3} onSave={onSave} />);
+
+    await user.click(screen.getByRole("button", { name: "Type of WO, Emergency" }));
+    await user.click(screen.getByRole("button", { name: /^Reactive$/ }));
+
+    expect(onSave).not.toHaveBeenCalled();
+    const save = screen.getByRole("button", { name: /^Save$/ });
+    expect(save).toBeDisabled();
+
+    await user.click(screen.getByRole("button", { name: /SEV 4/ }));
+    await user.click(save);
+
+    expect(onSave).toHaveBeenCalledWith("Reactive", 4);
+  });
+
+  it("opens the modal from the severity badge", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="Emergency" severity={2} onSave={onSave} />);
+
+    await user.click(screen.getByText("SEV 2"));
+
+    expect(screen.getByRole("dialog", { name: /Type & severity/i })).toBeInTheDocument();
+    expect(onSave).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/test/domain/work-orders/use-cases/use-work-order-table-mutations.test.tsx b/src/test/domain/work-orders/use-cases/use-work-order-table-mutations.test.tsx
index 4d1c374c..4edb9175 100644
--- a/src/test/domain/work-orders/use-cases/use-work-order-table-mutations.test.tsx
+++ b/src/test/domain/work-orders/use-cases/use-work-order-table-mutations.test.tsx
@@ -23,6 +23,7 @@ vi.mock("react-toastify", () => ({
   toast: { error: vi.fn(), success: vi.fn(), warning: vi.fn() },
 }));
 
+import { BoardPatchConflictError } from "@/domain/work-orders/errors/board-patch-errors";
 import { mapWorkOrderTableRow } from "@/domain/work-orders/mappers/work-order-table-row-mapper";
 import {
   applySchedulePatch,
@@ -642,3 +643,110 @@ describe("useWorkOrderTableMutations apptTime clear", () => {
     );
   });
 });
+
+describe("useWorkOrderTableMutations type and severity", () => {
+  let rowState: WorkOrderTableRow;
+
+  beforeEach(() => {
+    getById.mockReset();
+    update.mockReset();
+    patchBoardField.mockReset();
+    rowState = { ...BASE_ROW, type: "PM", severity: null };
+  });
+
+  it("patches severity before workOrderType and merges the API row", async () => {
+    const fields: string[] = [];
+    patchBoardField.mockImplementation(
+      async (
+        _id: unknown,
+        payload: { field: string; value?: string | null; workOrderVersion: string },
+      ) => {
+        fields.push(payload.field);
+        if (payload.field === "severity") {
+          rowState = {
+            ...rowState,
+            severity: payload.value ? (Number(payload.value) as 1) : null,
+            rowVersion: `${payload.workOrderVersion}-sev`,
+          };
+        }
+        if (payload.field === "workOrderType") {
+          rowState = {
+            ...rowState,
+            type: (payload.value as WorkOrderTableRow["type"]) || rowState.type,
+            rowVersion: `${payload.workOrderVersion}-type`,
+          };
+        }
+        return { ...rowState };
+      },
+    );
+
+    const onPatch = vi.fn();
+    const { result } = renderHook(
+      () =>
+        useWorkOrderTableMutations({
+          onPatch,
+          clearPatch: () => undefined,
+          getRow: () => rowState,
+        }),
+      { wrapper: makeWrapper() },
+    );
+
+    act(() => {
+      result.current.patchField(42, { type: "Emergency", severity: 1 });
+    });
+
+    await waitFor(() => expect(fields).toEqual(["severity", "workOrderType"]));
+    expect(onPatch).toHaveBeenCalledWith(
+      42,
+      expect.objectContaining({ type: "Emergency", severity: 1 }),
+    );
+  });
+
+  it("applies currentState on 409 conflict instead of clearing", async () => {
+    const currentState = { ...BASE_ROW, type: "PM" as const, severity: null };
+    patchBoardField.mockRejectedValue(new BoardPatchConflictError("stale", currentState));
+
+    const onPatch = vi.fn();
+    const clearPatch = vi.fn();
+    const { result } = renderHook(
+      () =>
+        useWorkOrderTableMutations({
+          onPatch,
+          clearPatch,
+          getRow: () => rowState,
+        }),
+      { wrapper: makeWrapper() },
+    );
+
+    act(() => {
+      result.current.patchField(42, { type: "Emergency", severity: 1 });
+    });
+
+    await waitFor(() =>
+      expect(onPatch).toHaveBeenCalledWith(42, expect.objectContaining({ type: "PM" })),
+    );
+    expect(clearPatch).not.toHaveBeenCalled();
+  });
+
+  it("rolls back with clearPatch on a generic type patch error", async () => {
+    patchBoardField.mockRejectedValue(new Error("network"));
+
+    const onPatch = vi.fn();
+    const clearPatch = vi.fn();
+    const { result } = renderHook(
+      () =>
+        useWorkOrderTableMutations({
+          onPatch,
+          clearPatch,
+          getRow: () => rowState,
+        }),
+      { wrapper: makeWrapper() },
+    );
+
+    act(() => {
+      result.current.patchField(42, { type: "Emergency", severity: 1 });
+    });
+
+    await waitFor(() => expect(clearPatch).toHaveBeenCalledWith(42));
+  });
+});
diff --git a/src/test/domain/work-orders/utils/format-board-audit-action.test.ts b/src/test/domain/work-orders/utils/format-board-audit-action.test.ts
index 7e8da248..9e9d7056 100644
--- a/src/test/domain/work-orders/utils/format-board-audit-action.test.ts
+++ b/src/test/domain/work-orders/utils/format-board-audit-action.test.ts
@@ -68,6 +68,28 @@ describe("formatBoardAuditAction", () => {
     ).toBe("WO marked as Past Due. Schedule On has passed without completion.");
   });
 
+  it("formats type correction as Changed Type to (AAP, new value only)", () => {
+    expect(
+      formatBoardAuditAction({
+        action: "FieldPatched",
+        fieldName: "WorkOrderType",
+        oldValue: "PM",
+        newValue: "Emergency",
+      }),
+    ).toBe('Changed Type to "Emergency"');
+  });
+
+  it("formats severity as Changed Severity to SEV N", () => {
+    expect(
+      formatBoardAuditAction({
+        action: "FieldPatched",
+        fieldName: "Severity",
+        oldValue: "3",
+        newValue: "1",
+      }),
+    ).toBe('Changed Severity to "SEV 1"');
+  });
+
   it("falls back to from → to for unknown fields", () => {
     expect(
       formatBoardAuditAction({
diff --git a/src/test/domain/work-orders/utils/severity-escalation.test.ts b/src/test/domain/work-orders/utils/severity-escalation.test.ts
new file mode 100644
index 00000000..812e40f9
--- /dev/null
+++ b/src/test/domain/work-orders/utils/severity-escalation.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import {
+  formatSeverityEscalationToast,
+  shouldAnnounceSeverityEscalation,
+} from "@/domain/work-orders/utils/severity-escalation";
+
+describe("shouldAnnounceSeverityEscalation", () => {
+  it("announces when severity newly enters SEV 1", () => {
+    expect(shouldAnnounceSeverityEscalation(3, 1)).toBe(true);
+    expect(shouldAnnounceSeverityEscalation(null, 1)).toBe(true);
+  });
+
+  it("does not announce a re-save of the same critical severity", () => {
+    expect(shouldAnnounceSeverityEscalation(1, 1)).toBe(false);
+  });
+
+  it("does not announce a de-escalation out of SEV 1/2", () => {
+    expect(shouldAnnounceSeverityEscalation(2, 3)).toBe(false);
+  });
+
+  it("does not announce SEV 2 to SEV 1 (already critical)", () => {
+    expect(shouldAnnounceSeverityEscalation(2, 1)).toBe(false);
+  });
+});
+
+describe("formatSeverityEscalationToast", () => {
+  it("matches the AAP warning copy", () => {
+    expect(formatSeverityEscalationToast("00000024965", 1)).toBe(
+      "WO #00000024965 escalated to SEV 1.",
+    );
+  });
+});
diff --git a/src/test/domain/work-orders/utils/table-filter-utils.test.ts b/src/test/domain/work-orders/utils/table-filter-utils.test.ts
index fb68c6f4..5a5bfcc2 100644
--- a/src/test/domain/work-orders/utils/table-filter-utils.test.ts
+++ b/src/test/domain/work-orders/utils/table-filter-utils.test.ts
@@ -172,6 +172,22 @@ describe("filterByBarAndSearch", () => {
     expect(ids).toEqual(["pd"]);
   });
 
+  it("hides a row after type correction when the bar filter no longer matches", () => {
+    const afterCorrection = makeRow({
+      id: "1",
+      type: "Emergency",
+      scheduledOn: "2026-06-03",
+    });
+
+    expect(
+      filterByBarAndSearch(
+        [afterCorrection],
+        bar(weekMonday, { types: new Set<WOType>(["PM"]) }),
+        "",
+      ).map((row) => row.id),
+    ).toEqual([]);
+  });
+
   it("does not filter by type when the set is empty", () => {
     const pm = makeRow({ id: "pm", type: "PM", scheduledOn: "2026-06-03" });
     const emergency = makeRow({ id: "em", type: "Emergency", scheduledOn: "2026-06-03" });
diff --git a/src/test/domain/work-orders/utils/work-order-lock.test.ts b/src/test/domain/work-orders/utils/work-order-lock.test.ts
index f65f3a30..e8ce1f1b 100644
--- a/src/test/domain/work-orders/utils/work-order-lock.test.ts
+++ b/src/test/domain/work-orders/utils/work-order-lock.test.ts
@@ -45,5 +45,10 @@ describe("work-order-lock", () => {
     expect(canApplyWorkOrderTablePatch("Completed", { site: "BK1" })).toBe(false);
     expect(canApplyWorkOrderTablePatch("Scheduled", { dispatcherId: "u2" })).toBe(true);
     expect(canApplyWorkOrderTablePatch("Canceled", { flagColor: "red" })).toBe(false);
+    expect(canApplyWorkOrderTablePatch("Completed", { type: "Emergency", severity: 1 })).toBe(
+      false,
+    );
+    expect(canApplyWorkOrderTablePatch("Canceled", { type: "PM" })).toBe(false);
+    expect(canApplyWorkOrderTablePatch("Scheduled", { type: "Reactive", severity: 3 })).toBe(true);
   });
 });

From ccdad96170cd48868cfc1f77499239d616a96740 Mon Sep 17 00:00:00 2001
From: Arthur Bassi <arthur.bassi@luby.com.br>
Date: Mon, 7 Sep 2026 11:39:12 -0300
Subject: [PATCH 2/2] fix(work-orders): persist type via PATCH and lock
 completed rows

---
 .../list/table/cells/assigned-to-cell.tsx     |  6 +-
 .../list/table/cells/type-cell.tsx            | 28 +++++---
 .../list/table/save-existing-row-type.ts      | 25 +++++--
 .../list/table/wo-table-row-cells.tsx         |  4 +-
 .../workorders/save-existing-row-type.test.ts | 32 ++++++---
 .../(protected)/workorders/type-cell.test.tsx | 17 +++++
 .../wo-table-row-cells-type-toast.test.tsx    | 69 +++++++++++++++++++
 .../wo-table-row-completed-lock.test.tsx      | 52 ++++++++++++++
 8 files changed, 205 insertions(+), 28 deletions(-)
 create mode 100644 src/test/app/(protected)/workorders/wo-table-row-cells-type-toast.test.tsx

diff --git a/src/app/(protected)/workorders/_components/list/table/cells/assigned-to-cell.tsx b/src/app/(protected)/workorders/_components/list/table/cells/assigned-to-cell.tsx
index cc4cf518..bd0db367 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/assigned-to-cell.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/assigned-to-cell.tsx
@@ -28,7 +28,7 @@ export function AssignedToCell({ dispatcherId, users, highlight, onSave }: Assig
           e.stopPropagation();
           setAnchorEl(e.currentTarget);
         }}
-        className="group/cell flex w-full items-center gap-1.5 rounded transition-opacity hover:opacity-80"
+        className="group/cell flex w-full min-w-0 items-center gap-1.5 rounded transition-opacity hover:opacity-80"
         style={
           highlight
             ? {
@@ -43,13 +43,13 @@ export function AssignedToCell({ dispatcherId, users, highlight, onSave }: Assig
         {selected ? (
           <DispatcherPill user={selected} />
         ) : (
-          <span className="flex items-center gap-1.5 text-[13px] text-[var(--color-text-muted)]">
+          <span className="flex min-w-0 items-center gap-1.5 text-[13px] text-[var(--color-text-muted)]">
             <Users
               size={13}
               className="shrink-0"
               style={{ color: highlight ? "var(--primary)" : "var(--color-text-muted)" }}
             />
-            Select dispatcher
+            <span className="truncate whitespace-nowrap">Select dispatcher</span>
           </span>
         )}
         <HoverChevron />
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx b/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
index 4cf14290..949722d6 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/cells/type-cell.tsx
@@ -18,14 +18,32 @@ type TypeCellProps = {
   value: WOType | "";
   severity?: WorkOrderSeverity | null;
   q?: string;
+  viewOnly?: boolean;
   onSave: (type: WOType, severity: WorkOrderSeverity | null) => void;
 };
 
-export function TypeCell({ value, severity = null, q, onSave }: TypeCellProps) {
+function TypeCellValue({ value, q }: { value: WOType | ""; q?: string }) {
+  if (value) {
+    return <WoTableTypeLabel type={value} q={q} />;
+  }
+  return <span className="text-[13px] text-[var(--color-text-muted)]">Select type of WO</span>;
+}
+
+export function TypeCell({ value, severity = null, q, viewOnly = false, onSave }: TypeCellProps) {
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const [modalOpen, setModalOpen] = useState(false);
   const [modalSeed, setModalSeed] = useState<WOType | "">(value);
   const [resetSeverity, setResetSeverity] = useState(false);
+  const showSeverityBadge = Boolean(value !== "" && typeNeedsSeverity(value) && severity != null);
+
+  if (viewOnly) {
+    return (
+      <div className="flex w-full items-center gap-1">
+        <TypeCellValue value={value} q={q} />
+        {Boolean(showSeverityBadge && severity != null) && <SeverityBadge severity={severity!} />}
+      </div>
+    );
+  }
 
   function pick(t: WOType) {
     setAnchorEl(null);
@@ -43,8 +61,6 @@ export function TypeCell({ value, severity = null, q, onSave }: TypeCellProps) {
     onSave(t, needsSeverity ? severity : null);
   }
 
-  const showSeverityBadge = Boolean(value !== "" && typeNeedsSeverity(value) && severity != null);
-
   return (
     <>
       <button
@@ -57,11 +73,7 @@ export function TypeCell({ value, severity = null, q, onSave }: TypeCellProps) {
         }}
         className="group/cell flex w-full items-center gap-1 transition-opacity hover:opacity-80"
       >
-        {value ? (
-          <WoTableTypeLabel type={value} q={q} />
-        ) : (
-          <span className="text-[13px] text-[var(--color-text-muted)]">Select type of WO</span>
-        )}
+        <TypeCellValue value={value} q={q} />
         {Boolean(showSeverityBadge && severity != null) && (
           <SeverityBadge
             severity={severity!}
diff --git a/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts b/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
index 0a83db69..6af21133 100644
--- a/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
+++ b/src/app/(protected)/workorders/_components/list/table/save-existing-row-type.ts
@@ -1,20 +1,33 @@
 import { toast } from "react-toastify";
 import type { WorkOrderSeverity } from "@/domain/work-orders/types/work-order-severity";
-import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
+import type {
+  WorkOrderTablePatch,
+  WorkOrderTableRow,
+} from "@/domain/work-orders/types/work-order-table-row";
 import type { WOType } from "@/domain/work-orders/types/work-order-wizard";
 import {
   formatSeverityEscalationToast,
   shouldAnnounceSeverityEscalation,
 } from "@/domain/work-orders/utils/severity-escalation";
 
+type PersistPatchFn = (
+  id: string | number,
+  patch: WorkOrderTablePatch,
+  options?: { onSuccess?: () => void },
+) => void;
+
 export function saveExistingRowType(
-  row: Pick<WorkOrderTableRow, "woNumber" | "severity">,
+  onPatch: PersistPatchFn,
+  row: Pick<WorkOrderTableRow, "id" | "woNumber" | "severity">,
   type: WOType,
   severity: WorkOrderSeverity | null,
-  onPatchRow: (patch: Partial<WorkOrderTableRow>) => void,
 ) {
-  if (shouldAnnounceSeverityEscalation(row.severity, severity)) {
-    toast.warn(formatSeverityEscalationToast(row.woNumber, severity));
+  const patch = { type, severity };
+  if (!shouldAnnounceSeverityEscalation(row.severity, severity)) {
+    onPatch(row.id, patch);
+    return;
   }
-  onPatchRow({ type, severity });
+  onPatch(row.id, patch, {
+    onSuccess: () => toast.warn(formatSeverityEscalationToast(row.woNumber, severity)),
+  });
 }
diff --git a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
index 283d732c..f5700a47 100644
--- a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
@@ -2,6 +2,7 @@ import type { CSSProperties } from "react";
 import type { LocationOption, WorkOrderUser } from "@/domain/work-orders/types/work-order";
 import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
 import { applyAssignedToTableSave } from "@/domain/work-orders/utils/work-order-feedback-toasts";
+import { isWorkOrderCompletionSurfaceReadOnly } from "@/domain/work-orders/utils/work-order-lock";
 import { saveExistingRowType } from "./save-existing-row-type";
 import { AssignedToCell } from "./cells/assigned-to-cell";
 import { DateCell } from "./cells/date-cell";
@@ -104,7 +105,8 @@ export function WoTableRowCells({
           value={row.type}
           severity={row.severity}
           q={search}
-          onSave={(t, sev) => saveExistingRowType(row, t, sev, onPatchRow)}
+          viewOnly={isWorkOrderCompletionSurfaceReadOnly(row.status)}
+          onSave={(t, sev) => saveExistingRowType(handlers.onPatch, row, t, sev)}
         />
       </td>
       <td
diff --git a/src/test/app/(protected)/workorders/save-existing-row-type.test.ts b/src/test/app/(protected)/workorders/save-existing-row-type.test.ts
index 57e81ff3..0ca3f3c9 100644
--- a/src/test/app/(protected)/workorders/save-existing-row-type.test.ts
+++ b/src/test/app/(protected)/workorders/save-existing-row-type.test.ts
@@ -8,35 +8,47 @@ vi.mock("react-toastify", () => ({
 
 import { saveExistingRowType } from "@/app/(protected)/workorders/_components/list/table/save-existing-row-type";
 
+const row = { id: 7, woNumber: "00000024965", severity: 3 as const };
+
 describe("saveExistingRowType", () => {
   beforeEach(() => {
     toastWarn.mockReset();
   });
 
-  it("warns when severity newly enters SEV 1 and still patches the row", () => {
-    const onPatchRow = vi.fn();
+  it("warns when severity newly enters SEV 1 only after persist onSuccess", () => {
+    const onPatch = vi.fn();
 
-    saveExistingRowType({ woNumber: "00000024965", severity: 3 }, "Emergency", 1, onPatchRow);
+    saveExistingRowType(onPatch, row, "Emergency", 1);
 
+    expect(toastWarn).not.toHaveBeenCalled();
+    expect(onPatch).toHaveBeenCalledWith(
+      7,
+      { type: "Emergency", severity: 1 },
+      expect.objectContaining({ onSuccess: expect.any(Function) }),
+    );
+
+    const { onSuccess } = onPatch.mock.calls[0]![2] as { onSuccess: () => void };
+    onSuccess();
     expect(toastWarn).toHaveBeenCalledWith("WO #00000024965 escalated to SEV 1.");
-    expect(onPatchRow).toHaveBeenCalledWith({ type: "Emergency", severity: 1 });
   });
 
   it("does not warn when staying on a critical severity", () => {
-    const onPatchRow = vi.fn();
+    const onPatch = vi.fn();
 
-    saveExistingRowType({ woNumber: "00000024965", severity: 1 }, "Emergency", 1, onPatchRow);
+    saveExistingRowType(onPatch, { ...row, severity: 1 }, "Emergency", 1);
 
     expect(toastWarn).not.toHaveBeenCalled();
-    expect(onPatchRow).toHaveBeenCalledWith({ type: "Emergency", severity: 1 });
+    expect(onPatch).toHaveBeenCalledWith(7, { type: "Emergency", severity: 1 });
+    expect(onPatch.mock.calls[0]![2]).toBeUndefined();
   });
 
   it("does not warn when clearing severity on a PM correction", () => {
-    const onPatchRow = vi.fn();
+    const onPatch = vi.fn();
 
-    saveExistingRowType({ woNumber: "00000024965", severity: 2 }, "PM", null, onPatchRow);
+    saveExistingRowType(onPatch, { ...row, severity: 2 }, "PM", null);
 
     expect(toastWarn).not.toHaveBeenCalled();
-    expect(onPatchRow).toHaveBeenCalledWith({ type: "PM", severity: null });
+    expect(onPatch).toHaveBeenCalledWith(7, { type: "PM", severity: null });
+    expect(onPatch.mock.calls[0]![2]).toBeUndefined();
   });
 });
diff --git a/src/test/app/(protected)/workorders/type-cell.test.tsx b/src/test/app/(protected)/workorders/type-cell.test.tsx
index 64f6b02a..f7844681 100644
--- a/src/test/app/(protected)/workorders/type-cell.test.tsx
+++ b/src/test/app/(protected)/workorders/type-cell.test.tsx
@@ -83,6 +83,23 @@ describe("TypeCell", () => {
     expect(onSave).toHaveBeenCalledWith("Reactive", 4);
   });
 
+  it("does not open the picker or severity modal when viewOnly", async () => {
+    const onSave = vi.fn();
+    const user = userEvent.setup();
+    render(<TypeCell value="Emergency" severity={2} viewOnly onSave={onSave} />);
+
+    expect(screen.queryByRole("button", { name: "Type of WO, Emergency" })).not.toBeInTheDocument();
+    expect(screen.getByText("Emergency")).toBeInTheDocument();
+    expect(screen.getByText("SEV 2")).toBeInTheDocument();
+
+    await user.click(screen.getByText("Emergency"));
+    await user.click(screen.getByText("SEV 2"));
+
+    expect(screen.queryByRole("button", { name: /^Reactive$/ })).not.toBeInTheDocument();
+    expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+    expect(onSave).not.toHaveBeenCalled();
+  });
+
   it("opens the modal from the severity badge", async () => {
     const onSave = vi.fn();
     const user = userEvent.setup();
diff --git a/src/test/app/(protected)/workorders/wo-table-row-cells-type-toast.test.tsx b/src/test/app/(protected)/workorders/wo-table-row-cells-type-toast.test.tsx
new file mode 100644
index 00000000..b98743e2
--- /dev/null
+++ b/src/test/app/(protected)/workorders/wo-table-row-cells-type-toast.test.tsx
@@ -0,0 +1,69 @@
+import { fireEvent, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { WoTableRowCells } from "@/app/(protected)/workorders/_components/list/table/wo-table-row-cells";
+import type { WoTableRowHandlers } from "@/app/(protected)/workorders/_components/list/table/wo-table-row";
+import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
+import { renderWithProviders } from "@/test/test-utils";
+
+vi.mock("@/app/(protected)/workorders/_components/list/table/cells/site-cell", () => ({
+  SiteCell: () => null,
+}));
+vi.mock(
+  "@/app/(protected)/workorders/_components/list/table/cells/editable-wo-number-cell",
+  () => ({
+    EditableWONumberCell: () => null,
+  }),
+);
+vi.mock("@/app/(protected)/workorders/_components/list/table/cells/type-cell", () => ({
+  TypeCell: ({ onSave }: { onSave: (type: string, severity: number) => void }) => (
+    <button type="button" onClick={() => onSave("Emergency", 1)}>
+      persist-type
+    </button>
+  ),
+}));
+vi.mock("@/app/(protected)/workorders/_components/list/table/cells/date-cell", () => ({
+  DateCell: () => null,
+}));
+vi.mock("@/app/(protected)/workorders/_components/list/table/cells/due-date-cell", () => ({
+  DueDateCell: () => null,
+}));
+vi.mock("@/app/(protected)/workorders/_components/list/table/cells/assigned-to-cell", () => ({
+  AssignedToCell: () => null,
+}));
+
+const row = { id: 7, woNumber: "00000024965", severity: 3 } as WorkOrderTableRow;
+
+describe("WoTableRowCells type persist", () => {
+  it("forwards type save through patch onSuccess instead of onPatchRow", () => {
+    const onPatch = vi.fn();
+    const onPatchRow = vi.fn();
+    const handlers = { onPatch } as unknown as WoTableRowHandlers;
+
+    renderWithProviders(
+      <table>
+        <tbody>
+          <tr>
+            <WoTableRowCells
+              row={row}
+              allRows={[]}
+              users={[]}
+              sites={[]}
+              handlers={handlers}
+              onPatchRow={onPatchRow}
+            />
+          </tr>
+        </tbody>
+      </table>,
+      { withAuth: false },
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "persist-type" }));
+
+    expect(onPatchRow).not.toHaveBeenCalled();
+    expect(onPatch).toHaveBeenCalledWith(
+      7,
+      { type: "Emergency", severity: 1 },
+      expect.objectContaining({ onSuccess: expect.any(Function) }),
+    );
+  });
+});
diff --git a/src/test/app/(protected)/workorders/wo-table-row-completed-lock.test.tsx b/src/test/app/(protected)/workorders/wo-table-row-completed-lock.test.tsx
index 2c02e58c..7ced9b99 100644
--- a/src/test/app/(protected)/workorders/wo-table-row-completed-lock.test.tsx
+++ b/src/test/app/(protected)/workorders/wo-table-row-completed-lock.test.tsx
@@ -133,4 +133,56 @@ describe("WoTableRow completed selective lock", () => {
     expect(screen.queryByRole("button", { name: /in progress/i })).not.toBeInTheDocument();
     expect(handlers.onPatch).not.toHaveBeenCalled();
   });
+
+  it("does not expose the type picker on a Completed row", () => {
+    const row = makeRow();
+    renderWithProviders(
+      <table>
+        <tbody>
+          <WoTableRow
+            row={row}
+            allRows={[row]}
+            users={[]}
+            sites={[]}
+            vendors={[]}
+            pmTypes={["HVAC"]}
+            isSelected={false}
+            isFlashing={false}
+            dragViz={{ dragId: null, overId: null }}
+            handlers={handlers}
+          />
+        </tbody>
+      </table>,
+      { withAuth: false },
+    );
+
+    expect(screen.queryByRole("button", { name: "Type of WO, PM" })).not.toBeInTheDocument();
+    expect(screen.getByText("PM")).toBeInTheDocument();
+  });
+
+  it("does not expose the type picker on a Canceled row", () => {
+    const row = makeRow({ status: "Canceled" });
+    renderWithProviders(
+      <table>
+        <tbody>
+          <WoTableRow
+            row={row}
+            allRows={[row]}
+            users={[]}
+            sites={[]}
+            vendors={[]}
+            pmTypes={["HVAC"]}
+            isSelected={false}
+            isFlashing={false}
+            dragViz={{ dragId: null, overId: null }}
+            handlers={handlers}
+          />
+        </tbody>
+      </table>,
+      { withAuth: false },
+    );
+
+    expect(screen.queryByRole("button", { name: "Type of WO, PM" })).not.toBeInTheDocument();
+    expect(screen.getByText("PM")).toBeInTheDocument();
+  });
 });