Fix the upserting of data into cached collections (#27965)

apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts

@@ -168,8 +168,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
 				return;
 			}
 
-			const { _id, ...data } = newRecord;
-			this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
+			const { _id } = newRecord;
+			this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
 			this.emit('changed', newRecord as any); // TODO: investigate why this is needed
 
 			if (hasUpdatedAt(newRecord) && newRecord._updatedAt > this.updatedAt) {
@@ -232,8 +232,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
 			if (action === 'removed') {
 				this.collection.remove(newRecord._id);
 			} else {
-				const { _id, ...data } = newRecord;
-				this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
+				const { _id } = newRecord;
+				this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
 			}
 			this.save();
 		});
@@ -276,8 +276,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
 				const actionTime = newRecord._updatedAt;
 				changes.push({
 					action: () => {
-						const { _id, ...data } = newRecord;
-						this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
+						const { _id } = newRecord;
+						this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
 						if (actionTime > this.updatedAt) {
 							this.updatedAt = actionTime;
 						}

apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts

@@ -59,7 +59,7 @@ export async function upsertMessage(
 		);
 	}
 
-	return direct.upsert({ _id }, { $set: messageToUpsert });
+	return direct.upsert({ _id }, msg);
 }
 
 export function upsertMessageBulk(