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: Not possible to edit room without proper permission with retention policy enabled #32547

Merged
merged 6 commits into from
Jun 18, 2024

Conversation

dougfabris
Copy link
Member

@dougfabris dougfabris commented Jun 3, 2024

Proposed changes (including videos or screenshots)

Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled

Issue(s)

Steps to test or reproduce

Further comments

CORE-486

SUP-602

Copy link
Contributor

dionisio-bot bot commented Jun 3, 2024

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

Copy link

changeset-bot bot commented Jun 3, 2024

🦋 Changeset detected

Latest commit: 4c79caa

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

This PR includes changesets to release 32 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/fuselage-ui-kit 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/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf 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

@dougfabris dougfabris added this to the 6.10 milestone Jun 3, 2024
Copy link

codecov bot commented Jun 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.41%. Comparing base (4f72d62) to head (4c79caa).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32547      +/-   ##
===========================================
+ Coverage    56.39%   56.41%   +0.01%     
===========================================
  Files         2479     2479              
  Lines        54580    54581       +1     
  Branches     11268    11268              
===========================================
+ Hits         30780    30790      +10     
+ Misses       21125    21115      -10     
- Partials      2675     2676       +1     
Flag Coverage Δ
e2e 56.09% <100.00%> (+0.01%) ⬆️
unit 72.00% <ø> (+0.01%) ⬆️

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

@dougfabris dougfabris marked this pull request as ready for review June 6, 2024 23:19
@dougfabris dougfabris requested a review from a team as a code owner June 6, 2024 23:19
@dougfabris dougfabris changed the title fix: Not possible to edit room without edit-room-retention-policy permission fix: Not possible to edit room without proper permission with retention policy enabled Jun 6, 2024
MarcosSpessatto
MarcosSpessatto previously approved these changes Jun 7, 2024
@scuciatto scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label Jun 18, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 18, 2024
@kodiakhq kodiakhq bot merged commit 94b12ed into develop Jun 18, 2024
44 of 46 checks passed
@kodiakhq kodiakhq bot deleted the fix/edit-room-retention branch June 18, 2024 11:44
gabriellsh added a commit that referenced this pull request Jun 18, 2024
…retention

* 'develop' of github.com:RocketChat/Rocket.Chat:
  fix: Not possible to edit room without proper permission with retention policy enabled (#32547)
  feat: Apps-Engine Deno Runtime update (#31821)
  feat: E2EE room setup header (#32446)
  fix: E2EE thread main message reactivity (#32381)
  chore: Add telemetry to CI so we can get a better understanding of resource usage (#32113)
  fix: Long katex strings breaking overflow in x axis (#32609)
  fix: Force highlighted code language registration (#32507)
  fix: sidebar last message E2EE (#32431)
  chore: remove message column on moderation console (#32432)
  fix: Accepted Media Types settings validation (#32478)
@dougfabris
Copy link
Member Author

/backport 6.9.2

Copy link
Contributor

dionisio-bot bot commented Jun 18, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.9.2-32547
git cherry-pick 94b12edfc6a561a4db0c318c65c6f40786b1fbf8
// solve the conflict
git push

after that just run /backport 6.9.2 again

dougfabris added a commit that referenced this pull request Jun 18, 2024
@dougfabris
Copy link
Member Author

/backport 6.9.2

Copy link
Contributor

dionisio-bot bot commented Jun 18, 2024

Pull request #32622 added to Project: "Patch 6.9.2"

This was referenced Jun 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants