Merge branch 'develop' into feat/single-contact-id

RocketChat · Oct 14, 2024 · cf84c57 · cf84c57
2 parents 130e619 + 8f71f78
commit cf84c57
Show file tree

Hide file tree

Showing 53 changed files with 3,329 additions and 1,464 deletions.
diff --git a/.changeset/e2ee-composer-freeze.md b/.changeset/e2ee-composer-freeze.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes E2EE composer freezing when the room state changes
diff --git a/apps/meteor/app/apps/server/bridges/livechat.ts b/apps/meteor/app/apps/server/bridges/livechat.ts
@@ -118,6 +118,7 @@ export class AppLivechatBridge extends LivechatBridge {
 							sidebarIcon: source.sidebarIcon,
 							defaultIcon: source.defaultIcon,
 							label: source.label,
+							destination: source.destination,
 						}),
 				},
 			},

diff --git a/apps/meteor/app/apps/server/converters/visitors.js b/apps/meteor/app/apps/server/converters/visitors.js
@@ -36,6 +36,7 @@ export class AppVisitorsConverter {
 			visitorEmails: 'visitorEmails',
 			livechatData: 'livechatData',
 			status: 'status',
+			contactId: 'contactId',
 		};
 
 		return transformMappedData(visitor, map);
@@ -54,6 +55,7 @@ export class AppVisitorsConverter {
 			phone: visitor.phone,
 			livechatData: visitor.livechatData,
 			status: visitor.status || 'online',
+			contactId: visitor.contactId,
 			...(visitor.visitorEmails && { visitorEmails: visitor.visitorEmails }),
 			...(visitor.department && { department: visitor.department }),
 		};

diff --git a/apps/meteor/app/importer-csv/server/CsvImporter.ts b/apps/meteor/app/importer-csv/server/CsvImporter.ts
@@ -4,15 +4,15 @@ import { Random } from '@rocket.chat/random';
 import { parse } from 'csv-parse/lib/sync';
 
 import { Importer, ProgressStep, ImporterWebsocket } from '../../importer/server';
-import type { IConverterOptions } from '../../importer/server/classes/ImportDataConverter';
+import type { ConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
 import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 export class CsvImporter extends Importer {
 	private csvParser: (csv: string) => string[];
 
-	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: IConverterOptions = {}) {
+	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: ConverterOptions = {}) {
 		super(info, importRecord, converterOptions);
 
 		this.csvParser = parse;

diff --git a/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js b/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { Readable } from 'stream';
 
-import { Settings } from '@rocket.chat/models';
+import { ImportData, Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { Importer, ProgressStep } from '../../importer/server';
@@ -89,6 +89,13 @@ export class HipChatEnterpriseImporter extends Importer {
 		await super.addCountToTotal(count);
 	}
 
+	async findDMForImportedUsers(...users) {
+		const record = await ImportData.findDMForImportedUsers(...users);
+		if (record) {
+			return record.data;
+		}
+	}
+
 	async prepareUserMessagesFile(file) {
 		this.logger.debug(`preparing room with ${file.length} messages `);
 		let count = 0;
@@ -110,7 +117,7 @@ export class HipChatEnterpriseImporter extends Importer {
 			const users = [senderId, receiverId].sort();
 
 			if (!dmRooms[receiverId]) {
-				dmRooms[receiverId] = await this.converter.findDMForImportedUsers(senderId, receiverId);
+				dmRooms[receiverId] = await this.findDMForImportedUsers(senderId, receiverId);
 
 				if (!dmRooms[receiverId]) {
 					const room = {

diff --git a/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts b/apps/meteor/app/importer-pending-files/server/PendingFileImporter.ts
@@ -8,12 +8,12 @@ import { Random } from '@rocket.chat/random';
 
 import { FileUpload } from '../../file-upload/server';
 import { Importer, ProgressStep, Selection } from '../../importer/server';
-import type { IConverterOptions } from '../../importer/server/classes/ImportDataConverter';
+import type { ConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
 
 export class PendingFileImporter extends Importer {
-	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: IConverterOptions = {}) {
+	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: ConverterOptions = {}) {
 		super(info, importRecord, converterOptions);
 	}
 

diff --git a/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts b/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts
@@ -6,15 +6,15 @@ import { parse } from 'csv-parse/lib/sync';
 
 import { RocketChatFile } from '../../file/server';
 import { Importer, ProgressStep } from '../../importer/server';
-import type { IConverterOptions } from '../../importer/server/classes/ImportDataConverter';
+import type { ConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
 import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 export class SlackUsersImporter extends Importer {
 	private csvParser: (csv: string) => string[];
 
-	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: IConverterOptions = {}) {
+	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: ConverterOptions = {}) {
 		super(info, importRecord, converterOptions);
 
 		this.csvParser = parse;