Sivin VargheseandGitHub
fbb3479263
# Pull Request Template ## Description This PR fixes a crash where opening a conversation threw `TypeError: Cannot read properties of null (reading 'localeCompare')` and prevented the agent assignment dropdown from rendering. Since #14866, agent bots are included in the assignable agents list. `AgentBot#name` is not presence-validated, so system bots (account-less, global) can have a `null` name. Those nameless bots flowed into name-based operations that assumed a string, causing crashes and warnings across multiple surfaces: * **Assignment dropdown sort:** `getAgentsByAvailability` called `a.name.localeCompare(b.name)`, causing a `localeCompare` `TypeError`. * **Dropdown search:** `MultiselectDropdownItems` called `option.name.toLowerCase()`, causing a `toLowerCase` `TypeError`. * **Agent Bots settings:** `Avatar` received `name=null` for a `String` prop, triggering a Vue prop validation warning. ### What changed * Keep nameless agent bots in the assignment dropdown and render a `-` fallback label in `useAgentsList`. These are still valid, assignable-by-ID records: the assignable agents API includes accessible bots, and `Conversations::AssignmentService` assigns them by ID. Preserving them avoids hiding valid assignment targets. Bots are still included only when `includeAgentBots` is enabled. * Make the sort in `getAgentsByAvailability` null-safe by coercing missing names to an empty string (defense in depth). * Make the search filter in `MultiselectDropdownItems` null-safe (defense in depth). * Pass a null-safe `name` prop to `Avatar` in the Agent Bots settings list to eliminate the Vue prop validation warning. Fixes https://linear.app/chatwoot/issue/CW-7670/agent-assignment-dropdown-crashes-with-cannot-read-properties-of-null ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? 1. Have a system agent bot (`name: null`) that is assignable to an inbox. 2. Open any conversation in that inbox. * The agent assignment dropdown renders without console errors. * The nameless bot is listed with a `-` label and can be assigned. 3. Go to **Settings → Agent Bots**. * The page renders without the `Avatar` prop validation warning. ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
52 lines
1.8 KiB
JavaScript
52 lines
1.8 KiB
JavaScript
/**
|
|
* Filters and sorts agents by availability status
|
|
* @param {Array} agents - List of agents
|
|
* @param {string} availability - Availability status to filter by
|
|
* @returns {Array} Filtered and sorted list of agents
|
|
*/
|
|
export const getAgentsByAvailability = (agents, availability) => {
|
|
return agents
|
|
.filter(agent => agent.availability_status === availability)
|
|
.sort((a, b) => (a.name || '').localeCompare(b.name || ''));
|
|
};
|
|
|
|
/**
|
|
* Sorts agents by availability status: online, busy, then offline
|
|
* @param {Array} agents - List of agents
|
|
* @returns {Array} Sorted list of agents
|
|
*/
|
|
export const getSortedAgentsByAvailability = agents => {
|
|
const onlineAgents = getAgentsByAvailability(agents, 'online');
|
|
const busyAgents = getAgentsByAvailability(agents, 'busy');
|
|
const offlineAgents = getAgentsByAvailability(agents, 'offline');
|
|
const filteredAgents = [...onlineAgents, ...busyAgents, ...offlineAgents];
|
|
return filteredAgents;
|
|
};
|
|
|
|
/**
|
|
* Updates the availability status of the current user based on the current account
|
|
* @param {Array} agents - List of agents
|
|
* @param {Object} currentUser - Current user object
|
|
* @param {number} currentAccountId - ID of the current account
|
|
* @returns {Array} Updated list of agents with dynamic presence
|
|
*/
|
|
// Here we are updating the availability status of the current user dynamically
|
|
// based on the current account availability status
|
|
export const getAgentsByUpdatedPresence = (
|
|
agents,
|
|
currentUser,
|
|
currentAccountId
|
|
) => {
|
|
const agentsWithDynamicPresenceUpdate = agents.map(item =>
|
|
item.id === currentUser.id && (item.assignee_type || 'User') === 'User'
|
|
? {
|
|
...item,
|
|
availability_status: currentUser.accounts.find(
|
|
account => account.id === currentAccountId
|
|
).availability_status,
|
|
}
|
|
: item
|
|
);
|
|
return agentsWithDynamicPresenceUpdate;
|
|
};
|