Merge remote-tracking branch 'origin/develop' into feat/manage-subscr…

…iption

.changeset/eleven-gorillas-deliver.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix trying to upload same file again and again.

.changeset/gentle-radios-relate.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed DM room with "guest" user kept as "read only" after reactivating user

.changeset/heavy-ads-carry.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Change plan name from Enterprise to Premium on marketplace filtering

.changeset/popular-actors-cheat.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Do not allow auto-translation to be enabled in E2E rooms

.changeset/proud-shrimps-cheat.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Unable to send attachments via email as an omni-agent

.changeset/shiny-pillows-run.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: cloud alerts not working

apps/meteor/app/autotranslate/server/methods/saveSettings.ts

@@ -1,4 +1,4 @@
-import { Subscriptions } from '@rocket.chat/models';
+import { Subscriptions, Rooms } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -46,6 +46,13 @@ Meteor.methods<ServerMethods>({
 
 		switch (field) {
 			case 'autoTranslate':
+				const room = await Rooms.findE2ERoomById(rid, { projection: { _id: 1 } });
+				if (room && value === '1') {
+					throw new Meteor.Error('error-e2e-enabled', 'Enabling auto-translation in E2E encrypted rooms is not allowed', {
+						method: 'saveAutoTranslateSettings',
+					});
+				}
+
 				await Subscriptions.updateAutoTranslateById(subscription._id, value === '1');
 				if (!subscription.autoTranslateLanguage && options.defaultLanguage) {
 					await Subscriptions.updateAutoTranslateLanguageById(subscription._id, options.defaultLanguage);

apps/meteor/app/channel-settings/server/functions/saveRoomEncrypted.ts

@@ -1,7 +1,7 @@
 import { Message } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
 import { isRegisterUser } from '@rocket.chat/core-typings';
-import { Rooms } from '@rocket.chat/models';
+import { Rooms, Subscriptions } from '@rocket.chat/models';
 import { Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { UpdateResult } from 'mongodb';
@@ -25,5 +25,9 @@ export const saveRoomEncrypted = async function (rid: string, encrypted: boolean
 
 		await Message.saveSystemMessage(type, rid, user.username, user);
 	}
+
+	if (encrypted) {
+		await Subscriptions.disableAutoTranslateByRoomId(rid);
+	}
 	return update;
 };

apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts

@@ -73,7 +73,7 @@ export async function getWorkspaceLicense(): Promise<{ updated: boolean; license
 
 		const payload = await fetchCloudWorkspaceLicensePayload({ token });
 
-		if (Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
+		if (currentLicense.value && Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
 			return fromCurrentLicense();
 		}
 

apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts

@@ -107,7 +107,7 @@ export async function announcementSync() {
 	} catch (err) {
 		SystemLogger.error({
 			msg: 'Failed to sync with Rocket.Chat Cloud',
-			url: '/sync',
+			url: '/comms/workspace',
 			err,
 		});
 	}

apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts

@@ -1,3 +1,4 @@
+import { SystemLogger } from '../../../../../server/lib/logger/system';
 import { CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken';
 import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 import { announcementSync } from './announcementSync';
@@ -7,10 +8,11 @@ export async function syncWorkspace() {
 	try {
 		await syncCloudData();
 		await announcementSync();
-	} catch (error) {
-		if (error instanceof CloudWorkspaceAccessTokenError) {
+	} catch (err) {
+		if (err instanceof CloudWorkspaceAccessTokenError) {
 			// TODO: Remove License if there is no access token
 		}
+		SystemLogger.error({ msg: 'Error during workspace sync', err });
 	}
 
 	await getCachedSupportedVersionsToken.reset();

apps/meteor/app/version-check/server/functions/getNewUpdates.ts

@@ -50,18 +50,16 @@ export const getNewUpdates = async () => {
 						infoUrl: String,
 					}),
 				],
-				alerts: [
-					Match.Optional([
-						Match.ObjectIncluding({
-							id: String,
-							title: String,
-							text: String,
-							textArguments: [Match.Any],
-							modifiers: [String] as [StringConstructor],
-							infoUrl: String,
-						}),
-					]),
-				],
+				alerts: Match.Optional([
+					Match.ObjectIncluding({
+						id: String,
+						title: String,
+						text: String,
+						textArguments: [Match.Any],
+						modifiers: [String] as [StringConstructor],
+						infoUrl: String,
+					}),
+				]),
 			}),
 		);
 

apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts

@@ -5,13 +5,15 @@ import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
-import { useRoom } from '../../views/room/contexts/RoomContext';
+import { dispatchToastMessage } from '../../lib/toast';
+import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 import { useReactiveValue } from '../useReactiveValue';
 
 export const useE2EERoomAction = () => {
 	const enabled = useSetting('E2E_Enable', false);
 	const room = useRoom();
+	const subscription = useRoomSubscription();
 	const readyToEncrypt = useReactiveValue(useCallback(() => e2e.isReady(), [])) || room.encrypted;
 	const permittedToToggleEncryption = usePermission('toggle-room-e2e-encryption', room._id);
 	const permittedToEditRoom = usePermission('edit-room', room._id);
@@ -21,8 +23,22 @@ export const useE2EERoomAction = () => {
 
 	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
 
-	const action = useMutableCallback(() => {
-		void toggleE2E({ rid: room._id, encrypted: !room.encrypted });
+	const action = useMutableCallback(async () => {
+		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
+		if (!success) {
+			return;
+		}
+
+		dispatchToastMessage({
+			type: 'success',
+			message: room.encrypted
+				? t('E2E_Encryption_disabled_for_room', { roomName: room.name })
+				: t('E2E_Encryption_enabled_for_room', { roomName: room.name }),
+		});
+
+		if (subscription?.autoTranslate) {
+			dispatchToastMessage({ type: 'success', message: t('AutoTranslate_Disabled_for_room', { roomName: room.name }) });
+		}
 	});
 
 	const enabledOnRoom = !!room.encrypted;

apps/meteor/client/lib/chats/ChatAPI.ts

@@ -144,7 +144,7 @@ export type ChatAPI = {
 	ActionManager: any;
 
 	readonly flows: {
-		readonly uploadFiles: (files: readonly File[]) => Promise<void>;
+		readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise<void>;
 		readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise<boolean>;
 		readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise<boolean>;
 		readonly processTooLongMessage: (message: IMessage) => Promise<boolean>;

apps/meteor/client/lib/chats/flows/uploadFiles.ts

@@ -6,7 +6,7 @@ import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
 import type { ChatAPI } from '../ChatAPI';
 
-export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promise<void> => {
+export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
 
 	const msg = await prependReplies('', replies);
@@ -52,4 +52,5 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promis
 	};
 
 	uploadNextFile();
+	resetFileInput?.();
 };

apps/meteor/client/views/marketplace/hooks/useFilteredApps.ts

@@ -80,7 +80,7 @@ export const useFilteredApps = ({
 			explore: fallback,
 			installed: fallback,
 			private: fallback,
-			premium: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Enterprise')),
+			premium: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Premium')),
 			requested: (apps: App[]) => apps.filter(({ appRequestStats, installed }) => Boolean(appRequestStats) && !installed),
 		};
 

apps/meteor/client/views/room/Header/icons/Encrypted.tsx

@@ -2,20 +2,31 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { HeaderState } from '@rocket.chat/ui-client';
-import { useSetting, usePermission, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, usePermission, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
+import { dispatchToastMessage } from '../../../../lib/toast';
+
 const Encrypted = ({ room }: { room: IRoom }) => {
 	const t = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
-	const toggleE2E = useMethod('saveRoomSettings');
+	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
 	const canToggleE2E = usePermission('toggle-room-e2e-encryption');
 	const encryptedLabel = canToggleE2E ? t('Encrypted_key_title') : t('Encrypted');
-	const handleE2EClick = useMutableCallback(() => {
+	const handleE2EClick = useMutableCallback(async () => {
 		if (!canToggleE2E) {
 			return;
 		}
-		toggleE2E(room._id, 'encrypted', !room?.encrypted);
+
+		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
+		if (!success) {
+			return;
+		}
+
+		dispatchToastMessage({
+			type: 'success',
+			message: t('E2E_Encryption_disabled_for_room', { roomName: room.name }),
+		});
 	});
 	return e2eEnabled && room?.encrypted ? (
 		<HeaderState title={encryptedLabel} icon='key' onClick={handleE2EClick} color={colors.s500} tiny />

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx

@@ -18,6 +18,14 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 	const fileInputRef = useRef<HTMLInputElement>(null);
 	const chat = useChat() ?? chatContext;
 
+	const resetFileInput = () => {
+		if (!fileInputRef.current) {
+			return;
+		}
+
+		fileInputRef.current.value = '';
+	};
+
 	const handleUploadChange = async (e: ChangeEvent<HTMLInputElement>) => {
 		const { mime } = await import('../../../../../../../app/utils/lib/mimeTypes');
 		const filesToUpload = Array.from(e.target.files ?? []).map((file) => {
@@ -26,8 +34,7 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 			});
 			return file;
 		});
-
-		chat?.flows.uploadFiles(filesToUpload);
+		chat?.flows.uploadFiles(filesToUpload, resetFileInput);
 	};
 
 	const handleUpload = () => {

apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx

@@ -1,4 +1,4 @@
-import { FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage';
+import { Callout, FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
@@ -11,6 +11,7 @@ import {
 	ContextualbarIcon,
 	ContextualbarContent,
 } from '../../../../components/Contextualbar';
+import { useRoom } from '../../contexts/RoomContext';
 
 type AutoTranslateProps = {
 	language: string;
@@ -30,6 +31,7 @@ const AutoTranslate = ({
 	handleClose,
 }: AutoTranslateProps): ReactElement => {
 	const t = useTranslation();
+	const room = useRoom();
 
 	return (
 		<>
@@ -40,14 +42,24 @@ const AutoTranslate = ({
 			</ContextualbarHeader>
 			<ContextualbarContent pbs={24}>
 				<FieldGroup>
+					{room.encrypted && (
+						<Callout title={t('Automatic_translation_not_available')} type='warning'>
+							{t('Automatic_translation_not_available_info')}
+						</Callout>
+					)}
 					<Field>
 						<FieldRow>
-							<ToggleSwitch id='automatic-translation' onChange={handleSwitch} defaultChecked={translateEnable} />
+							<ToggleSwitch
+								id='automatic-translation'
+								onChange={handleSwitch}
+								defaultChecked={translateEnable}
+								disabled={room.encrypted && !translateEnable}
+							/>
 							<FieldLabel htmlFor='automatic-translation'>{t('Automatic_Translation')}</FieldLabel>
 						</FieldRow>
 					</Field>
 					<Field>
-						<FieldLabel htmlFor='language'>{t('Language')}</FieldLabel>
+						<FieldLabel htmlFor='translate-to'>{t('Translate_to')}</FieldLabel>
 						<FieldRow verticalAlign='middle'>
 							<Select
 								id='language'

apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx

@@ -2,9 +2,11 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useLanguage } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo, useEffect, useState, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
+import { dispatchToastMessage } from '../../../../lib/toast';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import AutoTranslate from './AutoTranslate';
@@ -16,10 +18,12 @@ const AutoTranslateWithData = (): ReactElement => {
 	const userLanguage = useLanguage();
 	const [currentLanguage, setCurrentLanguage] = useState(subscription?.autoTranslateLanguage ?? '');
 	const saveSettings = useEndpointAction('POST', '/v1/autotranslate.saveSettings');
+	const { t } = useTranslation();
 
 	const { value: translateData } = useEndpointData('/v1/autotranslate.getSupportedLanguages', {
 		params: useMemo(() => ({ targetLanguage: userLanguage }), [userLanguage]),
 	});
+	const languagesDict = translateData ? Object.fromEntries(translateData.languages.map((lang) => [lang.language, lang.name])) : {};
 
 	const handleChangeLanguage = useMutableCallback((value) => {
 		setCurrentLanguage(value);
@@ -29,6 +33,10 @@ const AutoTranslateWithData = (): ReactElement => {
 			field: 'autoTranslateLanguage',
 			value,
 		});
+		dispatchToastMessage({
+			type: 'success',
+			message: t('AutoTranslate_language_set_to', { language: languagesDict[value] }),
+		});
 	});
 
 	const handleSwitch = useMutableCallback((event) => {
@@ -37,6 +45,18 @@ const AutoTranslateWithData = (): ReactElement => {
 			field: 'autoTranslate',
 			value: event.target.checked,
 		});
+		dispatchToastMessage({
+			type: 'success',
+			message: event.target.checked
+				? t('AutoTranslate_Enabled_for_room', { roomName: room.name })
+				: t('AutoTranslate_Disabled_for_room', { roomName: room.name }),
+		});
+		if (event.target.checked && currentLanguage) {
+			dispatchToastMessage({
+				type: 'success',
+				message: t('AutoTranslate_language_set_to', { language: languagesDict[currentLanguage] }),
+			});
+		}
 	});
 
 	useEffect(() => {