Merge branch 'develop' into favorite-setting-functioning

.changeset/curly-years-smile.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed an issue with the composer losing its edit state and highlighted after resizing the window.

.changeset/flat-windows-juggle.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/web-ui-registration": patch
+---
+
+Fixed login email verification flow when a user tries to join with username

.changeset/kind-dragons-flash.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+feat: add a11y doc links

apps/meteor/app/models/client/index.ts

@@ -14,7 +14,6 @@ import { RoomRoles } from './models/RoomRoles';
 import { UserAndRoom } from './models/UserAndRoom';
 import { UserRoles } from './models/UserRoles';
 import { Users } from './models/Users';
-import { WebdavAccounts } from './models/WebdavAccounts';
 
 export {
 	Base,
@@ -30,7 +29,6 @@ export {
 	ChatPermissions,
 	CustomSounds,
 	EmojiCustom,
-	WebdavAccounts,
 	/** @deprecated */
 	Users,
 	/** @deprecated */

apps/meteor/client/components/message/content/reactions/Reaction.tsx

@@ -1,36 +1,13 @@
 import { MessageReaction as MessageReactionTemplate, MessageReactionEmoji, MessageReactionCounter } from '@rocket.chat/fuselage';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTooltipClose, useTooltipOpen, useTranslation } from '@rocket.chat/ui-contexts';
-import { useQueryClient } from '@tanstack/react-query';
+import { useTooltipClose, useTooltipOpen } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React, { useContext, useRef } from 'react';
+import React, { useRef, useContext } from 'react';
 
 import { getEmojiClassNameAndDataTitle } from '../../../../lib/utils/renderEmoji';
-import { useGetMessageByID } from '../../../../views/room/contextualBar/Threads/hooks/useGetMessageByID';
-import MarkdownText from '../../../MarkdownText';
 import { MessageListContext } from '../../list/MessageListContext';
+import ReactionTooltip from './ReactionTooltip';
 
 // TODO: replace it with proper usage of i18next plurals
-const getTranslationKey = (users: string[], mine: boolean): TranslationKey => {
-	if (users.length === 0) {
-		if (mine) {
-			return 'You_reacted_with';
-		}
-	}
-
-	if (users.length > 10) {
-		if (mine) {
-			return 'You_users_and_more_Reacted_with';
-		}
-		return 'Users_and_more_reacted_with';
-	}
-
-	if (mine) {
-		return 'You_and_users_Reacted_with';
-	}
-	return 'Users_reacted_with';
-};
-
 type ReactionProps = {
 	hasReacted: (name: string) => boolean;
 	counter: number;
@@ -41,54 +18,15 @@ type ReactionProps = {
 };
 
 const Reaction = ({ hasReacted, counter, name, names, messageId, ...props }: ReactionProps): ReactElement => {
-	const t = useTranslation();
 	const ref = useRef<HTMLDivElement>(null);
 	const openTooltip = useTooltipOpen();
 	const closeTooltip = useTooltipClose();
 	const { showRealName, username } = useContext(MessageListContext);
 
 	const mine = hasReacted(name);
 
-	const key = getTranslationKey(names, mine);
-
 	const emojiProps = getEmojiClassNameAndDataTitle(name);
 
-	const getMessage = useGetMessageByID();
-
-	const queryClient = useQueryClient();
-
-	const getNames = async () => {
-		return queryClient.fetchQuery(
-			['chat.getMessage', 'reactions', messageId, names],
-			async () => {
-				// This happens if the only reaction is from the current user
-				if (!names.length) {
-					return [];
-				}
-
-				if (!showRealName) {
-					return names;
-				}
-
-				const data = await getMessage(messageId);
-
-				const { reactions } = data;
-				if (!reactions) {
-					return [];
-				}
-
-				if (username) {
-					const index = reactions[name].usernames.indexOf(username);
-					index >= 0 && reactions[name].names?.splice(index, 1);
-					return (reactions[name].names || names).filter(Boolean);
-				}
-
-				return reactions[name].names || names;
-			},
-			{ staleTime: 1000 * 60 * 5 },
-		);
-	};
-
 	return (
 		<MessageReactionTemplate
 			ref={ref}
@@ -102,17 +40,15 @@ const Reaction = ({ hasReacted, counter, name, names, messageId, ...props }: Rea
 				e.stopPropagation();
 				e.preventDefault();
 
-				const users = await getNames();
-
 				ref.current &&
 					openTooltip(
-						<MarkdownText
-							content={t(key, {
-								counter: names.length > 10 ? names.length - 10 : names.length,
-								users: users?.slice(0, 10).join(', ') || '',
-								emoji: name,
-							})}
-							variant='inline'
+						<ReactionTooltip
+							emojiName={name}
+							usernames={names}
+							mine={mine}
+							messageId={messageId}
+							showRealName={showRealName}
+							username={username}
 						/>,
 						ref.current,
 					);

apps/meteor/client/components/message/content/reactions/ReactionTooltip.tsx

@@ -0,0 +1,88 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+
+import { useGetMessageByID } from '../../../../views/room/contextualBar/Threads/hooks/useGetMessageByID';
+import MarkdownText from '../../../MarkdownText';
+
+type ReactionTooltipProps = {
+	emojiName: string;
+	usernames: string[];
+	username: string | undefined;
+	mine: boolean;
+	showRealName: boolean;
+	messageId: string;
+};
+
+const getTranslationKey = (users: string[], mine: boolean): TranslationKey => {
+	if (users.length === 0) {
+		if (mine) {
+			return 'You_reacted_with';
+		}
+	}
+
+	if (users.length > 10) {
+		if (mine) {
+			return 'You_users_and_more_Reacted_with';
+		}
+		return 'Users_and_more_reacted_with';
+	}
+
+	if (mine) {
+		return 'You_and_users_Reacted_with';
+	}
+	return 'Users_reacted_with';
+};
+
+const ReactionTooltip = ({ emojiName, usernames, mine, messageId, showRealName, username }: ReactionTooltipProps) => {
+	const t = useTranslation();
+
+	const key = getTranslationKey(usernames, mine);
+
+	const getMessage = useGetMessageByID();
+
+	const { data: users } = useQuery(
+		['chat.getMessage', 'reactions', messageId, usernames],
+		async () => {
+			// This happens if the only reaction is from the current user
+			if (!usernames.length) {
+				return [];
+			}
+
+			if (!showRealName) {
+				return usernames;
+			}
+
+			const data = await getMessage(messageId);
+
+			const { reactions } = data;
+
+			if (!reactions) {
+				return [];
+			}
+
+			if (username) {
+				const index = reactions[emojiName].usernames.indexOf(username);
+				index >= 0 && reactions[emojiName].names?.splice(index, 1);
+				return (reactions[emojiName].names || usernames).filter(Boolean);
+			}
+
+			return reactions[emojiName].names || usernames;
+		},
+		{ staleTime: 1000 * 60 * 5 },
+	);
+
+	return (
+		<MarkdownText
+			content={t(key, {
+				counter: usernames.length > 10 ? usernames.length - 10 : usernames.length,
+				users: users?.slice(0, 10).join(', ') || '',
+				emoji: emojiName,
+			})}
+			variant='inline'
+		/>
+	);
+};
+
+export default ReactionTooltip;

apps/meteor/client/components/message/toolbar/MessageToolbar.tsx

@@ -17,6 +17,7 @@ import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoT
 import { useChat } from '../../../views/room/contexts/ChatContext';
 import { useRoomToolbox } from '../../../views/room/contexts/RoomToolboxContext';
 import MessageActionMenu from './MessageActionMenu';
+import { useWebDAVMessageAction } from './useWebDAVMessageAction';
 
 const getMessageContext = (message: IMessage, room: IRoom, context?: MessageActionContext): MessageActionContext => {
 	if (context) {
@@ -72,6 +73,9 @@ const MessageToolbar = ({
 
 	const { messageToolbox: hiddenActions } = useLayoutHiddenActions();
 
+	// TODO: move this to another place
+	useWebDAVMessageAction();
+
 	const actionsQueryResult = useQuery(['rooms', room._id, 'messages', message._id, 'actions'] as const, async () => {
 		const props = { message, room, user, subscription, settings: mapSettings, chat };