Skip to content

Commit d1bf08e

Browse files
kanavnarulasleeperdeep
authored andcommitted
feat(ui): Display username while removing the user from the group (datahub-project#11706)
1 parent 195b735 commit d1bf08e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

datahub-web-react/src/app/entity/group/GroupMembers.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,13 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
137137
}, 3000);
138138
};
139139

140-
const onRemoveMember = (memberUrn: string) => {
140+
const onRemoveMember = (memberEntity: CorpUser) => {
141+
const memberName = entityRegistry.getDisplayName(EntityType.CorpUser, memberEntity);
141142
Modal.confirm({
142143
title: `Confirm Group Member Removal`,
143-
content: `Are you sure you want to remove this user from the group?`,
144+
content: `Are you sure you want to remove ${memberName} user from the group?`,
144145
onOk() {
145-
removeGroupMember(memberUrn);
146+
removeGroupMember(memberEntity?.urn);
146147
},
147148
onCancel() {},
148149
okText: 'Yes',
@@ -155,7 +156,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
155156
const total = relationships?.total || 0;
156157
const groupMembers = relationships?.relationships?.map((rel) => rel.entity as CorpUser) || [];
157158

158-
const getItems = (urnID: string): MenuProps['items'] => {
159+
const getItems = (userEntity: CorpUser): MenuProps['items'] => {
159160
return [
160161
{
161162
key: 'make',
@@ -169,7 +170,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
169170
{
170171
key: 'remove',
171172
disabled: isExternalGroup,
172-
onClick: () => onRemoveMember(urnID),
173+
onClick: () => onRemoveMember(userEntity),
173174
label: (
174175
<span>
175176
<UserDeleteOutlined /> Remove from Group
@@ -210,7 +211,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
210211
</MemberColumn>
211212
<MemberColumn xl={1} lg={1} md={1} sm={1} xs={1}>
212213
<MemberEditIcon>
213-
<Dropdown menu={{ items: getItems(item.urn) }}>
214+
<Dropdown menu={{ items: getItems(item) }}>
214215
<MoreOutlined />
215216
</Dropdown>
216217
</MemberEditIcon>

0 commit comments

Comments
 (0)