fix(work-orders): keep admin-approved revoke off the WO dialog (SH-214)

SH-214/SH-212 own that action on Uplift Approvals; the WO surface only revokes the requester's auto-approved uplift.

src/app/(protected)/workorders/_components/uplifts/work-order-uplift-list-item.tsx

@@ -11,7 +11,6 @@ import {
 type WorkOrderUpliftListItemProps = {
   uplift: WorkOrderUplift;
   readOnly: boolean;
-  isAdmin: boolean;
   currentUserId: string | number | null | undefined;
   pendingAction?: boolean;
   onCancel?: () => void;
@@ -21,7 +20,6 @@ type WorkOrderUpliftListItemProps = {
 export function WorkOrderUpliftListItem({
   uplift,
   readOnly,
-  isAdmin,
   currentUserId,
   pendingAction = false,
   onCancel,
@@ -30,7 +28,7 @@ export function WorkOrderUpliftListItem({
   const pillStyle = getUpliftStatusPillStyle(uplift.status);
   const showCancel = !readOnly && uplift.status === "pending" && Boolean(onCancel);
   const showRevoke =
-    !readOnly && canRevokeWorkOrderUplift(uplift, currentUserId, isAdmin) && Boolean(onRevoke);
+    !readOnly && canRevokeWorkOrderUplift(uplift, currentUserId) && Boolean(onRevoke);
 
   return (
     <div className="rounded-lg border border-[var(--color-border)] p-3">

src/app/(protected)/workorders/_components/uplifts/work-order-uplifts-dialog-content.tsx

@@ -11,7 +11,6 @@ import { hasOpenWorkOrderUplift } from "@/domain/work-orders/utils/uplift-displa
 
 type WorkOrderUpliftsDialogContentProps = {
   readOnly: boolean;
-  isAdmin: boolean;
   currentUserId: string | number | null | undefined;
   readOnlyStatusLabel?: string;
   isLoading: boolean;
@@ -28,7 +27,6 @@ type WorkOrderUpliftsDialogContentProps = {
 
 export function WorkOrderUpliftsDialogContent({
   readOnly,
-  isAdmin,
   currentUserId,
   readOnlyStatusLabel,
   isLoading,
@@ -78,7 +76,6 @@ export function WorkOrderUpliftsDialogContent({
             key={String(uplift.id)}
             uplift={uplift}
             readOnly={readOnly}
-            isAdmin={isAdmin}
             currentUserId={currentUserId}
             pendingAction={actionPending}
             onCancel={readOnly ? undefined : () => onCancelUplift(uplift.id)}

src/app/(protected)/workorders/_components/uplifts/work-order-uplifts-dialog.tsx

@@ -15,7 +15,6 @@ import {
   isWorkOrderUpliftsReadOnly,
   upliftRevokeRequiresReason,
 } from "@/domain/work-orders/utils/uplift-display-utils";
-import { isAdminUser } from "@/lib/auth/user-utils";
 import { useAuthContext } from "@/providers/auth-context";
 
 type RevokeTarget = {
@@ -31,7 +30,6 @@ type WorkOrderUpliftsDialogProps = {
 
 export function WorkOrderUpliftsDialog({ row, open, onClose }: WorkOrderUpliftsDialogProps) {
   const { user } = useAuthContext();
-  const isAdmin = isAdminUser(user?.userRoles);
   const workOrderId = row?.id ?? null;
   const readOnly = row ? isWorkOrderUpliftsReadOnly(row.status) : true;
   const {
@@ -79,7 +77,6 @@ export function WorkOrderUpliftsDialog({ row, open, onClose }: WorkOrderUpliftsD
         <DialogContent className="flex flex-col gap-3">
           <WorkOrderUpliftsDialogContent
             readOnly={readOnly}
-            isAdmin={isAdmin}
             currentUserId={user?.id}
             readOnlyStatusLabel={row?.status}
             isLoading={isLoading}

src/domain/work-orders/utils/uplift-display-utils.ts

@@ -87,18 +87,17 @@ export function canOpenUpliftsDialog(
 export function canRevokeWorkOrderUplift(
   uplift: Pick<WorkOrderUplift, "status" | "requestedById">,
   currentUserId: string | number | null | undefined,
-  isAdmin: boolean,
 ): boolean {
-  if (uplift.status === "auto_approved") {
+  if (uplift.status !== "auto_approved") {
-    // SH-196: auto-approved revoke is dispatcher-own only (no admin bypass).
+    // SH-214/SH-212: admin-approved revoke lives on Uplift Approvals, not the WO dialog.
-    return (
+    return false;
-      currentUserId != null &&
-      currentUserId !== "" &&
-      uplift.requestedById != null &&
-      String(uplift.requestedById) === String(currentUserId)
-    );
   }
-  return isAdmin && uplift.status === "approved";
+  return (
+    currentUserId != null &&
+    currentUserId !== "" &&
+    uplift.requestedById != null &&
+    String(uplift.requestedById) === String(currentUserId)
+  );
 }
 
 export function upliftRevokeRequiresReason(status: WorkOrderUpliftStatus): boolean {

src/test/app/(protected)/workorders/work-order-uplifts-affordances.test.tsx

@@ -1,6 +1,7 @@
 import { fireEvent, screen } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";
 import { UpliftCell } from "@/app/(protected)/workorders/_components/list/table/cells/uplift-cell";
+import { WorkOrderUpliftListItem } from "@/app/(protected)/workorders/_components/uplifts/work-order-uplift-list-item";
 import { WorkOrderUpliftsDialog } from "@/app/(protected)/workorders/_components/uplifts/work-order-uplifts-dialog";
 import type { WorkOrderTableRow } from "@/domain/work-orders/types/work-order-table-row";
 import type { WorkOrderUplift } from "@/domain/work-orders/types/work-order-uplift";
@@ -143,3 +144,33 @@ describe("WorkOrderUpliftsDialog affordances", () => {
     expect(screen.queryByRole("button", { name: /cancel pending/i })).not.toBeInTheDocument();
   });
 });
+
+describe("WorkOrderUpliftListItem revoke affordances", () => {
+  it("hides Revoke for admin-approved uplifts on the Work Order surface", () => {
+    renderWithProviders(
+      <WorkOrderUpliftListItem
+        uplift={{ ...pendingUplift, status: "approved" }}
+        readOnly={false}
+        currentUserId="admin-1"
+        onRevoke={vi.fn()}
+      />,
+      { withAuth: false },
+    );
+
+    expect(screen.queryByRole("button", { name: /revoke/i })).not.toBeInTheDocument();
+  });
+
+  it("shows Revoke for the requesting dispatcher on auto-approved uplifts", () => {
+    renderWithProviders(
+      <WorkOrderUpliftListItem
+        uplift={{ ...pendingUplift, status: "auto_approved", requestedById: "dispatcher-1" }}
+        readOnly={false}
+        currentUserId="dispatcher-1"
+        onRevoke={vi.fn()}
+      />,
+      { withAuth: false },
+    );
+
+    expect(screen.getByRole("button", { name: /revoke/i })).toBeInTheDocument();
+  });
+});

src/test/domain/work-orders/utils/uplift-display-utils.test.ts

@@ -12,7 +12,6 @@ describe("canRevokeWorkOrderUplift", () => {
       canRevokeWorkOrderUplift(
         { status: "auto_approved", requestedById: "dispatcher-1" },
         "dispatcher-1",
-        false,
       ),
     ).toBe(true);
   });
@@ -22,7 +21,6 @@ describe("canRevokeWorkOrderUplift", () => {
       canRevokeWorkOrderUplift(
         { status: "auto_approved", requestedById: "other-dispatcher" },
         "dispatcher-1",
-        false,
       ),
     ).toBe(false);
   });
@@ -32,7 +30,6 @@ describe("canRevokeWorkOrderUplift", () => {
       canRevokeWorkOrderUplift(
         { status: "auto_approved", requestedById: "dispatcher-1" },
         "admin-user",
-        true,
       ),
     ).toBe(false);
   });
@@ -42,24 +39,19 @@ describe("canRevokeWorkOrderUplift", () => {
       canRevokeWorkOrderUplift(
         { status: "auto_approved", requestedById: "admin-user" },
         "admin-user",
-        true,
       ),
     ).toBe(true);
   });
 
-  it("allows approved revoke only for admin", () => {
+  it("rejects approved revoke on the Work Order surface (SH-214)", () => {
     const uplift = { status: "approved" as const, requestedById: "dispatcher-1" };
-    expect(canRevokeWorkOrderUplift(uplift, "dispatcher-1", false)).toBe(false);
+    expect(canRevokeWorkOrderUplift(uplift, "dispatcher-1")).toBe(false);
-    expect(canRevokeWorkOrderUplift(uplift, "dispatcher-1", true)).toBe(true);
+    expect(canRevokeWorkOrderUplift(uplift, "admin-user")).toBe(false);
   });
 
   it("rejects revoke for other statuses", () => {
-    expect(canRevokeWorkOrderUplift({ status: "pending", requestedById: "u1" }, "u1", true)).toBe(
+    expect(canRevokeWorkOrderUplift({ status: "pending", requestedById: "u1" }, "u1")).toBe(false);
-      false,
+    expect(canRevokeWorkOrderUplift({ status: "rejected", requestedById: "u1" }, "u1")).toBe(false);
-    );
-    expect(canRevokeWorkOrderUplift({ status: "rejected", requestedById: "u1" }, "u1", true)).toBe(
-      false,
-    );
   });
 });