diff --git a/frontend/app/components/Session/Player/ReplayPlayer/PlayerBlock.tsx b/frontend/app/components/Session/Player/ReplayPlayer/PlayerBlock.tsx index 27756f170..3aa3f1f8e 100644 --- a/frontend/app/components/Session/Player/ReplayPlayer/PlayerBlock.tsx +++ b/frontend/app/components/Session/Player/ReplayPlayer/PlayerBlock.tsx @@ -13,7 +13,6 @@ interface IProps { activeTab: string; jiraConfig: Record fullView?: boolean - isClickmap?: boolean } function PlayerBlock(props: IProps) { @@ -24,14 +23,12 @@ function PlayerBlock(props: IProps) { activeTab, jiraConfig, fullView = false, - isClickmap } = props; - const shouldShowSubHeader = !fullscreen && !fullView && !isClickmap + const shouldShowSubHeader = !fullscreen && !fullView return (
{shouldShowSubHeader ? ( @@ -39,7 +36,6 @@ function PlayerBlock(props: IProps) {
); diff --git a/frontend/app/components/Session/Player/ReplayPlayer/PlayerContent.tsx b/frontend/app/components/Session/Player/ReplayPlayer/PlayerContent.tsx index 8e46b1163..7a4f3c132 100644 --- a/frontend/app/components/Session/Player/ReplayPlayer/PlayerContent.tsx +++ b/frontend/app/components/Session/Player/ReplayPlayer/PlayerContent.tsx @@ -17,11 +17,10 @@ interface IProps { fullscreen: boolean; activeTab: string; setActiveTab: (tab: string) => void; - isClickmap: boolean; session: Session } -function PlayerContent({ session, fullscreen, activeTab, setActiveTab, isClickmap }: IProps) { +function PlayerContent({ session, fullscreen, activeTab, setActiveTab }: IProps) { const { store } = React.useContext(PlayerContext) const { @@ -60,7 +59,7 @@ function PlayerContent({ session, fullscreen, activeTab, setActiveTab, isClickma style={activeTab && !fullscreen ? { maxWidth: 'calc(100% - 270px)' } : undefined} >
- +
{activeTab !== '' && ( diff --git a/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx b/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx index e07ffd70e..0e41640f6 100644 --- a/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx +++ b/frontend/app/components/Session/Player/ReplayPlayer/PlayerInst.tsx @@ -43,7 +43,6 @@ interface IProps { nextId: string; sessionId: string; activeTab: string; - isClickmap?: boolean; updateLastPlayedSession: (id: string) => void } diff --git a/frontend/app/components/Session/WebPlayer.tsx b/frontend/app/components/Session/WebPlayer.tsx index e2f97cd52..0c2bb89ab 100644 --- a/frontend/app/components/Session/WebPlayer.tsx +++ b/frontend/app/components/Session/WebPlayer.tsx @@ -28,7 +28,6 @@ function WebPlayer(props: any) { fullscreen, fetchList, customSession, - isClickmap, insights, jumpTimestamp, onMarkerClick, @@ -41,30 +40,24 @@ function WebPlayer(props: any) { const [contextValue, setContextValue] = useState(defaultContextValue); useEffect(() => { - if (!isClickmap) { - fetchList('issues'); - } - const usedSession = isClickmap && customSession ? customSession : session; + fetchList('issues'); - const [WebPlayerInst, PlayerStore] = createWebPlayer(usedSession, (state) => + const [WebPlayerInst, PlayerStore] = createWebPlayer(session, (state) => makeAutoObservable(state) ); setContextValue({ player: WebPlayerInst, store: PlayerStore }); props.fetchMembers(); - if (!isClickmap) { - notesStore.fetchSessionNotes(session.sessionId).then((r) => { - const note = props.query.get('note'); - if (note) { - WebPlayerInst.pause(); - setNoteItem(notesStore.getNoteById(parseInt(note, 10), r)); - setShowNote(true); - } - }); - } else { - WebPlayerInst.setMarkerClick(onMarkerClick) - } + notesStore.fetchSessionNotes(session.sessionId).then((r) => { + const note = props.query.get('note'); + if (note) { + WebPlayerInst.pause(); + setNoteItem(notesStore.getNoteById(parseInt(note, 10), r)); + setShowNote(true); + } + }) + const jumpToTime = props.query.get('jumpto'); const freeze = props.query.get('freeze') @@ -102,38 +95,33 @@ function WebPlayer(props: any) { return ( - <> - {!isClickmap ? ( - + {/* @ts-ignore */} + + + {showNoteModal ? ( + ) => m.id === noteItem?.userId)?.email + || '' + } + note={noteItem} + onClose={onNoteClose} + notFound={!noteItem} /> ) : null} - {/* @ts-ignore */} - - - {showNoteModal ? ( - ) => m.id === noteItem?.userId)?.email - || '' - } - note={noteItem} - onClose={onNoteClose} - notFound={!noteItem} - /> - ) : null} - - + ); }