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

feat: Remove a User #3706

Merged
merged 34 commits into from
Oct 2, 2024
Merged
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 Sep 17, 2024
470f3ea
init wiring up
RODO94 Sep 18, 2024
5850037
refactor: merge modal design into one dialog comp
RODO94 Sep 19, 2024
489e74a
add showEditButton bool to remove button and fix styling
RODO94 Sep 19, 2024
63b362c
fix: unused variables
RODO94 Sep 19, 2024
dd0f118
feat: optimistic update and type change for email:null
RODO94 Sep 19, 2024
c17aa24
init test work
RODO94 Sep 19, 2024
8e6235d
refactor: move from 'remove' / 'delete' to 'archive'
RODO94 Sep 19, 2024
13937e8
testing work for basic modal function working
RODO94 Sep 19, 2024
40f0fda
move to remove naming and run success testing
RODO94 Sep 19, 2024
e927c9e
finish success and axe testing
RODO94 Sep 20, 2024
5f111fa
update planx-core refs
RODO94 Sep 20, 2024
9e35fc4
fix: alter TeamMembers tests for new mock member
RODO94 Sep 20, 2024
242acd8
fix: alter TeamMembers tests for new mock member
RODO94 Sep 20, 2024
3c412f8
ui-fix: change colSpan to 5
RODO94 Sep 20, 2024
e483c88
feat: refine naming of variables
RODO94 Sep 20, 2024
7675e91
feat: add logic to only show remove on team editor table
RODO94 Sep 20, 2024
3a3653e
remove console log
RODO94 Sep 20, 2024
fe83df1
refactor: content refinement
RODO94 Sep 20, 2024
30214e2
fix: unusued vars and testid changes:
RODO94 Sep 20, 2024
2d3ab7a
alter permission conditions to focus on content
RODO94 Sep 30, 2024
92b0118
introduce showRemoveButton bool
RODO94 Sep 30, 2024
a5bc1d6
refactor: move onClick to fns define for each action
RODO94 Sep 30, 2024
6cc2beb
refactor: switch test-id using index to member.id
RODO94 Sep 30, 2024
3347877
change settingsModal into styled comp
RODO94 Sep 30, 2024
0843ae0
remove settingsModal
RODO94 Sep 30, 2024
df879ef
refactor: move styled dialog to styles file
RODO94 Sep 30, 2024
df8dc58
refactor: update types to keep type safety in adding members
RODO94 Sep 30, 2024
8e270d5
refactor: updateEditor test refactor for new testid
RODO94 Sep 30, 2024
2809806
refactor: trycatch in store and new lock file
RODO94 Oct 1, 2024
5f5f4bb
add fetchPolicy to get users for team query
RODO94 Oct 1, 2024
5883395
refactor: yaml file resetting
RODO94 Oct 1, 2024
92950bc
refactor: use BoxProps in SettingsSection comp
RODO94 Oct 1, 2024
1f0744b
alter ServiceSection to include background boolean
RODO94 Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
alter permission conditions to focus on content
  • Loading branch information
RODO94 committed Sep 30, 2024
commit 2d3ab7aa79ad1fbf9253807d0a8b86007ef4409c
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ export const MembersTable = ({
/>
</TableCell>
<TableCell>{member.email}</TableCell>
<Permission.IsPlatformAdmin>
<TableCell>
<TableCell>
<Permission.IsPlatformAdmin>
{showEditMemberButton && (
<EditUserButton
onClick={() => {
Expand All @@ -160,10 +160,10 @@ export const MembersTable = ({
Edit
</EditUserButton>
)}
</TableCell>
</Permission.IsPlatformAdmin>
<Permission.IsPlatformAdmin>
<TableCell>
</Permission.IsPlatformAdmin>
</TableCell>
<TableCell>
<Permission.IsPlatformAdmin>
Copy link
Contributor Author

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

{showEditMemberButton &&
member.role !== "platformAdmin" && (
<RemoveUserButton
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Only show remove button for team members, not Platform Admins

Expand All @@ -177,8 +177,8 @@ export const MembersTable = ({
Remove
</RemoveUserButton>
)}
</TableCell>
</Permission.IsPlatformAdmin>
</Permission.IsPlatformAdmin>
</TableCell>
</StyledTableRow>
))}
{showAddMemberButton && (
Expand Down
Loading