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

@@ -16,9 +16,6 @@ import {
 } from "@/domain/vendors/use-cases/use-save-vendor-company-roster";
 import { useVendorRosterResolver } from "./use-vendor-roster-resolver";
 
-const VENDOR_ROSTER_NO_CHANGES_MESSAGE =
-  "No changes to save. Enter technician details or update a company field.";
-
 const EDITABLE_COMPANY_FIELDS = [
   "name",
   "companyPhone",
@@ -183,7 +180,7 @@ export function useVendorRosterForm({
     if (mode === "create" && selection.selectedRoster != null) {
       const selected = selection.selectedRoster;
       if (!buildAdditiveRosterPatch(selected, values, selected.rowVersion, editedCompanyFields)) {
-        toast.error(VENDOR_ROSTER_NO_CHANGES_MESSAGE);
+        toast.error("Enter at least one technician to add to this vendor.");
         return;
       }
       save.mutate(

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

@@ -358,7 +358,7 @@ function TechniciansFieldArray({
     <Box>
       <Stack direction="row" sx={{ alignItems: "center", justifyContent: "space-between" }}>
         <Typography variant="subtitle2" className="font-semibold uppercase">
-          Technician details (optional)
+          Technicians ({fields.length})
         </Typography>
         <Button
           size="small"

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

@@ -110,34 +110,18 @@ function toUrlSearchParams(
   return sp;
 }
 
-function readOptionalString(item: Record<string, unknown>, ...keys: string[]): string {
-  for (const key of keys) {
-    const value = item[key];
-    if (typeof value === "string" && value.trim()) {
-      return value.trim();
-    }
-  }
-  return "";
-}
-
-/** GET User exposes `Name` as first name only; prefer FirstName + LastName when present. */
-function mapUserDisplayName(item: Record<string, unknown>): string {
-  const firstName = readOptionalString(item, "firstName", "FirstName");
-  const lastName = readOptionalString(item, "lastName", "LastName");
-  const fallback = readOptionalString(item, "name", "Name", "userName", "UserName");
-  if (lastName) {
-    return `${firstName || fallback} ${lastName}`.trim();
-  }
-  return firstName || fallback;
-}
-
 function mapUser(raw: unknown): WorkOrderUser {
   const item = (typeof raw === "object" && raw !== null ? raw : {}) as Record<string, unknown>;
   const id = item.id ?? item.Id;
+  const name =
+    (typeof item.name === "string" ? item.name : undefined) ??
+    (typeof item.Name === "string" ? item.Name : undefined) ??
+    (typeof item.userName === "string" ? item.userName : "") ??
+    "";
 
   return {
     id: typeof id === "string" || typeof id === "number" ? id : "",
-    name: mapUserDisplayName(item),
+    name,
   };
 }
 

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

@@ -2,7 +2,6 @@ import { act, renderHook, waitFor } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { ReactNode } from "react";
 import { useController, useFieldArray } from "react-hook-form";
-import { toast } from "react-toastify";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const rosterGet = vi.fn();
@@ -429,7 +428,6 @@ describe("useVendorRosterForm additive add flow (SH-250)", () => {
   beforeEach(() => {
     rosterGet.mockReset();
     saveMutate.mockReset();
-    vi.mocked(toast.error).mockReset();
   });
 
   it("issues an additive add — never update — when an existing company is selected", async () => {
@@ -500,10 +498,6 @@ describe("useVendorRosterForm additive add flow (SH-250)", () => {
     });
 
     expect(saveMutate).not.toHaveBeenCalled();
-    expect(vi.mocked(toast.error)).toHaveBeenCalledTimes(1);
-    expect(vi.mocked(toast.error)).toHaveBeenCalledWith(
-      "No changes to save. Enter technician details or update a company field.",
-    );
   });
 
   it("keeps the entered technician and retries with the fresh rowVersion after reload", async () => {

src/test/app/(protected)/vendors/vendor-create-modal.test.tsx

@@ -75,14 +75,6 @@ describe("VendorCreateModal validation", () => {
     );
   });
 
-  it("labels the optional technician section without counting blank drafts", () => {
-    renderCreateModal();
-
-    expect(screen.getByText("Technician details (optional)")).toBeInTheDocument();
-    expect(screen.queryByText("Technicians (1)")).not.toBeInTheDocument();
-    expect(screen.getByRole("textbox", { name: "Technician name (optional)" })).toBeVisible();
-  });
-
   it("labels the plain company field exactly, required, with no generated asterisk", () => {
     renderWithProviders(<PlainCompanyFieldsHarness />, { route: "/vendors", withAuth: false });
 

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

@@ -200,33 +200,6 @@ describe("workOrdersApi.fetchDispatchers", () => {
   });
 });
 
-const GET_USER_SERIALIZED_DIRECTORY = {
-  data: [
-    {
-      Id: "s1",
-      Name: "Alex",
-      FirstName: "Alex",
-      LastName: "Smith",
-      UserName: "alex.smith",
-    },
-  ],
-};
-
-describe("workOrdersApi.fetchUsers", () => {
-  beforeEach(() => {
-    apiGet.mockReset();
-  });
-
-  it("composes a full display name from the serialized GET User shape", async () => {
-    apiGet.mockResolvedValue(GET_USER_SERIALIZED_DIRECTORY);
-
-    const users = await workOrdersApi.fetchUsers();
-
-    expect(apiGet).toHaveBeenCalledWith(API_PATHS.user.list);
-    expect(users).toEqual([{ id: "s1", name: "Alex Smith" }]);
-  });
-});
-
 describe("workOrdersApi.getBoard", () => {
   beforeEach(() => {
     apiGet.mockReset();