fixup! ✨(front) manage chat user useParticipantsStore on disconnect

openfun · Apr 4, 2023 · 3d7cc59 · 3d7cc59
1 parent 37656ad
commit 3d7cc59
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/src/frontend/packages/lib_video/src/components/common/VideoInfoBar/index.spec.tsx b/src/frontend/packages/lib_video/src/components/common/VideoInfoBar/index.spec.tsx
@@ -39,24 +39,28 @@ describe('<VideoInfoBar />', () => {
       participants: [
         {
           id: 'id-anonymous',
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
           name: 'my anonymous name',
         },
         {
           id: 'id-anonymous-2',
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: true,
           name: 'my anonymous name 2',
         },
         {
           id: 'id-named',
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
           name: 'my name',
         },
         {
           id: 'id-instructor',
+          userJid: 'userJid-anonymous',
           isInstructor: true,
           isOnStage: true,
           name: 'my instructor',
@@ -260,16 +264,19 @@ describe('<VideoInfoBar />', () => {
       participants: [
         {
           ...mockParticipant,
+          userJid: 'userJid-anonymous',
           isInstructor: true,
           isOnStage: false,
         },
         {
           ...mockParticipant,
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: true,
         },
         {
           ...mockParticipant,
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
         },

diff --git a/src/frontend/packages/lib_video/src/components/live/common/LiveVideoPanel/index.spec.tsx b/src/frontend/packages/lib_video/src/components/live/common/LiveVideoPanel/index.spec.tsx
@@ -113,6 +113,7 @@ describe('<LiveVideoPanel />', () => {
       participants: [
         {
           ...mockParticipant,
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
         },
@@ -154,6 +155,7 @@ describe('<LiveVideoPanel />', () => {
       participants: [
         {
           ...mockParticipant,
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
         },

diff --git a/src/frontend/packages/lib_video/src/components/live/common/ViewersList/index.spec.tsx b/src/frontend/packages/lib_video/src/components/live/common/ViewersList/index.spec.tsx
@@ -32,32 +32,37 @@ const mockedParticipantOnStage2 = participantMockFactory();
 
 const mockedParticipantOnStage1Full = {
   ...mockedParticipantOnStage1,
+  userJid: 'userJid-stage1',
   isInstructor: false,
   isOnStage: true,
 };
 
 const mockedParticipantOnStage2Full = {
   ...mockedParticipantOnStage2,
+  userJid: 'userJid-stage2',
   isInstructor: false,
   isOnStage: true,
 };
 
 const participant1 = {
   id: 'example.jid.student1@prosody.org',
+  userJid: 'userJid-student1',
   isInstructor: true,
   isOnStage: false,
   name: 'Student 1',
 };
 
 const participant2 = {
   id: 'example.jid.student2@prosody.org',
+  userJid: 'userJid-student2',
   isInstructor: false,
   isOnStage: false,
   name: 'Student 2',
 };
 
 const participant3 = {
   id: 'example.jid.student3@prosody.org',
+  userJid: 'userJid-student3',
   isInstructor: false,
   isOnStage: false,
   name: 'Student 3',
@@ -230,12 +235,14 @@ describe('<ViewersList /> when user is an instructor', () => {
       participants: [
         {
           id: 'id-anonymous',
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
           name: anonymousName,
         },
         {
           id: 'id-named',
+          userJid: 'userJid-anonymous',
           isInstructor: false,
           isOnStage: false,
           name: 'my name',
@@ -269,6 +276,7 @@ describe('<ViewersList /> when user is a student', () => {
     act(() =>
       useParticipantsStore.getState().addParticipant({
         id: 'example.jid.instructor@prosody.org',
+        userJid: 'userJid-instructor',
         isInstructor: true,
         isOnStage: true,
         name: 'Instructor',
@@ -279,6 +287,7 @@ describe('<ViewersList /> when user is a student', () => {
     act(() =>
       useParticipantsStore.getState().addParticipant({
         id: 'example.jid.student1@prosody.org',
+        userJid: 'userJid-student1',
         isInstructor: false,
         isOnStage: false,
         name: 'Student 1',
@@ -289,6 +298,7 @@ describe('<ViewersList /> when user is a student', () => {
     act(() =>
       useParticipantsStore.getState().addParticipant({
         id: 'example.jid.student2@prosody.org',
+        userJid: 'userJid-student2',
         isInstructor: false,
         isOnStage: false,
         name: 'Student 2',
@@ -304,6 +314,7 @@ describe('<ViewersList /> when user is a student', () => {
     act(() =>
       useParticipantsStore.getState().addParticipant({
         id: 'example.jid.student2@prosody.org',
+        userJid: 'userJid-student2',
         isInstructor: false,
         isOnStage: false,
         name: 'Student 2',

diff --git a/src/frontend/packages/lib_video/src/components/live/common/ViewersList/utils.spec.ts b/src/frontend/packages/lib_video/src/components/live/common/ViewersList/utils.spec.ts
@@ -12,24 +12,28 @@ describe('sortParticipantNotOnStage', () => {
   it('sorts participants', () => {
     const anonymous1: ParticipantType = {
       id: 'id1',
+      userJid: 'userJid-id1',
       name: generateAnonymousNickname(),
       isInstructor: false,
       isOnStage: false,
     };
     const anonymous2: ParticipantType = {
       id: 'id2',
+      userJid: 'userJid-id2',
       name: generateAnonymousNickname(),
       isInstructor: false,
       isOnStage: false,
     };
     const registered1: ParticipantType = {
       id: 'id3',
+      userJid: 'userJid-id3',
       name: 'John Wick',
       isInstructor: false,
       isOnStage: false,
     };
     const registered2: ParticipantType = {
       id: 'id4',
+      userJid: 'userJid-id4',
       name: 'Jack Sparrow',
       isInstructor: false,
       isOnStage: false,

diff --git a/src/frontend/packages/lib_video/src/hooks/useParticipantsStore/index.spec.tsx b/src/frontend/packages/lib_video/src/hooks/useParticipantsStore/index.spec.tsx
@@ -2,41 +2,47 @@ import { useParticipantsStore } from '.';
 
 const participant1 = {
   id: 'example.jid.instructor1@prosody.org',
+  userJid: 'userJid-instructor1',
   isInstructor: true,
   isOnStage: true,
   name: 'Instructor 1',
 };
 
 const participant2 = {
   id: 'example.jid.instructor2@prosody.org',
+  userJid: 'userJid-instructor2',
   isInstructor: true,
   isOnStage: true,
   name: 'Instructor 2',
 };
 
 const participant3 = {
   id: 'example.jid.student1@prosody.org',
+  userJid: 'userJid-student1',
   isInstructor: false,
   isOnStage: true,
   name: 'Student 1',
 };
 
 const participant4 = {
   id: 'example.jid.student2@prosody.org',
+  userJid: 'userJid-student2',
   isInstructor: false,
   isOnStage: false,
   name: 'Student 2',
 };
 
 const sameIdParticipant1 = {
   id: 'example.jid.instructor1@prosody.org',
+  userJid: 'userJid-instructor1',
   isInstructor: false,
   isOnStage: false,
   name: 'Generic participant',
 };
 
 const sameNameParticipant1 = {
   id: 'example.jid.generic@prosody.org',
+  userJid: 'userJid-generic',
   isInstructor: false,
   isOnStage: false,
   name: 'Instructor 1',