review: ad condition to tag click when cannot redirect

RocketChat · Oct 7, 2024 · e04123a · e04123a
1 parent 0037f04
commit e04123a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/apps/meteor/client/views/room/Header/ParentRoom.tsx b/apps/meteor/client/views/room/Header/ParentRoom.tsx
@@ -10,21 +10,21 @@ type ParentRoomProps = {
 	room: Pick<IRoom, '_id' | 't' | 'name' | 'fname' | 'prid' | 'u'>;
 };
 
+const hasSubscription = (room: ParentRoomProps['room']): boolean => roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id);
 const ParentRoom = ({ room }: ParentRoomProps): ReactElement => {
 	const icon = useRoomIcon(room);
 
-	const handleRedirect = (): void => {
-		if (!roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id)) {
-			return;
-		}
-		roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
-	};
+	const handleRedirect = hasSubscription(room)
+		? (): void => {
+				roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+		  }
+		: undefined;
 
 	return (
 		<HeaderTag
 			role='button'
 			tabIndex={0}
-			onKeyDown={(e) => (e.code === 'Space' || e.code === 'Enter') && handleRedirect()}
+			onKeyDown={(e) => (e.code === 'Space' || e.code === 'Enter') && handleRedirect?.()}
 			onClick={handleRedirect}
 		>
 			<HeaderTagIcon icon={icon} />

diff --git a/apps/meteor/client/views/room/HeaderV2/ParentRoom.tsx b/apps/meteor/client/views/room/HeaderV2/ParentRoom.tsx
@@ -9,21 +9,21 @@ type ParentRoomProps = {
 	room: Pick<IRoom, '_id' | 't' | 'name' | 'fname' | 'prid' | 'u'>;
 };
 
+const hasSubscription = (room: ParentRoomProps['room']): boolean => roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id);
 const ParentRoom = ({ room }: ParentRoomProps) => {
 	const icon = useRoomIcon(room);
 
-	const handleRedirect = (): void => {
-		if (!roomCoordinator.getRoomDirectives(room.t).hasSubscription(room._id)) {
-			return;
-		}
-		roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
-	};
+	const handleRedirect = hasSubscription(room)
+		? (): void => {
+				roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room });
+		  }
+		: undefined;
 
 	return (
 		<HeaderTag
 			role='button'
 			tabIndex={0}
-			onKeyDown={(e) => (e.code === 'Space' || e.code === 'Enter') && handleRedirect()}
+			onKeyDown={(e) => (e.code === 'Space' || e.code === 'Enter') && handleRedirect?.()}
 			onClick={handleRedirect}
 		>
 			<HeaderTagIcon icon={icon} />