fix: "Discussions" filter is prioritized in admin "Rooms" page

apps/meteor/app/api/server/lib/rooms.ts

@@ -13,7 +13,7 @@ export async function findAdminRooms({
 }: {
 	uid: string;
 	filter: string;
-	types: string[];
+	types: string[] | undefined;
 	pagination: { offset: number; count: number; sort: Record<string, 1 | -1> };
 }): Promise<{
 	rooms: IRoom[];
@@ -27,7 +27,6 @@ export async function findAdminRooms({
 	const name = filter?.trim();
 	const discussion = types?.includes('discussions');
 	const includeTeams = types?.includes('teams');
-	const showOnlyTeams = types.length === 1 && types.includes('teams');
 	const typesToRemove = ['discussions', 'teams'];
 	const showTypes = Array.isArray(types) ? types.filter((type) => !typesToRemove.includes(type)) : [];
 	const options = {
@@ -36,14 +35,7 @@ export async function findAdminRooms({
 		limit: count,
 	};
 
-	let result;
-	if (name && showTypes.length) {
-		result = Rooms.findByNameOrFnameContainingAndTypes(name, showTypes, discussion, includeTeams, showOnlyTeams, options);
-	} else if (showTypes.length) {
-		result = Rooms.findByTypes(showTypes, discussion, includeTeams, showOnlyTeams, options);
-	} else {
-		result = Rooms.findByNameOrFnameContaining(name, discussion, includeTeams, showOnlyTeams, options);
-	}
+	const result = Rooms.findByNameOrFnameContainingAndTypes(name, showTypes, discussion, includeTeams, options);
 
 	const { cursor, totalCount } = result;
 

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

@@ -387,7 +387,7 @@ API.v1.addRoute(
 				await findAdminRooms({
 					uid: this.userId,
 					filter: filter || '',
-					types: types || [],
+					types: types && !Array.isArray(types) ? [types] : undefined,
 					pagination: {
 						offset,
 						count,

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

@@ -127,85 +127,47 @@ export class RoomsRaw extends BaseRaw {
 		return statistic;
 	}
 
-	findByNameOrFnameContainingAndTypes(name, types, discussion = false, teams = false, showOnlyTeams = false, options = {}) {
+	findByNameOrFnameContainingAndTypes(name, types, discussion = false, teams = false, options = {}) {
 		const nameRegex = new RegExp(escapeRegExp(name).trim(), 'i');
 
-		const onlyTeamsQuery = showOnlyTeams ? { teamMain: { $exists: true } } : {};
-
-		const teamCondition = teams
-			? {}
-			: {
-					teamMain: {
-						$exists: false,
-					},
-			  };
-
 		const query = {
-			t: {
-				$in: types,
-			},
-			prid: { $exists: discussion },
-			$or: [
-				{ name: nameRegex, federated: { $ne: true } },
-				{ fname: nameRegex },
-				{
-					t: 'd',
-					usernames: nameRegex,
-				},
-			],
-			...teamCondition,
-			...onlyTeamsQuery,
-		};
-		return this.findPaginated(query, options);
-	}
-
-	findByTypes(types, discussion = false, teams = false, onlyTeams = false, options = {}) {
-		const teamCondition = teams
-			? {}
-			: {
-					teamMain: {
-						$exists: false,
-					},
-			  };
-
-		const onlyTeamsCondition = onlyTeams ? { teamMain: { $exists: true } } : {};
-
-		const query = {
-			t: {
-				$in: types,
-			},
-			prid: { $exists: discussion },
-			...teamCondition,
-			...onlyTeamsCondition,
-		};
-		return this.findPaginated(query, options);
-	}
-
-	findByNameOrFnameContaining(name, discussion = false, teams = false, onlyTeams = false, options = {}) {
-		const nameRegex = new RegExp(escapeRegExp(name).trim(), 'i');
-
-		const teamCondition = teams
-			? {}
-			: {
-					teamMain: {
-						$exists: false,
-					},
-			  };
-
-		const onlyTeamsCondition = onlyTeams ? { $and: [{ teamMain: { $exists: true } }, { teamMain: true }] } : {};
-
-		const query = {
-			prid: { $exists: discussion },
-			$or: [
-				{ name: nameRegex, federated: { $ne: true } },
-				{ fname: nameRegex },
-				{
-					t: 'd',
-					usernames: nameRegex,
-				},
+			$and: [
+				name
+					? {
+							$or: [
+								{ name: nameRegex, federated: { $ne: true } },
+								{ fname: nameRegex },
+								{
+									t: 'd',
+									usernames: nameRegex,
+								},
+							],
+					  }
+					: {},
+				types && types.length
+					? {
+							$or: [
+								{
+									t: {
+										$in: types,
+									},
+								},
+								...(discussion ? [{ prid: { $exists: true } }] : []),
+								...(teams
+									? [
+											{
+												teamMain: {
+													$exists: true,
+												},
+											},
+									  ]
+									: []),
+							],
+					  }
+					: {},
 			],
-			...teamCondition,
-			...onlyTeamsCondition,
+			...(!discussion ? { prid: { $exists: false } } : {}),
+			...(!teams ? { teamMain: { $exists: false } } : {}),
 		};
 
 		return this.findPaginated(query, options);

apps/meteor/tests/end-to-end/api/09-rooms.js

@@ -1303,10 +1303,23 @@ describe('[Rooms]', function () {
 		const suffix = `test-${Date.now()}`;
 		const fnameRoom = `Ελληνικά-${suffix}`;
 		const nameRoom = `Ellinika-${suffix}`;
+		const discussionRoomName = `${nameRoom}-discussion`;
+
+		let testGroup;
 
 		before((done) => {
 			updateSetting('UI_Allow_room_names_with_special_chars', true).then(() => {
-				createRoom({ type: 'p', name: fnameRoom }).end(done);
+				createRoom({ type: 'p', name: fnameRoom }).end((err, res) => {
+					testGroup = res.body.group;
+					request
+						.post(api('rooms.createDiscussion'))
+						.set(credentials)
+						.send({
+							prid: testGroup._id,
+							t_name: discussionRoomName,
+						})
+						.end(done);
+				});
 			});
 		});
 
@@ -1397,6 +1410,73 @@ describe('[Rooms]', function () {
 					.end(done);
 			});
 		});
+		it('should filter by only rooms types', (done) => {
+			request
+				.get(api('rooms.adminRooms'))
+				.set(credentials)
+				.query({
+					types: ['p'],
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('rooms').and.to.be.an('array');
+					expect(res.body.rooms).to.have.lengthOf.at.least(1);
+					expect(res.body.rooms[0].t).to.be.equal('p');
+					expect(res.body.rooms.find((room) => room.name === nameRoom)).to.exist;
+					expect(res.body.rooms.find((room) => room.name === discussionRoomName)).to.not.exist;
+				})
+				.end(done);
+		});
+		it('should filter by only name', (done) => {
+			request
+				.get(api('rooms.adminRooms'))
+				.set(credentials)
+				.query({
+					filter: nameRoom,
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('rooms').and.to.be.an('array');
+					expect(res.body.rooms).to.have.lengthOf(1);
+					expect(res.body.rooms[0].name).to.be.equal(nameRoom);
+				})
+				.end(done);
+		});
+		it('should filter by type and name at the same query', (done) => {
+			request
+				.get(api('rooms.adminRooms'))
+				.set(credentials)
+				.query({
+					filter: nameRoom,
+					types: ['p'],
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('rooms').and.to.be.an('array');
+					expect(res.body.rooms).to.have.lengthOf(1);
+					expect(res.body.rooms[0].name).to.be.equal(nameRoom);
+				})
+				.end(done);
+		});
+		it('should return an empty array when filter by wrong type and correct room name', (done) => {
+			request
+				.get(api('rooms.adminRooms'))
+				.set(credentials)
+				.query({
+					filter: nameRoom,
+					types: ['c'],
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('rooms').and.to.be.an('array');
+					expect(res.body.rooms).to.have.lengthOf(0);
+				})
+				.end(done);
+		});
 	});
 
 	describe('update group dms name', () => {

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

@@ -12,18 +12,7 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 
 	getMostRecentAverageChatDurationTime(numberMostRecentChats: any, department: any): Promise<any>;
 
-	findByNameOrFnameContainingAndTypes(
-		name: any,
-		types: any,
-		discussion?: boolean,
-		teams?: boolean,
-		showOnlyTeams?: boolean,
-		options?: any,
-	): any;
-
-	findByTypes(types: any, discussion?: boolean, teams?: boolean, onlyTeams?: boolean, options?: any): any;
-
-	findByNameOrFnameContaining(name: any, discussion?: boolean, teams?: boolean, onlyTeams?: boolean, options?: any): any;
+	findByNameOrFnameContainingAndTypes(name: any, types: any, discussion?: boolean, teams?: boolean, options?: any): any;
 
 	findByTeamId(teamId: any, options?: any): any;