jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main branch merge and resolved conflicts

Browse source
This commit is contained in:
Shekar Siri 2021-12-27 21:52:42 +05:30
commit 526cbfa6dc
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/app/components/Session/LivePlayer.js
View file

@ -31,7 +31,7 @@ const InitLoader = connectPlayer(state => ({
}))(Loader);
function WebPlayer({ showAssist, session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt, loadingCredentials, assistCredendials, request, hasSessionsPath }) {
function WebPlayer ({ showAssist, session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt, loadingCredentials, assistCredendials, request, isEnterprise, hasSessionsPath }) {
useEffect(() => {
if (!loadingCredentials) {
initPlayer(session, jwt, assistCredendials, !hasSessionsPath && session.live);
@ -41,7 +41,9 @@ function WebPlayer({ showAssist, session, toggleFullscreen, closeBottomBlock, li
// LAYOUT (TODO: local layout state - useContext or something..)
useEffect(() => {
request();
if (isEnterprise) {
request();
}
return () => {
toggleFullscreen(false);
closeBottomBlock();
@ -74,7 +76,11 @@ export default withRequest({
showAssist: state.getIn([ 'sessions', 'showChatWindow' ]),
jwt: state.get('jwt'),
fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]),
<<<<<<< HEAD
hasSessionsPath: state.getIn([ 'sessions', 'sessionPath' ]).includes('/sessions'),
=======
isEnterprise: state.getIn([ 'user', 'client', 'edition' ]) === 'ee',
>>>>>>> e2eec140e9dce5709f8ff9fd3b114a1e2a0f0e11
}),
{ toggleFullscreen, closeBottomBlock },
)(WebPlayer)));