Merge pull request #262 from Sea-Haven-Industries/fix/ab/sh-394-exposure-dash

fix(uplifts): show a dash for Approved on WO when nothing is granted (SH-394)

package.json

@@ -50,63 +50,63 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/dm-sans": "^5.2.8",
-    "@fontsource/jetbrains-mono": "^5.2.8",
-    "@fontsource/montserrat": "^5.2.8",
+    "@fontsource/dm-sans": "^5.3.0",
+    "@fontsource/jetbrains-mono": "^5.3.0",
+    "@fontsource/montserrat": "^5.3.0",
     "@fullcalendar/daygrid": "^6.1.21",
     "@fullcalendar/interaction": "^6.1.21",
     "@fullcalendar/react": "^6.1.21",
     "@fullcalendar/timegrid": "^6.1.21",
     "@generouted/react-router": "^1.20.2",
-    "@hookform/resolvers": "^5.4.0",
-    "@mui/icons-material": "^9.2.0",
-    "@mui/material": "^9.2.0",
-    "@sentry/react": "10.73.0",
+    "@hookform/resolvers": "^5.9.1",
+    "@mui/icons-material": "9.2.0",
+    "@mui/material": "9.2.0",
+    "@sentry/react": "10.75.0",
     "@tanstack/query-broadcast-client-experimental": "5.103.1",
     "@tanstack/react-query": "5.103.1",
     "@tanstack/react-query-devtools": "5.103.1",
-    "@testing-library/dom": "^10.4.1",
+    "@testing-library/dom": "^10.4.2",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
-    "@testing-library/user-event": "^14.6.1",
+    "@testing-library/react": "^16.3.3",
+    "@testing-library/user-event": "^14.6.7",
     "clsx": "^2.1.1",
-    "ky": "^2.0.2",
-    "lucide-react": "^1.24.0",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7",
-    "react-hook-form": "^7.81.0",
+    "ky": "^2.1.0",
+    "lucide-react": "^1.47.0",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
+    "react-hook-form": "^7.88.0",
     "react-icons": "^5.7.0",
-    "react-router": "^8.2.0",
+    "react-router": "^8.4.0",
     "react-toastify": "^11.1.0",
-    "tailwind-merge": "^3.6.0",
-    "zod": "^4.4.3"
+    "tailwind-merge": "^3.7.0",
+    "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^21.2.1",
-    "@commitlint/config-conventional": "^21.2.0",
+    "@commitlint/cli": "^21.2.3",
+    "@commitlint/config-conventional": "^21.2.3",
     "@eslint/js": "^10.0.1",
     "@playwright/test": "^1.61.1",
-    "@sentry/cli": "3.7.0",
-    "@tailwindcss/vite": "^4.3.2",
-    "@types/node": "^24.13.3",
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^6.0.3",
-    "@vitest/coverage-v8": "^4.1.10",
-    "eslint": "^10.7.0",
+    "@sentry/cli": "3.8.0",
+    "@tailwindcss/vite": "^4.3.3",
+    "@types/node": "^24.13.6",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
+    "@vitejs/plugin-react": "^6.1.1",
+    "@vitest/coverage-v8": "^4.1.11",
+    "eslint": "^10.11.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-react-refresh": "^0.5.3",
-    "globals": "^17.7.0",
+    "eslint-plugin-react-refresh": "^0.5.7",
+    "globals": "^17.12.0",
     "husky": "^9.1.7",
     "jsdom": "^29.1.1",
-    "lint-staged": "^17.0.8",
-    "prettier": "^3.9.5",
-    "tailwindcss": "^4.3.2",
+    "lint-staged": "^17.5.1",
+    "prettier": "^3.9.8",
+    "tailwindcss": "^4.3.3",
     "typescript": "~6.0.3",
