diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx index dffbc2fffe74c82a39464617eca655c52e6207d1..6a20c226c9dca97f6b1c0356733d647c3aa5d7fd 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx @@ -180,6 +180,7 @@ class BreakoutRoom extends Component { const { breakoutRooms, intl, + getUsersByBreakoutId, } = this.props; const { @@ -193,7 +194,7 @@ class BreakoutRoom extends Component { {intl.formatMessage(intlMessages.breakoutRoom, breakout.sequence.toString())} <span className={styles.usersAssignedNumberLabel}> ( - {new Set(breakout.users.map(user => user.userId)).size} + {getUsersByBreakoutId(breakout.breakoutId).count()} ) </span> </span> diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx index 11eef08d0026a0e1740b3a55a52ee487fde2731d..abb636b74fa14ce6f6f499b5a63ce707edb7362a 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx @@ -19,6 +19,7 @@ export default withTracker((props) => { isPresenter, isModerator, closeBreakoutPanel, + getUsersByBreakoutId, } = Service; const breakoutRooms = findBreakouts(); const isMicrophoneUser = AudioService.isConnected() && !AudioService.isListenOnly(); @@ -36,5 +37,6 @@ export default withTracker((props) => { isPresenter: isPresenter(), isModerator: isModerator(), closeBreakoutPanel, + getUsersByBreakoutId, }; })(BreakoutContainer); diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/service.js b/bigbluebutton-html5/imports/ui/components/breakout-room/service.js index 5f6f1bebd33cc94dc0f3659af7ed87a742f7fd13..791363466675a3301efd976e876a741c94774b90 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/service.js +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/service.js @@ -65,6 +65,12 @@ const isModerator = () => { return mappedUser.isModerator; }; +const getUsersByBreakoutId = breakoutId => Users.find({ + meetingId: breakoutId, + connectionStatus: 'online', +}); + + export default { findBreakouts, endAllBreakouts, @@ -76,4 +82,5 @@ export default { isPresenter, closeBreakoutPanel, isModerator, + getUsersByBreakoutId, };