feat: add references to room.info endpoint

apps/meteor/app/api/server/v1/rooms.ts

@@ -1,4 +1,4 @@
-import { Media } from '@rocket.chat/core-services';
+import { Media, Team } from '@rocket.chat/core-services';
 import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Users, Uploads, Subscriptions } from '@rocket.chat/models';
 import type { Notifications } from '@rocket.chat/rest-typings';
@@ -416,7 +416,19 @@ API.v1.addRoute(
 				return API.v1.failure('not-allowed', 'Not Allowed');
 			}
 
-			return API.v1.success({ room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined });
+			const discussionParent =
+				room.prid &&
+				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
+					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
+				}));
+			const { team, parentRoom } = await Team.getRoomInfo(room);
+			const parent = discussionParent || parentRoom;
+
+			return API.v1.success({
+				room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined,
+				...(team && { team }),
+				...(parent && { parent }),
+			});
 		},
 	},
 );

apps/meteor/client/lib/rooms/roomCoordinator.tsx

@@ -63,6 +63,9 @@ class RoomCoordinatorClient extends RoomCoordinator {
 			canSendMessage(rid: string): boolean {
 				return ChatSubscription.find({ rid }).count() > 0;
 			},
+			hasSubscription(rid: string): boolean {
+				return ChatSubscription.find({ rid }).count() > 0;
+			},
 			...directives,
 			config: roomConfig,
 		});

apps/meteor/client/views/room/Header/ParentRoom.tsx

