diff --git a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx index 47f93eaa8..7ac544de2 100644 --- a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx +++ b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx @@ -1,37 +1,29 @@ import { useModal } from 'App/components/Modal'; -import React, { useState } from 'react'; +import React from 'react'; import SessionList from '../SessionList'; -import stl from './assistTabs.module.css' +import stl from './assistTabs.module.css'; interface Props { - userId: any, - userNumericHash: any, + userId: any; } const AssistTabs = (props: Props) => { - const [showMenu, setShowMenu] = useState(false) const { showModal } = useModal(); return (
{props.userId && ( - <> -
showModal(, { right: true, width: 700 })} - > - Active Sessions -
- +
+ showModal(, { right: true, width: 700 }) + } + > + Active Sessions +
)}
- {/* {props.userId}'s Live Sessions
} - isDisplayed={ showMenu } - content={ showMenu && } - onClose={ () => setShowMenu(false) } - /> */} ); }; diff --git a/frontend/app/components/Assist/components/SessionList/SessionList.tsx b/frontend/app/components/Assist/components/SessionList/SessionList.tsx index a919fcf09..4f297d2c5 100644 --- a/frontend/app/components/Assist/components/SessionList/SessionList.tsx +++ b/frontend/app/components/Assist/components/SessionList/SessionList.tsx @@ -46,7 +46,7 @@ function SessionList(props: Props) { >
{props.list.map((session: any) => ( -
+
{session.pageTitle && session.pageTitle !== '' && (
)} - hideModal()} key={session.sessionId} session={session} /> +
))}
diff --git a/frontend/app/components/Session/Player/LivePlayer/LivePlayerBlockHeader.tsx b/frontend/app/components/Session/Player/LivePlayer/LivePlayerBlockHeader.tsx index 1fd3b503e..2394e81ca 100644 --- a/frontend/app/components/Session/Player/LivePlayer/LivePlayerBlockHeader.tsx +++ b/frontend/app/components/Session/Player/LivePlayer/LivePlayerBlockHeader.tsx @@ -46,7 +46,7 @@ function LivePlayerBlockHeader(props: any) { history.push(withSiteId(ASSIST_ROUTE, siteId)); }; - const { userId, userNumericHash, metadata, isCallActive, agentIds } = session; + const { userId, metadata, isCallActive, agentIds } = session; let _metaList = Object.keys(metadata) .filter((i) => metaList.includes(i)) .map((key) => { @@ -87,7 +87,7 @@ function LivePlayerBlockHeader(props: any) {
)} - +
{_metaList.length > 0 && ( diff --git a/frontend/app/components/shared/SessionItem/SessionItem.tsx b/frontend/app/components/shared/SessionItem/SessionItem.tsx index 64d4bec18..eb228dd4d 100644 --- a/frontend/app/components/shared/SessionItem/SessionItem.tsx +++ b/frontend/app/components/shared/SessionItem/SessionItem.tsx @@ -55,6 +55,7 @@ interface Props { compact?: boolean; isDisabled?: boolean; isAdd?: boolean; + ignoreAssist?: boolean; } function SessionItem(props: RouteComponentProps & Props) { @@ -70,6 +71,7 @@ function SessionItem(props: RouteComponentProps & Props) { lastPlayedSessionId, onClick = null, compact = false, + ignoreAssist = false, } = props; const { @@ -99,9 +101,10 @@ function SessionItem(props: RouteComponentProps & Props) { const hasUserId = userId || userAnonymousId; const isSessions = isRoute(SESSIONS_ROUTE, location.pathname); const isAssist = - isRoute(ASSIST_ROUTE, location.pathname) || - isRoute(ASSIST_LIVE_SESSION, location.pathname) || - location.pathname.includes('multiview'); + !ignoreAssist && + (isRoute(ASSIST_ROUTE, location.pathname) || + isRoute(ASSIST_LIVE_SESSION, location.pathname) || + location.pathname.includes('multiview')); const isLastPlayed = lastPlayedSessionId === sessionId; const _metaList = Object.keys(metadata) diff --git a/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx b/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx index 0777d9925..890fc3ce7 100644 --- a/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx +++ b/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx @@ -70,7 +70,7 @@ function UserSessionsModal(props: Props) { {data.sessions.map((session: any) => (
- +
))}