@hmcts/media-viewer 3.1.2 → 3.1.4

package/fesm2020/hmcts-media-viewer.mjs

@@ -2166,7 +2166,9 @@ class IcpUpdateService {
     }
     removeParticipant(participantId) {
         this.socket.emit(IcpEvents.REMOVE_PARTICIPANT, {
-            participantId: participantId, caseId: this.session.caseId
+            participantId: participantId,
+            caseId: this.session.caseId,
+            documentId: this.session.documentId
         });
     }
     participantListUpdated() {
@@ -2174,14 +2176,20 @@ class IcpUpdateService {
     }
     updatePresenter(presenter) {
         this.socket.emit(IcpEvents.UPDATE_PRESENTER, {
-            ...this.session, presenterId: presenter.id, presenterName: presenter.username
+            ...this.session,
+            presenterId: presenter.id,
+            presenterName: presenter.username
         });
     }
     presenterUpdated() {
         return this.socket.listen(IcpEvents.PRESENTER_UPDATED);
     }
     updateScreen(screen) {
-        const update = { body: screen, caseId: this.session.caseId };
+        const update = {
+            body: screen,
+            caseId: this.session.caseId,
+            documentId: this.session.documentId
+        };
         this.socket.emit(IcpEvents.UPDATE_SCREEN, update);
     }
     screenUpdated() {
@@ -2303,8 +2311,9 @@ class IcpService {
         this.subscription = this.store.pipe(select(getCaseId), filter(value => !!value)).subscribe(caseId => {
             this.caseId = caseId;
         });
+        this.subscription.add(this.store.pipe(select(getDocumentId)).subscribe(docId => this.documentId = docId));
         this.subscription.add(this.toolbarEvents.icp.sessionLaunch.subscribe(() => {
-            if (this.caseId) {
+            if (this.caseId && this.documentId) {
                 this.launchSession();
             }
         }));
@@ -2314,7 +2323,7 @@ class IcpService {
         this.subscription.unsubscribe();
     }
     launchSession() {
-        this.store.dispatch(new LoadIcpSession(this.caseId));
+        this.store.dispatch(new LoadIcpSession({ caseId: this.caseId, documentId: this.documentId }));
         this.subscription.add(this.store.pipe(select(getIcpSession), filter(value => !!value && Object.keys(value).length > 1), take(1)).subscribe(() => { this.setUpSessionSubscriptions(); }));
     }
     setUpSessionSubscriptions() {
@@ -6850,9 +6859,9 @@ class IcpSessionApiService {
         this.httpClient = httpClient;
         this.ICP_SESSION_API = '/icp/sessions';
     }
-    loadSession(caseId) {
+    loadSession(payload) {
         return this.httpClient
-            .get(`${this.ICP_SESSION_API}/${caseId}`, { observe: 'response', withCredentials: true })
+            .get(`${this.ICP_SESSION_API}/${payload.caseId}/${payload.documentId}`, { observe: 'response', withCredentials: true })
             .pipe(map(response => response.body));
     }
 }
@@ -7122,7 +7131,7 @@ class IcpEffects {
         this.actions$ = actions$;
         this.icpApiService = icpApiService;
         this.icpUpdateService = icpUpdateService;
-        this.loadIcpSession$ = createEffect(() => this.actions$.pipe(ofType(LOAD_ICP_SESSION), map((action) => action.payload), exhaustMap((caseId) => this.icpApiService.loadSession(caseId)
+        this.loadIcpSession$ = createEffect(() => this.actions$.pipe(ofType(LOAD_ICP_SESSION), map((action) => action.payload), exhaustMap((payload) => this.icpApiService.loadSession(payload)
             .pipe(map(res => new JoinIcpSocketSession(res)), catchError(error => of(new LoadIcpSessionFailure(error)))))));
         this.joinIcpSocketSession$ = createEffect(() => this.actions$.pipe(ofType(JOIN_ICP_SOCKET_SESSION), map((action) => action.payload), switchMap((res) => this.icpUpdateService.joinSession(res.username, res.session)
             .pipe(map(participants => new IcpSocketSessionJoined({ session: res.session, participantInfo: participants }))))));