diff --git a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
index 1b1d694dd..bd026797e 100644
--- a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
+++ b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
@@ -1,77 +1,27 @@
import React, { useEffect, useState } from 'react';
-import { connect } from 'react-redux';
-import { applyFilter, addAttribute } from 'Duck/filters';
-import { fetchList } from 'Duck/sessions';
-import { KEYS } from 'Types/filter/customFilter';
-import { Link, Loader } from 'UI';
-import Filter from 'Types/filter';
-import { List } from 'immutable';
-import Counter from 'App/components/shared/SessionItem/Counter';
-import { fetchLiveList } from 'Duck/sessions';
-import { session as sessionRoute } from 'App/routes';
-import { session } from 'App/components/Session_/session.css';
-
-const RowItem = ({ startedAt, sessionId }) => {
- return (
-
-
- Tab1
-
-
-
- );
-}
+import { SlideModal } from 'UI';
+import SessionList from '../SessionList';
interface Props {
- list: List,
- session: any,
- fetchLiveList: () => void,
- applyFilter: () => void,
- filters: Filter
- addAttribute: (obj) => void,
- loading: boolean
+ userId: any,
}
const AssistTabs = React.memo((props: Props) => {
const [showMenu, setShowMenu] = useState(false)
- useEffect(() => {
- if (showMenu) {
- props.fetchLiveList();
- }
- }, [showMenu])
-
- useEffect(() => {
- if (!props.loading && props.list.size === 0) {
- props.fetchLiveList();
- }
- }, [props.list])
-
return (
-
setShowMenu(!showMenu)}>Active Tabs
- {showMenu && (
-
-
- {props.list.map((item, index) => (
-
- ))}
-
-
- )}
+
setShowMenu(!showMenu)}>
+ Live Sessions
+
+
Live Sessions by {props.userId} }
+ isDisplayed={ showMenu }
+ content={ showMenu && }
+ onClose={ () => setShowMenu(false) }
+ />
);
});
-export default connect(state => {
- const session = state.getIn([ 'sessions', 'current' ]);
- return {
- loading: state.getIn([ 'sessions', 'fetchLiveListRequest', 'loading' ]),
- list: state.getIn(['sessions', 'liveSessions']).filter(i => i.userId === session.userId),
- session,
- filters: state.getIn([ 'filters', 'appliedFilter' ]),
- }
-}, { applyFilter, addAttribute, fetchLiveList })(AssistTabs);
\ No newline at end of file
+export default AssistTabs;
\ No newline at end of file
diff --git a/frontend/app/components/Assist/components/SessionList/SessionList.tsx b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
new file mode 100644
index 000000000..aaab06fca
--- /dev/null
+++ b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
@@ -0,0 +1,40 @@
+import React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { fetchLiveList } from 'Duck/sessions';
+import { Loader, NoContent } from 'UI';
+import SessionItem from 'Shared/SessionItem';
+
+interface Props {
+ loading: boolean,
+ list: any,
+ session: any,
+ fetchLiveList: () => void,
+}
+function SessionList(props: Props) {
+ useEffect(() => {
+ props.fetchLiveList();
+ }, [])
+
+ return (
+
+
+
+ { props.list.map(session => ) }
+
+
+
+ );
+}
+
+export default connect(state => {
+ const session = state.getIn([ 'sessions', 'current' ]);
+ return {
+ session,
+ list: state.getIn(['sessions', 'liveSessions'])
+ .filter(i => i.userId === session.userId && i.sessionId !== session.sessionId),
+ loading: state.getIn([ 'sessions', 'fetchLiveListRequest', 'loading' ]),
+ }
+}, { fetchLiveList })(SessionList);
\ No newline at end of file
diff --git a/frontend/app/components/Assist/components/SessionList/index.ts b/frontend/app/components/Assist/components/SessionList/index.ts
new file mode 100644
index 000000000..779c9df2a
--- /dev/null
+++ b/frontend/app/components/Assist/components/SessionList/index.ts
@@ -0,0 +1 @@
+export { default } from './SessionList';
\ No newline at end of file
diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js
index fbc0b0a5b..20b5af366 100644
--- a/frontend/app/components/Session_/PlayerBlockHeader.js
+++ b/frontend/app/components/Session_/PlayerBlockHeader.js
@@ -116,7 +116,7 @@ export default class PlayerBlockHeader extends React.PureComponent {
- { live &&
}
+ { live &&
}
{ live &&
}
{ !live && (
<>