VIH-11222 remove host wants to join

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/hearing-controls/hearing-controls-base.component.spec.ts

@@ -888,14 +888,11 @@ describe('HearingControlsBaseComponent', () => {
             expect(videoCallService.suspendHearing).not.toHaveBeenCalled();
         });
 
-        it('should dismiss participant if confirmed leaving and another host is present', done => {
+        it('should dismiss participant if confirmed leaving and another host is present', () => {
             component.displayLeaveHearingPopup = true;
             const participantsModel = [];
             spyOn(component, 'isAnotherHostInHearing').and.returnValue(true);
             videoCallServiceSpy.leaveHearing.and.returnValue(Promise.resolve());
-            component.leaveHearing.subscribe(event => {
-                done();
-            });
 
             component.leave(true, participantsModel);
 

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/hearing-controls/hearing-controls-base.component.ts

@@ -42,7 +42,6 @@ export abstract class HearingControlsBaseComponent implements OnInit, OnDestroy
     @Output() public togglePanel = new EventEmitter<string>();
     @Output() public changeDeviceToggle = new EventEmitter();
     @Output() public changeLanguageSelected = new EventEmitter();
-    @Output() public leaveHearing = new EventEmitter();
 
     audioOnly = false;
 
@@ -459,9 +458,7 @@ export abstract class HearingControlsBaseComponent implements OnInit, OnDestroy
             const isAnotherHostInHearing = this.isAnotherHostInHearing(participants);
 
             if (isAnotherHostInHearing) {
-                this.videoCallService.leaveHearing(this.conferenceId, this.participant.id).then(() => {
-                    this.leaveHearing.emit();
-                });
+                this.videoCallService.leaveHearing(this.conferenceId, this.participant.id);
             } else {
                 this.videoCallService.suspendHearing(this.conferenceId);
             }

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.html

@@ -59,7 +59,6 @@
   <div class="video-wrapper">
     <video
       appForcePlayVideo
-      [muted]="shouldMuteHearing()"
       id="incomingFeedPrivate"
       [srcObject]="presentationStream && !streamInMain ? presentationStream : callStream"
       height="auto"

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html

@@ -37,8 +37,7 @@ <h1 #roomTitleLabel class="room-title-label">{{ getCaseNameAndNumber() }}</h1>
                                 [areParticipantsVisible]="areParticipantsVisible"
                                 (leaveConsultation)="leaveConsultation()"
                                 (togglePanel)="togglePanel($event)"
-                                (changeDeviceToggle)="showChooseCameraDialog()"
-                                (leaveHearing)="leaveHearing()">
+                                (changeDeviceToggle)="showChooseCameraDialog()">
                                 [conference]="conference">
                             </app-private-consultation-room-controls>
                         </div>
@@ -70,7 +69,6 @@ <h1 #roomTitleLabel class="room-title-label">{{ getCaseNameAndNumber() }}</h1>
                         <video
                             appForcePlayVideo
                             id="incomingFeedJudgePrivate"
-                            [muted]="shouldMuteHearing()"
                             [srcObject]="presentationStream && !streamInMain ? presentationStream : callStream"
                             height="auto"
                             class="incomingFeedPrivate"

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.spec.ts

@@ -56,7 +56,6 @@ import { HearingLayoutService } from 'src/app/services/hearing-layout.service';
 import { createParticipantRemoteMuteStoreServiceSpy } from '../services/mock-participant-remote-mute-store.service';
 import { ParticipantUpdated } from '../models/video-call-models';
 import { PexipDisplayNameModel } from '../../services/conference/models/pexip-display-name.model';
-import { WaitingRoomBaseDirective } from '../waiting-room-shared/waiting-room-base.component';
 import { FEATURE_FLAGS } from 'src/app/services/launch-darkly.service';
 import { ConferenceStatusMessage } from '../../services/models/conference-status-message';
 import { audioRecordingServiceSpy } from '../../testing/mocks/mock-audio-recording.service';
@@ -482,7 +481,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         flush();
 
         expect(videoCallService.startHearing).toHaveBeenCalledWith(component.conference.id, layout);
-        expect(component.hostWantsToJoinHearing).toBeTrue();
     }));
 
     it('should handle api error when start hearing fails', async () => {
@@ -498,7 +496,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         await component.joinHearingInSession();
 
         expect(videoCallService.joinHearingInSession).toHaveBeenCalledWith(component.conferenceId, component.participant.id);
-        expect(component.shouldCurrentUserJoinHearing()).toBeTrue();
     });
 
     describe('Audio recording and alert notifications', () => {
@@ -617,7 +614,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         // Assert
         expect(component.displayConfirmStartHearingPopup).toBeFalsy();
         expect(videoCallService.startHearing).toHaveBeenCalledOnceWith(hearingId, hearingLayout);
-        expect(component.hostWantsToJoinHearing).toBeTrue();
     }));
 
     it('should not enable IM when hearing has not been initalised', () => {
@@ -660,15 +656,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         expect(component.conferenceStartedBy).toBe(null);
     }));
 
