chore: adjust Rooms store usage in UserProvider and create convertSort

Author: juliajforesti

apps/meteor/client/lib/cachedCollections/pipe.ts

@@ -68,11 +68,44 @@ export function pipe<D>(
 	};
 }
 
-export const applyQueryOptions = <T extends { _id: string }>(records: T[], options: FindOptions<T>): T[] => {
+type OriginalStructure = FindOptions['sort'];
+
+type SortField = 'lm' | 'lowerCaseFName' | 'lowerCaseName';
+type SortDirection = -1 | 1;
+
+type SortObject = {
+	field: SortField;
+	direction: SortDirection;
+}[];
+
+/**
+ * Converts a MongoDB-style sort structure to a sort object.
+ */
+export const convertSort = (original: OriginalStructure): SortObject => {
+	const convertedSort: SortObject = [];
+
+	if (!original) {
+		return convertedSort;
+	}
+	Object.keys(original as Record<string, any>).forEach((key) => {
+		const direction = original[key as keyof OriginalStructure];
+
+		if (direction === -1 || direction === 1) {
+			convertedSort.push({
+				field: key as SortField,
+				direction,
+			});
+		}
+	});
+	return convertedSort;
+};
+
+export const applyQueryOptions = <T extends Record<string, any>>(records: T[], options: FindOptions): T[] => {
 	let currentPipeline = pipe(records);
-	if (options.sort && options.sort.length > 0) {
-		for (let i = options.sort.length - 1; i >= 0; i--) {
-			const { field, direction } = options.sort[i];
+	if (options.sort) {
+		const sortObj = convertSort(options.sort);
+		for (let i = sortObj.sort.length - 1; i >= 0; i--) {
+			const { field, direction } = sortObj[i];
 			currentPipeline = currentPipeline.sortByField(field, direction);
 		}
 	}

apps/meteor/client/providers/UserProvider/UserProvider.tsx

@@ -1,6 +1,7 @@
 import type { IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import { UserContext, useEndpoint, useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
@@ -20,6 +21,7 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { afterLogoutCleanUpCallback } from '../../../lib/callbacks/afterLogoutCleanUpCallback';
 import { useIdleConnection } from '../../hooks/useIdleConnection';
 import { useReactiveValue } from '../../hooks/useReactiveValue';
+import { applyQueryOptions } from '../../lib/cachedCollections/pipe';
 import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory';
 import { useSamlInviteToken } from '../../views/invite/hooks/useSamlInviteToken';
 
@@ -74,13 +76,28 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 			querySubscription: createReactiveSubscriptionFactory<ISubscription | undefined>((query, fields, sort) =>
 				Subscriptions.findOne(query, { fields, sort }),
 			),
-			queryRoom: createReactiveSubscriptionFactory<IRoom | undefined>((query, fields) => Rooms.findOne(query, { fields })),
+			queryRoom: createReactiveSubscriptionFactory<IRoom | undefined>((query) => {
+				const predicate = createPredicateFromFilter(query);
+				return Rooms.state.find(predicate);
+			}),
 			querySubscriptions: createReactiveSubscriptionFactory<SubscriptionWithRoom[]>((query, options) => {
 				if (userId) {
-					return Subscriptions.find(query, options).fetch();
+					const predicate = createPredicateFromFilter(query);
+					const subs = Subscriptions.state.filter(predicate);
+
+					if (options?.sort || options?.limit || options?.skip) {
+						return applyQueryOptions(subs, options);
+					}
+					return subs;
 				}
+				// Anonnymous users don't have subscriptions. Fetch Rooms instead.
+				const predicate = createPredicateFromFilter(query);
+				const rooms = Rooms.state.filter(predicate) as unknown as SubscriptionWithRoom[]; // FIXME: this is a hack to make the typings work. How was it working before?
 
-				return Rooms.find(query, options).fetch();
+				if (options?.sort || options?.limit) {
+					return applyQueryOptions(rooms, options);
+				}
+				return rooms;
 			}),
 			logout: async () => Meteor.logout(),
 			onLogout: (cb) => {

packages/ui-contexts/src/UserContext.ts

@@ -24,6 +24,8 @@ export type Sort<TSchema extends Document = Document> = Exclude<MongoFindOptions
 export type FindOptions<TSchema extends Document = Document> = {
 	fields?: Fields<TSchema>;
 	sort?: Sort<TSchema>;
+	skip?: number;
+	limit?: number;
 };
 
 export type UserContextValue = {