VIH-11147 refactor participant panel component to read from the redux…

… store (#2307) * add transfer direction to participant * all participants in consultation or waiting room now treated as in WR
hmcts · Nov 18, 2024 · e8f4b76 · e8f4b76
1 parent dff3615
commit e8f4b76
Show file tree

Hide file tree

Showing 30 changed files with 330 additions and 1,032 deletions.
diff --git a/VideoWeb/VideoWeb.EventHub/VideoWeb.EventHub.csproj b/VideoWeb/VideoWeb.EventHub/VideoWeb.EventHub.csproj
@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VideoWeb.Common\VideoWeb.Common.csproj" />

diff --git a/...b.UnitTests/Controllers/ConferenceManagement/GetVideoControlStatusesForConferenceTests.cs b/...b.UnitTests/Controllers/ConferenceManagement/GetVideoControlStatusesForConferenceTests.cs
@@ -46,16 +46,18 @@ public async Task should_return_the_statuses_for_the_conference()
         }
 
         [Test]
-        public async Task should_return_NoContent_status_code_if_video_control_statuses_is_null()
+        public async Task should_return_empty_dictionary_if_video_control_statuses_is_null()
         {
-
+            var conferenceVideoControlStatuses = new ConferenceVideoControlStatuses();
+
             _mocker.Mock<IConferenceVideoControlStatusService>()
                 .Setup(x => x.GetVideoControlStateForConference(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(() => default);
 
-            var response = await _sut.GetVideoControlStatusesForConference(_conferenceId) as NoContentResult;
+            var response = await _sut.GetVideoControlStatusesForConference(_conferenceId);
 
-            ClassicAssert.AreEqual(response.StatusCode, (int)HttpStatusCode.NoContent);
+
+            response.Should().BeAssignableTo<OkObjectResult>().Which.Value.Should().BeEquivalentTo(conferenceVideoControlStatuses);
         }
 
         [Test]

diff --git a/VideoWeb/VideoWeb.UnitTests/packages.lock.json b/VideoWeb/VideoWeb.UnitTests/packages.lock.json
@@ -2240,11 +2240,8 @@
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.4",
-        "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==",
-        "dependencies": {
-          "System.Text.Encodings.Web": "8.0.0"
-        }
+        "resolved": "8.0.5",
+        "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg=="
       },
       "System.Text.RegularExpressions": {
         "type": "Transitive",
@@ -2407,7 +2404,7 @@
           "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )",
           "Microsoft.AspNetCore.SignalR": "[1.1.0, )",
           "Microsoft.Extensions.Caching.Abstractions": "[8.0.0, )",
-          "System.Text.Json": "[8.0.4, )",
+          "System.Text.Json": "[8.0.5, )",
           "VideoWeb.Common": "[1.0.0, )",
           "VideoWeb.Contract": "[1.0.0, )"
         }

diff --git a/VideoWeb/VideoWeb/ClientApp/package-lock.json b/VideoWeb/VideoWeb/ClientApp/package-lock.json
diff --git a/VideoWeb/VideoWeb/ClientApp/package.json b/VideoWeb/VideoWeb/ClientApp/package.json
@@ -115,7 +115,7 @@
     "ng-mocks": "^14.12.2",
     "nswag": "^14.1.0",
     "prettier": "^3.3.3",
-    "puppeteer": "^23.7.1",
+    "puppeteer": "^23.8.0",
     "run-script-os": "^1.1.6",
     "sass": "^1.77.8",
     "typescript": ">=5.2.0 <5.4.0"

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/audio-recording.service.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/audio-recording.service.spec.ts
@@ -20,6 +20,7 @@ describe('AudioRecordingService', () => {
         isRemoteMuted: false,
         isSpotlighted: false,
         handRaised: false,
+        isVideoMuted: false,
         pexipDisplayName: 'vh-wowza',
         uuid: 'unique-identifier',
         callTag: 'call-tag',

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/clients/api-client.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/clients/api-client.ts
@@ -2019,15 +2019,6 @@ export class ApiClient extends ApiClientBase {
                     return _observableOf(result200);
                 })
             );
-        } else if (status === 204) {
-            return blobToText(responseBlob).pipe(
-                _observableMergeMap(_responseText => {
-                    let result204: any = null;
-                    let resultData204 = _responseText === '' ? null : JSON.parse(_responseText, this.jsonParseReviver);
-                    result204 = ConferenceVideoControlStatuses.fromJS(resultData204);
-                    return _observableOf(result204);
-                })
-            );
         } else if (status === 401) {
             return blobToText(responseBlob).pipe(
                 _observableMergeMap(_responseText => {

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/conference/participant.service.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/conference/participant.service.spec.ts
@@ -1237,6 +1237,7 @@ describe('ParticipantService', () => {
                 callTag: undefined,
                 isRemoteMuted: false,
                 isSpotlighted: false,
+                isVideoMuted: false,
                 handRaised: false,
                 isAudioOnlyCall: false,
                 isVideoCall: false,

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/conference/participant.service.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/conference/participant.service.ts
@@ -213,6 +213,9 @@ export class ParticipantService {
         this.logger.debug(`${this.loggerPrefix} loading participants and VMRs`);
 
         const conferenceId = this.conferenceService.currentConferenceId;
+        if (!conferenceId) {
+            return;
+        }
         return zip(
             this.conferenceService.getParticipantsForConference(conferenceId),
             this.conferenceService.getEndpointsForConference(conferenceId)

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts
@@ -117,6 +117,7 @@ export class HearingLayoutService {
 
     getCurrentRecommendedLayout(): Observable<HearingLayout> {
         return this.conferenceService.currentConference$.pipe(
+            filter(conference => conference !== null),
             take(1),
             map(conference => conference.id),
             mergeMap(conferenceId => this.apiClient.getRecommendedLayoutForHearing(conferenceId))
@@ -135,6 +136,7 @@ export class HearingLayoutService {
     updateCurrentLayout(layout: HearingLayout) {
         this.conferenceService.currentConference$
             .pipe(
+                filter(conference => conference !== null),
                 take(1),
                 map(conference => conference.id)
             )

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/shared/mappers/participant-panel-model-mapper.ts b/VideoWeb/VideoWeb/ClientApp/src/app/shared/mappers/participant-panel-model-mapper.ts
@@ -4,8 +4,37 @@ import { PanelModel } from 'src/app/waiting-space/models/panel-model-base';
 import { ParticipantPanelModel } from 'src/app/waiting-space/models/participant-panel-model';
 import { ParticipantModel } from '../models/participant';
 import { HearingRole } from 'src/app/waiting-space/models/hearing-role-model';
+import { VHParticipant } from 'src/app/waiting-space/store/models/vh-conference';
 
 export class ParticipantPanelModelMapper {
+    mapFromVHParticipants(participants: VHParticipant[]): PanelModel[] {
+        const panelModels: PanelModel[] = [];
+        participants.forEach(p => {
+            const panelModel = new ParticipantPanelModel(
+                p.id,
+                p.displayName,
+                p.role,
+                p.tiledDisplayName,
+                p.hearingRole,
+                p.representee,
+                p.status
+            );
+            if (p.pexipInfo) {
+                panelModel.assignPexipId(p.pexipInfo.uuid);
+                panelModel.updateParticipant(
+                    p.pexipInfo.isRemoteMuted,
+                    p.pexipInfo.handRaised,
+                    p.pexipInfo.isSpotlighted,
+                    p.id,
+                    p.localMediaStatus?.isMicrophoneMuted,
+                    p.localMediaStatus?.isCameraOff
+                );
+            }
+            panelModels.push(panelModel);
+        });
+        return panelModels;
+    }
+
     mapFromParticipantUserResponseArray(pats: ParticipantForUserResponse[]): PanelModel[] {
         const participants: PanelModel[] = [];
         pats.forEach(x => {

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/testing/mocks/mock-audio-recording.service.ts b/VideoWeb/VideoWeb/ClientApp/src/app/testing/mocks/mock-audio-recording.service.ts
@@ -20,6 +20,7 @@ const mockWowzaAgent: VHPexipParticipant = {
     handRaised: false,
     isAudioOnlyCall: true,
     isRemoteMuted: false,
+    isVideoMuted: false,
     isSpotlighted: false,
     isVideoCall: false,
     pexipDisplayName: 'vh-wowza',

diff --git a/.../ClientApp/src/app/waiting-space/hearing-controls/hearing-controls-base.component.spec.ts b/.../ClientApp/src/app/waiting-space/hearing-controls/hearing-controls-base.component.spec.ts
@@ -623,6 +623,7 @@ describe('HearingControlsBaseComponent', () => {
             pexipDisplayName: undefined,
             isRemoteMuted: false,
             isSpotlighted: true,
+            isVideoMuted: false,
             handRaised: false,
             uuid: undefined,
             callTag: undefined,

diff --git a/...oWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html b/...oWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html
@@ -53,8 +53,7 @@ <h1 #roomTitleLabel class="room-title-label">{{ getCaseNameAndNumber() }}</h1>
                             [roomLabel]="this.participant.current_room?.label"
                         >
                         </app-private-consultation-participants>
-                        <app-participants-panel *ngIf="!isPrivateConsultation"
-                                                [isCountdownCompleted]='countdownComplete'></app-participants-panel>
+                        <app-participants-panel></app-participants-panel>
                     </div>
                     <div *ngIf="hearing && !isPrivateConsultation" class="panel-wrapper"
                          [ngClass]="{ 'hide-panel': !panelStates['Chat'] }">

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/participant-panel-model.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/participant-panel-model.ts
@@ -34,7 +34,7 @@ export class ParticipantPanelModel extends IndividualPanelModel {
     }
 
     isAvailable(): boolean {
-        return (this.isQuickLinkUser && this.status === ParticipantStatus.InConsultation) || this.status === ParticipantStatus.Available;
+        return this.status === ParticipantStatus.InConsultation || this.status === ParticipantStatus.Available;
     }
 
     isInConsultation(): boolean {

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/participant-panel.model.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/participant-panel.model.spec.ts
@@ -45,11 +45,11 @@ describe('ParticipantPanelModel', () => {
         expect(model.isAvailable()).toBe(true);
     });
 
-    it('returns isAvailable: false when participant is not quick link user and status is in consultation', () => {
+    it('returns isAvailable: true when participant is not quick link user and status is in consultation', () => {
         participant.status = ParticipantStatus.InConsultation;
         model = mapper.mapFromParticipantUserResponse(participant);
         spyOnProperty(model, 'isQuickLinkUser').and.returnValue(false);
-        expect(model.isAvailable()).toBe(false);
+        expect(model.isAvailable()).toBe(true);
     });
 
     it('returns isAvailable: true when participant is quick link user and status is available', () => {

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/video-call-models.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/video-call-models.ts
@@ -19,18 +19,30 @@ export class ParticipantDeleted {
 }
 
 export class ParticipantUpdated {
+    /** Has been administratively audio muted. */
     public isRemoteMuted: boolean;
+    /** Is spotlighted. */
     public isSpotlighted: boolean;
+    /** Is hand raised. */
     public handRaised: boolean;
+    /** Pexip display name (string delimited values). */
     public pexipDisplayName: string;
+    /** Pexip UUID of participant. */
     public uuid: string;
+    /** Participant call tag. */
     public callTag: string;
+    /** Is the participant an audio only call. */
     public isAudioOnlyCall: boolean;
+    /** IDoes the participant have video capability. */
     public isVideoCall: boolean;
     public protocol: string;
+    /** The audio mix this participant is receiving e.g. "main". */
     public receivingAudioMix: string;
+    /** The audio mixes this participant is sending to. */
     public sentAudioMixes: PexipAudioMix[];
     public role: PexipParticipantRole;
+    /** Has the participant muted their video */
+    public isVideoMuted: boolean;
 
     private constructor(
         isRemoteMuted: string,
@@ -61,7 +73,7 @@ export class ParticipantUpdated {
     }
 
     static fromPexipParticipant(pexipParticipant: PexipParticipant) {
-        return new ParticipantUpdated(
+        const p = new ParticipantUpdated(
             pexipParticipant.is_muted,
             pexipParticipant.buzz_time,
             pexipParticipant.display_name,
@@ -75,6 +87,10 @@ export class ParticipantUpdated {
             pexipParticipant.receive_from_audio_mix,
             pexipParticipant.send_to_audio_mixes
         );
+
+        p.isVideoMuted = pexipParticipant.is_video_muted;
+
+        return p;
     }
 }
 

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/video-endpoint-panel-model.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/models/video-endpoint-panel-model.ts
@@ -1,11 +1,16 @@
 import { EndpointStatus, Role, VideoEndpointResponse } from '../../services/clients/api-client';
+import { VHEndpoint } from '../store/models/vh-conference';
 import { IndividualPanelModel } from './individual-panel-model';
 
 export class VideoEndpointPanelModel extends IndividualPanelModel {
     public status: EndpointStatus;
 
-    constructor(endpoint: VideoEndpointResponse) {
-        super(endpoint.id, endpoint.display_name, Role.Individual, endpoint.pexip_display_name, 'Video access point', '');
+    constructor(endpoint: VideoEndpointResponse | VHEndpoint) {
+        if (endpoint instanceof VideoEndpointResponse) {
+            super(endpoint.id, endpoint.display_name, Role.Individual, endpoint.pexip_display_name, 'Video access point', '');
+        } else {
+            super(endpoint.id, endpoint.displayName, Role.Individual, endpoint?.pexipInfo?.pexipDisplayName, 'Video access point', '');
+        }
         this.status = endpoint.status;
     }
 

diff --git a/...g-space/participants-panel/participants-panel-item/participants-panel-item.component.html b/...g-space/participants-panel/participants-panel-item/participants-panel-item.component.html
@@ -57,13 +57,19 @@
           <img
             *ngIf="participant.isMicRemoteMuted()"
             appTooltip
-            [text]="participant.isMicRemoteMuted() ? 'participants-panel.unmute-lock' : ('participants-panel.mute-participant' | translate)"
+            [text]="
+              participant.isMicRemoteMuted()
+                ? ('participants-panel.unmute-lock' | translate)
+                : ('participants-panel.mute-participant' | translate)
+            "
             colour="grey"
             [src]="participant.isMicRemoteMuted() ? '/assets/images/mic_remote_mute.png' : '/assets/images/mic.png'"
             class="panel-icon"
             [attr.alt]="
-              (participant.isMicRemoteMuted() ? 'participants-panel.microphone-muted-icon' : 'participants-panel.microphone-on-icon')
-                | translate
+              (participant.isMicRemoteMuted()
+                ? ('participants-panel.microphone-muted-icon' | translate)
+                : 'participants-panel.microphone-on-icon'
+              ) | translate
             "
             (click)="toggleParticipantMute(); $event.stopPropagation()"
             tabindex="0"