feat: Added new setting 'Hide conversation after closing'

.changeset/thick-spoons-compete.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Added new Omnichannel setting 'Hide conversation after closing'

apps/meteor/client/hooks/omnichannel/useOmnichannelCloseRoute.ts

@@ -0,0 +1,23 @@
+import { useRouter, useSetting } from '@rocket.chat/ui-contexts';
+import { useCallback } from 'react';
+
+export const useOmnichannelCloseRoute = () => {
+	const hideConversationAfterClosing = useSetting('Omnichannel_hide_conversation_after_closing');
+	const router = useRouter();
+
+	const navigateHome = useCallback(() => {
+		if (!hideConversationAfterClosing) {
+			return;
+		}
+
+		const routeName = router.getRouteName();
+
+		if (routeName === 'omnichannel-current-chats') {
+			router.navigate({ name: 'omnichannel-current-chats' });
+		} else {
+			router.navigate({ name: 'home' });
+		}
+	}, [hideConversationAfterClosing, router]);
+
+	return { navigateHome };
+};

apps/meteor/client/views/room/body/hooks/useGoToHomeOnRemoved.ts

@@ -1,16 +1,17 @@
-import type { IRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom, type IRoom } from '@rocket.chat/core-typings';
 import { useRoute, useStream, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import { useEffect } from 'react';
 
-const IGNORED_ROOMS = ['l', 'v'];
+import { useOmnichannelCloseRoute } from '../../../../hooks/omnichannel/useOmnichannelCloseRoute';
 
 export function useGoToHomeOnRemoved(room: IRoom, userId: string | undefined): void {
 	const homeRouter = useRoute('home');
 	const queryClient = useQueryClient();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const subscribeToNotifyUser = useStream('notify-user');
 	const t = useTranslation();
+	const { navigateHome } = useOmnichannelCloseRoute();
 
 	useEffect(() => {
 		if (!userId) {
@@ -21,19 +22,35 @@ export function useGoToHomeOnRemoved(room: IRoom, userId: string | undefined): v
 			if (event === 'removed' && subscription.rid === room._id) {
 				queryClient.invalidateQueries(['rooms', room._id]);
 
-				if (!IGNORED_ROOMS.includes(room.t)) {
-					dispatchToastMessage({
-						type: 'info',
-						message: t('You_have_been_removed_from__roomName_', {
-							roomName: room?.fname || room?.name || '',
-						}),
-					});
+				if (isOmnichannelRoom(room)) {
+					navigateHome();
+					return;
 				}
 
+				dispatchToastMessage({
+					type: 'info',
+					message: t('You_have_been_removed_from__roomName_', {
+						roomName: room?.fname || room?.name || '',
+					}),
+				});
+
 				homeRouter.push({});
 			}
 		});
 
 		return unSubscribeFromNotifyUser;
-	}, [userId, homeRouter, subscribeToNotifyUser, room._id, room?.fname, room?.name, t, dispatchToastMessage, queryClient, room.t]);
+	}, [
+		userId,
+		homeRouter,
+		subscribeToNotifyUser,
+		room._id,
+		room?.fname,
+		room?.name,
+		t,
+		dispatchToastMessage,
+		queryClient,
+		room.t,
+		room,
+		navigateHome,
+	]);
 }

apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json

@@ -3107,6 +3107,7 @@
   "Omnichannel_sorting_disclaimer": "Omnichannel conversations are sorted by {{sortingMechanism}}, edit a room to apply.",
   "Livechat_online": "Omnichannel on-line",
   "Omnichannel_placed_chat_on_hold": "Chat On Hold: {{comment}}",
+  "Omnichannel_hide_conversation_after_closing": "Hide conversation after closing",
   "Livechat_Queue": "Omnichannel Queue",
   "Livechat_registration_form": "Registration Form",
   "Livechat_registration_form_message": "Registration Form Message",