Merge driver and admin into employee; fix error with fields not persisting in edit modal

Author: anika-4444

frontend/src/components/EmployeeCards/EmployeeCards.tsx

@@ -2,8 +2,7 @@ import { useNavigate } from 'react-router-dom';
 import Card, { CardInfo } from '../Card/Card';
 import styles from './employeecards.module.css';
 import { phone, wheel, user } from '../../icons/userInfo/index';
-import { AdminType } from '@carriage-web/shared/types/admin';
-import { DriverType } from '@carriage-web/shared/types/driver';
+import { EmployeeType } from '@carriage-web/shared/types/employee';
 
 const formatPhone = (phoneNumber: string | undefined) => {
   if (phoneNumber !== undefined) {
@@ -17,34 +16,19 @@ const formatPhone = (phoneNumber: string | undefined) => {
   }
 };
 
-type Employee = AdminType | DriverType;
-
-function isAdmin(employee: Employee): employee is AdminType {
-  return 'isDriver' in employee;
-}
-
-function isDriver(employee: Employee): employee is DriverType {
-  return 'availability' in employee && !('isDriver' in employee);
-}
-
 type EmployeeCardProps = {
   id: string;
-  employee: Employee;
+  employee: EmployeeType;
 };
 
 const EmployeeCard = ({ id, employee }: EmployeeCardProps) => {
   const navigate = useNavigate();
   const netId = employee.email.split('@')[0];
   const fmtPhone = formatPhone(employee.phoneNumber);
 
-  // Determine if employee is admin, driver, or both
-  const adminEmployee = isAdmin(employee);
-  const driverEmployee = isDriver(employee);
-  const isBoth = adminEmployee && employee.isDriver;
-
   const roles = (): string => {
-    if (isBoth) return 'Admin • Driver';
-    if (adminEmployee) return 'Admin';
+    if (employee.isAdmin && employee.isDriver) return 'Admin • Driver';
+    if (employee.isAdmin) return 'Admin';
     return 'Driver';
   };
 
@@ -68,8 +52,8 @@ const EmployeeCard = ({ id, employee }: EmployeeCardProps) => {
           <p>{fmtPhone}</p>
         </CardInfo>
         <CardInfo
-          icon={adminEmployee ? user : wheel}
-          alt={adminEmployee ? 'admin' : 'wheel'}
+          icon={employee.isAdmin ? user : wheel}
+          alt={employee.isAdmin ? 'admin' : 'wheel'}
         >
           <p>{roles()}</p>
         </CardInfo>
@@ -79,7 +63,7 @@ const EmployeeCard = ({ id, employee }: EmployeeCardProps) => {
 };
 
 type EmployeeCardsProps = {
-  employees: Employee[];
+  employees: EmployeeType[];
 };
 
 const EmployeeCards = ({ employees }: EmployeeCardsProps) => {

frontend/src/components/EmployeeModal/EmployeeModal.tsx

@@ -13,9 +13,10 @@ import { useEmployees } from '../../context/EmployeesContext';
 import { useToast, ToastStatus } from '../../context/toastContext';
 import axios from '../../util/axios';
 import { extractNetIdFromEmail } from 'util/userUtils';
+import { EmployeeType } from '@carriage-web/shared/types/employee';
 
 type AdminData = {
-  type: string[];
+  adminRoles: string[];
   isDriver: boolean;
 };
 
@@ -37,23 +38,22 @@ type EmployeeEntity = {
   photoLink?: string;
 };
 
-// both for formating to current api data expections
-function extractAdminData(employeeData: EmployeeEntity) {
+// both for formatting to current api data expectations
+function extractAdminData(employeeData: EmployeeEntity): Omit<EmployeeType, 'id'> {
   return {
     firstName: employeeData.firstName,
     lastName: employeeData.lastName,
-    type: (employeeData.admin?.type || []) as (
-      | 'sds-admin'
-      | 'redrunner-admin'
-    )[],
+    adminRoles: employeeData.admin?.adminRoles || [],
+    isAdmin: true,
     isDriver: employeeData.admin?.isDriver || false,
     phoneNumber: employeeData.phoneNumber,
     email: employeeData.email,
     photoLink: employeeData.photoLink,
+    availability: employeeData.driver?.availability || [],
   };
 }
 
-function extractDriverData(employeeData: EmployeeEntity) {
+function extractDriverData(employeeData: EmployeeEntity): Partial<EmployeeType> {
   return {
     firstName: employeeData.firstName,
     lastName: employeeData.lastName,
@@ -62,6 +62,7 @@ function extractDriverData(employeeData: EmployeeEntity) {
     joinDate: employeeData.driver?.startDate,
     email: employeeData.email,
     photoLink: employeeData.photoLink,
+    isDriver: true,
   };
 }
 
@@ -93,13 +94,12 @@ const EmployeeModal = ({
   // Initialize form and roles when modal opens or existing employee changes
   React.useEffect(() => {
     if (existingEmployee && isOpen) {
-      // Initialize roles
+      // Initialize roles, normalizing Prisma enum values (SDS_ADMIN → sds-admin)
+      const normalizeRole = (r: string) =>
+        r.toLowerCase().replace(/_/g, '-');
       const roles: string[] = [];
-      if (existingEmployee.admin) {
-        // Add admin roles
-        if (existingEmployee.admin.type) {
-          roles.push(...existingEmployee.admin.type);
-        }
+      if (existingEmployee.admin?.adminRoles) {
+        roles.push(...existingEmployee.admin.adminRoles.map(normalizeRole));
       }
       if (existingEmployee.driver) {
         roles.push('driver');
@@ -131,8 +131,9 @@ const EmployeeModal = ({
 
   const closeModal = () => {
     methods.clearErrors();
-    setImageBase64(''); // Reset image state
-    setIsUploadingImage(false); // Reset upload state
+    setImageBase64('');
+    setIsUploadingImage(false);
+    setSelectedRole([]);
     setIsOpen(false);
   };
 
@@ -178,7 +179,7 @@ const EmployeeModal = ({
     switch (endpoint) {
       case '/api/drivers':
         // Use optimistic create from context
-        await createDriver(extractDriverData(employeeData));
+        await createDriver(extractDriverData(employeeData) as Omit<EmployeeType, 'id'>);
         res = employeeData; // The context will handle server response and ID assignment
         break;
       case '/api/admins':
@@ -330,7 +331,7 @@ const EmployeeModal = ({
 
     if (hasAdmin) {
       admin_data = {
-        type: selectedRoles.filter((role) => role !== 'driver'),
+        adminRoles: selectedRoles.filter((role) => role !== 'driver'),
         isDriver: hasDriver,
       };
     }
@@ -436,8 +437,13 @@ const EmployeeModal = ({
               phone={existingEmployee?.phoneNumber}
             />
 
+            <RoleSelector
+              selectedRoles={selectedRoles}
+              setSelectedRoles={setSelectedRole}
+            />
+
             {(selectedRoles.includes('driver') ||
-              existingEmployee?.driver?.availability) && (
+              existingEmployee?.driver != null) && (
               <>
                 <StartDate existingDate={existingEmployee?.driver?.startDate} />
                 <WorkingHours
@@ -447,11 +453,6 @@ const EmployeeModal = ({
               </>
             )}
 
-            <RoleSelector
-              selectedRoles={selectedRoles}
-              setSelectedRoles={setSelectedRole}
-            />
-
             <Button className={styles.submit} type="submit">
               {existingEmployee ? 'Save' : 'Add'}
             </Button>

frontend/src/components/UserDetail/ActionsCard.tsx

@@ -53,19 +53,21 @@ const ActionsCard: React.FC<ActionsCardProps> = ({
       netId: (employee as any).netId || '',
       email: employee.email,
       phoneNumber: employee.phoneNumber.replaceAll('-', ''),
-      ...(employee.availability || employee.startDate
+      ...(employee.isDriver
         ? {
             driver: {
               availability: (employee.availability || []) as any[],
-              startDate: employee.startDate || '',
+              startDate: employee.startDate
+                ? new Date(employee.startDate).toISOString().split('T')[0]
+                : '',
             },
           }
         : {}),
-      ...(employee.type
+      ...(employee.isAdmin
         ? {
             admin: {
-              isDriver: employee.isDriver || false,
-              type: employee.type || [],
+              isDriver: employee.isDriver,
+              adminRoles: employee.adminRoles || [],
             },
           }
         : {}),
@@ -116,7 +118,7 @@ const ActionsCard: React.FC<ActionsCardProps> = ({
   const getUserRole = () => {
     if (userType === 'employee') {
       const employee = user as Employee;
-      if (employee.isDriver && employee.type && employee.type.length > 0) {
+      if (employee.isDriver && employee.isAdmin) {
         return 'both';
       } else if (employee.isDriver) {
         return 'driver';

frontend/src/components/UserDetail/UserInfoCard.tsx

@@ -29,12 +29,8 @@ interface UserInfoCardProps {
 const UserInfoCard: React.FC<UserInfoCardProps> = ({ user, userType }) => {
   const getEmployeeRole = (employee: Employee) => {
     const roles: string[] = [];
-    if (employee.isDriver) {
-      roles.push('driver');
-    }
-    if (employee.type && employee.type.length > 0) {
-      roles.push(...employee.type);
-    }
+    if (employee.isDriver) roles.push('driver');
+    if (employee.isAdmin) roles.push(...(employee.adminRoles.length > 0 ? employee.adminRoles.map((r) => r.toLowerCase().replace('_', '-')) : ['admin']));
     return roles.length > 0 ? roles.join(' • ') : 'N/A';
   };