refactor(core-typings): Record types missing a required _updatedAt field

apps/meteor/app/api/server/v1/roles.ts

@@ -38,10 +38,24 @@ const rolesRoutes = API.v1
 		{
 			authRequired: true,
 			response: {
-				200: ajv.compile<{ roles: IRole[] }>({
+				200: ajv.compile<{ roles: Omit<IRole, '_updatedAt'>[] }>({
 					type: 'object',
 					properties: {
-						roles: { type: 'array', items: { $ref: '#/components/schemas/IRole' } },
+						roles: {
+							type: 'array',
+							items: {
+								type: 'object',
+								properties: {
+									_id: { type: 'string' },
+									description: { type: 'string' },
+									mandatory2fa: { type: 'boolean' },
+									name: { type: 'string' },
+									protected: { type: 'boolean' },
+									scope: { type: 'string', enum: ['Users', 'Subscriptions'] },
+								},
+								required: ['_id', 'description', 'name', 'protected', 'scope'],
+							},
+						},
 						success: { type: 'boolean', enum: [true] },
 					},
 					required: ['roles', 'success'],
@@ -187,9 +201,9 @@ const rolesRoutes = API.v1
 			}
 
 			const { cursor, totalCount } = await getUsersInRolePaginated(roleData._id, roomId, {
-				limit: count as number,
+				limit: count,
 				sort: { username: 1 },
-				skip: offset as number,
+				skip: offset,
 				projection,
 			});
 

apps/meteor/app/custom-sounds/server/lib/insertOrUpdateSound.ts

@@ -51,13 +51,10 @@ export const insertOrUpdateSound = async (soundData: ICustomSoundData): Promise<
 
 	if (soundData.name !== soundData.previousName || soundData.extension !== soundData.previousExtension) {
 		await CustomSounds.updateById(soundData._id, { name: soundData.name, extension: soundData.extension });
-		void api.broadcast('notify.updateCustomSound', {
-			soundData: {
-				_id: soundData._id,
-				name: soundData.name,
-				extension: soundData.extension,
-			},
-		});
+		const updatedSound = await CustomSounds.findOneById(soundData._id);
+		if (updatedSound) {
+			void api.broadcast('notify.updateCustomSound', { soundData: updatedSound });
+		}
 	}
 
 	return soundData._id;

apps/meteor/app/custom-sounds/server/lib/uploadCustomSound.ts

@@ -1,5 +1,6 @@
 import { api } from '@rocket.chat/core-services';
 import type { RequiredField } from '@rocket.chat/core-typings';
+import { CustomSounds } from '@rocket.chat/models';
 
 import { RocketChatFile } from '../../../file/server';
 import type { ICustomSoundData } from '../methods/insertOrUpdateSound';
@@ -29,7 +30,12 @@ export const uploadCustomSound = async (
 		});
 
 		ws.on('end', () => {
-			setTimeout(() => api.broadcast('notify.updateCustomSound', { soundData }), 500);
+			setTimeout(async () => {
+				const sound = await CustomSounds.findOneById(soundData._id);
+				if (sound) {
+					void api.broadcast('notify.updateCustomSound', { soundData: sound });
+				}
+			}, 500);
 			resolve();
 		});
 

apps/meteor/app/file-upload/server/lib/FileUpload.ts

@@ -284,7 +284,7 @@ export const FileUpload = {
 		);
 	},
 
-	async resizeImagePreview(fileParam: IUpload) {
+	async resizeImagePreview(fileParam: Pick<IUpload, '_id'>) {
 		let file = await Uploads.findOneById(fileParam._id);
 		if (!file) {
 			return;
@@ -302,7 +302,7 @@ export const FileUpload = {
 		return sharp(await FileUpload.getBuffer(file)).metadata();
 	},
 
-	async createImageThumbnail(fileParam: IUpload) {
+	async createImageThumbnail(fileParam: Pick<IUpload, '_id' | 'identify'>) {
 		if (!settings.get('Message_Attachments_Thumbnails_Enabled')) {
 			return;
 		}
@@ -836,7 +836,7 @@ export class FileUploadClass {
 	}
 
 	private async _validateFile(
-		fileData: OptionalId<IUpload>,
+		fileData: Omit<OptionalId<IUpload>, '_updatedAt'>,
 		content: stream.Readable | Buffer | string,
 	): Promise<stream.Readable | Buffer | string> {
 		const filter = this.store.getFilter();
@@ -863,7 +863,7 @@ export class FileUploadClass {
 	}
 
 	async _doInsert(
-		fileData: OptionalId<IUpload>,
+		fileData: Omit<OptionalId<IUpload>, '_updatedAt'>,
 		content: stream.Readable | Buffer | string,
 		options?: { session?: ClientSession },
 	): Promise<IUpload> {
@@ -888,7 +888,7 @@ export class FileUploadClass {
 	}
 
 	async insert(
-		fileData: OptionalId<IUpload>,
+		fileData: Omit<OptionalId<IUpload>, '_updatedAt'>,
 		streamOrBuffer: stream.Readable | Buffer | string,
 		options?: { session?: ClientSession },
 	): Promise<IUpload> {

apps/meteor/app/file-upload/ufs/AmazonS3/server.ts

@@ -13,7 +13,6 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import type { IUpload } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import { check } from 'meteor/check';
-import type { OptionalId } from 'mongodb';
 import _ from 'underscore';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
@@ -27,11 +26,11 @@ export type S3Options = StoreOptions & {
 		ACL: string;
 	};
 	URLExpiryTimeSpan: number;
-	getPath: (file: OptionalId<IUpload>) => string;
+	getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 };
 
 class AmazonS3Store extends UploadFS.Store {
-	protected getPath: (file: IUpload) => string;
+	protected getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 
 	constructor(options: S3Options) {
 		// Default options
@@ -105,7 +104,7 @@ class AmazonS3Store extends UploadFS.Store {
 			}
 
 			file.AmazonS3 = {
-				path: classOptions.getPath(file),
+				path: classOptions.getPath(file as Omit<IUpload, '_updatedAt'>),
 			};
 
 			file.store = this.options.name; // assign store to file

apps/meteor/app/file-upload/ufs/GoogleStorage/server.ts

@@ -3,7 +3,6 @@ import { Storage } from '@google-cloud/storage';
 import type { IUpload } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import { check } from 'meteor/check';
-import type { OptionalId } from 'mongodb';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { UploadFS } from '../../../../server/ufs';
@@ -19,11 +18,11 @@ type GStoreOptions = StoreOptions & {
 	};
 	bucket: string;
 	URLExpiryTimeSpan: number;
-	getPath: (file: OptionalId<IUpload>) => string;
+	getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 };
 
 class GoogleStorageStore extends UploadFS.Store {
-	protected getPath: (file: IUpload) => string;
+	protected getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 
 	constructor(options: GStoreOptions) {
 		super(options);
@@ -80,7 +79,7 @@ class GoogleStorageStore extends UploadFS.Store {
 			}
 
 			file.GoogleStorage = {
-				path: options.getPath(file),
+				path: options.getPath(file as Omit<IUpload, '_updatedAt'>),
 			};
 
 			file.store = this.options.name; // assign store to file

apps/meteor/app/file-upload/ufs/Webdav/server.ts

@@ -3,7 +3,6 @@ import stream from 'stream';
 import type { IUpload } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import { check } from 'meteor/check';
-import type { OptionalId } from 'mongodb';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { UploadFS } from '../../../../server/ufs';
@@ -19,11 +18,11 @@ type WebdavOptions = StoreOptions & {
 		};
 	};
 	uploadFolderPath: string;
-	getPath: (file: OptionalId<IUpload>) => string;
+	getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 };
 
 class WebdavStore extends UploadFS.Store {
-	protected getPath: (file: IUpload) => string;
+	protected getPath: (file: Omit<IUpload, '_updatedAt'>) => string;
 
 	constructor(options: WebdavOptions) {
 		super(options);
@@ -72,7 +71,7 @@ class WebdavStore extends UploadFS.Store {
 			}
 
 			file.Webdav = {
-				path: options.getPath(file),
+				path: options.getPath(file as Omit<IUpload, '_updatedAt'>),
 			};
 
 			file.store = this.options.name;

apps/meteor/app/importer/server/classes/converters/RecordConverter.ts

@@ -158,6 +158,7 @@ export class RecordConverter<R extends IImportRecord, T extends RecordConverterO
 			data,
 			dataType: this.getDataType(),
 			options,
+			_updatedAt: new Date(),
 		});
 	}
 

apps/meteor/app/livechat/imports/server/rest/sms.ts

@@ -26,7 +26,7 @@ import { createRoom } from '../../../server/lib/rooms';
 
 const logger = new Logger('SMS');
 
-const getUploadFile = async (details: Omit<IUpload, '_id'>, fileUrl: string) => {
+const getUploadFile = async (details: Omit<IUpload, '_id' | '_updatedAt'>, fileUrl: string) => {
 	const response = await fetch(fileUrl, {
 		ignoreSsrfValidation: false,
 		allowList: settings.get<string>('SSRF_Allowlist'),

apps/meteor/app/livechat/server/business-hour/LivechatBusinessHours.ts

@@ -3,7 +3,7 @@ import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import moment from 'moment-timezone';
 import { ObjectId } from 'mongodb';
 
-export const createDefaultBusinessHourRow = (): ILivechatBusinessHour => {
+export const createDefaultBusinessHourRow = (): Omit<ILivechatBusinessHour, '_updatedAt'> => {
 	const days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
 	const closedDays = ['Saturday', 'Sunday'];
 	return {

apps/meteor/app/livechat/server/business-hour/filterBusinessHoursThatMustBeOpened.ts

@@ -2,7 +2,7 @@ import type { ILivechatBusinessHour } from '@rocket.chat/core-typings';
 import moment from 'moment';
 
 export const filterBusinessHoursThatMustBeOpened = async (
-	businessHours: ILivechatBusinessHour[],
+	businessHours: Omit<ILivechatBusinessHour, '_updatedAt'>[],
 ): Promise<Pick<ILivechatBusinessHour, '_id' | 'type'>[]> => {
 	const currentTime = moment(moment().format('dddd:HH:mm:ss'), 'dddd:HH:mm:ss');
 

apps/meteor/client/components/ImageGallery/ImageGallery.tsx

@@ -98,7 +98,15 @@ const swiperStyle = css`
 	}
 `;
 
-export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[]; onClose: () => void; loadMore?: () => void }) => {
+export const ImageGallery = ({
+	images,
+	onClose,
+	loadMore,
+}: {
+	images: Pick<IUpload, '_id' | 'path' | 'url' | 'description'>[];
+	onClose: () => void;
+	loadMore?: () => void;
+}) => {
 	const { t } = useTranslation();
 	const swiperRef = useRef<SwiperRef>(null);
 	const [, setSwiperInst] = useState<SwiperClass>();

apps/meteor/client/hooks/useWorkspaceInfo.ts

@@ -53,15 +53,15 @@ export const useWorkspaceInfo = ({ refreshStatistics }: { refreshStatistics?: bo
 				queryFn: () => getStatistics({ refresh: refreshStatistics ? 'true' : 'false' }),
 				staleTime: Infinity,
 				placeholderData: keepPreviousData,
-				select: (data: unknown) => {
-					const statsData = data as Serialized<IStats>;
+				select: (data: Serialized<IStats>): IStats => {
 					return {
-						...statsData,
-						lastMessageSentAt: statsData.lastMessageSentAt ? new Date(statsData.lastMessageSentAt) : undefined,
+						...data,
+						lastMessageSentAt: data.lastMessageSentAt ? new Date(data.lastMessageSentAt) : undefined,
+						_updatedAt: new Date(data._updatedAt),
 					};
 				},
 			},
-		],
+		] as const,
 	});
 };
 

apps/meteor/client/lib/userStatuses.ts

@@ -33,7 +33,7 @@ export class UserStatuses implements Iterable<UserStatusDescriptor> {
 		this.store.set(customUserStatus.id, customUserStatus);
 	}
 
-	public createFromCustom(customUserStatus: ICustomUserStatus): UserStatusDescriptor {
+	public createFromCustom(customUserStatus: Omit<ICustomUserStatus, '_updatedAt'>): UserStatusDescriptor {
 		if (!this.isValidType(customUserStatus.statusType)) {
 			throw new Error('Invalid user status type');
 		}

apps/meteor/client/providers/CustomSoundProvider/CustomSoundProvider.tsx

@@ -23,7 +23,7 @@ const CustomSoundProvider = ({ children }: CustomSoundProviderProps) => {
 	const { notificationsSoundVolume, voipRingerVolume } = useUserSoundPreferences();
 
 	const { data: list } = useQuery({
-		queryFn: async () => {
+		queryFn: async (): Promise<Omit<ICustomSound, '_updatedAt'>[]> => {
 			const customSoundsList = await sdk.call('listCustomSounds');
 			if (!customSoundsList.length) {
 				return defaultSounds;

apps/meteor/client/providers/CustomSoundProvider/lib/helpers.ts

@@ -25,7 +25,7 @@ export const soundTranslationKeys: Record<string, string> = {
 	'ringtone': 'Sound_Ringtone',
 };
 
-export const defaultSounds: ICustomSound[] = [
+export const defaultSounds: Omit<ICustomSound, '_updatedAt'>[] = [
 	{ _id: 'chime', name: 'Sound_Chime', extension: 'mp3', src: getAssetUrl('sounds/chime.mp3') },
 	{ _id: 'door', name: 'Sound_Door', extension: 'mp3', src: getAssetUrl('sounds/door.mp3') },
 	{ _id: 'beep', name: 'Sound_Beep', extension: 'mp3', src: getAssetUrl('sounds/beep.mp3') },

apps/meteor/client/startup/roles.ts

@@ -8,7 +8,7 @@ import { Roles } from '../stores';
 onLoggedIn(async () => {
 	const { roles } = await sdk.rest.get('/v1/roles.list');
 	// if a role is checked before this collection is populated, it will return undefined
-	Roles.state.replaceAll(roles);
+	Roles.state.replaceAll(roles.map((role) => ({ ...role, _updatedAt: new Date(role._updatedAt) })));
 });
 
 type ClientAction = 'inserted' | 'updated' | 'removed' | 'changed';

apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.spec.tsx

@@ -8,6 +8,7 @@ const mockSounds = Array.from({ length: 25 }, (_, i) => ({
 	_id: `sound-${i}`,
 	name: `Custom Sound ${i + 1}`,
 	extension: 'mp3',
+	_updatedAt: '2024-01-01T00:00:00.000Z',
 }));
 
 const getMockedAppRoot = () =>

apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.spec.tsx

@@ -42,13 +42,15 @@ const roles: IRole[] = [
 		protected: true,
 		scope: 'Users',
 		_id: 'owner',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'Administrator',
 		name: 'admin',
 		protected: true,
 		scope: 'Users',
 		_id: 'admin',
+		_updatedAt: new Date(),
 	},
 ];