fix: `onlyMyDepartments` not applying to agents #36747

KevLehman · 2025-08-19T14:08:22Z

This pull request improves the consistency and correctness of the onlyMyDepartments flag behavior in Livechat endpoints, especially for users with monitor and agent roles. The changes ensure that department filtering logic accurately reflects the user's assignments, and updates supporting methods and tests accordingly.

Department filtering logic improvements

The onlyMyDepartments flag now works consistently: for monitors, it includes departments where the user is serving as an agent; for agents, it filters departments the user is serving in. Managers and admins retain full visibility. (.changeset/selfish-dancers-study.md)
The query restriction logic in addQueryRestrictionsToDepartmentsModel is updated to use $and and $or operators, ensuring departments are filtered by both direct membership and ancestor relationships. (apps/meteor/ee/app/livechat-enterprise/server/hooks/applyDepartmentRestrictions.ts)

Role handling adjustments

The method getUnitsFromUser now checks both livechat-monitor and livechat-agent roles, ensuring agents are properly included in department filtering. (apps/meteor/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.ts)
The callback for applying department restrictions no longer checks for the livechat-monitor role before applying restrictions, simplifying the logic and ensuring the correct query is returned for all users. (apps/meteor/ee/app/livechat-enterprise/server/hooks/applyDepartmentRestrictions.ts)

Test updates

A test case that previously checked monitor behavior when assigned as an agent in a department is now skipped, reflecting the updated logic for department filtering. (apps/meteor/tests/end-to-end/api/livechat/22-monitors.ts)

Proposed changes (including videos or screenshots)

Issue(s)

https://rocketchat.atlassian.net/browse/CTZ-308

Steps to test or reproduce

Further comments

dionisio-bot · 2025-08-19T14:08:27Z

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

changeset-bot · 2025-08-19T14:08:27Z

🦋 Changeset detected

Latest commit: 68887fa

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 39 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/http-router	Patch
@rocket.chat/livechat	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/ui-avatar	Patch
@rocket.chat/ui-client	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/web-ui-registration	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/models	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/mock-providers	Patch
@rocket.chat/ui-video-conf	Patch
@rocket.chat/ui-voip	Patch
@rocket.chat/instance-status	Patch
@rocket.chat/omni-core	Patch
@rocket.chat/omni-core-ee	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

codecov · 2025-08-19T14:16:17Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 65.53%. Comparing base (ef0b5b0) to head (68887fa).
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #36747      +/-   ##
===========================================
+ Coverage    64.96%   65.53%   +0.56%     
===========================================
  Files         3010     3182     +172     
  Lines       105354   107988    +2634     
  Branches     19844    20420     +576     
===========================================
+ Hits         68443    70768    +2325     
- Misses       34515    34627     +112     
- Partials      2396     2593     +197

Flag	Coverage Δ
e2e	`55.65% <ø> (+2.79%)`	⬆️
unit	`71.39% <ø> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

rebuild yarn.lock clone and build homeserver repo indentatioin change setup-node order remove existing homeserver path test /tmp diff job :/ must link use bundle branch fix storybook too fix lint error fix old federation tests fix more similar issues ci: remove deploy-preview for PRs (#36725) test: cleanup page-objects (#36665) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> regression: Prevent `load more` in emoji picker route to home page (#36720) fix: unhandled rejection from stale runtime (#36670) fix: prevent unexpected token errors from newer syntax in apps (#36625) chore: Move E2E Encryption startup (#36722) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> fix: `VideoConfPopup` not receiving focus properly (#36738) i18n: Incomplete Room Name Validation Message (#35318) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> fix: encryption toggle disabled/reset when toggling Private or Broadcast under E2E defaults (#36714) fix: moment js not loading some locales (#36651) fix: Custom notification sounds on incoming messages (#36703) Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> fix: `onlyMyDepartments` not applying to agents (#36747) fix: enhance inquiry locking mechanism with timeout and error handling (#36749) fix: media playback failing due to expired urls (#36622) test: add saml login tests for user without name and user with channels (#36383) more fixes remove homeserver link again more lint issues another coupe cache homeserver stuff another lint probelem yeah i ran lint locally finally. fix the other dockerfiles

rebuild yarn.lock clone and build homeserver repo indentatioin change setup-node order remove existing homeserver path test /tmp diff job :/ must link use bundle branch fix storybook too fix lint error fix old federation tests fix more similar issues ci: remove deploy-preview for PRs (#36725) test: cleanup page-objects (#36665) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> regression: Prevent in emoji picker route to home page (#36720) fix: unhandled rejection from stale runtime (#36670) fix: prevent unexpected token errors from newer syntax in apps (#36625) chore: Move E2E Encryption startup (#36722) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> fix: not receiving focus properly (#36738) i18n: Incomplete Room Name Validation Message (#35318) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> fix: encryption toggle disabled/reset when toggling Private or Broadcast under E2E defaults (#36714) fix: moment js not loading some locales (#36651) fix: Custom notification sounds on incoming messages (#36703) Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> fix: not applying to agents (#36747) fix: enhance inquiry locking mechanism with timeout and error handling (#36749) fix: media playback failing due to expired urls (#36622) test: add saml login tests for user without name and user with channels (#36383) more fixes remove homeserver link again more lint issues another coupe cache homeserver stuff another lint probelem yeah i ran lint locally finally. fix the other dockerfiles

fix

9027468

KevLehman added 4 commits August 19, 2025 09:08

fix for deps to not overlimit

35eb0fd

test:

fb01b45

fas

af18f1c

Create selfish-dancers-study.md

6e63ac7

KevLehman marked this pull request as ready for review August 19, 2025 21:09

KevLehman requested review from a team as code owners August 19, 2025 21:09

sampaiodiego approved these changes Aug 19, 2025

View reviewed changes

KevLehman added the stat: QA assured Means it has been tested and approved by a company insider label Aug 19, 2025

KevLehman added this to the 7.10.0 milestone Aug 19, 2025

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Aug 19, 2025

Merge branch 'develop' into fix/onlymydepartments

68887fa

kodiakhq bot merged commit 882672a into develop Aug 20, 2025
85 of 87 checks passed

kodiakhq bot deleted the fix/onlymydepartments branch August 20, 2025 00:49

rocketchat-github-ci mentioned this pull request Aug 20, 2025

Release 7.10.0 #36760

Merged

KevLehman mentioned this pull request Aug 26, 2025

regression: Department & Unit limits not correctly applied to agents #36801

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: `onlyMyDepartments` not applying to agents #36747

fix: `onlyMyDepartments` not applying to agents #36747

Uh oh!

KevLehman commented Aug 19, 2025 •

edited by scuciatto

Loading

Uh oh!

dionisio-bot bot commented Aug 19, 2025 •

edited

Loading

Uh oh!

changeset-bot bot commented Aug 19, 2025 •

edited

Loading

Uh oh!

codecov bot commented Aug 19, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix: onlyMyDepartments not applying to agents #36747

fix: onlyMyDepartments not applying to agents #36747

Uh oh!

Conversation

KevLehman commented Aug 19, 2025 • edited by scuciatto Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Department filtering logic improvements

Role handling adjustments

Test updates

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Uh oh!

dionisio-bot bot commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

codecov bot commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix: `onlyMyDepartments` not applying to agents #36747

fix: `onlyMyDepartments` not applying to agents #36747

KevLehman commented Aug 19, 2025 •

edited by scuciatto

Loading

dionisio-bot bot commented Aug 19, 2025 •

edited

Loading

changeset-bot bot commented Aug 19, 2025 •

edited

Loading

codecov bot commented Aug 19, 2025 •

edited

Loading