-    it('should set shouldUpdateHostShowVideo to false when participant not connecting to pexip', async () => {
-        component.hostWantsToJoinHearing = true;
-        component.connected = false;
-
-        component.updateShowVideo();
-
-        expect(component.hostWantsToJoinHearing).toBeFalse();
-    });
-
     it('should not pull the STAFFMEMBER in to the hearing when STAFFMEMBER is in Waiting Room and hearing started by the JUDGE', () => {
         component.ngOnInit();
         component.connected = true;
@@ -689,7 +676,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         component.conferenceStartedBy = component.conference.participants.find(p => p.role === Role.StaffMember).id;
         component.participant = component.conference.participants.find(p => p.role === Role.StaffMember);
         component.participant.status = ParticipantStatus.InHearing;
-        component.hostWantsToJoinHearing = true;
         component.updateShowVideo();
 
         expect(component.hearing.isInSession()).toBeTrue();
@@ -709,7 +695,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         component.conferenceStartedBy = component.conference.participants.find(p => p.role === Role.StaffMember).id;
         component.participant = component.conference.participants.find(p => p.role === Role.StaffMember);
         component.participant.status = ParticipantStatus.InConsultation;
-        component.hostWantsToJoinHearing = false;
         component.updateShowVideo();
 
         expect(component.hearing.isInSession()).toBeFalse();
@@ -994,38 +979,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
         });
     });
 
-    describe('shouldUnmuteForHearing', () => {
-        let superShouldUnmuteForHearing: jasmine.SpyObj<any>;
-
-        beforeEach(() => {
-            superShouldUnmuteForHearing = spyOn(WaitingRoomBaseDirective.prototype, 'shouldUnmuteForHearing');
-        });
-
-        it('should return false when super.shouldUnmuteForHearing is false hostWantsToJoinHearing is false', () => {
-            superShouldUnmuteForHearing.and.returnValue(false);
-            component.hostWantsToJoinHearing = false;
-            expect(component.shouldUnmuteForHearing()).toBe(false);
-        });
-
-        it('should return false when super.shouldUnmuteForHearing is false hostWantsToJoinHearing is true', () => {
-            superShouldUnmuteForHearing.and.returnValue(false);
-            component.hostWantsToJoinHearing = true;
-            expect(component.shouldUnmuteForHearing()).toBe(false);
-        });
-
-        it('should return false when super.shouldUnmuteForHearing is true hostWantsToJoinHearing is false', () => {
-            superShouldUnmuteForHearing.and.returnValue(true);
-            component.hostWantsToJoinHearing = false;
-            expect(component.shouldUnmuteForHearing()).toBe(false);
-        });
-
-        it('should return true when super.shouldUnmuteForHearing is true hostWantsToJoinHearing is true', () => {
-            superShouldUnmuteForHearing.and.returnValue(true);
-            component.hostWantsToJoinHearing = true;
-            expect(component.shouldUnmuteForHearing()).toBe(true);
-        });
-    });
-
     describe('updateSpotlightStateOnParticipantDisconnectDuringConference', () => {
         it('should do nothing if the conference is not in session', () => {
             // Arrange
@@ -1128,11 +1081,6 @@ describe('JudgeWaitingRoomComponent when conference exists', () => {
             // Assert
             expect(videoControlCacheServiceSpy.setSpotlightStatus).toHaveBeenCalledOnceWith(participant.id, false);
         });
-
-        it('should return hostWantsToJoinHearing false when leave hearing button has been clicked', () => {
-            component.leaveHearing();
-            expect(component.hostWantsToJoinHearing).toBeFalse();
-        });
     });
 
     describe('joinHearingClicked', () => {

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.ts

@@ -51,7 +51,6 @@ import { getCountdownComplete } from '../store/selectors/conference.selectors';
 export class JudgeWaitingRoomComponent extends WaitingRoomBaseDirective implements OnDestroy, OnInit {
     continueWithNoRecording = false;
     expanedPanel = true;
-    hostWantsToJoinHearing = false;
     displayConfirmStartHearingPopup: boolean;
     displayJoinHearingPopup: boolean;
 
@@ -325,7 +324,6 @@ export class JudgeWaitingRoomComponent extends WaitingRoomBaseDirective implemen
 
         this.hearingLayoutService.currentLayout$.pipe(take(1)).subscribe(async layout => {
             try {
-                this.hostWantsToJoinHearing = true;
                 await this.videoCallService.startHearing(this.hearing.id, layout);
             } catch (err) {
                 this.logger.error(`${this.loggerPrefixJudge} Failed to ${action} a hearing for conference`, err, {
@@ -364,17 +362,11 @@ export class JudgeWaitingRoomComponent extends WaitingRoomBaseDirective implemen
     }
 
     async joinHearingInSession() {
-        this.hostWantsToJoinHearing = true;
         await this.videoCallService.joinHearingInSession(this.conferenceId, this.participant.id);
     }
 
     shouldCurrentUserJoinHearing(): boolean {
-        return this.participant.status === ParticipantStatus.InHearing || this.hostWantsToJoinHearing;
-    }
-
-    resetVideoFlags() {
-        super.resetVideoFlags();
-        this.hostWantsToJoinHearing = false;
+        return this.participant.status === ParticipantStatus.InHearing;
     }
 
     audioRestartCallback(continueWithNoRecording: boolean) {
@@ -427,14 +419,6 @@ export class JudgeWaitingRoomComponent extends WaitingRoomBaseDirective implemen
         }
     }
 
-    leaveHearing() {
-        this.hostWantsToJoinHearing = false;
-    }
-
-    shouldUnmuteForHearing(): boolean {
-        return super.shouldUnmuteForHearing() && this.hostWantsToJoinHearing;
-    }
-
     setTrapFocus() {
         ModalTrapFocus.trap('video-container');
     }

VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html

@@ -69,7 +69,6 @@ <h1 #roomTitleLabel class="room-title-label">{{ getCaseNameAndNumber() }}</h1>
     <video
       appForcePlayVideo
       id="incomingFeedPrivate"
-      [muted]="shouldMuteHearing()"
       [srcObject]="presentationStream && !streamInMain ? presentationStream : callStream"
       poster="/assets/images/empty_crest.jpg"
     >