Skip to content

[FIX] Adding retentionEnabledDefault check before showing warning message #20692

Merged
ggazzo merged 6 commits intoRocketChat:developfrom
yash-rajpal:fix-20685
May 12, 2021
Merged

[FIX] Adding retentionEnabledDefault check before showing warning message #20692
ggazzo merged 6 commits intoRocketChat:developfrom
yash-rajpal:fix-20685

Conversation

@yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented Feb 11, 2021

  • I have read the Contributing Guide
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Proposed changes (including videos or screenshots)

Added check for retentionEnabledDefault before showing prune warning message.

Issue(s)

fixes #20685

Steps to test or reproduce

Check issue

Further comments

Before showing message in RoomInfo, we were only checking for global retentionPolicyEnabled, we were not checking for the channel or dm or group policy. So added check for that.

image
So when these 3 are off, warning should not be shown in respective types of channels.

image

@yash-rajpal
Copy link
Member Author

image

Also fixed sentence a bit, as described in issue, "days" word was missing after number of days

@yash-rajpal
Copy link
Member Author

@ggazzo @dougfabris this pr is ready for review. :)

@yash-rajpal
Copy link
Member Author

@ggazzo @dougfabris Please have a look. Thanks :)

@tassoevan tassoevan requested a review from a team May 10, 2021 22:18
@tassoevan tassoevan added this to the 3.15.0 milestone May 10, 2021
@ggazzo ggazzo merged commit df3e405 into RocketChat:develop May 12, 2021
@sampaiodiego sampaiodiego mentioned this pull request May 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Broken retention policy warning shown in all rooms

4 participants

Comments