Browse Source

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.
master
Дамян Минков 3 years ago
parent
commit
ea26a48678
No account linked to committer's email address

+ 4
- 0
.github/workflows/ci.yml View File

13
         node-version: '14.x'
13
         node-version: '14.x'
14
     - run: npm i -g npm@7
14
     - run: npm i -g npm@7
15
     - run: npm install
15
     - run: npm install
16
+    - name: Check git status
17
+      run: git status
18
+    - name: Check git diff
19
+      run: git diff
16
     - name: Check if the git repository is clean
20
     - name: Check if the git repository is clean
17
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
21
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
18
     - run: npm run lint
22
     - run: npm run lint

+ 5
- 1
conference.js View File

129
     isPrejoinPageEnabled,
129
     isPrejoinPageEnabled,
130
     isPrejoinPageVisible,
130
     isPrejoinPageVisible,
131
     makePrecallTest,
131
     makePrecallTest,
132
-    setJoiningInProgress
132
+    setJoiningInProgress,
133
+    setPrejoinPageVisibility
133
 } from './react/features/prejoin';
134
 } from './react/features/prejoin';
134
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
135
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
135
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
136
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
2005
         room.on(JitsiConferenceEvents.CONFERENCE_JOINED, () => {
2006
         room.on(JitsiConferenceEvents.CONFERENCE_JOINED, () => {
2006
             this._onConferenceJoined();
2007
             this._onConferenceJoined();
2007
         });
2008
         });
2009
+        room.on(JitsiConferenceEvents.CONFERENCE_JOIN_IN_PROGRESS, () => {
2010
+            APP.store.dispatch(setPrejoinPageVisibility(false));
2011
+        });
2008
 
2012
 
2009
         room.on(
2013
         room.on(
2010
             JitsiConferenceEvents.CONFERENCE_LEFT,
2014
             JitsiConferenceEvents.CONFERENCE_LEFT,

+ 6
- 6
package-lock.json View File

55
         "jquery-i18next": "1.2.1",
55
         "jquery-i18next": "1.2.1",
56
         "js-md5": "0.6.1",
56
         "js-md5": "0.6.1",
57
         "jwt-decode": "2.2.0",
57
         "jwt-decode": "2.2.0",
58
-        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#d27a510f844562ef8e25a10ae655d103227ec7ac",
58
+        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#75ds3106544afca8c0ab6223f6899a28f6b60be4b",
59
         "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
59
         "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
60
         "lodash": "4.17.21",
60
         "lodash": "4.17.21",
61
         "moment": "2.29.1",
61
         "moment": "2.29.1",
12842
     },
12842
     },
12843
     "node_modules/lib-jitsi-meet": {
12843
     "node_modules/lib-jitsi-meet": {
12844
       "version": "0.0.0",
12844
       "version": "0.0.0",
12845
-      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#d27a510f844562ef8e25a10ae655d103227ec7ac",
12846
-      "integrity": "sha512-EbBmBW+3WhazdBHH5SLonLmaA1aFNMXyD2qOFmXrhh/L7JQ31U4NkIhCp5AccsKBokaslAwBLeQx2NmTFyNEuw==",
12845
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#75d3106544afca8c0ab6223f6899a28f6b60be4b",
12846
+      "integrity": "sha512-aIGBi0Klp0PKxl2r4JMi5+4n8CXas15P1qa2fOUxFRcIzauaN/GWsnWWCX86VEDKkgxYWWZD0H6fJd3j5DDHaw==",
12847
       "hasInstallScript": true,
12847
       "hasInstallScript": true,
12848
       "license": "Apache-2.0",
12848
       "license": "Apache-2.0",
12849
       "dependencies": {
12849
       "dependencies": {
31949
       }
31949
       }
31950
     },
31950
     },
31951
     "lib-jitsi-meet": {
31951
     "lib-jitsi-meet": {
31952
-      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#d27a510f844562ef8e25a10ae655d103227ec7ac",
31953
-      "integrity": "sha512-EbBmBW+3WhazdBHH5SLonLmaA1aFNMXyD2qOFmXrhh/L7JQ31U4NkIhCp5AccsKBokaslAwBLeQx2NmTFyNEuw==",
31954
-      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#d27a510f844562ef8e25a10ae655d103227ec7ac",
31952
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#75d3106544afca8c0ab6223f6899a28f6b60be4b",
31953
+      "integrity": "sha512-aIGBi0Klp0PKxl2r4JMi5+4n8CXas15P1qa2fOUxFRcIzauaN/GWsnWWCX86VEDKkgxYWWZD0H6fJd3j5DDHaw==",
31954
+      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#75ds3106544afca8c0ab6223f6899a28f6b60be4b",
31955
       "requires": {
31955
       "requires": {
31956
         "@jitsi/js-utils": "2.0.0",
31956
         "@jitsi/js-utils": "2.0.0",
31957
         "@jitsi/sdp-interop": "github:jitsi/sdp-interop#4669790bb9020cc8f10c1d1f3823c26b08497547",
31957
         "@jitsi/sdp-interop": "github:jitsi/sdp-interop#4669790bb9020cc8f10c1d1f3823c26b08497547",

+ 1
- 1
package.json View File

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

+ 1
- 2
react/features/base/conference/middleware.web.js View File

1
 // @flow
1
 // @flow
2
 
2
 
3
-import { setPrejoinPageVisibility, setSkipPrejoinOnReload } from '../../prejoin';
3
+import { setSkipPrejoinOnReload } from '../../prejoin';
4
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
4
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
5
 import { MiddlewareRegistry } from '../redux';
5
 import { MiddlewareRegistry } from '../redux';
6
 
6
 
13
     switch (action.type) {
13
     switch (action.type) {
14
     case CONFERENCE_JOINED: {
14
     case CONFERENCE_JOINED: {
15
         if (enableForcedReload) {
15
         if (enableForcedReload) {
16
-            dispatch(setPrejoinPageVisibility(false));
17
             dispatch(setSkipPrejoinOnReload(false));
16
             dispatch(setSkipPrejoinOnReload(false));
18
         }
17
         }
19
 
18
 

+ 0
- 2
react/features/prejoin/actions.js View File

259
 
259
 
260
         const jitsiTracks = localTracks.map(t => t.jitsiTrack);
260
         const jitsiTracks = localTracks.map(t => t.jitsiTrack);
261
 
261
 
262
-        dispatch(setPrejoinPageVisibility(false));
263
-
264
         APP.conference.prejoinStart(jitsiTracks);
262
         APP.conference.prejoinStart(jitsiTracks);
265
     };
263
     };
266
 }
264
 }

+ 1
- 3
react/features/prejoin/middleware.js View File

12
 import {
12
 import {
13
     setDeviceStatusOk,
13
     setDeviceStatusOk,
14
     setDeviceStatusWarning,
14
     setDeviceStatusWarning,
15
-    setJoiningInProgress,
16
-    setPrejoinPageVisibility
15
+    setJoiningInProgress
17
 } from './actions';
16
 } from './actions';
18
 import { isPrejoinPageVisible } from './functions';
17
 import { isPrejoinPageVisible } from './functions';
19
 
18
 
85
  * @returns {Object}
84
  * @returns {Object}
86
  */
85
  */
87
 function _conferenceJoined({ dispatch }, next, action) {
86
 function _conferenceJoined({ dispatch }, next, action) {
88
-    dispatch(setPrejoinPageVisibility(false));
89
     dispatch(setJoiningInProgress(false));
87
     dispatch(setJoiningInProgress(false));
90
 
88
 
91
     return next(action);
89
     return next(action);

Loading…
Cancel
Save