Merge pull request #8575 from antobinary/fixing-8549

Add bbb_show_participants_on_login as a join parameter

bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js

@@ -57,6 +57,7 @@ const currentParameters = [
   // LAYOUT
   'bbb_auto_swap_layout',
   'bbb_hide_presentation',
+  'bbb_show_participants_on_login',
   // OUTSIDE COMMANDS
   'bbb_outside_toggle_self_voice',
   'bbb_outside_toggle_recording',

bigbluebutton-html5/imports/startup/client/base.jsx

@@ -18,6 +18,10 @@ import Breakouts from '/imports/api/breakouts';
 import AudioService from '/imports/ui/components/audio/service';
 import { FormattedMessage } from 'react-intl';
 import { notify } from '/imports/ui/services/notification';
+import deviceInfo from '/imports/utils/deviceInfo';
+import getFromUserSettings from '/imports/ui/services/users-settings';
+
+const CHAT_ENABLED = Meteor.settings.public.chat.enabled;
 
 const BREAKOUT_END_NOTIFY_DELAY = 50;
 
@@ -348,6 +352,16 @@ const BaseContainer = withTracker(() => {
     });
   }
 
+  if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
+    Session.set('openPanel', 'userlist');
+    if (CHAT_ENABLED) {
+      Session.set('openPanel', 'chat');
+      Session.set('idChatOpen', '');
+    }
+  } else {
+    Session.set('openPanel', '');
+  }
+
   return {
     approved,
     ejected,

bigbluebutton-html5/imports/ui/components/join-handler/component.jsx

@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import Auth from '/imports/ui/services/auth';
 import { setCustomLogoUrl } from '/imports/ui/components/user-list/service';
 import { makeCall } from '/imports/ui/services/api';
-import deviceInfo from '/imports/utils/deviceInfo';
 import logger from '/imports/startup/client/logger';
 import LoadingScreen from '/imports/ui/components/loading-screen/component';
 
@@ -12,10 +11,6 @@ const propTypes = {
   children: PropTypes.element.isRequired,
 };
 
-const APP_CONFIG = Meteor.settings.public.app;
-const { showParticipantsOnLogin } = APP_CONFIG;
-const CHAT_ENABLED = Meteor.settings.public.chat.enabled;
-
 class JoinHandler extends Component {
   static setError(codeError) {
     Session.set('hasError', true);
@@ -179,16 +174,6 @@ class JoinHandler extends Component {
 
       await setCustomData(response);
 
-      if (showParticipantsOnLogin && !deviceInfo.type().isPhone) {
-        Session.set('openPanel', 'userlist');
-        if (CHAT_ENABLED) {
-          Session.set('openPanel', 'chat');
-          Session.set('idChatOpen', '');
-        }
-      } else {
-        Session.set('openPanel', '');
-      }
-
       logger.info({
         logCode: 'joinhandler_component_joinroutehandler_success',
         extraInfo: {

bigbluebutton-html5/private/config/settings.yml

@@ -3,7 +3,6 @@ public:
     mobileFontSize: 16px
     desktopFontSize: 14px
     audioChatNotification: false
-    showParticipantsOnLogin: true
     autoJoin: true
     listenOnlyMode: true
     forceListenOnly: false