fix: Blank selected department when selecting out of range

apps/meteor/client/components/AutoCompleteDepartment.tsx

@@ -42,8 +42,9 @@ const AutoCompleteDepartment = ({
 				haveNone,
 				excludeDepartmentId,
 				showArchived,
+				selectedDepartment: value,
 			}),
-			[debouncedDepartmentsFilter, onlyMyDepartments, haveAll, haveNone, excludeDepartmentId, showArchived],
+			[debouncedDepartmentsFilter, onlyMyDepartments, haveAll, haveNone, excludeDepartmentId, showArchived, value],
 		),
 	);
 

apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.spec.ts

@@ -0,0 +1,107 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { useDepartmentsList } from './useDepartmentsList';
+
+const initialDepartmentsListMock = Array.from(Array(25)).map((_, index) => {
+	return {
+		_id: `${index}`,
+		name: `test_department_${index}`,
+		enabled: true,
+		email: `test${index}@email.com`,
+		showOnRegistration: false,
+		showOnOfflineForm: false,
+		type: 'd',
+		_updatedAt: '2024-09-26T20:05:31.330Z',
+		offlineMessageChannelName: '',
+		numAgents: 0,
+		ancestors: undefined,
+		parentId: undefined,
+	};
+});
+
+it('should not add selected department if it is already in the departments list on first fetch', async () => {
+	const selectedDepartmentMappedToOption = {
+		_id: '5',
+		label: 'test_department_5',
+		value: '5',
+	};
+
+	const { result } = renderHook(
+		() =>
+			useDepartmentsList({
+				filter: '',
+				onlyMyDepartments: true,
+				haveAll: true,
+				showArchived: true,
+				selectedDepartment: '5',
+			}),
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot()
+				.withEndpoint('GET', '/v1/livechat/department', () => ({
+					count: 25,
+					offset: 0,
+					total: 25,
+					departments: initialDepartmentsListMock,
+				}))
+				.build(),
+		},
+	);
+
+	await waitFor(() => expect(result.current.itemsList.items).toContainEqual(selectedDepartmentMappedToOption));
+	// The expected length is 26 because the hook will add the 'All' item on run time
+	await waitFor(() => expect(result.current.itemsList.items.length).toBe(26));
+});
+
+it('should add selected department if it is not part of departments list on first fetch', async () => {
+	const missingDepartmentRawMock = {
+		_id: '56f5be8bcf8cd67f9e9bcfdc',
+		name: 'test_department_25',
+		enabled: true,
+		email: '[email protected]',
+		showOnRegistration: false,
+		showOnOfflineForm: false,
+		type: 'd',
+		_updatedAt: '2024-09-26T20:05:31.330Z',
+		offlineMessageChannelName: '',
+		numAgents: 0,
+		ancestors: undefined,
+		parentId: undefined,
+	};
+
+	const missingDepartmentMappedToOption = {
+		_id: '56f5be8bcf8cd67f9e9bcfdc',
+		label: 'test_department_25',
+		value: '56f5be8bcf8cd67f9e9bcfdc',
+	};
+
+	const { result } = renderHook(
+		() =>
+			useDepartmentsList({
+				filter: '',
+				onlyMyDepartments: true,
+				haveAll: true,
+				showArchived: true,
+				selectedDepartment: '56f5be8bcf8cd67f9e9bcfdc',
+			}),
+		{
+			legacyRoot: true,
+			wrapper: mockAppRoot()
+				.withEndpoint('GET', '/v1/livechat/department', () => ({
+					count: 25,
+					offset: 0,
+					total: 25,
+					departments: initialDepartmentsListMock,
+				}))
+				.withEndpoint('GET', `/v1/livechat/department/:_id`, () => ({
+					department: missingDepartmentRawMock,
+				}))
+				.build(),
+		},
+	);
+
+	await waitFor(() => expect(result.current.itemsList.items).toContainEqual(missingDepartmentMappedToOption));
+	// The expected length is 27 because the hook will add the 'All' item and the missing department on run time
+	await waitFor(() => expect(result.current.itemsList.items.length).toBe(27));
+});

apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts

@@ -4,6 +4,7 @@ import { useCallback, useState } from 'react';
 import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
 import { RecordList } from '../../../lib/lists/RecordList';
