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

Swag at permissions changes #2135

Merged
merged 41 commits into from
Mar 22, 2024

Conversation

mkimberlin
Copy link
Member

@mkimberlin mkimberlin commented Mar 20, 2024

Talked to Syd last night and ended up taking a swag at this while my family was gone and I was bored. 🤣 It ended up coming together pretty quickly. @S78901 had most of it there already, and it was really just a matter of writing a couple of map calls to get it going.

Just in case @S78901 wanted to preserve any of that code, I have left the original page in place and copied it over to PermissionsPage. However, if I didn't forget anything, it could be removed.

ZacharyKlein
ZacharyKlein previously approved these changes Mar 20, 2024
Copy link
Collaborator

@ZacharyKlein ZacharyKlein left a comment

Choose a reason for hiding this comment

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

LGTM

@ZacharyKlein
Copy link
Collaborator

@mkimberlin Did you intend to merge this into feature-2064/admin-ui-page?

@mkimberlin
Copy link
Member Author

@mkimberlin Did you intend to merge this into feature-2064/admin-ui-page?

@ZacharyKlein I did. The permissions weren't loaded into global state, just local state in the EditPermissionsPage. So, in order to provide the selector method that I promised @S78901, I had to come off of their branch.

@mkimberlin mkimberlin changed the base branch from feature-2064/admin-ui-page to develop March 21, 2024 12:00
@mkimberlin mkimberlin dismissed ZacharyKlein’s stale review March 21, 2024 12:00

The base branch was changed.

@mkimberlin mkimberlin linked an issue Mar 21, 2024 that may be closed by this pull request
3 tasks
web-ui/src/components/menu/Menu.jsx Outdated Show resolved Hide resolved
web-ui/src/context/actions.js Outdated Show resolved Hide resolved
web-ui/src/pages/PermissionsPage.jsx Outdated Show resolved Hide resolved
web-ui/src/helpers/checks.js Outdated Show resolved Hide resolved
web-ui/src/api/roles.js Outdated Show resolved Hide resolved
web-ui/src/api/rolepermissions.js Outdated Show resolved Hide resolved
@mkimberlin mkimberlin requested a review from pieperm March 21, 2024 22:10
Copy link
Contributor

@S78901 S78901 left a comment

Choose a reason for hiding this comment

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

Great work Michael! Thanks for adding the finishing touch with the new Java changes

@mkimberlin mkimberlin merged commit f24d263 into develop Mar 22, 2024
1 check passed
@mkimberlin mkimberlin deleted the feature-2134/add-categories-to-permissions branch March 22, 2024 20:07
@mkimberlin mkimberlin linked an issue Apr 1, 2024 that may be closed by this pull request
3 tasks
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.

Enhance Permission Service Response with Category Admin UI Page - Permissions Control
4 participants