Merge pull request #16990 from GuiLeme/issue-16872

fix (html5): not showing invitation when user is moved to another breakout room
bigbluebutton · Mar 14, 2023 · af06006 · af06006
2 parents e292162 + 4f3931c
commit af06006
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -13,6 +13,7 @@ import AudioDial from '../audio-dial/component';
 import AudioAutoplayPrompt from '../autoplay/component';
 import Settings from '/imports/ui/services/settings';
 import CaptionsSelectContainer from '/imports/ui/components/audio/captions/select/container';
+import { showModal } from '/imports/ui/components/common/modal/service';
 
 const propTypes = {
   intl: PropTypes.shape({
@@ -176,6 +177,7 @@ class AudioModal extends Component {
       audioLocked,
       isUsingAudio,
     } = this.props;
+    window.addEventListener("CLOSE_AUDIO_MODAL", this.handleCloseAudioModal);
 
     if (!isUsingAudio) {
       if (forceListenOnlyAttendee || audioLocked) return this.handleJoinListenOnly();
@@ -210,6 +212,7 @@ class AudioModal extends Component {
       exitAudio();
     }
     if (resolve) resolve();
+    window.removeEventListener("CLOSE_AUDIO_MODAL", this.handleCloseAudioModal);
     Session.set('audioModalIsOpen', false);
   }
 
@@ -249,6 +252,10 @@ class AudioModal extends Component {
     });
   }
 
+  handleCloseAudioModal = () => {
+    showModal(null);
+  }
+
   handleGoToEchoTest() {
     const { AudioError } = this.props;
     const { MIC_ERROR } = AudioError;

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/service.js b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/service.js
@@ -38,7 +38,7 @@ export const joinMicrophone = (skipEchoTest = false) => {
   });
 
   return call.then(() => {
-    showModal(null);
+    window.dispatchEvent(new Event("CLOSE_AUDIO_MODAL"));
   }).catch((error) => {
     throw error;
   });
@@ -55,7 +55,7 @@ export const joinListenOnly = () => {
       // prop transitions to a state where it was handled OR the user opts
       // to close the modal.
       if (!Service.autoplayBlocked()) {
-        showModal(null);
+        window.dispatchEvent(new Event("CLOSE_AUDIO_MODAL"));
       }
       resolve();
     });

diff --git a/bigbluebutton-html5/imports/ui/components/audio/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/container.jsx
@@ -98,7 +98,7 @@ class AudioContainer extends PureComponent {
   /**
    * Helper function to determine wheter user is returning from breakout room
    * to main room.
-   * @param  {[Object} prevProps prevProps param from componentDidUpdate
+   * @param  {Object} prevProps prevProps param from componentDidUpdate
    * @return {boolean}           True if user is returning from breakout room
    *                             to main room. False, otherwise.
    */