From dd8b220ff988256cff276e0f1eb018cf6397e29a Mon Sep 17 00:00:00 2001
From: Tudor-Ovidiu Avram <tudor.potecaru@8x8.com>
Date: Thu, 7 Jan 2021 14:34:22 +0200
Subject: [PATCH] feat(jaas) allow tile view to be disabled

---
 config.js                                     | 3 +++
 react/features/base/config/configWhitelist.js | 1 +
 react/features/video-layout/functions.js      | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/config.js b/config.js
index 71d659fc9..ef94d8ee1 100644
--- a/config.js
+++ b/config.js
@@ -623,6 +623,9 @@ var config = {
     // otherwise the app doesn't render it.
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
 
+    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
+    // disableTileView: true,
+
     // Hides the conference subject
     // hideConferenceSubject: true
 
diff --git a/react/features/base/config/configWhitelist.js b/react/features/base/config/configWhitelist.js
index 76c819412..95b0d8ddc 100644
--- a/react/features/base/config/configWhitelist.js
+++ b/react/features/base/config/configWhitelist.js
@@ -91,6 +91,7 @@ export default [
     'disableRtx',
     'disableSimulcast',
     'disableThirdPartyRequests',
+    'disableTileView',
     'displayJids',
     'doNotStoreRoom',
     'e2eping',
diff --git a/react/features/video-layout/functions.js b/react/features/video-layout/functions.js
index e77de62f5..fa3455b64 100644
--- a/react/features/video-layout/functions.js
+++ b/react/features/video-layout/functions.js
@@ -82,6 +82,12 @@ export function shouldDisplayTileView(state: Object = {}) {
         return false;
     }
 
+    const { disableTileView } = state['features/base/config'];
+
+    if (disableTileView) {
+        return false;
+    }
+
     const { tileViewEnabled } = state['features/video-layout'];
 
     if (tileViewEnabled !== undefined) {