diff --git a/frontend/app/components/Session/LivePlayer.js b/frontend/app/components/Session/LivePlayer.js index 3d408866a..29a532f0e 100644 --- a/frontend/app/components/Session/LivePlayer.js +++ b/frontend/app/components/Session/LivePlayer.js @@ -60,14 +60,11 @@ export default withRequest({ loadingName: 'loadingCredentials', })(withPermissions(['ASSIST_LIVE'], '', true)(connect( state => { - // const isAssist = state.getIn(['sessions', 'activeTab']).type === 'live'; - // const hasSessioPath = state.getIn([ 'sessions', 'sessionPath' ]).includes('/sessions'); return { session: state.getIn([ 'sessions', 'current' ]), showAssist: state.getIn([ 'sessions', 'showChatWindow' ]), jwt: state.get('jwt'), fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), - // hasSessionsPath: hasSessioPath && !isAssist, isEnterprise: state.getIn([ 'user', 'client', 'edition' ]) === 'ee', hasErrors: !!state.getIn([ 'sessions', 'errors' ]), } diff --git a/frontend/app/components/Session/Session.js b/frontend/app/components/Session/Session.js index 210a24bff..f3adb2930 100644 --- a/frontend/app/components/Session/Session.js +++ b/frontend/app/components/Session/Session.js @@ -6,8 +6,6 @@ import { fetchList as fetchSlackList } from 'Duck/integrations/slack'; import { Link, NoContent, Loader } from 'UI'; import { sessions as sessionsRoute } from 'App/routes'; import withPermissions from 'HOCs/withPermissions' - -import LivePlayer from './LivePlayer'; import WebPlayer from './WebPlayer'; import IOSPlayer from './IOSPlayer'; @@ -20,7 +18,6 @@ function Session({ session, fetchSession, fetchSlackList, - hasSessionsPath }) { usePageTitle("OpenReplay Session Player"); useEffect(() => { @@ -35,41 +32,38 @@ function Session({ return () => { if (!session.exists()) return; } - },[ sessionId, hasSessionsPath ]); + },[ sessionId ]); return ( - {'Please check your data retention plan, or try '} - {'another one'} - - } - > - - { session.isIOS - ? - : - } - - + show={ hasErrors } + title="Session not found." + subtext={ + + {'Please check your data retention plan, or try '} + {'another one'} + + } + > + + { session.isIOS + ? + : + } + + ); } export default withPermissions(['SESSION_REPLAY'], '', true)(connect((state, props) => { const { match: { params: { sessionId } } } = props; - const isAssist = state.getIn(['sessions', 'activeTab']).type === 'live'; - const hasSessiosPath = state.getIn([ 'sessions', 'sessionPath' ]).includes('/sessions'); - return { - sessionId, - loading: state.getIn([ 'sessions', 'loading' ]), - hasErrors: !!state.getIn([ 'sessions', 'errors' ]), - session: state.getIn([ 'sessions', 'current' ]), - hasSessionsPath: hasSessiosPath && !isAssist, - }; -}, { - fetchSession, - fetchSlackList, + return { + sessionId, + loading: state.getIn([ 'sessions', 'loading' ]), + hasErrors: !!state.getIn([ 'sessions', 'errors' ]), + session: state.getIn([ 'sessions', 'current' ]), + }; + }, { + fetchSession, + fetchSlackList, })(Session)); \ No newline at end of file