Skip to content

Only add 'Remove participant' menu item present if role allows #2328

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

Merged
mgamis-msft merged 10 commits into from
Sep 14, 2022
Merged

Only add 'Remove participant' menu item present if role allows #2328

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e251ef0
add remove menu item for participant item if role allows
mgamis-msft Sep 12, 2022
8cf49d3
Change files
mgamis-msft Sep 12, 2022
d4877a3
update people pane context menu
mgamis-msft Sep 13, 2022
b56a8f9
update rooms call screen test for participant item menu
mgamis-msft Sep 13, 2022
4bd1229
Change files
mgamis-msft Sep 13, 2022
36d8fa4
added 'removeButtonAllowed' to dependency array
mgamis-msft Sep 13, 2022
346ab0f
update ParticipantList enzyme test
mgamis-msft Sep 13, 2022
ad20238
Merge branch 'main' into mgamis/remove-menu-item-if-role-allows
mgamis-msft Sep 13, 2022
869d7a3
fixed ParticipantList test for Presenter role
mgamis-msft Sep 13, 2022
b8079c7
Merge branch 'main' into mgamis/remove-menu-item-if-role-allows
mgamis-msft Sep 13, 2022
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
7 changes: 7 additions & 0 deletions change/@internal-react-components-adc6676f-7138-4d80-b57a-c5fac2aee223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add remove participant menu item for participant item if role allows.",
"packageName": "@internal/react-components",
"email": "miguelgamis@microsoft.com",
"dependentChangeType": "patch"
}
9 changes: 3 additions & 6 deletions packages/react-components/src/components/ParticipantList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,20 +200,17 @@ export const ParticipantList = (props: ParticipantListProps): JSX.Element => {
const createParticipantMenuItems = useCallback(
(participant: ParticipantListParticipant): IContextualMenuItem[] => {
let menuItems: IContextualMenuItem[] = [];
let disabled = !participant.isRemovable;
let participantIsRemovable = participant.isRemovable;
/* @conditional-compile-remove(rooms) */
const isRemovable = _usePermissions().removeParticipantButton;
/* @conditional-compile-remove(rooms) */
disabled = !isRemovable || disabled;
if (participant.userId !== myUserId && onRemoveParticipant) {
participantIsRemovable = _usePermissions().removeParticipantButton && participantIsRemovable;
if (participant.userId !== myUserId && onRemoveParticipant && participantIsRemovable) {
menuItems.push({
key: 'remove',
text: strings.removeButtonLabel,
onClick: () => onRemoveParticipant(participant.userId),
itemProps: {
styles: props.styles?.participantItemStyles?.participantSubMenuItemsStyles
},
disabled: disabled,
'data-ui-id': ids.participantListRemoveParticipantButton
});
}
Expand Down
⚡