Merge pull request #7298 from Tainan404/issue-7026

Fix user count in breakout panel using users collection

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>

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);

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,
 };