-    "typescript-eslint": "^8.63.0",
-    "vite": "^8.1.4",
-    "vitest": "^4.1.10"
+    "typescript-eslint": "^8.70.0",
+    "vite": "^8.3.0",
+    "vitest": "^4.1.11"
   },
   "engines": {
     "node": ">=22.22.1"

src/app/(protected)/uplifts/_components/format-uplift-money.ts

@@ -4,3 +4,7 @@ export function formatUpliftMoney(value: number): string {
     maximumFractionDigits: 2,
   })}`;
 }
+
+export function isGrantedAmount(value: number | null): value is number {
+  return value != null && value > 0;
+}

src/app/(protected)/uplifts/_components/uplift-approvals-table.tsx

@@ -12,7 +12,10 @@ import {
   TableRow,
   Tooltip,
 } from "@mui/material";
-import { formatUpliftMoney } from "@/app/(protected)/uplifts/_components/format-uplift-money";
+import {
+  formatUpliftMoney,
+  isGrantedAmount,
+} from "@/app/(protected)/uplifts/_components/format-uplift-money";
 import { Text } from "@/components/ui/text";
 import { useUpliftsCanApprove } from "@/domain/uplifts/use-cases/use-uplifts-can-approve";
 import type { UpliftQueueItem } from "@/domain/uplifts/types/uplift";
@@ -215,7 +218,7 @@ function UpliftApprovalRow({
         </Text>
       </TableCell>
       <TableCell>
-        {row.approvedOnWoTotal != null ? (
+        {isGrantedAmount(row.approvedOnWoTotal) ? (
           <Text variant="body">{formatUpliftMoney(row.approvedOnWoTotal)}</Text>
         ) : (
           <Text variant="caption" tone="muted">

src/app/(protected)/uplifts/_components/uplift-detail-modal.tsx

@@ -16,7 +16,10 @@ import {
   formatUpliftCalendarDate,
   formatUpliftDateTime,
 } from "@/app/(protected)/uplifts/_components/format-uplift-dates";
-import { formatUpliftMoney } from "@/app/(protected)/uplifts/_components/format-uplift-money";
+import {
+  formatUpliftMoney,
+  isGrantedAmount,
+} from "@/app/(protected)/uplifts/_components/format-uplift-money";
 import { Text } from "@/components/ui/text";
 import { useWorkOrderUplifts } from "@/domain/work-orders/use-cases/use-work-order-uplifts";
 import { useUpliftsCanApprove } from "@/domain/uplifts/use-cases/use-uplifts-can-approve";
@@ -142,6 +145,7 @@ function ApprovedOnWoBreakdown({
   breakdown: ExposureBreakdown;
   unavailable: boolean;
 }) {
+  const grantedTotal = isGrantedAmount(breakdown.total) ? breakdown.total : null;
   return (
     <Box sx={BORDERED_BLOCK_SX}>
       <BreakdownRow
@@ -156,7 +160,12 @@ function ApprovedOnWoBreakdown({
         strong={false}
         unavailable={unavailable}
       />
-      <BreakdownRow label="Total" value={breakdown.total} strong unavailable={unavailable} />
+      <BreakdownRow
+        label="Total"
+        value={grantedTotal}
+        strong
+        unavailable={unavailable && breakdown.total == null}
+      />
     </Box>
   );
 }

src/test/app/(protected)/uplifts/uplift-approved-on-wo-dash.test.tsx

@@ -0,0 +1,160 @@
+import { fireEvent, screen, within } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { UpliftQueueItem, UpliftsQueueResult } from "@/domain/uplifts/types/uplift";
+import { renderWithProviders } from "@/test/test-utils";
+
+const queueState = vi.hoisted(() => ({ data: null as UpliftsQueueResult | null }));
+const woUplifts = vi.hoisted(() => ({
+  data: [] as Array<Record<string, unknown>> | null,
+  isError: false,
+}));
+
+vi.mock("@/domain/uplifts/use-cases/use-uplifts-queue", () => ({
+  useUpliftsQueue: () => ({
+    data: queueState.data,
+    isLoading: false,
+    isFetching: false,
+    error: null,
+    refetch: vi.fn(),
+  }),
+}));
+
+vi.mock("@/domain/uplifts/use-cases/use-uplift-actions", () => ({
+  useApproveUplift: () => ({ isPending: false, mutate: vi.fn() }),
+  useRejectUplift: () => ({ isPending: false, mutate: vi.fn() }),
+  useRevokeUplift: () => ({ isPending: false, mutate: vi.fn() }),
+}));
+
+vi.mock("@/providers/auth-context", async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  useAuthContext: () => ({ user: { userRoles: "Admin" } }),
+}));
+
+vi.mock("@/domain/uplifts/use-cases/use-uplifts-can-approve", () => ({
+  useUpliftsCanApprove: () => ({ data: true }),
+}));
+
+vi.mock("@/domain/work-orders/use-cases/use-work-order-uplifts", () => ({
+  useWorkOrderUplifts: () => ({
+    data: woUplifts.data,
+    isLoading: false,
+    isError: woUplifts.isError,
+  }),
+}));
+
+const pendingItem: UpliftQueueItem = {
+  id: 41,
+  status: "Pending",
+  currentNTE: 100,
+  requestedNTE: 250,
+  delta: 150,
+  vendorReason: "Extra parts",
+  requestedAt: "2026-01-15T10:00:00Z",
+  requestedByVendorName: "Gateway",
+  decidedAt: "",
+  decidedByName: "",
+  decisionNote: "",
+  requiredTier: 1,
+  canDecide: true,
+  expiresAt: "",
+  notificationStatus: "",
+  notificationError: "",
+  evidenceDocumentId: null,
+  evidenceFileName: "",
+  evidenceContentType: "",
+  evidenceSizeBytes: null,
+  dispatchNumber: "DSP-41",
+  poNumber: "PO-41",
+  vendorCompanyName: "Gateway Plumbing",
+  workOrderId: 99,
+  dispatchId: 7,
+  woNumber: "WO-99",
+  site: "Site A",
+  serviceName: "Plumbing repair",
+  technicianName: "",
+  workOrderDispatcherName: "",
+  workOrderScheduledDate: "",
+  attachmentCount: null,
+  approvedOnWoAuto: null,
+  approvedOnWoAdmin: null,
+  approvedOnWoTotal: null,
+  workOrderClosed: false,
+};
+
+function seedQueue(overrides: Partial<UpliftQueueItem>) {
+  queueState.data = {
+    items: [{ ...pendingItem, ...overrides }],
+    totalCount: 1,
+    page: 1,
+    pageSize: 25,
+    pendingExposureTotal: 250,
+  };
+}
+
+async function renderQueuePage() {
+  const { default: UpliftQueuePage } = await import("@/app/(protected)/uplifts/index");
+  renderWithProviders(<UpliftQueuePage />);
+}
+
+function approvedOnWoColumnText(): string {
+  const table = screen.getByRole("table", { name: "pending uplift requests" });
+  const headers = within(table).getAllByRole("columnheader");
+  const columnIndex = headers.findIndex((header) => header.textContent === "Approved on WO");
+  const row = within(table).getByRole("row", { name: /Open uplift details for WO-99/ });
+  return within(row).getAllByRole("cell")[columnIndex]?.textContent ?? "";
+}
+
+function modalTotalText(): string {
+  fireEvent.click(screen.getByRole("row", { name: /Open uplift details for WO-99/ }));
+  const dialog = screen.getByRole("dialog");
+  const label = within(dialog).getByText("Total");
+  return label.parentElement?.lastElementChild?.textContent ?? "";
+}
+
+describe("Uplift Approvals: Approved on WO", () => {
+  beforeEach(() => {
+    woUplifts.data = [];
+    woUplifts.isError = false;
+  });
+
+  it.each([
+    { total: 0, expected: "—" },
+    { total: null, expected: "—" },
+    { total: 125, expected: "$125.00" },
+  ])(
+    "renders $expected in the column and the modal Total for total $total",
+    async ({ total, expected }) => {
+      seedQueue({ approvedOnWoTotal: total });
+      await renderQueuePage();
+
+      const column = approvedOnWoColumnText();
+      const modalTotal = modalTotalText();
+
+      expect(column).toBe(expected);
+      expect(modalTotal).toBe(column);
+    },
+  );
+
+  it("shows a dash in both places when the row total is unknown and the WO has nothing granted", async () => {
+    woUplifts.data = [
+      { id: 1, status: "pending", amount: 250 },
+      { id: 2, status: "rejected", amount: 80 },
+      { id: 3, status: "revoked", amount: 40 },
+    ];
+    seedQueue({ approvedOnWoTotal: null });
+    await renderQueuePage();
+
+    expect(approvedOnWoColumnText()).toBe("—");
+    expect(modalTotalText()).toBe("—");
+  });
+
+  it("keeps the modal Total as a dash when the WO uplift lookup fails but the row reports zero", async () => {
+    woUplifts.data = null;
+    woUplifts.isError = true;
+    seedQueue({ approvedOnWoAuto: 0, approvedOnWoAdmin: 0, approvedOnWoTotal: 0 });
+    await renderQueuePage();
+
+    expect(approvedOnWoColumnText()).toBe("—");
+    expect(modalTotalText()).toBe("—");
+  });
+});