Merge branch 'develop' into fix/videoconf-display-avatars

Author: kodiakhq[bot]

.changeset/proud-mayflies-invite.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Includes attachments metadata in JSON export if type is file when exporting messages

.github/CODEOWNERS

@@ -20,7 +20,7 @@
 /apps/meteor/app/voip @RocketChat/omnichannel
 /apps/meteor/app/sms @RocketChat/omnichannel
 /apps/meteor/server @RocketChat/backend
-/apps/meteor/server/models @RocketChat/Architecture
+/packages/models @RocketChat/Architecture
 apps/meteor/server/startup/migrations @RocketChat/Architecture
 /apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
 /apps/meteor/server/services/voip-asterisk @RocketChat/omnichannel

apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx

@@ -51,6 +51,8 @@ const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMes
 	});
 
 	const handleRecord = useEffectEvent(async () => {
+		chat?.composer?.setRecordingMode(true);
+
 		if (recordingRoomId && recordingRoomId !== rid) {
 			return;
 		}
@@ -105,7 +107,7 @@ const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMes
 	}
 
 	return (
-		<Box display='flex' position='absolute' color='default' pi={4} pb={12}>
+		<Box display='flex' position='absolute' color='default' pi={4} pb={12} role='group' aria-label={t('Audio_recorder')}>
 			{state === 'recording' && (
 				<>
 					<MessageComposerAction icon='circle-cross' title={t('Cancel_recording')} onClick={handleCancelButtonClick} />

apps/meteor/client/views/room/contextualBar/ExportMessages/useDownloadExportMutation.ts

@@ -8,7 +8,29 @@ import { Messages } from '../../../../../app/models/client';
 import { downloadJsonAs } from '../../../../lib/download';
 import { useRoom } from '../../contexts/RoomContext';
 
-const messagesFields: FindOptions<IMessage> = { projection: { _id: 1, ts: 1, u: 1, msg: 1, _updatedAt: 1, tlm: 1, replies: 1, tmid: 1 } };
+const messagesFields: FindOptions<IMessage> = {
+	projection: {
+		'_id': 1,
+		'ts': 1,
+		'u': 1,
+		'msg': 1,
+		'_updatedAt': 1,
+		'tlm': 1,
+		'replies': 1,
+		'tmid': 1,
+		'attachments.ts': 1,
+		'attachments.title': 1,
+		'attachments.title_link': 1,
+		'attachments.title_link_download': 1,
+		'attachments.image_dimensions': 1,
+		'attachments.image_preview': 1,
+		'attachments.image_url': 1,
+		'attachments.image_type': 1,
+		'attachments.image_size': 1,
+		'attachments.type': 1,
+		'attachments.description': 1,
+	},
+};
 
 export const useDownloadExportMutation = () => {
 	const { t } = useTranslation();

apps/meteor/playwright.config.ts

@@ -15,7 +15,7 @@ export default {
 		launchOptions: {
 			// force GPU hardware acceleration
 			// (even in headless mode)
-			args: ['--use-gl=egl', '--use-fake-ui-for-media-stream'],
+			args: ['--use-gl=egl', '--use-fake-ui-for-media-stream', '--use-fake-device-for-media-stream'],
 		},
 		permissions: ['microphone'],
 	},

apps/meteor/tests/e2e/message-composer.spec.ts

@@ -115,4 +115,32 @@ test.describe.serial('message-composer', () => {
 			await expect(poHomeChannel.composerBoxPopup.getByText('rocket.cat')).toBeVisible();
 		});
 	});
+
+	test.describe('audio recorder', () => {
+		test('should open audio recorder', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.composerToolbar.getByRole('button', { name: 'Audio message', exact: true }).click();
+
+			await expect(poHomeChannel.audioRecorder).toBeVisible();
+		});
+
+		test('should stop recording when clicking on cancel', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.composerToolbar.getByRole('button', { name: 'Audio message', exact: true }).click();
+			await expect(poHomeChannel.audioRecorder).toBeVisible();
+
+			await poHomeChannel.audioRecorder.getByRole('button', { name: 'Cancel recording', exact: true }).click();
+			await expect(poHomeChannel.audioRecorder).not.toBeVisible();
+		});
+
+		test('should open file modal when clicking on "Finish recording"', async ({ page }) => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.composerToolbar.getByRole('button', { name: 'Audio message', exact: true }).click();
+			await expect(poHomeChannel.audioRecorder).toBeVisible();
+
+			await page.waitForTimeout(1000);
+			await poHomeChannel.audioRecorder.getByRole('button', { name: 'Finish Recording', exact: true }).click();
+			await expect(poHomeChannel.content.fileUploadModal).toBeVisible();
+		});
+	});
 });

apps/meteor/tests/e2e/page-objects/fragments/home-content.ts

@@ -112,6 +112,10 @@ export class HomeContent {
 		return this.page.locator('#modal-root .rcx-button-group--align-end .rcx-button--secondary');
 	}
 
+	get fileUploadModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'File Upload' });
+	}
+
 	get modalFilePreview(): Locator {
 		return this.page.locator(
 			'//div[@id="modal-root"]//header//following-sibling::div[1]//div//div//img | //div[@id="modal-root"]//header//following-sibling::div[1]//div//div//div//i',

apps/meteor/tests/e2e/page-objects/home-channel.ts

@@ -116,4 +116,8 @@ export class HomeChannel {
 	get btnNotPossibleDecodeKey(): Locator {
 		return this.page.getByRole('button', { name: "Wasn't possible to decode your encryption key to be imported." });
 	}
+
+	get audioRecorder(): Locator {
+		return this.page.getByRole('group', { name: 'Audio recorder', exact: true });
+	}
 }

packages/i18n/src/locales/en.i18n.json

@@ -748,6 +748,7 @@
   "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
   "Audio_Notifications_Value": "Default Message Notification Audio",
   "Audio_record": "Audio record",
+  "Audio_recorder": "Audio recorder",
   "Audios": "Audios",
   "Audit": "Audit",
   "Auditing": "Auditing",