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

Display username while removing the user from the group #11438

Closed
wants to merge 29 commits into from
Closed

Display username while removing the user from the group #11438

Changes from 24 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8457b94
Advance search - Added case sensitive flag for CONTAINS
kanavnarula Aug 30, 2024
fe84c68
Merge branch 'master' into master
kanavnarula Aug 30, 2024
7d91099
Merge branch 'master' into master
kanavnarula Sep 10, 2024
c600aa5
Spotless fix
Sep 14, 2024
34a8348
Merge branch 'master' into master
kanavnarula Sep 14, 2024
8181eb8
Merge branch 'master' into master
kanavnarula Sep 17, 2024
59674e8
Merge branch 'master' into master
david-leifker Sep 17, 2024
86caccc
test cases
Sep 17, 2024
253b54b
Merge branch 'master' into master
kanavnarula Sep 17, 2024
21e47b2
Merge branch 'master' into master
kanavnarula Sep 17, 2024
78678a5
Merge branch 'master' into master
kanavnarula Sep 17, 2024
77a0372
Merge branch 'master' into master
kanavnarula Sep 18, 2024
5cf0d60
Merge branch 'master' into master
kanavnarula Sep 18, 2024
4256026
Merge branch 'datahub-project:master' into master
kanavnarula Sep 20, 2024
dfd0b70
Show user name while removing user from the group
kanavnarula Sep 20, 2024
042d241
Fix linting issue
kanavnarula Sep 20, 2024
b2107d8
Fix prettier issue
Sep 20, 2024
8edeb3b
remove double quotes
Sep 20, 2024
15e23e1
Merge branch 'master' into master
kanavnarula Sep 20, 2024
e58e02e
Merge branch 'master' into master
kanavnarula Sep 20, 2024
7bc95ce
Display username instead of urn
kanavnarula Sep 21, 2024
5ef48ee
display name in place of urn
Sep 21, 2024
332015f
Merge branch 'master' into master
kanavnarula Sep 24, 2024
35847e7
Merge branch 'master' into master
kanavnarula Oct 22, 2024
392b35e
Use displayName method to pull corp user name
kanavnarula Oct 23, 2024
f77adf9
Merge branch 'master' into master
kanavnarula Oct 23, 2024
9619e81
Merge branch 'datahub-project:master' into master
kanavnarula Oct 24, 2024
b9af57e
Add parent container hierarchy label to the container
kanavnarula Oct 24, 2024
f2f1290
Add parent container hierarchy label to the container
kanavnarula Oct 24, 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
13 changes: 7 additions & 6 deletions datahub-web-react/src/app/entity/group/GroupMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,13 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
}, 3000);
};

const onRemoveMember = (memberUrn: string) => {
const onRemoveMember = (memberEntity: CorpUser) => {
const memberName = memberEntity?.properties?.displayName || undefined;
Copy link
Collaborator

Choose a reason for hiding this comment

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

please use entityRegistry.getDisplayName(EntityType.CorpUser, memberEntity)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jjoyce0510 - Logic updated to pull display name using above command. Thanks!

Modal.confirm({
title: `Confirm Group Member Removal`,
content: `Are you sure you want to remove this user from the group?`,
content: `Are you sure you want to remove ${memberName} user from the group?`,
onOk() {
removeGroupMember(memberUrn);
removeGroupMember(memberEntity?.urn);
},
onCancel() {},
okText: 'Yes',
Expand All @@ -155,7 +156,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
const total = relationships?.total || 0;
const groupMembers = relationships?.relationships?.map((rel) => rel.entity as CorpUser) || [];

const getItems = (urnID: string): MenuProps['items'] => {
const getItems = (userEntity: CorpUser): MenuProps['items'] => {
return [
{
key: 'make',
Expand All @@ -169,7 +170,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
{
key: 'remove',
disabled: isExternalGroup,
onClick: () => onRemoveMember(urnID),
onClick: () => onRemoveMember(userEntity),
label: (
<span>
<UserDeleteOutlined /> Remove from Group
Expand Down Expand Up @@ -210,7 +211,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
</MemberColumn>
<MemberColumn xl={1} lg={1} md={1} sm={1} xs={1}>
<MemberEditIcon>
<Dropdown menu={{ items: getItems(item.urn) }}>
<Dropdown menu={{ items: getItems(item) }}>
<MoreOutlined />
</Dropdown>
</MemberEditIcon>
Expand Down
Loading