+import { normalizeDepartments } from '../normalizeDepartments';
 
 type DepartmentsListOptions = {
 	filter: string;
@@ -14,9 +15,10 @@ type DepartmentsListOptions = {
 	excludeDepartmentId?: string;
 	enabled?: boolean;
 	showArchived?: boolean;
+	selectedDepartment?: string;
 };
 
-type DepartmentListItem = {
+export type DepartmentListItem = {
 	_id: string;
 	label: string;
 	value: string;
@@ -35,6 +37,7 @@ export const useDepartmentsList = (
 	const reload = useCallback(() => setItemsList(new RecordList<DepartmentListItem>()), []);
 
 	const getDepartments = useEndpoint('GET', '/v1/livechat/department');
+	const getDepartment = useEndpoint('GET', '/v1/livechat/department/:_id', { _id: options.selectedDepartment ?? '' });
 
 	useComponentDidUpdate(() => {
 		options && reload();
@@ -60,30 +63,32 @@ export const useDepartmentsList = (
 					}
 					return true;
 				})
-				.map(({ _id, name, _updatedAt, ...department }): DepartmentListItem => {
-					return {
+				.map(
+					({ _id, name, ...department }): DepartmentListItem => ({
 						_id,
 						label: department.archived ? `${name} [${t('Archived')}]` : name,
 						value: _id,
-					};
-				});
+					}),
+				);
+
+			const normalizedItems = await normalizeDepartments(items, options.selectedDepartment ?? '', getDepartment);
 
 			options.haveAll &&
-				items.unshift({
+				normalizedItems.unshift({
 					_id: '',
 					label: t('All'),
 					value: 'all',
 				});
 
 			options.haveNone &&
-				items.unshift({
+				normalizedItems.unshift({
 					_id: '',
 					label: t('None'),
 					value: '',
 				});
 
 			return {
-				items,
+				items: normalizedItems,
 				itemCount: options.departmentId ? total - 1 : total,
 			};
 		},
@@ -94,9 +99,11 @@ export const useDepartmentsList = (
 			options.excludeDepartmentId,
 			options.enabled,
 			options.showArchived,
+			options.selectedDepartment,
 			options.haveAll,
 			options.haveNone,
 			options.departmentId,
+			getDepartment,
 			t,
 		],
 	);

apps/meteor/client/components/Omnichannel/normalizeDepartments.ts

@@ -0,0 +1,20 @@
+import type { EndpointFunction } from '@rocket.chat/ui-contexts';
+
+import type { DepartmentListItem } from './hooks/useDepartmentsList';
+
+export const normalizeDepartments = async (
+	departments: DepartmentListItem[],
+	selectedDepartment: string,
+	getDepartment: EndpointFunction<'GET', '/v1/livechat/department/:_id'>,
+) => {
+	const isSelectedDepartmentAlreadyOnList = departments.find((department) => department._id === selectedDepartment);
+	if (!selectedDepartment || selectedDepartment === 'all' || isSelectedDepartmentAlreadyOnList) {
+		return departments;
+	}
+
+	const { department: missingDepartment } = await getDepartment({});
+
+	return missingDepartment
+		? [...departments, { _id: missingDepartment._id, label: missingDepartment.name, value: missingDepartment._id }]
+		: departments;
+};

apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts

@@ -146,7 +146,7 @@ test.describe('OC - Current Chats [Auto Selection]', async () => {
 		expect(results.violations).toEqual([]);
 	});
 
-	test('OC - Current chats - Filters', async () => {
+	test('OC - Current chats - Filters', async ({ page }) => {
 		const [departmentA, departmentB] = departments.map(({ data }) => data);
 
 		await test.step('expect to filter by guest', async () => {
@@ -236,6 +236,12 @@ test.describe('OC - Current Chats [Auto Selection]', async () => {
 			await expect(poCurrentChats.findRowByName(visitorA)).toBeVisible();
 		});
 
+		await test.step('expect department filter to show selected value after page reload', async () => {
+			await poCurrentChats.selectDepartment(departmentA.name);
+			await page.reload();
+			await expect(poCurrentChats.inputDepartmentValue).toContainText(departmentA.name);
+		});
+
 		// TODO: Unit test await test.step('expect to filter by period', async () => {});
 
 		// TODO: Unit test await test.step('expect to filter by custom fields', async () => {});

apps/meteor/tests/e2e/page-objects/omnichannel-current-chats.ts

@@ -35,6 +35,10 @@ export class OmnichannelCurrentChats extends OmnichannelAdministration {
 		return this.page.locator('[data-qa="autocomplete-department"] input');
 	}
 
+	get inputDepartmentValue(): Locator {
+		return this.page.locator('[data-qa="autocomplete-department"] span');
+	}
+
 	get inputTags(): Locator {
 		return this.page.locator('[data-qa="current-chats-tags"] [role="listbox"]');
 	}