Skip to content

[End Call Options] End call for everyone only for when the user is connected #4768

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
dmceachernmsft merged 6 commits into from
Jun 21, 2024
Merged

[End Call Options] End call for everyone only for when the user is connected #4768

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3770a8
only show menu button for Connected state
dmceachernmsft Jun 20, 2024
3d16491
Change files
dmceachernmsft Jun 20, 2024
2fc7a52
Merge branch 'main' into dmceachernmsft/end-call-ev-lobby
dmceachernmsft Jun 20, 2024
8fd7f89
fix state fetch
dmceachernmsft Jun 21, 2024
121f940
Merge branch 'dmceachernmsft/end-call-ev-lobby' of https://github.com…
dmceachernmsft Jun 21, 2024
4efc2f6
Merge branch 'main' into dmceachernmsft/end-call-ev-lobby
dmceachernmsft Jun 21, 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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-f3a9c5ac-cd6e-40c1-a577-4dba2b34b5ae.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "End call options",
"comment": "Only allow the user to end the call for everyone if they are acitvely in the call",
"packageName": "@azure/communication-react",
"email": "dmceachern@microsoft.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-f3a9c5ac-cd6e-40c1-a577-4dba2b34b5ae.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "End call options",
"comment": "Only allow the user to end the call for everyone if they are acitvely in the call",
"packageName": "@azure/communication-react",
"email": "dmceachern@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 6 additions & 1 deletion packages/react-composites/src/composites/common/ControlBar/CommonCallControlBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ export const CommonCallControlBar = (props: CommonCallControlBarProps & Containe
/* @conditional-compile-remove(teams-meeting-conference) */
const [showTeamsMeetingConferenceModal, setShowTeamsMeetingConferenceModal] = useState(false);

const adapterState = props.callAdapter.getState();
Comment thread
dmceachernmsft marked this conversation as resolved.
Outdated

/* @conditional-compile-remove(end-call-options) */
// If the hangup capability is not present, we default to true
const isHangUpForEveryoneAllowed =
Expand Down Expand Up @@ -469,7 +471,10 @@ export const CommonCallControlBar = (props: CommonCallControlBarProps & Containe
!props.mobileView &&
isHangUpForEveryoneAllowed &&
!isTeams && // Temporary disable it for Teams call, since capability does not give the right value
props.callControls?.endCallButton?.hangUpForEveryone === 'endCallOptions'
props.callControls?.endCallButton?.hangUpForEveryone === 'endCallOptions' &&
// Only show the end call menu when the call is connected, user should not be able to end the call for everyone
// when they are not actively in the call to communicate they will.
adapterState.call?.state === 'Connected'
}
/>
</ControlBar>
Expand Down
⚡