-
Notifications
You must be signed in to change notification settings - Fork 2
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
feat: Remove a User #3706
Merged
Merged
feat: Remove a User #3706
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
5961d8e
init remove button work
RODO94 470f3ea
init wiring up
RODO94 5850037
refactor: merge modal design into one dialog comp
RODO94 489e74a
add showEditButton bool to remove button and fix styling
RODO94 63b362c
fix: unused variables
RODO94 dd0f118
feat: optimistic update and type change for email:null
RODO94 c17aa24
init test work
RODO94 8e6235d
refactor: move from 'remove' / 'delete' to 'archive'
RODO94 13937e8
testing work for basic modal function working
RODO94 40f0fda
move to remove naming and run success testing
RODO94 e927c9e
finish success and axe testing
RODO94 5f111fa
update planx-core refs
RODO94 9e35fc4
fix: alter TeamMembers tests for new mock member
RODO94 242acd8
fix: alter TeamMembers tests for new mock member
RODO94 3c412f8
ui-fix: change colSpan to 5
RODO94 e483c88
feat: refine naming of variables
RODO94 7675e91
feat: add logic to only show remove on team editor table
RODO94 3a3653e
remove console log
RODO94 fe83df1
refactor: content refinement
RODO94 30214e2
fix: unusued vars and testid changes:
RODO94 2d3ab7a
alter permission conditions to focus on content
RODO94 92b0118
introduce showRemoveButton bool
RODO94 a5bc1d6
refactor: move onClick to fns define for each action
RODO94 6cc2beb
refactor: switch test-id using index to member.id
RODO94 3347877
change settingsModal into styled comp
RODO94 0843ae0
remove settingsModal
RODO94 df879ef
refactor: move styled dialog to styles file
RODO94 df8dc58
refactor: update types to keep type safety in adding members
RODO94 8e270d5
refactor: updateEditor test refactor for new testid
RODO94 2809806
refactor: trycatch in store and new lock file
RODO94 5f5f4bb
add fetchPolicy to get users for team query
RODO94 5883395
refactor: yaml file resetting
RODO94 92950bc
refactor: use BoxProps in SettingsSection comp
RODO94 1f0744b
alter ServiceSection to include background boolean
RODO94 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
alter permission conditions to focus on content
- Loading branch information
commit 2d3ab7aa79ad1fbf9253807d0a8b86007ef4409c
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -146,8 +146,8 @@ export const MembersTable = ({ | |
/> | ||
</TableCell> | ||
<TableCell>{member.email}</TableCell> | ||
<Permission.IsPlatformAdmin> | ||
<TableCell> | ||
<TableCell> | ||
<Permission.IsPlatformAdmin> | ||
{showEditMemberButton && ( | ||
<EditUserButton | ||
onClick={() => { | ||
|
@@ -160,10 +160,10 @@ export const MembersTable = ({ | |
Edit | ||
</EditUserButton> | ||
)} | ||
</TableCell> | ||
</Permission.IsPlatformAdmin> | ||
<Permission.IsPlatformAdmin> | ||
<TableCell> | ||
</Permission.IsPlatformAdmin> | ||
</TableCell> | ||
<TableCell> | ||
<Permission.IsPlatformAdmin> | ||
{showEditMemberButton && | ||
member.role !== "platformAdmin" && ( | ||
<RemoveUserButton | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only show remove button for team members, not Platform Admins |
||
|
@@ -177,8 +177,8 @@ export const MembersTable = ({ | |
Remove | ||
</RemoveUserButton> | ||
)} | ||
</TableCell> | ||
</Permission.IsPlatformAdmin> | ||
</Permission.IsPlatformAdmin> | ||
</TableCell> | ||
</StyledTableRow> | ||
))} | ||
{showAddMemberButton && ( | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Permission level moved inside
<TableCell>
to ensure consistent UI across different permission levels