Merge pull request #19844 from JoVictorNunes/fix-default-layout-3.0

!fix(layout): defaultLayout join parameter (port)
bigbluebutton · Mar 20, 2024 · 51d1217 · 51d1217
2 parents beae4f6 + 0a1b1e8
commit 51d1217
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
@@ -66,6 +66,7 @@ const currentParameters = [
   'bbb_hide_nav_bar',
   'bbb_change_layout',
   'bbb_direct_leave_button',
+  'bbb_default_layout',
 ];
 
 function valueParser(val) {

diff --git a/bigbluebutton-html5/imports/ui/components/layout/push-layout/pushLayoutEngine.jsx b/bigbluebutton-html5/imports/ui/components/layout/push-layout/pushLayoutEngine.jsx
@@ -70,10 +70,15 @@ class PushLayoutEngine extends React.Component {
       pushLayoutMeeting,
     } = this.props;
 
-    const userLayout = LAYOUT_TYPE[getFromUserSettings('bbb_change_layout', false)];
-    Settings.application.selectedLayout = enforceLayout || userLayout || meetingLayout;
+    const changeLayout = LAYOUT_TYPE[getFromUserSettings('bbb_change_layout', null)];
+    const defaultLayout = LAYOUT_TYPE[getFromUserSettings('bbb_default_layout', null)];
 
-    let selectedLayout = Settings.application.selectedLayout;
+    Settings.application.selectedLayout = enforceLayout
+      || changeLayout
+      || defaultLayout
+      || meetingLayout;
+
+    let { selectedLayout } = Settings.application;
     if (isMobile()) {
       selectedLayout = selectedLayout === 'custom' ? 'smart' : selectedLayout;
       Settings.application.selectedLayout = selectedLayout;

diff --git a/docs/docs/administration/customize.md b/docs/docs/administration/customize.md
@@ -1516,6 +1516,7 @@ Useful tools for development:
 | `userdata-bbb_show_public_chat_on_login=`  | If set to `false`, the chat panel will not be visible on page load until opened. Not the same as disabling chat.        | `true`        |
 | `userdata-bbb_hide_nav_bar=`               | If set to `true`, the navigation bar (the top portion of the client) will not be displayed. Introduced in BBB 2.4-rc-3. | `false`       |
 | `userdata-bbb_hide_actions_bar=`           | If set to `true`, the actions bar (the bottom portion of the client) will not be displayed. Introduced in BBB 2.4-rc-3. | `false`       |
+| `userdata-bbb_default_layout=`             | The layout name to be loaded first when the application is loaded. If none is provided, the meeting layout will be used. Introduced in BBB 3.0.0-alpha.5. | `none`       |
 
 #### Examples
 

diff --git a/docs/docs/data/join.tsx b/docs/docs/data/join.tsx
@@ -43,12 +43,6 @@ const joinEndpointTableData = [
     "type": "String",
     "description": (<>If you want to pass in a custom voice-extension when a user joins the voice conference using voip. This is useful if you want to collect more info in you Call Detail Records about the user joining the conference. You need to modify your /etc/asterisk/bbb-extensions.conf to handle this new extensions.</>)
   },
-  {
-    "name": "defaultLayout",
-    "required": false,
-    "type": "String",
-    "description": (<>The layout name to be loaded first when the application is loaded.</>)
-  },
   {
     "name": "avatarURL",
     "required": false,

diff --git a/docs/docs/development/api.md b/docs/docs/development/api.md
@@ -109,6 +109,8 @@ Updated in 2.7:
 
 Updated in 3.0:
 
+- **join** - **Added:** `userdata-bbb_default_layout`. **Removed:** `defaultLayout` (replaced by `userdata-bbb_default_layout`).
+
 
 ## API Data Types