feat: Improve Engagement Dashboard's "Channels" tab performance

.changeset/proud-waves-bathe.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/model-typings": minor
+---
+
+Fixed Engagement Dashboard's "Channels" tab not loading when there are many rooms in the workspace

apps/meteor/ee/server/lib/engagementDashboard/channels.ts

@@ -43,15 +43,7 @@ export const findAllChannelsWithNumberOfMessages = async ({
 		options,
 	}).toArray();
 
-	const total =
-		(
-			await Rooms.countChannelsWithNumberOfMessagesBetweenDate({
-				start: convertDateToInt(start),
-				end: convertDateToInt(end),
-				startOfLastWeek: convertDateToInt(startOfLastWeek),
-				endOfLastWeek: convertDateToInt(endOfLastWeek),
-			}).toArray()
-		)[0]?.total ?? 0;
+	const total = await Rooms.countDocuments();
 
 	return {
 		channels,

apps/meteor/server/models/raw/Rooms.ts

@@ -494,24 +494,25 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 				diffFromLastWeek: { $subtract: ['$messages', '$lastWeekMessages'] },
 			},
 		};
-		const firstParams = [
-			lookup,
-			messagesProject,
-			messagesUnwind,
-			messagesGroup,
-			lastWeekMessagesUnwind,
-			lastWeekMessagesGroup,
-			presentationProject,
-		];
+		const firstParams = [lookup, messagesProject, messagesUnwind, messagesGroup];
+		const lastParams = [lastWeekMessagesUnwind, lastWeekMessagesGroup, presentationProject];
+
 		const sort = { $sort: options?.sort || { messages: -1 } };
-		const params: Exclude<Parameters<Collection<IRoom>['aggregate']>[0], undefined> = [...firstParams, sort];
+		const sortAndPaginationParams: Exclude<Parameters<Collection<IRoom>['aggregate']>[0], undefined> = [sort];
 
 		if (options?.offset) {
-			params.push({ $skip: options.offset });
+			sortAndPaginationParams.push({ $skip: options.offset });
 		}
 
 		if (options?.count) {
-			params.push({ $limit: options.count });
+			sortAndPaginationParams.push({ $limit: options.count });
+		}
+		const params: Exclude<Parameters<Collection<IRoom>['aggregate']>[0], undefined> = [...firstParams];
+
+		if (options?.sort) {
+			params.push(...lastParams, ...sortAndPaginationParams);
+		} else {
+			params.push(...sortAndPaginationParams, ...lastParams, sort);
 		}
 
 		return params;
@@ -531,22 +532,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		});
 	}
 
-	countChannelsWithNumberOfMessagesBetweenDate(params: {
-		start: number;
-		end: number;
-		startOfLastWeek: number;
-		endOfLastWeek: number;
-		options?: any;
-	}): AggregationCursor<{ total: number }> {
-		const aggregationParams = this.getChannelsWithNumberOfMessagesBetweenDateQuery(params);
-		aggregationParams.push({ $count: 'total' });
-
-		return this.col.aggregate<{ total: number }>(aggregationParams, {
-			allowDiskUse: true,
-			readPreference: readSecondaryPreferred(),
-		});
-	}
-
 	findOneByNameOrFname(name: NonNullable<IRoom['name'] | IRoom['fname']>, options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
 		const query = {
 			$or: [

packages/model-typings/src/models/IRoomsModel.ts

@@ -94,14 +94,6 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 		options?: any;
 	}): AggregationCursor<IChannelsWithNumberOfMessagesBetweenDate>;
 
-	countChannelsWithNumberOfMessagesBetweenDate(params: {
-		start: number;
-		end: number;
-		startOfLastWeek: number;
-		endOfLastWeek: number;
-		options?: any;
-	}): AggregationCursor<{ total: number }>;
-
 	findOneByName(name: NonNullable<IRoom['name']>, options?: FindOptions<IRoom>): Promise<IRoom | null>;
 
 	findDefaultRoomsForTeam(teamId: any): FindCursor<IRoom>;