@burdenoff/microfe-movethewheels 2026.929.1 → 2026.929.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@burdenoff/microfe-movethewheels",
-  "version": "2026.929.1",
+  "version": "2026.929.3",
   "description": "Burdenoff MoveTheWheels Microfrontend - Logistics & Supply Chain Management Platform",
   "type": "module",
   "files": [

package/src/movethewheels/hooks/useFleet.ts

@@ -54,8 +54,8 @@ export interface CreateDriverInput {
   payCurrency?: string;
 }
 
-/** Superset of `CreateDriverInput` with fields that only make sense on an existing driver. */
-export interface UpdateDriverInput extends CreateDriverInput {
+/** Fields accepted when updating an existing driver; employee IDs are immutable. */
+export interface UpdateDriverInput extends Omit<CreateDriverInput, 'employeeId'> {
   onLeaveUntil?: string | null;
   terminatedAt?: string;
   terminationReason?: string;
@@ -602,7 +602,7 @@ export function mapDriver(driver: ApiDriver): Driver {
     phone: driver.phone ?? '',
     employeeId: driver.employeeId,
     licenseNumber: driver.licenseNumber ?? '',
-    licenseType: driver.licenseClass ?? 'standard',
+    licenseType: driver.licenseClass ?? '',
     licenseExpiry: driver.licenseExpiry ? new Date(driver.licenseExpiry) : undefined,
     vehicleIds: driver.vehicleId ? [driver.vehicleId] : [],
     assignedVehicle: driver.vehicleId ?? undefined,

package/src/movethewheels/pages/DriverDetailsPage.tsx

@@ -53,6 +53,7 @@ import {
   useVehicle,
   useVehicles,
   toApiDriverStatus,
+  type CreateDriverInput,
   type UpdateDriverInput,
 } from '../hooks/useFleet';
 import { useDebouncedValue } from '../hooks/useDebouncedValue';
@@ -163,8 +164,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
 
   const goBack = () => navigate?.(joinPath(basePath, 'fleet/drivers'));
 
-  const buildPayload = (): UpdateDriverInput => ({
-    employeeId: form.employeeId.trim(),
+  const buildPayload = (includeLeaveFields = true): UpdateDriverInput => ({
     firstName: form.firstName.trim(),
     lastName: form.lastName.trim(),
     email: form.email.trim() || undefined,
@@ -174,12 +174,18 @@ function NewDriverForm({ editId }: { editId?: string }) {
     licenseExpiry: fromDateInput(form.licenseExpiry),
     status: toApiDriverStatus(form.status),
     vehicleId: form.vehicleId || undefined,
-    rating: form.rating ? Number(form.rating) : undefined,
+    rating: form.rating.trim() ? Number(form.rating) : undefined,
     notes: form.notes.trim() || undefined,
     hireDate: fromDateInput(form.hireDate),
-    baseSalary: form.baseSalary ? Number(form.baseSalary) : undefined,
-    bonusYtd: form.bonusYtd ? Number(form.bonusYtd) : undefined,
+    baseSalary: form.baseSalary.trim() ? Number(form.baseSalary) : undefined,
+    bonusYtd: form.bonusYtd.trim() ? Number(form.bonusYtd) : undefined,
     payCurrency: form.payCurrency.trim() || undefined,
+    ...(includeLeaveFields ? { onLeaveUntil: fromDateInput(form.onLeaveUntil) ?? null } : {}),
+  });
+
+  const buildCreatePayload = (): CreateDriverInput => ({
+    employeeId: form.employeeId.trim(),
+    ...buildPayload(false),
   });
 
   const handleSubmit = async (e: React.FormEvent) => {
@@ -199,7 +205,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
         const updated = await updateDriver(editId, buildPayload());
         navigate?.(joinPath(basePath, `fleet/drivers/${updated.id}`));
       } else {
-        const created = await createDriver(buildPayload());
+        const created = await createDriver(buildCreatePayload());
         navigate?.(joinPath(basePath, `fleet/drivers/${created.id}`));
       }
     } catch (err) {
@@ -280,7 +286,8 @@ function NewDriverForm({ editId }: { editId?: string }) {
             <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
               <div className="space-y-2">
                 <Label htmlFor="employeeId">
-                  Employee ID <span className="text-status-error-text">*</span>
+                  Employee ID {isEditing ? '(immutable)' : ''}{' '}
+                  <span className="text-status-error-text">{!isEditing && '*'}</span>
                 </Label>
                 <Input
                   id="employeeId"
@@ -288,6 +295,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
                   onChange={(e) => setForm((prev) => ({ ...prev, employeeId: e.target.value }))}
                   placeholder="EMP-001"
                   required
+                  disabled={isEditing}
                 />
               </div>
               <div className="space-y-2">
@@ -445,7 +453,19 @@ function NewDriverForm({ editId }: { editId?: string }) {
                 />
               </div>
               <div className="space-y-2">
-                <Label htmlFor="onLeaveUntil">On Leave Until</Label>
+                <div className="flex items-center justify-between gap-2">
+                  <Label htmlFor="onLeaveUntil">On Leave Until</Label>
+                  {form.onLeaveUntil && (
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => setForm((prev) => ({ ...prev, onLeaveUntil: '' }))}
+                    >
+                      Clear
+                    </Button>
+                  )}
+                </div>
                 <Input
                   id="onLeaveUntil"
                   type="date"
@@ -823,7 +843,9 @@ export default function DriverDetailsPage() {
                   {driver.currentLocation.address || 'Location updating...'}
                 </p>
                 <p className="text-xs text-text-secondary mt-1">
-                  Updated {formatDate(driver.currentLocation.timestamp || new Date(), 'relative')}
+                  {driver.currentLocation.timestamp
+                    ? `Updated ${formatDate(driver.currentLocation.timestamp, 'relative')}`
+                    : 'Update time not recorded'}
                 </p>
               </CardContent>
             </Card>

package/src/movethewheels/pages/RouteDetailsPage.tsx

@@ -18,7 +18,6 @@ import {
   ArrowUp,
   ArrowDown,
   Fuel,
-  Search,
 } from 'lucide-react';
 import { PageLayout, LoadingState, ErrorState } from '../components/PageLayout';
 import { StatusBadge } from '../components/StatusBadge';
@@ -57,7 +56,6 @@ import { useAssignmentSuggestions } from '../hooks/useFleetIntelligence';
 import { AssignmentSuggestions } from '../components/AssignmentSuggestions';
 import { useI18n } from '@burdenoff/fe-libs/shared/providers/shell/I18nProvider';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
-import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { formatDate, formatAddress, formatCurrency } from '../utils/formatters';
 import { joinPath } from '../utils/navigation';
 import { ROUTE_STATUS_COLORS } from '../constants';
@@ -76,8 +74,8 @@ function NewRouteForm({ editId }: { editId?: string }) {
   const { basePath, navigate } = useMoveTheWheels();
   const { createRoute, updateRoute } = useRoutes();
   const { route } = useRoute(editId);
-  const [fleetSearch, setFleetSearch] = useState('');
-  const debouncedFleetSearch = useDebouncedValue(fleetSearch);
+  const [vehicleSearch, setVehicleSearch] = useState('');
+  const [driverSearch, setDriverSearch] = useState('');
   const isEditing = !!editId;
   const [form, setForm] = useState<{
     name: string;
@@ -92,14 +90,24 @@ function NewRouteForm({ editId }: { editId?: string }) {
     driverId: '',
     stops: [{ address: '', type: 'delivery' }],
   });
-  const { vehicles, isLoading: vehiclesLoading } = useVehicles({
+  const {
+    vehicles,
+    isLoading: vehiclesLoading,
+    hasMore: vehiclesHaveMore,
+    totalVehicles,
+  } = useVehicles({
     limit: 20,
-    search: debouncedFleetSearch || undefined,
+    search: vehicleSearch || undefined,
     driverId: form.driverId || undefined,
   });
-  const { drivers, isLoading: driversLoading } = useDrivers({
+  const {
+    drivers,
+    isLoading: driversLoading,
+    hasMore: driversHaveMore,
+    totalDrivers,
+  } = useDrivers({
     limit: 20,
-    search: debouncedFleetSearch || undefined,
+    search: driverSearch || undefined,
     vehicleId: form.vehicleId || undefined,
   });
   // The selected vehicle/driver may fall outside the current search page (e.g. when
@@ -286,22 +294,6 @@ function NewRouteForm({ editId }: { editId?: string }) {
                 </Select>
               </div>
             </div>
-            <div className="space-y-2">
-              <Label htmlFor="fleet-search">Search vehicles &amp; drivers</Label>
-              <div className="relative">
-                <Search className="pointer-events-none absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-text-secondary" />
-                <Input
-                  id="fleet-search"
-                  value={fleetSearch}
-                  onChange={(e) => setFleetSearch(e.target.value)}
-                  placeholder="Vehicle number, driver name or employee ID"
-                  className="pl-9"
-                />
-              </div>
-              <p className="text-xs text-text-secondary">
-                Narrows both pickers below as you type — up to 20 matches at a time.
-              </p>
-            </div>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div className="space-y-2">
                 <Label htmlFor="vehicle">Vehicle (optional)</Label>
@@ -320,10 +312,13 @@ function NewRouteForm({ editId }: { editId?: string }) {
                   )}
                   selectedOption={selectedVehicle}
                   selectedLoading={selectedVehicleLoading}
+                  onSearchChange={setVehicleSearch}
+                  searchPlaceholder="Search vehicle number or type…"
+                  hasMore={vehiclesHaveMore}
+                  totalCount={totalVehicles}
                   required
                   placeholder="Assign later"
                   emptyText="No available vehicles."
-                  // Search is driven by the shared "Search fleet" box above.
                 />
               </div>
               <div className="space-y-2">
@@ -343,6 +338,10 @@ function NewRouteForm({ editId }: { editId?: string }) {
                   )}
                   selectedOption={selectedDriver}
                   selectedLoading={selectedDriverLoading}
+                  onSearchChange={setDriverSearch}
+                  searchPlaceholder="Search driver name or employee ID…"
+                  hasMore={driversHaveMore}
+                  totalCount={totalDrivers}
                   required
                   placeholder="Assign later"
                   emptyText="No available drivers."