Merge pull request #229 from Resgrid/develop

RU-T47 Fixing role assignments issue

Author: ucswift

app.config.ts

@@ -80,7 +80,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       'android.permission.FOREGROUND_SERVICE_MICROPHONE',
       'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
       'android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE',
-      'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK',
       'android.permission.READ_PHONE_STATE',
       'android.permission.READ_PHONE_NUMBERS',
       'android.permission.MANAGE_OWN_CALLS',

src/components/roles/__tests__/role-assignment-item.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react-native';
+import { fireEvent, render, screen } from '@testing-library/react-native';
 import React from 'react';
 
 import { type PersonnelInfoResultData } from '@/models/v4/personnel/personnelInfoResultData';
@@ -9,57 +9,48 @@ import { RoleAssignmentItem } from '../role-assignment-item';
 // Mock react-i18next
 jest.mock('react-i18next', () => ({
   useTranslation: () => ({
-    t: (key: string, defaultValue?: string) => defaultValue || key,
+    t: (key: string, defaultValue?: string | Record<string, string>) => {
+      if (typeof defaultValue === 'string') return defaultValue;
+      if (typeof defaultValue === 'object' && defaultValue.defaultValue) return defaultValue.defaultValue;
+      return key;
+    },
   }),
 }));
 
-// Mock the Select components
-jest.mock('@/components/ui/select', () => ({
-  Select: ({ children, selectedValue, onValueChange }: any) => {
-    const { View } = require('react-native');
+// Mock nativewind
+jest.mock('nativewind', () => ({
+  useColorScheme: () => ({ colorScheme: 'light' }),
+  cssInterop: jest.fn(),
+}));
+
+// Mock the RoleUserSelectionModal to simplify testing
+let mockModalOnSelectUser: ((userId?: string) => void) | undefined;
+jest.mock('../role-user-selection-modal', () => ({
+  RoleUserSelectionModal: ({ isOpen, onClose, roleName, selectedUserId, users, onSelectUser }: any) => {
+    const { View, Text, TouchableOpacity } = require('react-native');
+    mockModalOnSelectUser = onSelectUser;
+    if (!isOpen) return null;
     return (
-      <View testID="select" onPress={() => onValueChange && onValueChange('user1')}>
-        {children}
+      <View testID="user-selection-modal">
+        <Text testID="modal-role-name">{roleName}</Text>
+        <TouchableOpacity testID="select-unassigned" onPress={() => { onSelectUser(undefined); onClose(); }}>
+          <Text>Unassigned</Text>
+        </TouchableOpacity>
+        {users.map((user: any) => (
+          <TouchableOpacity key={user.UserId} testID={`select-user-${user.UserId}`} onPress={() => { onSelectUser(user.UserId); onClose(); }}>
+            <Text>{`${user.FirstName} ${user.LastName}`}</Text>
+          </TouchableOpacity>
+        ))}
       </View>
     );
   },
-  SelectTrigger: ({ children }: any) => {
-    const { View } = require('react-native');
-    return <View testID="select-trigger">{children}</View>;
-  },
-  SelectInput: ({ value, placeholder }: any) => {
-    const { Text } = require('react-native');
-    return <Text testID="select-input">{value || placeholder}</Text>;
-  },
-  SelectIcon: () => {
-    const { View } = require('react-native');
-    return <View testID="select-icon" />;
-  },
-  SelectPortal: ({ children }: any) => children,
-  SelectBackdrop: () => {
-    const { View } = require('react-native');
-    return <View testID="select-backdrop" />;
-  },
-  SelectContent: ({ children }: any) => {
-    const { View } = require('react-native');
-    return <View testID="select-content">{children}</View>;
-  },
-  SelectDragIndicatorWrapper: ({ children }: any) => children,
-  SelectDragIndicator: () => {
-    const { View } = require('react-native');
-    return <View testID="select-drag-indicator" />;
-  },
-  SelectItem: ({ label, value }: any) => {
-    const { Text } = require('react-native');
-    return <Text testID={`select-item-${value}`}>{label}</Text>;
-  },
 }));
 
-// Mock other UI components
+// Mock UI components
 jest.mock('@/components/ui/text', () => ({
-  Text: ({ children, className }: any) => {
+  Text: ({ children, className, testID }: any) => {
     const { Text } = require('react-native');
-    return <Text testID="text">{children}</Text>;
+    return <Text testID={testID || 'text'}>{children}</Text>;
   },
 }));
 
@@ -70,6 +61,13 @@ jest.mock('@/components/ui/vstack', () => ({
   },
 }));
 
+jest.mock('@/components/ui/hstack', () => ({
+  HStack: ({ children }: any) => {
+    const { View } = require('react-native');
+    return <View testID="hstack">{children}</View>;
+  },
+}));
+
 describe('RoleAssignmentItem', () => {
   const mockOnAssignUser = jest.fn();
 
@@ -88,19 +86,19 @@ describe('RoleAssignmentItem', () => {
       DepartmentId: 'dept1',
       IdentificationNumber: '',
       MobilePhone: '',
-      GroupId: '',
-      GroupName: '',
+      GroupId: 'group1',
+      GroupName: 'Engine 1',
       StatusId: '',
-      Status: '',
-      StatusColor: '',
+      Status: 'Available',
+      StatusColor: '#00ff00',
       StatusTimestamp: '',
       StatusDestinationId: '',
       StatusDestinationName: '',
       StaffingId: '',
-      Staffing: '',
-      StaffingColor: '',
+      Staffing: 'On Shift',
+      StaffingColor: '#0000ff',
       StaffingTimestamp: '',
-      Roles: [],
+      Roles: ['Firefighter'],
     },
     {
       UserId: 'user2',
@@ -128,6 +126,7 @@ describe('RoleAssignmentItem', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockModalOnSelectUser = undefined;
   });
 
   it('renders the role name', () => {
@@ -143,20 +142,36 @@ describe('RoleAssignmentItem', () => {
     expect(screen.getByText('Captain')).toBeTruthy();
   });
 
-  it('displays placeholder when no user is assigned', () => {
+  it('displays "Unassigned" when no user is assigned', () => {
+    render(
+      <RoleAssignmentItem
+        role={mockRole}
+        availableUsers={mockUsers}
+        onAssignUser={mockOnAssignUser}
+        currentAssignments={[]}
+      />
+    );
+
+    expect(screen.getByText('Unassigned')).toBeTruthy();
+  });
+
+  it('displays assigned user name inline when user is assigned', () => {
+    const assignedUser = mockUsers[0];
+
     render(
       <RoleAssignmentItem
         role={mockRole}
+        assignedUser={assignedUser}
         availableUsers={mockUsers}
         onAssignUser={mockOnAssignUser}
         currentAssignments={[]}
       />
     );
 
-    expect(screen.getByText('Select user')).toBeTruthy();
+    expect(screen.getByText('John Doe')).toBeTruthy();
   });
 
-  it('displays assigned user name when user is assigned', () => {
+  it('displays user details inline (group, status, staffing)', () => {
     const assignedUser = mockUsers[0];
 
     render(
@@ -169,12 +184,35 @@ describe('RoleAssignmentItem', () => {
       />
     );
 
-    expect(screen.getAllByText('John Doe')).toHaveLength(2); // One in input, one in options
+    expect(screen.getByText('Engine 1')).toBeTruthy();
+    expect(screen.getByText('Available')).toBeTruthy();
+    expect(screen.getByText('On Shift')).toBeTruthy();
   });
 
-  it('filters out users assigned to other roles', () => {
+  it('opens selection modal on tap', () => {
+    render(
+      <RoleAssignmentItem
+        role={mockRole}
+        availableUsers={mockUsers}
+        onAssignUser={mockOnAssignUser}
+        currentAssignments={[]}
+      />
+    );
+
+    // Modal should not be visible initially
+    expect(screen.queryByTestId('user-selection-modal')).toBeNull();
+
+    // Tap the item
+    fireEvent.press(screen.getByTestId('role-assignment-role1'));
+
+    // Modal should now be visible
+    expect(screen.getByTestId('user-selection-modal')).toBeTruthy();
+    expect(screen.getByTestId('modal-role-name')).toBeTruthy();
+  });
+
+  it('shows all users including those assigned to other roles in the modal', () => {
     const currentAssignments = [
-      { roleId: 'role2', userId: 'user2' }, // user2 is assigned to a different role
+      { roleId: 'role2', userId: 'user2', roleName: 'Engineer' }, // user2 is assigned to a different role
     ];
 
     render(
@@ -186,19 +224,21 @@ describe('RoleAssignmentItem', () => {
       />
     );
 
-    // Should show unassigned option
-    expect(screen.getByTestId('select-item-')).toBeTruthy();
-    // Should show user1 (not assigned to other roles)
-    expect(screen.getByTestId('select-item-user1')).toBeTruthy();
-    // Should NOT show user2 (assigned to other role)
-    expect(screen.queryByTestId('select-item-user2')).toBeNull();
+    // Open modal
+    fireEvent.press(screen.getByTestId('role-assignment-role1'));
+
+    // Should show both users (no filtering)
+    expect(screen.getByTestId('select-user-user1')).toBeTruthy();
+    expect(screen.getByTestId('select-user-user2')).toBeTruthy();
+    // Unassigned option should always be present
+    expect(screen.getByTestId('select-unassigned')).toBeTruthy();
   });
 
-  it('includes user assigned to the same role in available users', () => {
+  it('shows all users in the modal including those assigned to same and other roles', () => {
     const assignedUser = mockUsers[0];
     const currentAssignments = [
-      { roleId: 'role1', userId: 'user1' }, // user1 is assigned to this role
-      { roleId: 'role2', userId: 'user2' }, // user2 is assigned to a different role
+      { roleId: 'role1', userId: 'user1', roleName: 'Captain' }, // user1 is assigned to this role
+      { roleId: 'role2', userId: 'user2', roleName: 'Engineer' }, // user2 is assigned to a different role
     ];
 
     render(
@@ -211,15 +251,15 @@ describe('RoleAssignmentItem', () => {
       />
     );
 
-    // Should show assigned user name
-    expect(screen.getAllByText('John Doe')).toHaveLength(2); // One in input, one in options
-    // Should show user1 in options (assigned to this role)
-    expect(screen.getByTestId('select-item-user1')).toBeTruthy();
-    // Should NOT show user2 (assigned to other role)
-    expect(screen.queryByTestId('select-item-user2')).toBeNull();
+    // Open modal
+    fireEvent.press(screen.getByTestId('role-assignment-role1'));
+
+    // Should show both users (no filtering, all users visible)
+    expect(screen.getByTestId('select-user-user1')).toBeTruthy();
+    expect(screen.getByTestId('select-user-user2')).toBeTruthy();
   });
 
-  it('shows unassigned option', () => {
+  it('calls onAssignUser when selecting a user in the modal', () => {
     render(
       <RoleAssignmentItem
         role={mockRole}
@@ -229,7 +269,48 @@ describe('RoleAssignmentItem', () => {
       />
     );
 
-    expect(screen.getByTestId('select-item-')).toBeTruthy();
-    expect(screen.getByText('Unassigned')).toBeTruthy();
+    // Open modal
+    fireEvent.press(screen.getByTestId('role-assignment-role1'));
+
+    // Select user1
+    fireEvent.press(screen.getByTestId('select-user-user1'));
+
+    expect(mockOnAssignUser).toHaveBeenCalledWith('user1');
+  });
+
+  it('calls onAssignUser with undefined when selecting Unassigned', () => {
+    const assignedUser = mockUsers[0];
+
+    render(
+      <RoleAssignmentItem
+        role={mockRole}
+        assignedUser={assignedUser}
+        availableUsers={mockUsers}
+        onAssignUser={mockOnAssignUser}
+        currentAssignments={[]}
+      />
+    );
+
+    // Open modal
+    fireEvent.press(screen.getByTestId('role-assignment-role1'));
+
+    // Select Unassigned
+    fireEvent.press(screen.getByTestId('select-unassigned'));
+
+    expect(mockOnAssignUser).toHaveBeenCalledWith(undefined);
+  });
+
+  it('has proper accessibility role on the pressable', () => {
+    render(
+      <RoleAssignmentItem
+        role={mockRole}
+        availableUsers={mockUsers}
+        onAssignUser={mockOnAssignUser}
+        currentAssignments={[]}
+      />
+    );
+
+    const pressable = screen.getByTestId('role-assignment-role1');
+    expect(pressable.props.accessibilityRole).toBe('button');
   });
 });