@@ -13,7 +13,12 @@ type ParentRoomProps = {
 const ParentRoom = ({ room }: ParentRoomProps): ReactElement => {
 	const icon = useRoomIcon(room);
 
-	const handleRedirect = (): void => roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+	const handleRedirect = (): void => {
+		if (!roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id)) {
+			return;
+		}
+		roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+	};
 
 	return (
 		<HeaderTag

apps/meteor/client/views/room/Header/ParentRoomWithData.tsx

@@ -10,20 +10,27 @@ type ParentRoomWithDataProps = {
 	room: IRoom;
 };
 
-const ParentRoomWithData = ({ room }: ParentRoomWithDataProps): ReactElement => {
-	const { prid } = room;
+const getParentId = ({ prid, teamId }: IRoom): string => {
+	if (prid) {
+		return prid;
+	}
 
-	if (!prid) {
-		throw new Error('Parent room ID is missing');
+	if (teamId) {
+		return teamId;
 	}
 
-	const subscription = useUserSubscription(prid);
+	throw new Error('Parent room ID is missing');
+};
+
+const ParentRoomWithData = ({ room }: ParentRoomWithDataProps): ReactElement => {
+	const parentId = getParentId(room);
 
+	const subscription = useUserSubscription(parentId);
 	if (subscription) {
-		return <ParentRoom room={subscription} />;
+		return <ParentRoom room={{ ...subscription, _id: subscription.rid }} />;
 	}
 
-	return <ParentRoomWithEndpointData rid={prid} />;
+	return <ParentRoomWithEndpointData rid={room._id} />;
 };
 
 export default ParentRoomWithData;

apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx

@@ -5,6 +5,7 @@ import React from 'react';
 import { HeaderTagSkeleton } from '../../../components/Header';
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
 import ParentRoom from './ParentRoom';
+import ParentTeam from './ParentTeam';
 
 type ParentRoomWithEndpointDataProps = {
 	rid: IRoom['_id'];
@@ -21,6 +22,17 @@ const ParentRoomWithEndpointData = ({ rid }: ParentRoomWithEndpointDataProps): R
 		return null;
 	}
 
+	if (data.parent) {
+		return <ParentRoom room={data.parent} />;
+	}
+
+	if (data.team) {
+		if (data.team.roomId === rid) {
+			return null;
+		}
+		return <ParentTeam team={data.team} />;
+	}
+
 	return <ParentRoom room={data.room} />;
 };
 

apps/meteor/client/views/room/Header/ParentTeam.tsx

@@ -1,65 +1,33 @@
-import type { IRoom } from '@rocket.chat/core-typings';
+import type { ITeam } from '@rocket.chat/core-typings';
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
-import { useUserId, useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { HeaderTag, HeaderTagIcon, HeaderTagSkeleton } from '../../../components/Header';
+import { HeaderTag, HeaderTagIcon } from '../../../components/Header';
 import { goToRoomById } from '../../../lib/utils/goToRoomById';
 
-type APIErrorResult = { success: boolean; error: string };
+const ParentTeam = ({ team }: { team: Pick<ITeam, 'name' | 'roomId' | 'type'> }): ReactElement | null => {
+	const isTeamPublic = team.type === TEAM_TYPE.PUBLIC;
 
-const ParentTeam = ({ room }: { room: IRoom }): ReactElement | null => {
-	const { teamId } = room;
-	const userId = useUserId();
-
-	if (!teamId) {
-		throw new Error('invalid rid');
-	}
-
-	if (!userId) {
-		throw new Error('invalid uid');
-	}
-
-	const teamsInfoEndpoint = useEndpoint('GET', '/v1/teams.info');
-	const userTeamsListEndpoint = useEndpoint('GET', '/v1/users.listTeams');
-
-	const {
-		data: teamInfoData,
-		isLoading: teamInfoLoading,
-		isError: teamInfoError,
-	} = useQuery(['teamId', teamId], async () => teamsInfoEndpoint({ teamId }), {
-		keepPreviousData: true,
-		retry: (_, error) => (error as APIErrorResult)?.error === 'unauthorized' && false,
-	});
-
-	const { data: userTeams, isLoading: userTeamsLoading } = useQuery(['userId', userId], async () => userTeamsListEndpoint({ userId }));
-
-	const userBelongsToTeam = userTeams?.teams?.find((team) => team._id === teamId) || false;
-	const isTeamPublic = teamInfoData?.teamInfo.type === TEAM_TYPE.PUBLIC;
+	const subscription = useUserSubscription(team.roomId);
 
 	const redirectToMainRoom = (): void => {
-		const rid = teamInfoData?.teamInfo.roomId;
+		const rid = team.roomId;
 		if (!rid) {
 			return;
 		}
 
+		const isTeamPublic = team.type === TEAM_TYPE.PUBLIC;
+		const userBelongsToTeam = !!subscription;
+
 		if (!(isTeamPublic || userBelongsToTeam)) {
 			return;
 		}
 
 		goToRoomById(rid);
 	};
 
-	if (teamInfoLoading || userTeamsLoading) {
-		return <HeaderTagSkeleton />;
-	}
-
-	if (teamInfoError) {
-		return null;
-	}
-
 	return (
 		<HeaderTag
 			role='button'
@@ -68,7 +36,7 @@ const ParentTeam = ({ room }: { room: IRoom }): ReactElement | null => {
 			onClick={redirectToMainRoom}
 		>
 			<HeaderTagIcon icon={{ name: isTeamPublic ? 'team' : 'team-lock' }} />
-			{teamInfoData?.teamInfo.name}
+			{team.name}
 		</HeaderTag>
 	);
 };

apps/meteor/client/views/room/Header/RoomHeader.tsx

@@ -8,7 +8,6 @@ import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle,
 import MarkdownText from '../../../components/MarkdownText';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
 import ParentRoomWithData from './ParentRoomWithData';
-import ParentTeam from './ParentTeam';
 import RoomTitle from './RoomTitle';
 import RoomToolbox from './RoomToolbox';
 import Encrypted from './icons/Encrypted';
@@ -47,8 +46,7 @@ const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderPro
 				<HeaderContentRow>
 					<RoomTitle room={room} />
 					<Favorite room={room} />
-					{room.prid && <ParentRoomWithData room={room} />}
-					{room.teamId && !room.teamMain && <ParentTeam room={room} />}
+					{(room.prid || room.teamId) && <ParentRoomWithData room={room} />}
 					{isRoomFederated(room) && <FederatedRoomOriginServer room={room} />}
 					<Encrypted room={room} />
 					<Translate room={room} />

apps/meteor/client/views/room/HeaderV2/ParentRoom.tsx

@@ -12,7 +12,12 @@ type ParentRoomProps = {
 const ParentRoom = ({ room }: ParentRoomProps) => {
 	const icon = useRoomIcon(room);
 
-	const handleRedirect = (): void => roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+	const handleRedirect = (): void => {
+		if (!roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id)) {
+			return;
+		}
+		roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+	};
 
 	return (
 		<HeaderTag

apps/meteor/client/views/room/HeaderV2/ParentRoomWithData.tsx

@@ -9,20 +9,27 @@ type ParentRoomWithDataProps = {
 	room: IRoom;
 };
 
-const ParentRoomWithData = ({ room }: ParentRoomWithDataProps) => {
-	const { prid } = room;
+const getParentId = ({ prid, teamId }: IRoom): string => {
+	if (prid) {
+		return prid;
+	}
 
-	if (!prid) {
-		throw new Error('Parent room ID is missing');
+	if (teamId) {
+		return teamId;
 	}
 
-	const subscription = useUserSubscription(prid);
+	throw new Error('Parent room ID is missing');
+};
+
+const ParentRoomWithData = ({ room }: ParentRoomWithDataProps) => {
+	const parentId = getParentId(room);
 
+	const subscription = useUserSubscription(parentId);
 	if (subscription) {
-		return <ParentRoom room={subscription} />;
+		return <ParentRoom room={{ ...subscription, _id: subscription.rid }} />;
 	}
 
-	return <ParentRoomWithEndpointData rid={prid} />;
+	return <ParentRoomWithEndpointData rid={room._id} />;
 };
 
 export default ParentRoomWithData;

apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 import { HeaderTagSkeleton } from '../../../components/Header';
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
 import ParentRoom from './ParentRoom';
+import ParentTeam from './ParentTeam';
 
 type ParentRoomWithEndpointDataProps = {
 	rid: IRoom['_id'];
@@ -20,6 +21,17 @@ const ParentRoomWithEndpointData = ({ rid }: ParentRoomWithEndpointDataProps) =>
 		return null;
 	}
 
+	if (data.parent) {
+		return <ParentRoom room={data.parent} />;
+	}
+
+	if (data.team) {
+		if (data.team.roomId === rid) {
+			return null;
+		}
+		return <ParentTeam team={data.team} />;
+	}
+
 	return <ParentRoom room={data.room} />;
 };
 

apps/meteor/client/views/room/HeaderV2/ParentTeam.tsx

@@ -1,68 +1,33 @@
-import type { IRoom } from '@rocket.chat/core-typings';
+import type { ITeam } from '@rocket.chat/core-typings';
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
-import { useUserId, useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
 import React from 'react';
 
-import { HeaderTag, HeaderTagIcon, HeaderTagSkeleton } from '../../../components/Header';
+import { HeaderTag, HeaderTagIcon } from '../../../components/Header';
 import { goToRoomById } from '../../../lib/utils/goToRoomById';
 
-type APIErrorResult = { success: boolean; error: string };
+const ParentTeam = ({ team }: { team: Pick<ITeam, 'name' | 'roomId' | 'type'> }): ReactElement | null => {
+	const isTeamPublic = team.type === TEAM_TYPE.PUBLIC;
 
-type ParentTeamProps = {
-	room: IRoom;
-};
-
-const ParentTeam = ({ room }: ParentTeamProps) => {
-	const { teamId } = room;
-	const userId = useUserId();
-
-	if (!teamId) {
-		throw new Error('invalid rid');
-	}
-
-	if (!userId) {
-		throw new Error('invalid uid');
-	}
-
-	const teamsInfoEndpoint = useEndpoint('GET', '/v1/teams.info');
-	const userTeamsListEndpoint = useEndpoint('GET', '/v1/users.listTeams');
-
-	const {
-		data: teamInfoData,
-		isLoading: teamInfoLoading,
-		isError: teamInfoError,
-	} = useQuery(['teamId', teamId], async () => teamsInfoEndpoint({ teamId }), {
-		keepPreviousData: true,
-		retry: (_, error) => (error as APIErrorResult)?.error === 'unauthorized' && false,
-	});
-
-	const { data: userTeams, isLoading: userTeamsLoading } = useQuery(['userId', userId], async () => userTeamsListEndpoint({ userId }));
-
-	const userBelongsToTeam = userTeams?.teams?.find((team) => team._id === teamId) || false;
-	const isTeamPublic = teamInfoData?.teamInfo.type === TEAM_TYPE.PUBLIC;
+	const subscription = useUserSubscription(team.roomId);
 
 	const redirectToMainRoom = (): void => {
-		const rid = teamInfoData?.teamInfo.roomId;
+		const rid = team.roomId;
 		if (!rid) {
 			return;
 		}
 
+		const isTeamPublic = team.type === TEAM_TYPE.PUBLIC;
+		const userBelongsToTeam = !!subscription;
+
 		if (!(isTeamPublic || userBelongsToTeam)) {
 			return;
 		}
 
 		goToRoomById(rid);
 	};
 
-	if (teamInfoLoading || userTeamsLoading) {
-		return <HeaderTagSkeleton />;
-	}
-
-	if (teamInfoError) {
-		return null;
-	}
-
 	return (
 		<HeaderTag
 			role='button'
@@ -71,7 +36,7 @@ const ParentTeam = ({ room }: ParentTeamProps) => {
 			onClick={redirectToMainRoom}
 		>
 			<HeaderTagIcon icon={{ name: isTeamPublic ? 'team' : 'team-lock' }} />
-			{teamInfoData?.teamInfo.name}
+			{team.name}
 		</HeaderTag>
 	);
 };

apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx

@@ -7,7 +7,6 @@ import React, { Suspense } from 'react';
 import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
 import ParentRoomWithData from './ParentRoomWithData';
-import ParentTeam from './ParentTeam';
 import RoomTitle from './RoomTitle';
 import RoomToolbox from './RoomToolbox';
 import Encrypted from './icons/Encrypted';
@@ -45,8 +44,7 @@ const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
 				<HeaderContentRow>
 					<RoomTitle room={room} />
 					<Favorite room={room} />
-					{room.prid && <ParentRoomWithData room={room} />}
-					{room.teamId && !room.teamMain && <ParentTeam room={room} />}
+					{(room.prid || room.teamId) && <ParentRoomWithData room={room} />}
 					{isRoomFederated(room) && <FederatedRoomOriginServer room={room} />}
 					<Encrypted room={room} />
 					<Translate room={room} />