Skip to content

Commit edf0aa8

Browse files
Merge branch 'develop' into feat/openapi-ldap
2 parents a14fbe9 + 01f6714 commit edf0aa8

File tree

69 files changed

+885
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+885
-668
lines changed

.changeset/blue-books-wash.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/rest-typings": patch
4+
---
5+
6+
Fixes an issue that prevented the action of saving an agent when editing a department to work.

.changeset/empty-tables-change.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Fixes the condition for firing the `LivechatSessionTaken` webhook event.

.changeset/nasty-countries-live.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/rest-typings": patch
4+
---
5+
6+
Fixes file filtering by name or type not working for non-private channels.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/rest-typings": patch
4+
---
5+
6+
Fixes Omnichannel Rest API validation schemas that were flagging `Pagination` properties as invalid
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/meteor': patch
3+
---
4+
5+
Fixes an error message triggered whenever a room is selected on secondary navigation for teams.

.changeset/silver-rice-hug.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/i18n': minor
3+
'@rocket.chat/meteor': minor
4+
---
5+
6+
Resolves some accessibility violations in the rooms file list context bar, including issues with ARIA attributes and focus management.

.changeset/swift-waves-argue.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@rocket.chat/core-typings': minor
3+
'@rocket.chat/i18n': minor
4+
'@rocket.chat/meteor': minor
5+
---
6+
7+
Adds a new setting to select which algorithm to use when signing SAML requests and responses

.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch

Lines changed: 0 additions & 358 deletions
This file was deleted.

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Team, isMeteorError } from '@rocket.chat/core-services';
22
import type { IIntegration, IUser, IRoom, RoomType, UserStatus } from '@rocket.chat/core-typings';
33
import { Integrations, Messages, Rooms, Subscriptions, Uploads, Users } from '@rocket.chat/models';
4-
import { isGroupsOnlineProps, isGroupsMessagesProps } from '@rocket.chat/rest-typings';
4+
import { isGroupsOnlineProps, isGroupsMessagesProps, isGroupsFilesProps } from '@rocket.chat/rest-typings';
55
import { check, Match } from 'meteor/check';
66
import { Meteor } from 'meteor/meteor';
77
import type { Filter } from 'mongodb';
@@ -389,21 +389,28 @@ API.v1.addRoute(
389389

390390
API.v1.addRoute(
391391
'groups.files',
392-
{ authRequired: true },
392+
{ authRequired: true, validateParams: isGroupsFilesProps },
393393
{
394394
async get() {
395+
const { typeGroup, name, roomId, roomName } = this.queryParams;
396+
395397
const findResult = await findPrivateGroupByIdOrName({
396-
params: this.queryParams,
398+
params: roomId ? { roomId } : { roomName },
397399
userId: this.userId,
398400
checkedArchived: false,
399401
});
400402

401403
const { offset, count } = await getPaginationItems(this.queryParams);
402404
const { sort, fields, query } = await this.parseJsonQuery();
403405

404-
const ourQuery = Object.assign({}, query, { rid: findResult.rid });
406+
const filter = {
407+
...query,
408+
rid: findResult.rid,
409+
...(name ? { name: { $regex: name || '', $options: 'i' } } : {}),
410+
...(typeGroup ? { typeGroup } : {}),
411+
};
405412

406-
const { cursor, totalCount } = await Uploads.findPaginatedWithoutThumbs(ourQuery, {
413+
const { cursor, totalCount } = await Uploads.findPaginatedWithoutThumbs(filter, {
407414
sort: sort || { name: 1 },
408415
skip: offset,
409416
limit: count,

0 commit comments

Comments
 (0)