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: Disables GenericMenu without any sections or items #30319

Merged
merged 10 commits into from
Sep 19, 2023

Conversation

anjy7
Copy link
Contributor

@anjy7 anjy7 commented Sep 7, 2023

Proposed changes (including videos or screenshots)

Screenshot from 2023-09-07 01-51-22
The "Create new" button is disabled as it should be when the user doesn't have those permissions

Issue(s)

Fixes #30312
Fixes #30159

Steps to test or reproduce

1.Disable ''Create Private Channels", "Create Public Channels", "Create Team", "Start Discussion", "Start Discussion (Other-User)" and "Create Direct Messages" permissions for users
2.Log in as a normal user
3.Click on the "Create new" menu

Further comments

@anjy7 anjy7 requested a review from a team as a code owner September 7, 2023 07:49
@changeset-bot
Copy link

changeset-bot bot commented Sep 7, 2023

🦋 Changeset detected

Latest commit: f2d9fa3

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

This PR includes changesets to release 29 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings 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/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

@CLAassistant
Copy link

CLAassistant commented Sep 7, 2023

CLA assistant check
All committers have signed the CLA.

@anjy7
Copy link
Contributor Author

anjy7 commented Sep 7, 2023

Fixes #30159 as well
image

@anjy7
Copy link
Contributor Author

anjy7 commented Sep 7, 2023

@dougfabris could you please have a look at this

@anjy7
Copy link
Contributor Author

anjy7 commented Sep 10, 2023

Hey @dougfabris, I have made the requested changes. Please have a look

@dougfabris dougfabris added this to the 6.5.0 milestone Sep 18, 2023
@dougfabris dougfabris changed the title fix: disabled generic menu button when relevant user permissions are disabled fix: Disables GenericMenu without any sections or items Sep 18, 2023
@codecov
Copy link

codecov bot commented Sep 18, 2023

Codecov Report

Merging #30319 (f2d9fa3) into develop (027b011) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #30319   +/-   ##
========================================
  Coverage    50.23%   50.23%           
========================================
  Files          780      780           
  Lines        14478    14478           
  Branches      2617     2617           
========================================
  Hits          7273     7273           
  Misses        6810     6810           
  Partials       395      395           
Flag Coverage Δ
unit 60.80% <ø> (ø)

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

@dougfabris
Copy link
Member

@anjy7 Can you sign the CLA, please?

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Sep 18, 2023
@anjy7
Copy link
Contributor Author

anjy7 commented Sep 18, 2023

@anjy7 Can you sign the CLA, please?

done, thank you

@dougfabris
Copy link
Member

@anjy7 Thank you for contributing and helping us!

@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 Sep 19, 2023
@ggazzo ggazzo merged commit 696bbc4 into RocketChat:develop Sep 19, 2023
gabriellsh added a commit that referenced this pull request Sep 19, 2023
…ove/iframeLogin

* 'develop' of github.com:RocketChat/Rocket.Chat: (29 commits)
  fix: Disables `GenericMenu` without any sections or items (#30319)
  i18n: Language update from LingoHub 🤖 on 2023-09-18Z (#30426)
  chore:  remove connectToCloud option (#30430)
  chore: remove Troubleshoot options (#30429)
  chore: bump fuselage packages (#30424)
  chore: Webhooks page refactor (#30274)
  chore: color palette changes (#30385)
  fix: increase cron job check delay to 1 min (#30402)
  fix: Presence broadcast isn't enabled after license validation (#30282)
  test: create non private team and readonly team (#30371)
  Bump version to 6.5.0-develop
  refactor: Implement functional code for the 'useFilteredApps' hook (#30279)
  Release 6.4.0-rc.1
  Release 6.3.6
  regression: Login page callout messages (#30399)
  test: tests for muting and unmuting (#30286)
  regression: Fix rooms table not showing teams (#30361)
  regression: Move queue-timeout setting to CE and remove dependency on waiting queue (#30386)
  fix: engagement dashboard not working (#30277)
  Bump 6.3.6
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA skipped stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
4 participants