BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: breakout join

Browse Source
This commit is contained in:
João Victor 2024-01-30 13:51:57 -03:00
parent 69a174b15f
commit 9e8b30bc31
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx
View File

@ -36,6 +36,7 @@ const BreakoutContainer = (props) => {
const [breakoutRoomTransfer] = useMutation(USER_TRANSFER_VOICE_TO_MEETING);
const [breakoutRoomRequestJoinURL] = useMutation(BREAKOUT_ROOM_REQUEST_JOIN_URL);
const [cameraBroadcastStop] = useMutation(CAMERA_BROADCAST_STOP);
const toggleVoice = useToggleVoice();
const sendUserUnshareWebcam = (cameraId) => {
cameraBroadcastStop({ variables: { cameraId } });
@ -67,38 +68,6 @@ const BreakoutContainer = (props) => {
breakoutRoomRequestJoinURL({ variables: { breakoutRoomId } });
};
return <BreakoutComponent
amIPresenter={amIPresenter}
endAllBreakouts={endAllBreakouts}
setBreakoutsTime={setBreakoutsTime}
transferUserToMeeting={transferUserToMeeting}
requestJoinURL={requestJoinURL}
sendUserUnshareWebcam={sendUserUnshareWebcam}
{...{ layoutContextDispatch, isRTL, amIModerator, ...props }}
/>;
};
export default withTracker((props) => {
const {
isNewTimeHigherThanMeetingRemaining,
findBreakouts,
getBreakoutRoomUrl,
meetingId,
isUserInBreakoutRoom,
} = Service;
const breakoutRooms = findBreakouts();
const isMicrophoneUser = (AudioService.isConnectedToBreakout() || AudioService.isConnected())
&& !AudioService.isListenOnly();
const isMeteorConnected = Meteor.status().connected;
const isReconnecting = AudioService.isReconnecting();
const {
setBreakoutAudioTransferStatus,
getBreakoutAudioTransferStatus,
} = AudioService;
const toggleVoice = useToggleVoice();
const logUserCouldNotRejoinAudio = () => {
logger.warn({
logCode: 'mainroom_audio_rejoin',
@ -123,6 +92,36 @@ export default withTracker((props) => {
}
};
return <BreakoutComponent
amIPresenter={amIPresenter}
endAllBreakouts={endAllBreakouts}
setBreakoutsTime={setBreakoutsTime}
transferUserToMeeting={transferUserToMeeting}
requestJoinURL={requestJoinURL}
sendUserUnshareWebcam={sendUserUnshareWebcam}
{...{ layoutContextDispatch, isRTL, amIModerator, rejoinAudio, ...props }}
/>;
};
export default withTracker((props) => {
const {
isNewTimeHigherThanMeetingRemaining,
findBreakouts,
getBreakoutRoomUrl,
meetingId,
isUserInBreakoutRoom,
} = Service;
const breakoutRooms = findBreakouts();
const isMicrophoneUser = (AudioService.isConnectedToBreakout() || AudioService.isConnected())
&& !AudioService.isListenOnly();
const isMeteorConnected = Meteor.status().connected;
const isReconnecting = AudioService.isReconnecting();
const {
setBreakoutAudioTransferStatus,
getBreakoutAudioTransferStatus,
} = AudioService;
return {
...props,
breakoutRooms,
@ -133,7 +132,6 @@ export default withTracker((props) => {
isMeteorConnected,
isUserInBreakoutRoom,
forceExitAudio: () => AudioManager.forceExitAudio(),
rejoinAudio,
isReconnecting,
setBreakoutAudioTransferStatus,
getBreakoutAudioTransferStatus,