change(ui) - notes removed an extra call to members
This commit is contained in:
parent
03e28df698
commit
1793cd16bf
10 changed files with 6 additions and 22 deletions
|
|
@ -88,7 +88,6 @@ class EventGroupWrapper extends React.Component {
|
|||
)}
|
||||
{isNote ? (
|
||||
<NoteEvent
|
||||
userEmail={this.props.members.find((m) => m.id === event.userId)?.email || event.userId}
|
||||
note={event}
|
||||
filterOutNote={filterOutNote}
|
||||
onEdit={this.props.setEditNoteTooltip}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import { TeamBadge } from 'Shared/SessionListContainer/components/Notes';
|
|||
interface Props {
|
||||
note: Note;
|
||||
noEdit: boolean;
|
||||
userEmail: string;
|
||||
filterOutNote: (id: number) => void;
|
||||
onEdit: (noteTooltipObj: Record<string, any>) => void;
|
||||
}
|
||||
|
|
@ -86,7 +85,7 @@ function NoteEvent(props: Props) {
|
|||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{props.userEmail}, {props.userEmail}
|
||||
{props.note.userName}
|
||||
</div>
|
||||
<div className="text-disabled-text text-sm">
|
||||
{formatTimeOrDate(props.note.createdAt as unknown as number, timezone)}
|
||||
|
|
|
|||
|
|
@ -51,8 +51,6 @@ function WebPlayer(props: any) {
|
|||
);
|
||||
setContextValue({ player: WebPlayerInst, store: PlayerStore });
|
||||
|
||||
props.fetchMembers();
|
||||
|
||||
if (!isClickmap) {
|
||||
notesStore.fetchSessionNotes(session.sessionId).then((r) => {
|
||||
const note = props.query.get('note');
|
||||
|
|
@ -123,10 +121,6 @@ function WebPlayer(props: any) {
|
|||
<Modal open={showNoteModal} onClose={onNoteClose}>
|
||||
{showNoteModal ? (
|
||||
<ReadNote
|
||||
userEmail={
|
||||
props.members.find((m: Record<string, any>) => m.id === noteItem?.userId)?.email
|
||||
|| ''
|
||||
}
|
||||
note={noteItem}
|
||||
onClose={onNoteClose}
|
||||
notFound={!noteItem}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,6 @@ class EventGroupWrapper extends React.Component {
|
|||
)}
|
||||
{isNote ? (
|
||||
<NoteEvent
|
||||
userEmail={this.props.members.find((m) => m.id === event.userId)?.email || event.userId}
|
||||
note={event}
|
||||
filterOutNote={filterOutNote}
|
||||
onEdit={this.props.setEditNoteTooltip}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import { TeamBadge } from 'Shared/SessionListContainer/components/Notes';
|
|||
interface Props {
|
||||
note: Note;
|
||||
noEdit: boolean;
|
||||
userEmail: string;
|
||||
filterOutNote: (id: number) => void;
|
||||
onEdit: (noteTooltipObj: Record<string, any>) => void;
|
||||
}
|
||||
|
|
@ -86,7 +85,7 @@ function NoteEvent(props: Props) {
|
|||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{props.userEmail}, {props.userEmail}
|
||||
{props.note.userName}
|
||||
</div>
|
||||
<div className="text-disabled-text text-sm">
|
||||
{formatTimeOrDate(props.note.createdAt as unknown as number, timezone)}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function ReadNote(props: Props) {
|
|||
<Icon name="quotes" color="main" size={16} />
|
||||
</div>
|
||||
<div className="ml-2">
|
||||
<div className="text-base">{props.userEmail}</div>
|
||||
<div className="text-base">{props.note.userName}</div>
|
||||
<div className="text-disabled-text text-sm">
|
||||
{formatTimeOrDate(props.note.createdAt as unknown as number, timezone)}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ function SessionListContainer({
|
|||
fetchMembers: () => void;
|
||||
members: object[];
|
||||
}) {
|
||||
React.useEffect(() => {
|
||||
fetchMembers();
|
||||
}, []);
|
||||
return (
|
||||
<div className="widget-wrapper">
|
||||
<SessionHeader />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import TeamBadge from './TeamBadge';
|
|||
|
||||
interface Props {
|
||||
note: Note;
|
||||
userEmail: string;
|
||||
}
|
||||
|
||||
function NoteItem(props: Props) {
|
||||
|
|
@ -69,7 +68,7 @@ function NoteItem(props: Props) {
|
|||
) : null}
|
||||
<div className="text-disabled-text flex items-center text-sm">
|
||||
<span className="color-gray-darkest mr-1">By </span>
|
||||
{props.userEmail},{' '}
|
||||
{props.note.userName},{' '}
|
||||
{formatTimeOrDate(props.note.createdAt as unknown as number, timezone)}
|
||||
<div className="mx-2" />
|
||||
{!props.note.isPublic ? null : <TeamBadge />}
|
||||
|
|
|
|||
|
|
@ -35,10 +35,7 @@ function NotesList({ members }: { members: Array<Record<string, any>> }) {
|
|||
<div className="border-b rounded bg-white">
|
||||
{sliceListPerPage(list, notesStore.page - 1, notesStore.pageSize).map((note) => (
|
||||
<React.Fragment key={note.noteId}>
|
||||
<NoteItem
|
||||
note={note}
|
||||
userEmail={members.find((m) => m.id === note.userId)?.email || note.userId}
|
||||
/>
|
||||
<NoteItem note={note} />
|
||||
</React.Fragment>
|
||||
))}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ export interface Note {
|
|||
tag: iTag
|
||||
timestamp: number
|
||||
userId: number
|
||||
userName: string
|
||||
}
|
||||
|
||||
export interface NotesFilter {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue