merge(work-orders): sync with platform-polish tip

src/app/(protected)/vendors/_components/use-vendor-deactivation.ts

@@ -15,7 +15,9 @@ export interface VendorDeactivationState {
   confirm: () => void;
 }
 
-export function useVendorDeactivation(): VendorDeactivationState {
+export function useVendorDeactivation(options?: {
+  onSuccess?: () => void;
+}): VendorDeactivationState {
   const [target, setTarget] = useState<VendorListItem | null>(null);
   const [error, setError] = useState<string | null>(null);
   const deleteVendor = useDeleteVendor();
@@ -39,7 +41,10 @@ export function useVendorDeactivation(): VendorDeactivationState {
     if (!target || target.id == null) return;
     setError(null);
     deleteVendor.mutate(target.id, {
-      onSuccess: () => setTarget(null),
+      onSuccess: () => {
+        setTarget(null);
+        options?.onSuccess?.();
+      },
       onError: (err: Error) => setError(err.message || "Failed to deactivate vendor"),
     });
   };

src/app/(protected)/vendors/_components/use-vendor-roster-form.ts

@@ -20,6 +20,24 @@ import type {
   VendorRosterConflict,
 } from "@/domain/vendors/types/vendor";
 
+function withoutBlankNewTechnicians(
+  values: VendorCompanyRosterFormValues,
+): VendorCompanyRosterFormValues {
+  return {
+    ...values,
+    technicians: values.technicians.filter(
+      (technician) =>
+        technician.id != null ||
+        Boolean(
+          technician.contactName.trim() ||
+          technician.phone.trim() ||
+          technician.email.trim() ||
+          technician.tradeSpecialties.trim(),
+        ),
+    ),
+  };
+}
+
 export interface VendorRosterFormProps {
   mode: "create" | "update";
   vendorId?: string | number;
@@ -109,7 +127,7 @@ export function useVendorRosterForm({
     save.mutate(
       {
         mode: isUpdate ? "update" : "create",
-        values: formValues,
+        values: withoutBlankNewTechnicians(formValues),
         companyId: isUpdate ? (committedRoster?.companyId ?? companyId) : undefined,
         rowVersion: isUpdate ? committedRoster?.rowVersion : undefined,
         originalRoster: mode === "update" ? routeRoster : undefined,

src/app/(protected)/vendors/_components/vendor-roster-form-fields.tsx

@@ -1,4 +1,10 @@
-import { Controller, useFieldArray, type Control, type FieldErrors } from "react-hook-form";
+import {
+  Controller,
+  useFieldArray,
+  useWatch,
+  type Control,
+  type FieldErrors,
+} from "react-hook-form";
 import AddIcon from "@mui/icons-material/Add";
 import DeleteOutlineIcon from "@mui/icons-material/DeleteOutlined";
 import {
@@ -28,6 +34,7 @@ interface VendorRosterFormFieldsProps {
   selectedCompanyId?: string | number | null;
   onSelectCompany?: (company: VendorFacetCompany | null) => Promise<void>;
   onClearSelectedCompany?: (nextName?: string) => void;
+  onRequestDeactivate?: (technician: RosterTechnicianValues) => void;
 }
 
 function CompanyNameField({
@@ -221,6 +228,7 @@ interface TechnicianRowProps {
   onRemove: () => void;
   canRemove: boolean;
   tradeOptions: string[];
+  onRequestDeactivate?: (technician: RosterTechnicianValues) => void;
 }
 
 function TechnicianRow({
@@ -230,7 +238,10 @@ function TechnicianRow({
   onRemove,
   canRemove,
   tradeOptions,
+  onRequestDeactivate,
 }: TechnicianRowProps) {
+  const technician = useWatch({ control, name: `technicians.${index}` });
+
   return (
     <Stack spacing={2} className="rounded-md border border-solid border-gray-200 p-3">
       <Stack direction="row" sx={{ alignItems: "center", justifyContent: "space-between" }}>
@@ -305,7 +316,13 @@ function TechnicianRow({
             control={
               <Switch
                 checked={field.value}
-                onChange={(_event, checked) => field.onChange(checked)}
+                onChange={(_event, checked) => {
+                  if (!checked && technician?.id != null && onRequestDeactivate != null) {
+                    onRequestDeactivate(technician);
+                    return;
+                  }
+                  field.onChange(checked);
+                }}
               />
             }
             label={field.value ? "Active" : "Inactive"}
@@ -320,10 +337,12 @@ function TechniciansFieldArray({
   control,
   errors,
   tradeOptions,
+  onRequestDeactivate,
 }: {
   control: Control<VendorCompanyRosterFormValues>;
   errors: FieldErrors<VendorCompanyRosterFormValues>;
   tradeOptions: string[];
+  onRequestDeactivate?: (technician: RosterTechnicianValues) => void;
 }) {
   const { fields, append, remove } = useFieldArray({ control, name: "technicians" });
 
@@ -366,6 +385,7 @@ function TechniciansFieldArray({
               onRemove={() => remove(index)}
               canRemove
               tradeOptions={tradeOptions}
+              onRequestDeactivate={onRequestDeactivate}
             />
           ))
         )}
@@ -375,12 +395,17 @@ function TechniciansFieldArray({
 }
 
 export function VendorRosterFormFields(props: VendorRosterFormFieldsProps) {
-  const { control, errors, tradeOptions = [] } = props;
+  const { control, errors, tradeOptions = [], onRequestDeactivate } = props;
   return (
     <Stack spacing={3}>
       <CompanyFields {...props} />
       <Divider />
-      <TechniciansFieldArray control={control} errors={errors} tradeOptions={tradeOptions} />
+      <TechniciansFieldArray
+        control={control}
+        errors={errors}
+        tradeOptions={tradeOptions}
+        onRequestDeactivate={onRequestDeactivate}
+      />
     </Stack>
   );
 }

src/app/(protected)/vendors/_components/vendor-roster-page.tsx

@@ -1,17 +1,44 @@
 import type { ReactNode } from "react";
 import { useNavigate } from "react-router";
 import { Alert, Box, Button, CircularProgress, Paper, Stack, Typography } from "@mui/material";
+import { VendorDeactivationDialog } from "./vendor-deactivation-dialog";
 import { VendorPortalTokenPanel } from "./vendor-portal-token-panel";
 import { VendorRosterConflictAlert } from "./vendor-roster-conflict-alert";
 import { VendorRosterFormFields } from "./vendor-roster-form-fields";
 import { VendorRosterLoadErrorAlert } from "./vendor-roster-load-error";
+import { useVendorDeactivation } from "./use-vendor-deactivation";
 import { useVendorRosterForm } from "./use-vendor-roster-form";
+import type { RosterTechnicianValues } from "@/domain/vendors/schemas/vendor-roster-schema";
+import type { VendorCompanyRoster, VendorListItem } from "@/domain/vendors/types/vendor";
 
 interface VendorRosterPageProps {
   vendorId?: string;
   companyId?: string;
 }
 
+function toDeactivationListItem(
+  roster: VendorCompanyRoster,
+  technician: RosterTechnicianValues,
+): VendorListItem {
+  return {
+    id: technician.id ?? null,
+    companyId: roster.companyId,
+    companyName: roster.name,
+    contactName: technician.contactName,
+    email: technician.email,
+    phone: technician.phone,
+    companyPhone: roster.companyPhone,
+    googleMapsUrl: roster.googleMapsUrl,
+    notes: roster.notes,
+    totalJobs: 0,
+    city: roster.city,
+    state: roster.state,
+    tradeSpecialties: technician.tradeSpecialties,
+    isActive: technician.isActive,
+    preferredContact: technician.preferredContact ?? "Phone",
+  };
+}
+
 function PageShell({
   title,
   subtitle,
@@ -43,6 +70,9 @@ function PageShell({
 export default function VendorRosterPage({ vendorId, companyId }: VendorRosterPageProps) {
   const navigate = useNavigate();
   const isEdit = vendorId !== undefined || companyId !== undefined;
+  const deactivation = useVendorDeactivation({
+    onSuccess: () => navigate("/vendors"),
+  });
   const form = useVendorRosterForm({
     mode: isEdit ? "update" : "create",
     vendorId,
@@ -50,6 +80,11 @@ export default function VendorRosterPage({ vendorId, companyId }: VendorRosterPa
     onSuccess: () => navigate("/vendors"),
   });
 
+  const handleRequestDeactivate = (technician: RosterTechnicianValues) => {
+    if (!form.roster || technician.id == null) return;
+    deactivation.open(toDeactivationListItem(form.roster, technician));
+  };
+
   if (isEdit && form.isLoading) {
     return (
       <Box className="flex justify-center p-10">
@@ -104,6 +139,7 @@ export default function VendorRosterPage({ vendorId, companyId }: VendorRosterPa
             control={form.control}
             errors={form.errors}
             tradeOptions={form.trades}
+            onRequestDeactivate={isEdit ? handleRequestDeactivate : undefined}
             {...companySelectionProps}
           />
 
@@ -125,6 +161,17 @@ export default function VendorRosterPage({ vendorId, companyId }: VendorRosterPa
           </Stack>
         </Stack>
       </Box>
+
+      <VendorDeactivationDialog
+        target={deactivation.target}
+        isLoading={deactivation.isLoading}
+        isSaving={deactivation.isSaving}
+        error={deactivation.error}
+        impact={deactivation.impact}
+        impactError={deactivation.impactError}
+        onClose={deactivation.close}
+        onConfirm={deactivation.confirm}
+      />
     </PageShell>
   );
 }

src/app/(protected)/workorders/_components/detail/use-work-order-slide-over.ts

@@ -14,6 +14,7 @@ import {
   useUploadWorkOrderMedia,
 } from "@/domain/work-orders/use-cases/use-work-order-mutations";
 import { isWorkOrderDocumentsReadOnly } from "@/domain/work-orders/utils/work-order-media-limits";
+import { todayIso } from "@/domain/work-orders/utils/wizard-date-utils";
 import { useAuthContext } from "@/providers/auth-context";
 import { useSlideOverEditState } from "./use-slide-over-edit-state";
 import { useSlideOverMediaState } from "./use-slide-over-media-state";
@@ -99,13 +100,22 @@ export function useWorkOrderSlideOver({
     uploadCompletionMutation.mutate(
       { file, workOrderVersion: version },
       {
-        onSuccess: () => {
+        onSuccess: async () => {
           // Mirror CompDoc finalize: ensure completedDate then mark docStatus Yes.
           const patch: WorkOrderTablePatch = { docStatus: "Yes" };
           if (!infoSource.completedDate) {
-            patch.completedDate = new Date().toISOString().slice(0, 10);
+            patch.completedDate = todayIso();
+          }
+          try {
+            await new Promise<void>((resolve, reject) => {
+              onSave(row.id, patch, {
+                onSuccess: () => resolve(),
+                onError: (error) => reject(error),
+              });
+            });
+          } catch {
+            toast.error("Uploaded PDF but failed to update document status. Refresh and retry.");
           }
-          onSave(row.id, patch);
         },
       },
     );

src/app/(protected)/workorders/_components/wizard/wizard-step-location-site-select.tsx

@@ -41,6 +41,7 @@ export function WizardStepLocationSiteSelect({
             siteCode: loc ? resolveSiteCode(loc) : "",
             pocName: "",
             pocPhone: "",
+            pocNotes: "",
           });
         }}
       />

src/domain/vendors/use-cases/use-save-vendor-company-roster.ts

@@ -91,6 +91,11 @@ export function useSaveVendorCompanyRoster(): UseMutationResult<
           ? getSingleStatusOnlyChange(originalRoster, values)
           : null;
         if (statusChange) {
+          if (statusChange.isActive === false) {
+            throw new Error(
+              "Use Deactivate to check open work orders before inactivating a technician.",
+            );
+          }
           const baseRoster = originalRoster as VendorCompanyRoster;
           await vendorsApi.update(statusChange.id, { isActive: statusChange.isActive });
           return {

src/domain/work-orders/mappers/work-order-board-mapper.ts

@@ -3,9 +3,16 @@ import type {
   WorkOrderTypeApi,
 } from "@/domain/work-orders/types/work-order-board";
 
-import { WORK_ORDER_TYPE_API } from "@/domain/work-orders/types/work-order-board";
+import {
+  LIFECYCLE_STATUS_API,
+  WORK_ORDER_TYPE_API,
+} from "@/domain/work-orders/types/work-order-board";
 
-import type { WOType, WorkOrderWizardDraft } from "@/domain/work-orders/types/work-order-wizard";
+import type {
+  WizardWOStatus,
+  WOType,
+  WorkOrderWizardDraft,
+} from "@/domain/work-orders/types/work-order-wizard";
 
 import { fmtDateRange } from "@/domain/work-orders/utils/wizard-date-utils";
 
@@ -98,6 +105,10 @@ export function mapWizardDraftToBoardCreatePayload(
     siteCode,
   };
 
+  if (draft.status) {
+    payload.lifecycleStatus = LIFECYCLE_STATUS_API[draft.status as WizardWOStatus];
+  }
+
   if (draft.woNumber.trim()) {
     payload.woNumber = draft.woNumber.trim();
   }

src/domain/work-orders/types/work-order-board.ts

@@ -64,6 +64,8 @@ export const LIFECYCLE_STATUS_API_TO_FE: Record<number, WizardWOStatus | "Cancel
 export interface WorkOrderBoardCreatePayload {
   workOrderType: WorkOrderTypeApi;
   siteCode: string;
+  /** Lifecycle status selected in the wizard; numeric board enum. */
+  lifecycleStatus?: LifecycleStatusApi;
   woNumber?: string;
   assignTo?: string;
   dueDate?: string;

src/test/app/(protected)/vendors/use-vendor-roster-form.test.tsx

@@ -24,11 +24,16 @@ vi.mock("@/domain/vendors/use-cases/use-vendor-facets", () => ({
   useVendorFacets: () => ({ data: { companies: [], trades: [] } }),
 }));
 
+const saveMutate = vi.fn();
+
 vi.mock("@/domain/vendors/use-cases/use-save-vendor-company-roster", async () => {
   const actual = await vi.importActual<
     typeof import("@/domain/vendors/use-cases/use-save-vendor-company-roster")
   >("@/domain/vendors/use-cases/use-save-vendor-company-roster");
-  return { ...actual, useSaveVendorCompanyRoster: () => ({ mutate: vi.fn(), isPending: false }) };
+  return {
+    ...actual,
+    useSaveVendorCompanyRoster: () => ({ mutate: saveMutate, isPending: false }),
+  };
 });
 
 import { useVendorRosterForm } from "@/app/(protected)/vendors/_components/use-vendor-roster-form";
@@ -101,6 +106,7 @@ function deferRoster(): {
 describe("useVendorRosterForm load-error handling", () => {
   beforeEach(() => {
     rosterGet.mockReset();
+    saveMutate.mockReset();
   });
 
   it("shows a safe retryable error when selecting an existing company fetch is rejected", async () => {
@@ -199,6 +205,7 @@ describe("useVendorRosterForm load-error handling", () => {
 describe("useVendorRosterForm stale-selection handling", () => {
   beforeEach(() => {
     rosterGet.mockReset();
+    saveMutate.mockReset();
   });
 
   it("keeps the newest company roster when two lookups resolve out of order", async () => {
@@ -273,3 +280,97 @@ describe("useVendorRosterForm stale-selection handling", () => {
     expect(result.current.name.field.value).toBe("Draft Vendor");
   });
 });
+
+describe("useVendorRosterForm blank technician filtering", () => {
+  beforeEach(() => {
+    rosterGet.mockReset();
+    saveMutate.mockReset();
+  });
+
+  it("omits blank new technician rows from the save payload", () => {
+    const { result } = renderHook(() => useVendorRosterForm({ mode: "create" }), {
+      wrapper: makeWrapper(createClient()),
+    });
+
+    act(() => {
+      result.current.submit({
+        name: "Gateway Plumbing",
+        companyPhone: "(314) 555-0100",
+        email: "dispatch@gateway.test",
+        address: "",
+        city: "",
+        state: "",
+        zip: "",
+        googleMapsUrl: "",
+        notes: "",
+        technicians: [
+          {
+            contactName: "Taylor",
+            phone: "(314) 555-0199",
+            email: "taylor@gateway.test",
+            tradeSpecialties: "Plumbing",
+            isActive: true,
+          },
+          {
+            contactName: "",
+            phone: "",
+            email: "",
+            tradeSpecialties: "",
+            isActive: true,
+          },
+        ],
+      });
+    });
+
+    expect(saveMutate).toHaveBeenCalledTimes(1);
+    const payload = saveMutate.mock.calls[0]?.[0] as {
+      values: { technicians: Array<{ contactName: string }> };
+    };
+    expect(payload.values.technicians).toHaveLength(1);
+    expect(payload.values.technicians[0]?.contactName).toBe("Taylor");
+  });
+
+  it("keeps existing technicians with an id even when contact fields are blank", () => {
+    const { result } = renderHook(() => useVendorRosterForm({ mode: "create" }), {
+      wrapper: makeWrapper(createClient()),
+    });
+
+    act(() => {
+      result.current.submit({
+        name: "Gateway Plumbing",
+        companyPhone: "(314) 555-0100",
+        email: "dispatch@gateway.test",
+        address: "",
+        city: "",
+        state: "",
+        zip: "",
+        googleMapsUrl: "",
+        notes: "",
+        technicians: [
+          {
+            id: 9,
+            contactName: "",
+            phone: "",
+            email: "",
+            tradeSpecialties: "",
+            isActive: true,
+          },
+        ],
+      });
+    });
+
+    const payload = saveMutate.mock.calls[0]?.[0] as {
+      values: { technicians: Array<{ id?: number }> };
+    };
+    expect(payload.values.technicians).toEqual([
+      {
+        id: 9,
+        contactName: "",
+        phone: "",
+        email: "",
+        tradeSpecialties: "",
+        isActive: true,
+      },
+    ]);
+  });
+});

src/test/domain/vendors/use-cases/use-save-vendor-company-roster.test.ts

@@ -1,7 +1,32 @@
-import { describe, expect, it } from "vitest";
+import { createElement, type ReactNode } from "react";
-import { getSingleStatusOnlyChange } from "@/domain/vendors/use-cases/use-save-vendor-company-roster";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  getSingleStatusOnlyChange,
+  useSaveVendorCompanyRoster,
+} from "@/domain/vendors/use-cases/use-save-vendor-company-roster";
 import type { VendorCompanyRoster } from "@/domain/vendors/types/vendor";
 
+const updateVendor = vi.fn();
+
+vi.mock("@/domain/vendors/api/vendors-api", () => ({
+  vendorsApi: {
+    update: (...args: unknown[]) => updateVendor(...args),
+  },
+}));
+
+vi.mock("@/domain/vendors/api/vendor-company-roster-api", () => ({
+  vendorCompanyRosterApi: {
+    update: vi.fn(),
+    create: vi.fn(),
+  },
+}));
+
+vi.mock("react-toastify", () => ({
+  toast: { success: vi.fn(), error: vi.fn() },
+}));
+
 const roster: VendorCompanyRoster = {
   companyId: 10,
   rowVersion: "rv-1",
@@ -69,3 +94,49 @@ describe("getSingleStatusOnlyChange", () => {
     ).toBeNull();
   });
 });
+
+describe("useSaveVendorCompanyRoster status-only deactivation gate", () => {
+  beforeEach(() => {
+    updateVendor.mockReset();
+    updateVendor.mockResolvedValue(undefined);
+  });
+
+  it("rejects sparse Active→Inactive updates and still allows reactivation", async () => {
+    const client = new QueryClient({ defaultOptions: { queries: { retry: false } } });
+    const wrapper = ({ children }: { children: ReactNode }) =>
+      createElement(QueryClientProvider, { client }, children);
+
+    const { result } = renderHook(() => useSaveVendorCompanyRoster(), { wrapper });
+
+    const activeRoster: VendorCompanyRoster = {
+      ...roster,
+      technicians: [{ ...roster.technicians[0], isActive: true }],
+    };
+
+    await expect(
+      result.current.mutateAsync({
+        mode: "update",
+        values: {
+          ...values,
+          technicians: [{ ...values.technicians[0], isActive: false }],
+        },
+        companyId: 10,
+        rowVersion: "rv-1",
+        originalRoster: activeRoster,
+      }),
+    ).rejects.toThrow("Use Deactivate to check open work orders before inactivating a technician.");
+    expect(updateVendor).not.toHaveBeenCalled();
+
+    await result.current.mutateAsync({
+      mode: "update",
+      values: {
+        ...values,
+        technicians: [{ ...values.technicians[0], isActive: true }],
+      },
+      companyId: 10,
+      rowVersion: "rv-1",
+      originalRoster: roster,
+    });
+    expect(updateVendor).toHaveBeenCalledWith(7, { isActive: true });
+  });
+});

src/test/domain/work-orders/api/work-orders-api.test.ts

@@ -119,6 +119,7 @@ describe("workOrdersApi.createFromBoard", () => {
     expect(apiPost).toHaveBeenCalledWith(API_PATHS.workOrder.boardCreate, {
       workOrderType: 2,
       siteCode: "BK5",
+      lifecycleStatus: 1,
       woNumber: "12345",
     });
   });

src/test/domain/work-orders/mappers/work-order-board-mapper.test.ts

@@ -55,9 +55,25 @@ describe("mapWizardDraftToBoardCreatePayload", () => {
       workOrderType: 2,
 
       siteCode: "BK5",
+
+      lifecycleStatus: 1,
     });
   });
 
+  it("maps wizard status to lifecycleStatus on create", () => {
+    const payload = mapWizardDraftToBoardCreatePayload({
+      ...EMPTY_WIZARD_DRAFT,
+
+      type: "PM",
+
+      siteCode: "BK5",
+
+      status: "Scheduled",
+    });
+
+    expect(payload.lifecycleStatus).toBe(3);
+  });
+
   it("maps full wizard payload with structured service and notes fields", () => {
     const payload = mapWizardDraftToBoardCreatePayload({
       ...EMPTY_WIZARD_DRAFT,

src/test/domain/work-orders/utils/wizard-date-utils.test.ts

@@ -1,8 +1,10 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   fmtDateRange,
   fmtShortDate,
+  pad2,
   rangeDayCount,
+  todayIso,
 } from "@/domain/work-orders/utils/wizard-date-utils";
 
 describe("fmtShortDate", () => {
@@ -29,3 +31,27 @@ describe("rangeDayCount", () => {
     expect(rangeDayCount("2026-06-08", "2026-06-08")).toBe(1);
   });
 });
+
+describe("todayIso", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("uses local calendar day, not UTC ISO date, near midnight", () => {
+    // 02:30 UTC is still the previous local evening in Americas (UTC−N).
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-08-11T02:30:00.000Z"));
+
+    const now = new Date();
+    const expectedLocal = `${now.getFullYear()}-${pad2(now.getMonth() + 1)}-${pad2(now.getDate())}`;
+    const utcSlice = now.toISOString().slice(0, 10);
+
+    expect(todayIso()).toBe(expectedLocal);
+    expect(utcSlice).toBe("2026-08-11");
+
+    if (now.getTimezoneOffset() > 0) {
+      expect(todayIso()).toBe("2026-08-10");
+      expect(todayIso()).not.toBe(utcSlice);
+    }
+  });
+});