feat: Hides prejoin screen on conference in progress event. (#10175)

* feat: Hides prejoin screen on conference in progress event.

We enter the conference view as early as possible on conference in progress as the joined event can be late in a big conference.
Also, we show conference view only when joining is in progress, for example, the with the lobby enabled where we try to join but fail, we do not want to show the conference view for a fraction of a second before showing lobby screen.

* squash: Drops CONFERENCE_JOIN_IN_PROGRESS.

* squash: Updates ljm with the new JitsiConference event.

* squash: Adds some debugs to the github action.

Easier to catch problems with package-lock.json file.

.github/workflows/ci.yml

@@ -13,6 +13,10 @@ jobs:
         node-version: '14.x'
     - run: npm i -g npm@7
     - run: npm install
+    - name: Check git status
+      run: git status
+    - name: Check git diff
+      run: git diff
     - name: Check if the git repository is clean
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
     - run: npm run lint

conference.js

@@ -129,7 +129,8 @@ import {
     isPrejoinPageEnabled,
     isPrejoinPageVisible,
     makePrecallTest,
-    setJoiningInProgress
+    setJoiningInProgress,
+    setPrejoinPageVisibility
 } from './react/features/prejoin';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
@@ -2005,6 +2006,9 @@ export default {
         room.on(JitsiConferenceEvents.CONFERENCE_JOINED, () => {
             this._onConferenceJoined();
         });
+        room.on(JitsiConferenceEvents.CONFERENCE_JOIN_IN_PROGRESS, () => {
+            APP.store.dispatch(setPrejoinPageVisibility(false));
+        });
 
         room.on(
             JitsiConferenceEvents.CONFERENCE_LEFT,

package-lock.json

@@ -55,7 +55,7 @@
         "jquery-i18next": "1.2.1",
         "js-md5": "0.6.1",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#d27a510f844562ef8e25a10ae655d103227ec7ac",
+        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#75ds3106544afca8c0ab6223f6899a28f6b60be4b",
         "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
         "lodash": "4.17.21",
         "moment": "2.29.1",
@@ -12842,8 +12842,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#d27a510f844562ef8e25a10ae655d103227ec7ac",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#75d3106544afca8c0ab6223f6899a28f6b60be4b",
-      "integrity": "sha512-EbBmBW+3WhazdBHH5SLonLmaA1aFNMXyD2qOFmXrhh/L7JQ31U4NkIhCp5AccsKBokaslAwBLeQx2NmTFyNEuw==",
+      "integrity": "sha512-aIGBi0Klp0PKxl2r4JMi5+4n8CXas15P1qa2fOUxFRcIzauaN/GWsnWWCX86VEDKkgxYWWZD0H6fJd3j5DDHaw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -31949,9 +31949,9 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#d27a510f844562ef8e25a10ae655d103227ec7ac",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#75d3106544afca8c0ab6223f6899a28f6b60be4b",
-      "integrity": "sha512-EbBmBW+3WhazdBHH5SLonLmaA1aFNMXyD2qOFmXrhh/L7JQ31U4NkIhCp5AccsKBokaslAwBLeQx2NmTFyNEuw==",
+      "integrity": "sha512-aIGBi0Klp0PKxl2r4JMi5+4n8CXas15P1qa2fOUxFRcIzauaN/GWsnWWCX86VEDKkgxYWWZD0H6fJd3j5DDHaw==",
-      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#d27a510f844562ef8e25a10ae655d103227ec7ac",
+      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#75ds3106544afca8c0ab6223f6899a28f6b60be4b",
       "requires": {
         "@jitsi/js-utils": "2.0.0",
         "@jitsi/sdp-interop": "github:jitsi/sdp-interop#4669790bb9020cc8f10c1d1f3823c26b08497547",

package.json

@@ -60,7 +60,7 @@
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#d27a510f844562ef8e25a10ae655d103227ec7ac",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#75ds3106544afca8c0ab6223f6899a28f6b60be4b",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.21",
     "moment": "2.29.1",

react/features/base/conference/middleware.web.js

@@ -1,6 +1,6 @@
 // @flow
 
-import { setPrejoinPageVisibility, setSkipPrejoinOnReload } from '../../prejoin';
+import { setSkipPrejoinOnReload } from '../../prejoin';
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import { MiddlewareRegistry } from '../redux';
 
@@ -13,7 +13,6 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
     switch (action.type) {
     case CONFERENCE_JOINED: {
         if (enableForcedReload) {
-            dispatch(setPrejoinPageVisibility(false));
             dispatch(setSkipPrejoinOnReload(false));
         }
 

react/features/prejoin/actions.js

@@ -259,8 +259,6 @@ export function joinConference(options?: Object, ignoreJoiningInProgress: boolea
 
         const jitsiTracks = localTracks.map(t => t.jitsiTrack);
 
-        dispatch(setPrejoinPageVisibility(false));
-
         APP.conference.prejoinStart(jitsiTracks);
     };
 }

react/features/prejoin/middleware.js

@@ -12,8 +12,7 @@ import {
 import {
     setDeviceStatusOk,
     setDeviceStatusWarning,
-    setJoiningInProgress,
+    setJoiningInProgress
-    setPrejoinPageVisibility
 } from './actions';
 import { isPrejoinPageVisible } from './functions';
 
@@ -85,7 +84,6 @@ MiddlewareRegistry.register(store => next => async action => {
  * @returns {Object}
  */
 function _conferenceJoined({ dispatch }, next, action) {
-    dispatch(setPrejoinPageVisibility(false));
     dispatch(setJoiningInProgress(false));
 
     return next(action);