fix: missing edited indicator for thread parent message (#40063)

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

Author: abhinavkrin

.changeset/dry-squids-wonder.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the missing edited indicator for the main parent message in the thread panel to ensure visual consistency with the main channel view.

apps/meteor/client/lib/utils/mapMessageFromApi.spec.ts

@@ -0,0 +1,46 @@
+import { mapMessageFromApi } from './mapMessageFromApi';
+
+it('should convert all date fields to Date objects', () => {
+	const now = new Date();
+	const iso = now.toISOString();
+	const input = {
+		_id: 'id',
+		ts: iso,
+		_updatedAt: iso,
+		pinnedAt: iso,
+		tlm: iso,
+		webRtcCallEndTs: iso,
+		editedAt: iso,
+		dlm: iso,
+		msg: 'hi',
+		u: { _id: 'u', username: 'user' },
+		rid: 'r',
+		attachments: [{ ts: iso, title: 'attach' }],
+	};
+	const result = mapMessageFromApi(input);
+	expect(result.ts).toBeInstanceOf(Date);
+	expect(result._updatedAt).toBeInstanceOf(Date);
+	expect(result.pinnedAt).toBeInstanceOf(Date);
+	expect(result.tlm).toBeInstanceOf(Date);
+	expect(result.webRtcCallEndTs).toBeInstanceOf(Date);
+	expect(result.editedAt).toBeInstanceOf(Date);
+	expect(result.dlm).toBeInstanceOf(Date);
+	expect(result.attachments?.[0].ts).toBeInstanceOf(Date);
+});
+
+it('should not set missing optional dates', () => {
+	const input = {
+		_id: 'id',
+		ts: new Date().toISOString(),
+		_updatedAt: new Date().toISOString(),
+		msg: 'hi',
+		u: { _id: 'u', username: 'user' },
+		rid: 'r',
+	};
+	const result = mapMessageFromApi(input);
+	expect(result.pinnedAt).toBeUndefined();
+	expect(result.tlm).toBeUndefined();
+	expect(result.webRtcCallEndTs).toBeUndefined();
+	expect(result.editedAt).toBeUndefined();
+	expect(result.dlm).toBeUndefined();
+});

apps/meteor/client/lib/utils/mapMessageFromApi.ts

@@ -1,24 +1,31 @@
-import type { IMessage, Serialized } from '@rocket.chat/core-typings';
+import type { IDiscussionMessage, IEditedMessage, IMessage, Serialized } from '@rocket.chat/core-typings';
 
-export const mapMessageFromApi = ({
+type MappableMessage = IMessage & Partial<Pick<IEditedMessage, 'editedAt' | 'editedBy'>> & Partial<Pick<IDiscussionMessage, 'dlm'>>;
+
+export const mapMessageFromApi = <T extends MappableMessage = IMessage>({
 	attachments,
 	tlm,
 	ts,
 	_updatedAt,
 	pinnedAt,
 	webRtcCallEndTs,
+	editedAt,
+	dlm,
 	...message
-}: Serialized<IMessage>): IMessage => ({
-	...message,
-	ts: new Date(ts),
-	...(tlm && { tlm: new Date(tlm) }),
-	_updatedAt: new Date(_updatedAt),
-	...(pinnedAt && { pinnedAt: new Date(pinnedAt) }),
-	...(webRtcCallEndTs && { webRtcCallEndTs: new Date(webRtcCallEndTs) }),
-	...(attachments && {
-		attachments: attachments.map(({ ts, ...attachment }) => ({
-			...(ts && { ts: new Date(ts) }),
-			...(attachment as any),
-		})),
-	}),
-});
+}: Serialized<T>): T =>
+	({
+		...message,
+		ts: new Date(ts),
+		...(tlm && { tlm: new Date(tlm) }),
+		_updatedAt: new Date(_updatedAt),
+		...(pinnedAt && { pinnedAt: new Date(pinnedAt) }),
+		...(webRtcCallEndTs && { webRtcCallEndTs: new Date(webRtcCallEndTs) }),
+		...(attachments && {
+			attachments: attachments.map(({ ts, ...attachment }) => ({
+				...(ts && { ts: new Date(ts) }),
+				...attachment,
+			})),
+		}),
+		...(editedAt && { editedAt: new Date(editedAt) }),
+		...(dlm && { dlm: new Date(dlm) }),
+	}) as unknown as T;