Test

Author: tassoevan

apps/meteor/client/hooks/useRoomInfoEndpoint.ts

@@ -1,25 +1,49 @@
-import type { IRoom } from '@rocket.chat/core-typings';
+import type { IRoom, ITeam, Serialized } from '@rocket.chat/core-typings';
 import { useEndpoint, useUserId } from '@rocket.chat/ui-contexts';
+import type { UseQueryOptions } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { minutesToMilliseconds } from 'date-fns';
 
 import { roomsQueryKeys } from '../lib/queryKeys';
 
-export const useRoomInfoEndpoint = (rid: IRoom['_id']) => {
+type UseRoomInfoEndpointOptions<
+	TData = Serialized<{
+		room: IRoom | undefined;
+		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+		team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
+	}>,
+> = Omit<
+	UseQueryOptions<
+		Serialized<{
+			room: IRoom | undefined;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
+		}>,
+		{ success: boolean; error: string },
+		TData,
+		ReturnType<typeof roomsQueryKeys.info>
+	>,
+	'queryKey' | 'queryFn'
+>;
+
+export const useRoomInfoEndpoint = <
+	TData = Serialized<{
+		room: IRoom | undefined;
+		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+		team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
+	}>,
+>(
+	rid: IRoom['_id'],
+	options?: UseRoomInfoEndpointOptions<TData>,
+) => {
 	const getRoomInfo = useEndpoint('GET', '/v1/rooms.info');
 	const uid = useUserId();
 	return useQuery({
 		queryKey: roomsQueryKeys.info(rid),
 		queryFn: () => getRoomInfo({ roomId: rid }),
 		gcTime: minutesToMilliseconds(15),
-
-		retry: (count, error: { success: boolean; error: string }) => {
-			if (count > 2 || error.error === 'not-allowed') {
-				return false;
-			}
-			return true;
-		},
-
+		retry: (count, error: { success: boolean; error: string }) => count <= 2 && error.error !== 'not-allowed',
 		enabled: !!uid,
+		...options,
 	});
 };

apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx

@@ -1,3 +1,4 @@
+import type { IRoom } from '@rocket.chat/core-typings';
 import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
@@ -10,7 +11,7 @@ import { roomsQueryKeys } from '../../lib/queryKeys';
 import { dispatchToastMessage } from '../../lib/toast';
 import { PRIORITY_ICONS } from '../priorities/PriorityIcon';
 
-export const useOmnichannelPrioritiesMenu = (rid: string) => {
+export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
 	const { t } = useTranslation();
 	const queryClient = useQueryClient();
 	const updateRoomPriority = useEndpoint('POST', '/v1/livechat/room/:rid/priority', { rid });

apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx

@@ -54,7 +54,8 @@ function ChatInfo({ id, route }: ChatInfoProps) {
 		livechatData,
 		source,
 		queuedAt,
-	} = room || { v: {} };
+	} = room ?? {};
+	console.log('Priority id:', priorityId);
 
 	const routePath = useRoute(route || 'omnichannel-directory');
 	const canViewCustomFields = usePermission('view-livechat-room-customfields');

apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEditWithData.tsx

@@ -19,7 +19,7 @@ function RoomEditWithData({ id: roomId, reload, reloadInfo, onClose }: RoomEditW
 	const { data: room, isLoading: isRoomLoading, isError: isRoomError } = useOmnichannelRoomInfo(roomId);
 	const { _id: visitorId } = room?.v ?? {};
 
-	const { data: visitor, isLoading: isVisitorLoading, isError: isVisitorError } = useVisitorInfo(visitorId, { enabled: !!visitorId });
+	const { data: visitor, isLoading: isVisitorLoading, isError: isVisitorError } = useVisitorInfo(visitorId!, { enabled: !!visitorId });
 
 	if (isRoomLoading || isVisitorLoading) {
 		return <FormSkeleton />;

apps/meteor/client/views/omnichannel/directory/hooks/useOmnichannelRoomInfo.tsx

@@ -1,13 +1,17 @@
-import type { IOmnichannelRoom, Serialized } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom, IRoom, Serialized } from '@rocket.chat/core-typings';
 
 import { useRoomInfoEndpoint } from '../../../../hooks/useRoomInfoEndpoint';
 
-export const useOmnichannelRoomInfo = (roomId: string) => {
-	const { data: roomData, ...props } = useRoomInfoEndpoint(roomId);
-	const room = roomData?.room as Serialized<IOmnichannelRoom>;
+export const useOmnichannelRoomInfo = (rid: IRoom['_id']) => {
+	const query = useRoomInfoEndpoint(rid, {
+		select: (data) => {
+			const newData = (data.room as Serialized<IOmnichannelRoom>) ?? null;
+			console.log('useOmnichannelRoomInfo select', newData._id, 'priorityId', newData.priorityId);
+			return newData;
+		},
+	});
 
-	return {
-		data: room,
-		...props,
-	};
+	console.log('useOmnichannelRoomInfo data', query.data?._id, 'priorityId', query.data?.priorityId);
+
+	return query;
 };

apps/meteor/client/views/omnichannel/directory/utils/formatQueuedAt.ts

@@ -1,7 +1,7 @@
 import type { IOmnichannelRoom, Serialized } from '@rocket.chat/core-typings';
 import moment from 'moment';
 
-export const formatQueuedAt = (room: Serialized<IOmnichannelRoom>) => {
+export const formatQueuedAt = (room: Serialized<IOmnichannelRoom> | undefined) => {
 	const { servedBy, closedAt, open, queuedAt, ts } = room || {};
 	const queueStartedAt = queuedAt || ts;