fix(prejoin) fix prejoin app dialogs not being visible

https://github.com/jitsi/lib-jitsi-meet/compare/v1549.0.0+877c4546...v1553.0.0+57646337

config.js

@@ -580,9 +580,19 @@ var config = {
     // Require users to always specify a display name.
     // requireDisplayName: true,
 
+    // DEPRECATED! Use 'welcomePage.disabled' instead.
     // Whether to use a welcome page or not. In case it's false a random room
     // will be joined when no room is specified.
-    enableWelcomePage: true,
+    // enableWelcomePage: true,
+
+    // Configs for welcome page.
+    // welcomePage: {
+    //     // Whether to disable welcome page. In case it's disabled a random room
+    //     // will be joined when no room is specified.
+    //     disabled: false,
+    //     // If set,landing page will redirect to this URL.
+    //     customUrl: ''
+    // },
 
     // Disable app shortcuts that are registered upon joining a conference
     // disableShortcuts: false,

css/premeeting/_prejoin-third-party.scss

@@ -2,7 +2,8 @@ $sidePanelWidth: 300px;
 
 .prejoin-third-party {
   flex-direction: column-reverse;
-  
+  z-index: auto;
+
   .content {
       height: auto;
       margin: 0 auto;

package-lock.json

@@ -74,7 +74,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -13497,8 +13497,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
-      "integrity": "sha512-cxzr8vnJ6RyqWYzJ4LO09PqblJ6nIrJFFmzW8kPQgC1Nhq7sDAD896827q/shd+FE6bSoK0xVjDP+gW+JInS9A==",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#66877b963df15a23e612166e9151602a8343baf0",
+      "integrity": "sha512-yX2sYztN6Rj38JFqzZRHUWVX3g9MMkZaTgS74U2u8Vfkn9blsZeRTju+/Ko+ZQezQX8qG/qNRsCtOX0Z16OFhA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@jitsi/js-utils": "2.0.0",
@@ -30510,8 +30510,9 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
-      "integrity": "sha512-cxzr8vnJ6RyqWYzJ4LO09PqblJ6nIrJFFmzW8kPQgC1Nhq7sDAD896827q/shd+FE6bSoK0xVjDP+gW+JInS9A==",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#66877b963df15a23e612166e9151602a8343baf0",
+      "integrity": "sha512-yX2sYztN6Rj38JFqzZRHUWVX3g9MMkZaTgS74U2u8Vfkn9blsZeRTju+/Ko+ZQezQX8qG/qNRsCtOX0Z16OFhA==",
+      "from": "lib-jitsi-meet@https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
       "requires": {
         "@jitsi/js-utils": "2.0.0",
         "@jitsi/logger": "2.0.0",

package.json

@@ -79,7 +79,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1549.0.0+877c4546/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",

react/features/app/actions.web.ts

@@ -21,6 +21,7 @@ import { isVpaasMeeting } from '../jaas/functions';
 import { clearNotifications, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
 import { setFatalError } from '../overlay/actions';
+import { isWelcomePageEnabled } from '../welcome/functions';
 
 import {
     redirectToStaticPage,
@@ -203,7 +204,7 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea
 
         // if Welcome page is enabled redirect to welcome page after 3 sec, if
         // there is a thank you message to be shown, 0.5s otherwise.
-        if (getState()['features/base/config'].enableWelcomePage) {
+        if (isWelcomePageEnabled(getState())) {
             setTimeout(
                 () => {
                     dispatch(redirectWithStoredParams('/'));

react/features/app/getRouteToRender.web.js

@@ -8,7 +8,7 @@ import { Conference } from '../conference';
 import { getDeepLinkingPage } from '../deep-linking';
 import { UnsupportedDesktopBrowser } from '../unsupported-browser';
 import { BlankPage, WelcomePage } from '../welcome';
-import { isWelcomePageEnabled } from '../welcome/functions';
+import { getCustomLandingPageURL, isWelcomePageEnabled } from '../welcome/functions';
 
 /**
  * Determines which route is to be rendered in order to depict a specific Redux
@@ -75,7 +75,13 @@ function _getWebWelcomePageRoute(state) {
 
     if (isWelcomePageEnabled(state)) {
         if (isSupportedBrowser()) {
-            route.component = WelcomePage;
+            const customLandingPage = getCustomLandingPageURL(state);
+
+            if (customLandingPage) {
+                route.href = customLandingPage;
+            } else {
+                route.component = WelcomePage;
+            }
         } else {
             route.component = UnsupportedDesktopBrowser;
         }

react/features/base/config/configType.ts

@@ -506,6 +506,10 @@ export interface IConfig {
     webrtcIceUdpDisable?: boolean;
     websocket?: string;
     websocketKeepAliveUrl?: string;
+    welcomePage?: {
+        customUrl?: string;
+        disabled?: boolean;
+    };
     whiteboard?: {
         collabServerBaseUrl?: string;
         enabled?: boolean;

react/features/base/config/reducer.ts

@@ -338,6 +338,13 @@ function _translateLegacyConfig(oldValue: IConfig) {
         });
     }
 
+    newValue.welcomePage = oldValue.welcomePage || {};
+    if (oldValue.hasOwnProperty('enableWelcomePage')
+        && !newValue.welcomePage.hasOwnProperty('disabled')
+    ) {
+        newValue.welcomePage.disabled = !oldValue.enableWelcomePage;
+    }
+
     newValue.prejoinConfig = oldValue.prejoinConfig || {};
     if (oldValue.hasOwnProperty('prejoinPageEnabled')
         && !newValue.prejoinConfig.hasOwnProperty('enabled')

react/features/welcome/functions.ts

@@ -17,5 +17,17 @@ export function isWelcomePageEnabled(stateful: IStateful) {
         return getFeatureFlag(stateful, WELCOME_PAGE_ENABLED, false);
     }
 
-    return toState(stateful)['features/base/config'].enableWelcomePage;
+    const config = toState(stateful)['features/base/config'];
+
+    return !config.welcomePage?.disabled;
+}
+
+/**
+ * Returns the configured custom URL (if any) to redirect to instead of the normal landing page.
+ *
+ * @param {IStateful} stateful - The redux state or {@link getState}.
+ * @returns {string} - The custom URL.
+ */
+export function getCustomLandingPageURL(stateful: IStateful) {
+    return toState(stateful)['features/base/config'].welcomePage?.customUrl;
 }

static/prejoin.html

@@ -6,6 +6,7 @@
     <!--#include virtual="/base.html" -->
     <link rel="stylesheet" href="css/all.css">
     <script>
+      window.EXCALIDRAW_ASSET_PATH = 'libs/';
       document.addEventListener('DOMContentLoaded', () => {
           if (!JitsiMeetJS.app) {
             return;