session history latency not showing
includes fix for showing unknown latency badge for all sessions and reformat the session time
This commit is contained in:
parent
ed9887f9e9
commit
ae138b79c0
|
|
@ -8,6 +8,7 @@ import JKUserLatencyBadge from '../profile/JKUserLatencyBadge';
|
|||
import { useTranslation } from 'react-i18next';
|
||||
import { useAuth } from '../../context/UserAuth';
|
||||
import { fetchUserLatencies } from '../../store/features/latencySlice';
|
||||
import { useDispatch } from 'react-redux';
|
||||
|
||||
const JKSessionsHistoryItem = ({ session_id, sessionGroup }) => {
|
||||
const { greaterThan } = useResponsive();
|
||||
|
|
@ -15,6 +16,7 @@ const JKSessionsHistoryItem = ({ session_id, sessionGroup }) => {
|
|||
const [participants, setParticipants] = useState([]);
|
||||
const { t } = useTranslation();
|
||||
const { currentUser } = useAuth();
|
||||
const dispatch = useDispatch();
|
||||
|
||||
useEffect(() => {
|
||||
console.log('sessionGroup', sessionGroup);
|
||||
|
|
@ -43,14 +45,12 @@ const JKSessionsHistoryItem = ({ session_id, sessionGroup }) => {
|
|||
);
|
||||
}, [sessionGroup]);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
if (participants.length > 0 && currentUser) {
|
||||
const currentUserId = currentUser.id;
|
||||
const otherUserIds = participants.filter(p => p.id !== currentUserId).map(p => p.id);
|
||||
console.log('X_DEBUG_ JKSessionsHistoryItem', currentUserId, otherUserIds);
|
||||
fetchUserLatencies({ currentUserId, otherUserIds});
|
||||
dispatch(fetchUserLatencies({ currentUserId, otherUserIds }));
|
||||
}
|
||||
}, [participants]);
|
||||
|
||||
|
|
@ -94,10 +94,14 @@ const JKSessionsHistoryItem = ({ session_id, sessionGroup }) => {
|
|||
))}
|
||||
</td>
|
||||
<td className="text-center">
|
||||
{participants.filter(p => p.user.id !== currentUser.id).map(participant => (
|
||||
{participants.map(participant => (
|
||||
<Row key={participant.id} style={musicianRowStyle}>
|
||||
<Col>
|
||||
<JKUserLatencyBadge key={participant.id} user={participant.user} showBadgeOnly={true} />
|
||||
{participant.id !== currentUser.id ? (
|
||||
<JKUserLatencyBadge key={participant.id} user={participant.user} showBadgeOnly={true} />
|
||||
) : (
|
||||
<span />
|
||||
)}
|
||||
</Col>
|
||||
</Row>
|
||||
))}
|
||||
|
|
@ -106,22 +110,23 @@ const JKSessionsHistoryItem = ({ session_id, sessionGroup }) => {
|
|||
{participants.map(participant => (
|
||||
<Row style={musicianRowStyle} key={participant.id} data-testid={`Participant${participant.id}Tracks`}>
|
||||
<Col>
|
||||
{participant.tracks && participant.tracks.map(track => (
|
||||
<span key={track.id} className="mr-1 mb-1" title={track.instrment}>
|
||||
<a
|
||||
id={`Participant${participant.id}Track${track.id}Instrument`}
|
||||
data-testid={`Track${track.id}Instrument`}
|
||||
>
|
||||
<JKInstrumentIcon instrumentId={track.instrument_id} instrumentName={track.instrument} />
|
||||
</a>
|
||||
<UncontrolledTooltip
|
||||
placement="top"
|
||||
target={`Participant${participant.id}Track${track.id}Instrument`}
|
||||
>
|
||||
{track.instrument}
|
||||
</UncontrolledTooltip>
|
||||
</span>
|
||||
))}
|
||||
{participant.tracks &&
|
||||
participant.tracks.map(track => (
|
||||
<span key={track.id} className="mr-1 mb-1" title={track.instrment}>
|
||||
<a
|
||||
id={`Participant${participant.id}Track${track.id}Instrument`}
|
||||
data-testid={`Track${track.id}Instrument`}
|
||||
>
|
||||
<JKInstrumentIcon instrumentId={track.instrument_id} instrumentName={track.instrument} />
|
||||
</a>
|
||||
<UncontrolledTooltip
|
||||
placement="top"
|
||||
target={`Participant${participant.id}Track${track.id}Instrument`}
|
||||
>
|
||||
{track.instrument}
|
||||
</UncontrolledTooltip>
|
||||
</span>
|
||||
))}
|
||||
</Col>
|
||||
</Row>
|
||||
))}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ const useSessionHelper = (session) => {
|
|||
const sessionDateTime = session => {
|
||||
if(!session.created_at) return '';
|
||||
const date = new Date(session.created_at);
|
||||
return moment(date).format('dddd, MMMM Do YYYY, h:mm A z');
|
||||
return moment(date).format('dddd, MMMM DD, YYYY, h:mmA z');
|
||||
};
|
||||
|
||||
return {
|
||||
|
|
|
|||
Loading…
Reference in New Issue