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

ui: Show the correct 'ACLs Disabled' page when ACLs are disabled #10604

Merged
merged 3 commits into from
Jul 14, 2021

Conversation

johncowen
Copy link
Contributor

@johncowen johncowen commented Jul 13, 2021

With ACLs disabled:

Before:

image

After:

Screenshot 2021-07-13 at 13 33 54

Fixes #10591

Extra note here. Out testing mostly runs everything with ACLs enabled, so we had to do a little bit of gymnastics to disable ACLs just for this test, which is also related to work going on elsewhere, got me thinking we might want to shuffle this around a little at some point. Not an urgent thing in the slightest, it's been fine for a number of years and has held up pretty well, but seeing as its a good few years old now and we have a better picture it could be an area we might want to tweak at some point.

  • Needs a changelog

John Cowen added 2 commits July 13, 2021 11:39
1. When ACLs are disabled I can access the 'please enable ACLs' page
2. When ACLs are enabled, its the same as canRead
@johncowen johncowen added theme/ui Anything related to the UI backport/1.10 labels Jul 13, 2021
@johncowen johncowen requested review from lkysow and kaxcode July 13, 2021 12:40
@johncowen johncowen modified the milestones: 1.10.0, 1.10.1 Jul 13, 2021
@vercel vercel bot temporarily deployed to Preview – consul July 14, 2021 11:47 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 14, 2021 11:47 Inactive
Copy link
Contributor

@kaxcode kaxcode left a comment

Choose a reason for hiding this comment

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

LGTM

@johncowen johncowen merged commit 54f0cd8 into main Jul 14, 2021
@johncowen johncowen deleted the ui/bugfix/acls-disabled-page branch July 14, 2021 17:52
@hc-github-team-consul-core
Copy link
Contributor

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/409080.

@hc-github-team-consul-core
Copy link
Contributor

🍒✅ Cherry pick of commit 54f0cd8 onto release/1.10.x succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request Jul 14, 2021
)

Adds 'can access ACLs' which means one of two things

1. When ACLs are disabled I can access the 'please enable ACLs' page
2. When ACLs are enabled, its the same as canRead
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/ui Anything related to the UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change copy on Tokens page when ACLs disabled
3 participants