From 1793cd16bfc4724cc313c049e403e6efd2b742ff Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 30 Jan 2023 15:03:30 +0100
Subject: [PATCH] change(ui) - notes removed an extra call to members

---
 .../Player/ReplayPlayer/EventsBlock/EventGroupWrapper.js    | 1 -
 .../Session/Player/ReplayPlayer/EventsBlock/NoteEvent.tsx   | 3 +--
 frontend/app/components/Session/WebPlayer.tsx               | 6 ------
 .../components/Session_/EventsBlock/EventGroupWrapper.js    | 1 -
 frontend/app/components/Session_/EventsBlock/NoteEvent.tsx  | 3 +--
 .../Session_/Player/Controls/components/ReadNote.tsx        | 2 +-
 .../shared/SessionListContainer/SessionListContainer.tsx    | 3 ---
 .../SessionListContainer/components/Notes/NoteItem.tsx      | 3 +--
 .../SessionListContainer/components/Notes/NoteList.tsx      | 5 +----
 frontend/app/services/NotesService.ts                       | 1 +
 10 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/EventGroupWrapper.js b/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/EventGroupWrapper.js
index 1ec053462..924be9f2c 100644
--- a/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/EventGroupWrapper.js
+++ b/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/EventGroupWrapper.js
@@ -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}
diff --git a/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/NoteEvent.tsx b/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/NoteEvent.tsx
index 676b1f901..a09869ba5 100644
--- a/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/NoteEvent.tsx
+++ b/frontend/app/components/Session/Player/ReplayPlayer/EventsBlock/NoteEvent.tsx
@@ -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)}
diff --git a/frontend/app/components/Session/WebPlayer.tsx b/frontend/app/components/Session/WebPlayer.tsx
index e2f97cd52..0a9e3c48c 100644
--- a/frontend/app/components/Session/WebPlayer.tsx
+++ b/frontend/app/components/Session/WebPlayer.tsx
@@ -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}
diff --git a/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js b/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
index 1ec053462..924be9f2c 100644
--- a/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
+++ b/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
@@ -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}
diff --git a/frontend/app/components/Session_/EventsBlock/NoteEvent.tsx b/frontend/app/components/Session_/EventsBlock/NoteEvent.tsx
index 676b1f901..a09869ba5 100644
--- a/frontend/app/components/Session_/EventsBlock/NoteEvent.tsx
+++ b/frontend/app/components/Session_/EventsBlock/NoteEvent.tsx
@@ -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)}
diff --git a/frontend/app/components/Session_/Player/Controls/components/ReadNote.tsx b/frontend/app/components/Session_/Player/Controls/components/ReadNote.tsx
index 988412b2d..550c8f99f 100644
--- a/frontend/app/components/Session_/Player/Controls/components/ReadNote.tsx
+++ b/frontend/app/components/Session_/Player/Controls/components/ReadNote.tsx
@@ -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>
diff --git a/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx b/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
index 6a863e69b..67b1e12e7 100644
--- a/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
+++ b/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
@@ -15,9 +15,6 @@ function SessionListContainer({
   fetchMembers: () => void;
   members: object[];
 }) {
-  React.useEffect(() => {
-    fetchMembers();
-  }, []);
   return (
     <div className="widget-wrapper">
       <SessionHeader />
diff --git a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
index 1ece07d7f..05113f523 100644
--- a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
@@ -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 />}
diff --git a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteList.tsx b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteList.tsx
index 0a66cd0eb..3c48d2af0 100644
--- a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteList.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteList.tsx
@@ -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>
diff --git a/frontend/app/services/NotesService.ts b/frontend/app/services/NotesService.ts
index cdecb7c3f..d66316129 100644
--- a/frontend/app/services/NotesService.ts
+++ b/frontend/app/services/NotesService.ts
@@ -32,6 +32,7 @@ export interface Note {
   tag: iTag
   timestamp: number
   userId: number
+  userName: string
 }
 
 export interface NotesFilter {