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.

Sign up for GitHub

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

Jump to bottom

Introduce UI for Custom Roles #2512

Merged
merged 44 commits into from
May 16, 2024
Merged

Introduce UI for Custom Roles #2512

merged 44 commits into from
May 16, 2024

Conversation

mknowlton89
Copy link
Collaborator

@mknowlton89 mknowlton89 commented May 13, 2024 •
edited

Features and Changes

Dependencies

Fast Follows (Will complete as separate PRs after this is approved/merged)

  • Add character counter to name/description fields
  • Start using the getConfirmationContent on RoleList's <DeleteButton />
  • Build our deactivate/reactivate flows

Changes from the mock

  • I did increase the character count for a custom role description to be 100 characters (up from 56). Looking at our existing descriptions, the longest of those is 95, so it felt odd to limit it lower than that.

Testing

  • Ensure that free/pro orgs can't create, edit, delete, duplicate, or apply custom roles to users or teams or set the org's default role
  • Ensure that enterprise orgs can create new custom roles
  • Ensure that enterprise orgs can delete custom roles
  • Ensure that enterprise orgs can edit custom roles
  • Ensure that enterprise orgs can duplicate custom roles
  • Ensure that enterprise org can duplicate existing roles
  • Ensure that enterprise orgs can not delete standard roles
  • Ensure that only enterprise orgs can apply custom roles to their users & teams
  • Ensure an org can not create a custom role with an id equal to one of our standard roles
  • Ensure an org can not delete a custom role if there is a user or team using it
  • Ensure an org can not delete a custom role if it is the org's default role
  • Ensure that if an enterprise org downgrades to free or pro, they’re not longer able to add, edit, remove custom roles, nor are they able to add the custom role to any of their new or existing users or teams
  • Ensure that if an enterprise org downgrades to free or pro and the org's default role is a custom role, we reset their default role back to collaborator.

Warning

On the test above, the code in migrations.ts doesn't actually update the org record in mongo. It looks like that isn't called downstream of anything that actually calls updateOrganization. But I can confirm that calling getDefaultRole returns the expected result.

  • Ensure that if a user has a custom role and an org downgrades to free or pro, the user's permissions are still based on the custom role

Screenshots

jdorn and others added 27 commits May 8, 2024 10:59
@jdorn
Add policies layer in between roles and permissions
fac854a
@jdorn
Define policies, role->policies map, and policy->permissions map
5c4e782
@jdorn
Hook up new policy-based roles to existing permissions flow
b57773b
@jdorn
Add new fields to OrganizationModel
b2e6d92
@jdorn
Remove test suite (part of different PR)
818657e
@jdorn
Add isRoleValid checks throughout back-end
1788cb1
@mknowlton89
Merges in main and resolves conflict.
7450d68
@mknowlton89
Fixes broken import paths
2d4950f
@jdorn
Merge remote-tracking branch 'origin/main' into permission-policies
e430fd9
@jdorn
Fix tests, add metadata about policies
7895224
@jdorn
Move isRoleValid and areProjectRolesValid to shared
4b40c2f
@jdorn
Helper function to get default role
5f133b4
@jdorn
Move permission constants to new file, add displayName to policies
9f950ac
@jdorn
Remove old permission-constants file that's not being used
4a23b7f
@jdorn
Change getRoles logic to match design mocks
4e29865
@jdorn
Use getDefaultRole helper throughout codebase
db8b73a
@jdorn
Fix type export
f9e31a7
@jdorn
Add new permission, commercial feature, and back-end routes for manag…
974af56 
…ing custom roles
@mknowlton89
Merges in main and resolves conflicts.
160fcca
@mknowlton89
Fixes lint issues and updates policies.
9bebefb
@mknowlton89
Adds missing 'manageSDKWebhooks' permission to SDKConnectionsFullAcce…
b8d0fed 
…ss policy.
@mknowlton89
Introduce UI for Custom Roles
b641a41
@mknowlton89
Merge branch 'permission-policies' into mk/custom-roles-ui
a505a17
@mknowlton89
Adds basic logic for creating, updating, duplicating, and deleting roles
b40720c
@mknowlton89
Gets basic flow working a bit better and formats the role dropdown wh…
a99c467 
…en adding/updating a user.
@mknowlton89
Merges in main and resolves import conflict.
be07356
@mknowlton89
Removes FactFiltersFullAccess policy
8a0d605
@mknowlton89 mknowlton89 changed the base branch from main to permission-policies May 14, 2024 16:57
@mknowlton89 mknowlton89 self-assigned this May 14, 2024
@mknowlton89
Changes to improve the duplicate role flow.
603f088
@mknowlton89
Improves UI around role selector, adds wrapper to reduce copy/pasted …
2787e19 
…code, and fixes a few bugs.
@mknowlton89
Cleans up RoleList a bit
bf34a4c
@mknowlton89
Optimizations to improve readability
2d05fa2
@mknowlton89
Small UI tweaks to match the mocks more closely
4a5db5e
@mknowlton89
Hides the Create Custom Role link if the org doesn't have the feature…
eb4d9e1 
… and checks for custom role feature before building the list of roles in the role selector.
@mknowlton89
Adds logic to revert back to collaborator role if org has custom role…
eb54191 
… set as default role and downgrades away from enterprise.
@mknowlton89
Merge branch 'main' into permission-policies
d58484e
@mknowlton89
Merge branch 'permission-policies' into mk/custom-roles-ui
0afe3be
@mknowlton89
Increases role.description limit to 100 characters and ensures we're …
ba8c875 
…passing the orgs custom roles to the front end context.
@mknowlton89 mknowlton89 marked this pull request as ready for review May 15, 2024 18:27
@mknowlton89 mknowlton89 requested review from msamper and jdorn and removed request for msamper May 15, 2024 18:27
@mknowlton89 mknowlton89 mentioned this pull request May 15, 2024
Merged
3 tasks
jdorn
jdorn reviewed May 16, 2024
View reviewed changes
packages/front-end/components/Settings/Team/SingleRoleSelector.tsx Outdated
formatOptionLabel={(value) => {
const r = roles.find((r) => r.id === value.label);
if (!r) {
return;
Copy link
Member

@jdorn jdorn May 16, 2024 •
edited

Choose a reason for hiding this comment

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

Kevin fixed this in a separate PR. We want to do return value.label here (or <strong>{value.label}</strong> instead of returning undefined.

Base automatically changed from permission-policies to main May 16, 2024 13:21
@github-actions GitHub Actions
Copy link

github-actions bot commented May 16, 2024 •
edited

Your preview environment pr-2512-bttf has been deployed.

Preview environment endpoints are available at:

@mknowlton89 mknowlton89 merged commit 4574937 into main May 16, 2024
3 checks passed
@mknowlton89 mknowlton89 deleted the mk/custom-roles-ui branch May 16, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdorn jdorn jdorn approved these changes

Assignees

@mknowlton89 mknowlton89

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mknowlton89 @jdorn