Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: New users are not automatically inserted in auto-join rooms inside default teams #31720

Merged
merged 19 commits into from
Mar 5, 2024

Conversation

Gustrb
Copy link
Contributor

@Gustrb Gustrb commented Feb 9, 2024

Proposed changes (including videos or screenshots)

Earlier, whenever we had auto join teams, when the user joined, we would not look at the auto-join channels inside of it.
The idea is, that when we are going to create the subscriptions between the team and the user, we check whether the team has a default channel, if so, fetch those and add the user to it as well

Issue(s)

Steps to test or reproduce

  1. Convert the general room into a team
  2. Create a new channel inside the general team
  3. Set the new channel as auto-join
  4. Create a new user

Expected Behavior: The user should be added to both the team and the channel
Current behavior: The user is being added only to the team

Further comments

CORE-58

Earlier, whenever we had auto join teams, when the user joined, we would not look at the auto-join channels
inside of it
Copy link

changeset-bot bot commented Feb 9, 2024

🦋 Changeset detected

Latest commit: 91980e2

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

This PR includes changesets to release 31 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts 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/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status 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

Copy link

codecov bot commented Feb 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.57%. Comparing base (b0aace7) to head (91980e2).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #31720      +/-   ##
===========================================
- Coverage    54.61%   54.57%   -0.05%     
===========================================
  Files         2283     2283              
  Lines        50279    50279              
  Branches     10255    10255              
===========================================
- Hits         27461    27439      -22     
- Misses       20331    20351      +20     
- Partials      2487     2489       +2     
Flag Coverage Δ
e2e 53.54% <ø> (-0.02%) ⬇️
e2e-api 40.00% <ø> (-0.11%) ⬇️
unit 76.44% <ø> (ø)

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

@Gustrb Gustrb marked this pull request as ready for review February 9, 2024 20:16
Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to add tests to cover this fix? It could be API or even UI...

@Gustrb Gustrb requested a review from a team as a code owner February 12, 2024 22:35
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
@scuciatto scuciatto added this to the 6.7 milestone Feb 19, 2024
@matheusbsilva137 matheusbsilva137 changed the title fix: Considering the auto join channels inside teams fix: New users are not automatically inserted in auto-join rooms inside default teams Feb 23, 2024
apps/meteor/tests/data/rooms.helper.js Outdated Show resolved Hide resolved
apps/meteor/tests/data/rooms.helper.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/end-to-end/api/01-users.js Outdated Show resolved Hide resolved
apps/meteor/tests/data/rooms.helper.js Dismissed Show dismissed Hide dismissed
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Mar 5, 2024
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Mar 5, 2024
@kodiakhq kodiakhq bot merged commit 0f0d631 into develop Mar 5, 2024
45 checks passed
@kodiakhq kodiakhq bot deleted the fix/auto-join-channels-on-auto-join-teams branch March 5, 2024 17:09
gabriellsh added a commit that referenced this pull request Mar 6, 2024
…tMarkdown

* 'develop' of github.com:RocketChat/Rocket.Chat:
  chore: improve useJumpToMessage (#31907)
  feat: Add `link` action to composer toolbar (#31679)
  chore: replace `PaletteStyleTag` in favor of fuselage component (#31839)
  fix: presence for mobiles with duplicated connections (#31895)
  fix: New users are not automatically inserted in auto-join rooms inside default teams (#31720)
  fix: livechat agent status set to available after reactivation (#31651)
  chore: Deprecate `insertOrUpdateUser` method (#31884)
  chore: update ts version on recently merged package (#31885)
  chore: move utilitary functions out of ee folder (#31207)
  chore: Remove references to EE code from the app bridges (#31757)
  fix: Room import doesn't honor the specified owner (#31803)
  fix: message parser emphasis black hole (#31868)
  chore: remove hardcoded position for message date (#31866)
  feat: show date on message's scroll (#31572)
  chore: `RoomHeader` keyboard navigability (#31837)
  fix: Login page breaking when handling not expected errors (#31804)
ricardogarim pushed a commit that referenced this pull request Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
squad: core stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants