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

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

@@ -87,14 +87,12 @@ Meteor.methods<ServerMethods>({
 		}
 
 		if (soundData.name !== soundData.previousName) {
-			await CustomSounds.setName(soundData._id, soundData.name);
-			void api.broadcast('notify.updateCustomSound', {
-				soundData: {
-					_id: soundData._id,
-					name: soundData.name,
-					extension: soundData.extension,
-				},
-			});
+			const updatedSound = await CustomSounds.setName(soundData._id, soundData.name);
+			if (updatedSound) {
+				void api.broadcast('notify.updateCustomSound', {
+					soundData: updatedSound,
+				});
+			}
 		}
 
 		return soundData._id;

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

@@ -1,6 +1,7 @@
 import { api } from '@rocket.chat/core-services';
 import type { RequiredField } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
+import { CustomSounds } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import type { ICustomSoundData } from './insertOrUpdateSound';
@@ -28,8 +29,13 @@ Meteor.methods<ServerMethods>({
 
 		return new Promise((resolve) => {
 			const ws = RocketChatFileCustomSoundsInstance.createWriteStream(`${soundData._id}.${soundData.extension}`, contentType);
-			ws.on('end', () => {
-				setTimeout(() => api.broadcast('notify.updateCustomSound', { soundData }), 500);
+			ws.on('end', async () => {
+				setTimeout(async () => {
+					const sound = await CustomSounds.findOneById(soundData._id);
+					if (sound) {
+						void api.broadcast('notify.updateCustomSound', { soundData: sound });
+					}
+				}, 500);
 				resolve();
 			});
 

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/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

@@ -11,7 +11,7 @@ Meteor.startup(() => {
 	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/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(),
 	},
 ];
 

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

@@ -24,55 +24,63 @@ 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(),
 	},
 	{
 		description: 'Leader',
 		name: 'leader',
 		protected: false,
 		scope: 'Subscriptions',
 		_id: 'leader',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'Moderator',
 		name: 'moderator',
 		protected: false,
 		scope: 'Subscriptions',
 		_id: 'moderator',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'User',
 		name: 'user',
 		protected: true,
 		scope: 'Users',
 		_id: 'user',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'Guest',
 		name: 'guest',
 		protected: true,
 		scope: 'Users',
 		_id: 'guest',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'Bot',
 		name: 'bot',
 		protected: true,
 		scope: 'Users',
 		_id: 'bot',
+		_updatedAt: new Date(),
 	},
 	{
 		description: 'App',
 		name: 'app',
 		protected: true,
 		scope: 'Users',
 		_id: 'app',
+		_updatedAt: new Date(),
 	},
 ];
 

apps/meteor/client/views/admin/users/AdminUserForm.tsx

@@ -50,7 +50,7 @@ type AdminUserFormProps = {
 	onReload: () => void;
 	context: string;
 	refetchUserFormData?: () => void;
-	roleData: { roles: IRole[] } | undefined;
+	roleData: { roles: Serialized<IRole>[] } | undefined;
 	roleError: Error | null;
 };
 

apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx

@@ -1,4 +1,4 @@
-import type { IRole, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { ReactElement } from 'react';
@@ -12,7 +12,7 @@ type AdminUserFormWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
 	context: string;
-	roleData: { roles: IRole[] } | undefined;
+	roleData: { roles: Serialized<IRole>[] } | undefined;
 	roleError: Error | null;
 };
 

apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx

@@ -24,7 +24,7 @@ import { useShowVoipExtension } from '../useShowVoipExtension';
 
 type UsersTableProps = {
 	tab: AdminUsersTab;
-	roleData: { roles: IRole[] } | undefined;
+	roleData: { roles: Serialized<IRole>[] } | undefined;
 	users: Serialized<DefaultUserInfo>[];
 	total: number;
 	isLoading: boolean;

apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx

@@ -1,4 +1,4 @@
-import type { IRole } from '@rocket.chat/core-typings';
+import type { IRole, Serialized } from '@rocket.chat/core-typings';
 import { Box, Icon, Margins, TextInput } from '@rocket.chat/fuselage';
 import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import type { OptionProp } from '@rocket.chat/ui-client';
@@ -11,7 +11,7 @@ import type { UsersFilters } from '../AdminUsersPage';
 
 type UsersTableFiltersProps = {
 	setUsersFilters: Dispatch<SetStateAction<UsersFilters>>;
-	roleData: { roles: IRole[] } | undefined;
+	roleData: { roles: Serialized<IRole>[] } | undefined;
 };
 
 const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps) => {

apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.stories.tsx

@@ -25,7 +25,6 @@ Default.args = {
 				connected: true,
 			},
 			instanceRecord: {
-				_updatedAt: new Date(),
 				_createdAt: new Date(),
 				_id: 'instance-id',
 				name: 'instance-name',

apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx

@@ -70,15 +70,6 @@ const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => {
 							>
 								{formatDateAndTime(instanceRecord?._createdAt)}
 							</DescriptionListEntry>
-							<DescriptionListEntry
-								label={
-									<>
-										{t('Instance_Record')} &gt; {t('Updated_at')}
-									</>
-								}
-							>
-								{formatDateAndTime(instanceRecord?._updatedAt)}
-							</DescriptionListEntry>
 						</DescriptionList>
 					</AccordionItem>
 				))}

apps/meteor/client/views/omnichannel/tags/TagEdit.tsx

@@ -24,7 +24,7 @@ type TagEditPayload = {
 };
 
 type TagEditProps = {
-	tagData?: ILivechatTag;
+	tagData?: Serialized<ILivechatTag>;
 	currentDepartments?: Serialized<ILivechatDepartment>[];
 	onClose: () => void;
 };

apps/meteor/client/views/omnichannel/tags/TagEditWithDepartmentData.tsx

@@ -1,13 +1,14 @@
-import type { ILivechatTag } from '@rocket.chat/core-typings';
+import type { ILivechatTag, Serialized } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client';
-import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import TagEdit from './TagEdit';
 
-const TagEditWithDepartmentData = ({ tagData, onClose }: { tagData: ILivechatTag; onClose: () => void }) => {
-	const t = useTranslation();
+const TagEditWithDepartmentData = ({ tagData, onClose }: { tagData: Serialized<ILivechatTag>; onClose: () => void }) => {
+	const { t } = useTranslation();
 
 	const getDepartmentsById = useEndpoint('GET', '/v1/livechat/department.listByIds');
 	const { data, isPending, isError } = useQuery({

apps/meteor/ee/server/lib/roles/insertRole.ts

@@ -9,7 +9,7 @@ type InsertRoleOptions = {
 	broadcastUpdate?: boolean;
 };
 
-export const insertRoleAsync = async (roleData: Omit<IRole, '_id'>, options: InsertRoleOptions = {}): Promise<IRole> => {
+export const insertRoleAsync = async (roleData: Omit<IRole, '_id' | '_updatedAt'>, options: InsertRoleOptions = {}): Promise<IRole> => {
 	const { name, scope, description, mandatory2fa } = roleData;
 
 	if (await Roles.findOneByName(name)) {

apps/meteor/ee/server/lib/roles/updateRole.ts

@@ -9,7 +9,11 @@ type UpdateRoleOptions = {
 	broadcastUpdate?: boolean;
 };
 
-export const updateRole = async (roleId: IRole['_id'], roleData: Omit<IRole, '_id'>, options: UpdateRoleOptions = {}): Promise<IRole> => {
+export const updateRole = async (
+	roleId: IRole['_id'],
+	roleData: Omit<IRole, '_id' | '_updatedAt'>,
+	options: UpdateRoleOptions = {},
+): Promise<IRole> => {
 	const role = await Roles.findOneById(roleId);
 
 	if (!role) {

apps/meteor/ee/server/models/raw/LivechatTag.ts

@@ -35,6 +35,7 @@ export class LivechatTagRaw extends BaseRaw<ILivechatTag> implements ILivechatTa
 			description,
 			numDepartments: departments.length,
 			departments,
+			_updatedAt: new Date(), // TODO: this will be reassigned by the model
 		};
 
 		if (_id) {

apps/meteor/tests/data/livechat/department.ts

@@ -197,7 +197,7 @@ export const archiveDepartment = async (departmentId: string): Promise<void> =>
 		.expect(200);
 };
 
-export const disableDepartment = async (department: ILivechatDepartment): Promise<void> => {
+export const disableDepartment = async (department: Omit<ILivechatDepartment, '_updatedAt'>): Promise<void> => {
 	department.enabled = false;
 	delete department._updatedAt;
 	const updatedDepartment = await updateDepartment(department._id, department);

apps/meteor/tests/mocks/data.ts

@@ -440,6 +440,7 @@ export function createFakeTag(overrides?: Partial<Serialized<ILivechatTag>>): Se
 		description: 'description',
 		numDepartments: 0,
 		departments: [],
+		_updatedAt: new Date().toISOString(),
 		...overrides,
 	};
 }

packages/core-services/src/events/Events.ts

@@ -3,7 +3,6 @@ import type { ISetting as AppsSetting } from '@rocket.chat/apps-engine/definitio
 import type {
 	IEmailInbox,
 	IEmoji,
-	IInquiry,
 	IInstanceStatus,
 	IIntegration,
 	IIntegrationHistory,
@@ -72,7 +71,7 @@ export type EventSignatures = {
 	'license.sync'(): void;
 	'license.actions'(actions: Record<Partial<LicenseLimitKind>, boolean>): void;
 
-	'livechat-inquiry-queue-observer'(data: { action: string; inquiry: IInquiry }): void;
+	'livechat-inquiry-queue-observer'(data: { action: string; inquiry: ILivechatInquiryRecord }): void;
 	'message'(data: { action: string; message: IMessage }): void;
 	'meteor.clientVersionUpdated'(data: AutoUpdateRecord): void;
 	'notify.desktop'(uid: string, data: INotificationDesktop): void;

packages/core-typings/src/ICredentialToken.ts

@@ -1,6 +1,6 @@
-export interface ICredentialToken {
-	_id: string;
+import type { IRocketChatRecord } from './IRocketChatRecord';
 
+export interface ICredentialToken extends IRocketChatRecord {
 	userInfo: {
 		username?: string;
 		attributes?: any;

packages/core-typings/src/ICronHistoryItem.ts

@@ -1,5 +1,6 @@
-export interface ICronHistoryItem {
-	_id: string;
+import type { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface ICronHistoryItem extends IRocketChatRecord {
 	name: string;
 	intendedAt: Date;
 	startedAt: Date;

packages/core-typings/src/ICustomSound.ts

@@ -1,8 +1,8 @@
-export interface ICustomSound {
-	_id: string;
+import type { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface ICustomSound extends IRocketChatRecord {
 	name: string;
 	extension: string;
 	src?: string;
 	random?: unknown;
-	_updatedAt?: Date;
 }

packages/core-typings/src/ICustomUserStatus.ts

@@ -1,5 +1,4 @@
+import type { IRocketChatRecord } from './IRocketChatRecord';
 import type { IUserStatus } from './IUserStatus';
 
-export interface ICustomUserStatus extends IUserStatus {
-	_updatedAt?: Date;
-}
+export interface ICustomUserStatus extends IUserStatus, IRocketChatRecord {}

packages/core-typings/src/IEmailMessageHistory.ts

@@ -1,5 +1,6 @@
-export interface IEmailMessageHistory {
-	_id: string;
+import type { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IEmailMessageHistory extends IRocketChatRecord {
 	email: string;
 	createdAt?: Date;
 }