From 1a927f576c9f986a78a460f686d23e22f2fb143a Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 22 Nov 2021 23:31:31 +0530 Subject: [PATCH] change(ui) - assist read config from db --- frontend/app/components/Session/LivePlayer.js | 6 +++--- frontend/app/components/Session/WebPlayer.js | 5 +++-- frontend/app/player/singletone.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/app/components/Session/LivePlayer.js b/frontend/app/components/Session/LivePlayer.js index 2a0b8cae0..2cccce911 100644 --- a/frontend/app/components/Session/LivePlayer.js +++ b/frontend/app/components/Session/LivePlayer.js @@ -30,9 +30,9 @@ const InitLoader = connectPlayer(state => ({ }))(Loader); -function WebPlayer ({ showAssist, session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt, iceServers }) { +function WebPlayer ({ showAssist, session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt, config }) { useEffect(() => { - initPlayer(session, jwt, iceServers); + initPlayer(session, jwt, config); return () => cleanPlayer() }, [ session.sessionId ]); @@ -59,7 +59,7 @@ export default connect(state => ({ session: state.getIn([ 'sessions', 'current' ]), showAssist: state.getIn([ 'sessions', 'showChatWindow' ]), jwt: state.get('jwt'), - iceServers: state.getIn([ 'user', 'account', 'iceServers' ]), + config: state.getIn([ 'user', 'account', 'iceServers' ]), fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), }), { toggleFullscreen, diff --git a/frontend/app/components/Session/WebPlayer.js b/frontend/app/components/Session/WebPlayer.js index 479ae3ac8..04854a444 100644 --- a/frontend/app/components/Session/WebPlayer.js +++ b/frontend/app/components/Session/WebPlayer.js @@ -35,9 +35,9 @@ function PlayerContent({ live, fullscreen, showEvents }) { ) } -function WebPlayer ({ session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt }) { +function WebPlayer ({ session, toggleFullscreen, closeBottomBlock, live, fullscreen, jwt, config }) { useEffect(() => { - initPlayer(session, jwt); + initPlayer(session, jwt, config); return () => cleanPlayer() }, [ session.sessionId ]); @@ -60,6 +60,7 @@ function WebPlayer ({ session, toggleFullscreen, closeBottomBlock, live, fullscr export default connect(state => ({ session: state.getIn([ 'sessions', 'current' ]), jwt: state.get('jwt'), + config: state.getIn([ 'user', 'account', 'iceServers' ]), fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), }), { toggleFullscreen, diff --git a/frontend/app/player/singletone.js b/frontend/app/player/singletone.js index adca40cf6..619f9b02b 100644 --- a/frontend/app/player/singletone.js +++ b/frontend/app/player/singletone.js @@ -28,11 +28,11 @@ document.addEventListener("visibilitychange", function() { } }); -export function init(session, jwt) { +export function init(session, jwt, config) { const live = session.live; const endTime = !live && session.duration.valueOf(); - instance = new Player(session, jwt); + instance = new Player(session, jwt, config); update({ initialized: true, live,