From 405c2821b4f9f545989cfce1e80135990ce7c4cf Mon Sep 17 00:00:00 2001 From: shaed-parkar <41630528+shaed-parkar@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:52:08 +0000 Subject: [PATCH] VIH-11082 im behind feature flag (#2302) * defer checking for hearing layout until conference is not null * VIH-11082 hide im behind a feature flag * hide im components --- .../app/services/hearing-layout.service.ts | 1 + .../src/app/services/launch-darkly.service.ts | 3 +- .../admin-im-list.component.html | 2 +- .../admin-im-list/admin-im-list.component.ts | 3 + .../command-centre-menu.component.html | 12 +- .../command-centre-menu.component.ts | 3 + .../vho-hearing-list.component.html | 21 +- .../vho-hearing-list.component.ts | 3 + ...ing-room.component.eventhub.events.spec.ts | 1 + .../joh-waiting-room.component.html | 406 +++++++++--------- .../joh-waiting-room.component.spec.ts | 1 + .../judge-waiting-room.component.html | 2 +- .../judge-waiting-room.component.spec.ts | 1 + .../participant-waiting-room.component.html | 2 +- ...iting-room.component.analogue-time.spec.ts | 1 + ...ing-room.component.eventhub.events.spec.ts | 1 + ...participant-waiting-room.component.spec.ts | 1 + ...oom-base.component.eventhub-events.spec.ts | 1 + ...ting-room-base.component.non-event.spec.ts | 1 + ...m-base.component.video-call-events.spec.ts | 2 + .../waiting-room-base.component.ts | 5 +- 21 files changed, 247 insertions(+), 226 deletions(-) diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts index 83b342c339..c7170f9742 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/services/hearing-layout.service.ts @@ -125,6 +125,7 @@ export class HearingLayoutService { getCurrentLayout(): Observable { return this.conferenceService.currentConference$.pipe( + filter(conference => conference !== null), take(1), map(conference => conference.id), mergeMap(currentConferenceId => this.apiClient.getLayoutForHearing(currentConferenceId)) diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/services/launch-darkly.service.ts b/VideoWeb/VideoWeb/ClientApp/src/app/services/launch-darkly.service.ts index 296f34513f..f091ede754 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/services/launch-darkly.service.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/services/launch-darkly.service.ts @@ -10,7 +10,8 @@ export const FEATURE_FLAGS = { vodafone: 'vodafone', activeSessionFilter: 'active-sessions-filter', interpreterEnhancements: 'interpreter-enhancements', - dialOutParticipant: 'dial-out-participant' + dialOutParticipant: 'dial-out-participant', + instantMessaging: 'instant-messaging' }; @Injectable({ diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.html index 532b5d72ce..fd24a0b35f 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.html @@ -8,7 +8,7 @@ 'im-list-top': participant.isJudge }" > -
+
diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.ts b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.ts index 3d6b94e938..205681a466 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/admin-im-list/admin-im-list.component.ts @@ -4,6 +4,7 @@ import { Hearing } from 'src/app/shared/models/hearing'; import { Participant } from 'src/app/shared/models/participant'; import { ParticipantContactDetails } from 'src/app/shared/models/participant-contact-details'; import { ParticipantStatusDirective } from '../vho-shared/participant-status-base/participant-status-base.component'; +import { FEATURE_FLAGS } from 'src/app/services/launch-darkly.service'; @Component({ selector: 'app-admin-im-list', templateUrl: './admin-im-list.component.html', @@ -13,6 +14,8 @@ export class AdminImListComponent extends ParticipantStatusDirective implements @Input() hearing: Hearing; @Output() selectedParticipant = new EventEmitter(); + featureFlags = FEATURE_FLAGS; + currentParticipant: ParticipantContactDetails; roles = Role; diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.html index 28f0ca9852..444e83974f 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.html @@ -1,11 +1,13 @@
- +
-
+ +
-
-
- +
+ +
+
diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.ts b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.ts index be06ddf04d..a12e02508c 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/command-centre-menu/command-centre-menu.component.ts @@ -8,6 +8,7 @@ import { Router } from '@angular/router'; import { Role, UserProfileResponse } from '../../services/clients/api-client'; import { VideoWebService } from '../../services/api/video-web.service'; import { ProfileService } from '../../services/api/profile.service'; +import { FEATURE_FLAGS } from 'src/app/services/launch-darkly.service'; @Component({ selector: 'app-command-centre-menu', @@ -18,6 +19,8 @@ export class CommandCentreMenuComponent implements OnInit, OnDestroy { @Output() selectedMenu = new EventEmitter(); @Input() conferenceId: string | null; + featureFlags = FEATURE_FLAGS; + subscriptions$ = new Subscription(); currentMenu: MenuOption; private loggedInUser: UserProfileResponse; diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.html index 964a80984d..ea1687dbb9 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.html @@ -4,7 +4,8 @@

{{ 'judge-hearing-list.you-have-no-video-hearings' |

-
{{ 'judge-hearing-list.you-have-no-video-hearings' |
{{ conference.judgeName }}
{{ conference.hearingVenueName }}
-
- Allocated To: {{ conference.allocatedCso }} -
+
Allocated To: {{ conference.allocatedCso }}
-
-
+
+ +
+
-
+
diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.ts b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.ts index 7899477c0b..57734b84ab 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/vh-officer/vho-hearing-list/vho-hearing-list.component.ts @@ -3,6 +3,7 @@ import { ConferenceResponseVho, ParticipantResponseVho } from 'src/app/services/ import { Hearing } from 'src/app/shared/models/hearing'; import { HearingSummary } from 'src/app/shared/models/hearing-summary'; import { ParticipantSummary } from '../../shared/models/participant-summary'; +import { FEATURE_FLAGS } from 'src/app/services/launch-darkly.service'; @Component({ selector: 'app-vho-hearing-list', @@ -13,6 +14,8 @@ export class VhoHearingListComponent { @Input() conferences: HearingSummary[]; @Output() selectedConference = new EventEmitter(); + featureFlags = FEATURE_FLAGS; + currentConference: HearingSummary; get noConferences(): boolean { diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.eventhub.events.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.eventhub.events.spec.ts index 8c6231bf52..d71de55fad 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.eventhub.events.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.eventhub.events.spec.ts @@ -52,6 +52,7 @@ describe('JohWaitingRoomComponent eventhub events', () => { beforeEach(async () => { launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); unloadDetectorServiceSpy = jasmine.createSpyObj('UnloadDetectorService', [], ['shouldUnload']); shouldUnloadSubject = new Subject(); getSpiedPropertyGetter(unloadDetectorServiceSpy, 'shouldUnload').and.returnValue(shouldUnloadSubject.asObservable()); diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.html index 3948b60fa0..61c3203d8d 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.html @@ -1,238 +1,240 @@
-

- {{ 'joh-waiting-room.loading' | translate }} -

+

+ {{ 'joh-waiting-room.loading' | translate }} +

-
-
-
-
-
{{ getCaseNameAndNumber() }}
-
- (show more) -
-
- - -
-
- -
- - -
- -
- +
+
+
+
+
{{ getCaseNameAndNumber() }}
- + (show more)
+
+ +
-
- +
+ +
+ + +
+ +
+ +
+
+
+
+ +
-
-
-

- {{ 'joh-waiting-room.your-video-hearing' | translate }} {{ getConferenceStatusText() }} -

-
+
+
+

{{ 'joh-waiting-room.your-video-hearing' | translate }} {{ getConferenceStatusText() }}

+
- - -
-
- -
-
-
- -
-
+ + +
+
+ +
+
+
+
+
+
- - - - - - - - - - - + + +
{{ 'joh-waiting-room.hearing' | translate }}{{ 'joh-waiting-room.date' | translate }}
- - ({{ 'case-type.' + stringToTranslateId(hearing.caseType) | translate }}) -
- {{ 'joh-waiting-room.case-number' | translate }}: - - 		- {{ hearing.scheduledStartTime | translateDate : 'dd MMMM yyyy' }} - + + + + + + + + + + + - - -
{{ 'joh-waiting-room.hearing' | translate }}{{ 'joh-waiting-room.date' | translate }}
+ + ({{ 'case-type.' + stringToTranslateId(hearing.caseType) | translate }}) +
+ {{ 'joh-waiting-room.case-number' | translate }}: + + 		+ {{ hearing.scheduledStartTime | translateDate: 'dd MMMM yyyy' }} + {{ hearing.scheduledStartTime | date: 'HH:mm' }} {{ 'joh-waiting-room.to' | translate }} - {{ hearing.scheduledEndTime | date: 'HH:mm' }} + {{ hearing.scheduledEndTime | date: 'HH:mm' }} -
- +
+
+ +
+
+
+
+

{{ 'joh-waiting-room.please-wait' | translate }}

+

+ {{ 'joh-waiting-room.hearing-starting-at' | translate: { date: hearing.scheduledStartTime | date: 'HH:mm' } }} +

+
-
-
-
-
-

{{ 'joh-waiting-room.please-wait' | translate }}

-

- {{ 'joh-waiting-room.hearing-starting-at' | translate: {date: hearing.scheduledStartTime | date: 'HH:mm'} }} -

-
- -
-

{{ 'joh-waiting-room.hearing-closed' | translate }}

-
- -
-

{{ 'joh-waiting-room.hearing-paused' | translate }}

-
- -
-

{{ 'joh-waiting-room.hearing-suspended-technical-title' | translate }}

-

{{ 'joh-waiting-room.hearing-suspended-message' | translate }}

-
-
-
-
-
- -
-
-
-
-

{{ 'joh-waiting-room.time-now' | translate }}

-

- {{ currentTime | date: 'HH:mm' }} -

-
-
-
+
+

{{ 'joh-waiting-room.hearing-closed' | translate }}

-
- + +
+

{{ 'joh-waiting-room.hearing-paused' | translate }}

-
- - - {{ 'joh-waiting-room.warning' | translate }} - {{ 'joh-waiting-room.please-wait-while-we-connect-you' | translate }} - + +
+

{{ 'joh-waiting-room.hearing-suspended-technical-title' | translate }}

+

{{ 'joh-waiting-room.hearing-suspended-message' | translate }}

+
+
+
+
+
+ +
-
-

- {{ 'joh-waiting-room.video-hearing-team-contact' | translate: {phone: (phoneNumber$ | async)} }} +

+
+

{{ 'joh-waiting-room.time-now' | translate }}

+

+ {{ currentTime | date: 'HH:mm' }}

+
+
- -
- - +
+
+
+ + + {{ 'joh-waiting-room.warning' | translate }} + {{ 'joh-waiting-room.please-wait-while-we-connect-you' | translate }} + +
+
+

+ {{ 'joh-waiting-room.video-hearing-team-contact' | translate: { phone: (phoneNumber$ | async) } }} +

+
+
+ +
+ +
- + - + - + - \ No newline at end of file + diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.spec.ts index 321aa09738..3493e2fba0 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/joh-waiting-room/joh-waiting-room.component.spec.ts @@ -78,6 +78,7 @@ describe('JohWaitingRoomComponent', () => { beforeEach(async () => { launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); translateService.instant.calls.reset(); component = new JohWaitingRoomComponent( activatedRoute, diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html index f1af803280..b27e8d6e97 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.html @@ -280,7 +280,7 @@

diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.spec.ts index 4fe7d042a5..61f357bcb1 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-waiting-room/judge-waiting-room.component.spec.ts @@ -231,6 +231,7 @@ describe('JudgeWaitingRoomComponent when conference exists', () => { participantRemoteMuteStoreServiceSpy = createParticipantRemoteMuteStoreServiceSpy(); launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); component = new JudgeWaitingRoomComponent( activatedRoute, diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html index 8610c10d1c..8436dccf51 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html @@ -323,7 +323,7 @@

{{ 'participant-waiting-room.please-wait' | tr

- + { shouldUnloadSubject = new Subject(); getSpiedPropertyGetter(unloadDetectorServiceSpy, 'shouldUnload').and.returnValue(shouldUnloadSubject.asObservable()); launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); participantRemoteMuteStoreServiceSpy = createParticipantRemoteMuteStoreServiceSpy(); diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.eventhub.events.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.eventhub.events.spec.ts index 406bab1bc1..4919072c10 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.eventhub.events.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.eventhub.events.spec.ts @@ -58,6 +58,7 @@ describe('ParticipantWaitingRoomComponent event hub events', () => { beforeEach(() => { launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); unloadDetectorServiceSpy = jasmine.createSpyObj('UnloadDetectorService', [], ['shouldUnload']); userMediaServiceSpy = jasmine.createSpyObj('UserMediaService', [], ['isAudioOnly$']); diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.spec.ts index 15002f893c..29ff2db0eb 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/tests/participant-waiting-room.component.spec.ts @@ -87,6 +87,7 @@ describe('ParticipantWaitingRoomComponent when conference exists', () => { beforeEach(() => { launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); unloadDetectorServiceSpy = jasmine.createSpyObj( 'UnloadDetectorService', [], diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.eventhub-events.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.eventhub-events.spec.ts index ccd6ff0566..6b9d93c0f5 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.eventhub-events.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.eventhub-events.spec.ts @@ -120,6 +120,7 @@ describe('WaitingRoomComponent EventHub Call', () => { beforeEach(async () => { launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); logged = new LoggedParticipantResponse({ participant_id: globalParticipant.id, display_name: globalParticipant.display_name, diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.non-event.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.non-event.spec.ts index a7806bbc16..fc869f3217 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.non-event.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.non-event.spec.ts @@ -81,6 +81,7 @@ describe('WaitingRoomComponent message and clock', () => { beforeEach(() => { participantRemoteMuteStoreServiceSpy = createParticipantRemoteMuteStoreServiceSpy(); launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); component = new WRTestComponent( activatedRoute, videoWebService, diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.video-call-events.spec.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.video-call-events.spec.ts index f0ccf95a66..474a4d6129 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.video-call-events.spec.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/tests/waiting-room-base.component.video-call-events.spec.ts @@ -88,6 +88,8 @@ describe('WaitingRoomComponent Video Call', () => { initAllWRDependencies(); launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.vodafone, false).and.returnValue(of(false)); + launchDarklyService.getFlag.withArgs(FEATURE_FLAGS.instantMessaging, false).and.returnValue(of(true)); + launchDarklyService.getFlag.and.returnValue(of(true)); component = new WRTestComponent( activatedRoute, diff --git a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/waiting-room-base.component.ts b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/waiting-room-base.component.ts index 7647a3da24..4779ab507a 100644 --- a/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/waiting-room-base.component.ts +++ b/VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/waiting-room-shared/waiting-room-base.component.ts @@ -75,6 +75,7 @@ export abstract class WaitingRoomBaseDirective implements AfterContentChecked { @ViewChild('hearingControls', { static: false }) hearingControls: PrivateConsultationRoomControlsComponent; vodafoneEnabled = false; + instantMessagingEnabled = false; maxBandwidth = null; audioOnly: boolean; @@ -168,10 +169,10 @@ export abstract class WaitingRoomBaseDirective implements AfterContentChecked { this.vodafoneEnabled = flag; }); this.launchDarklyService - .getFlag(FEATURE_FLAGS.vodafone, false) + .getFlag(FEATURE_FLAGS.instantMessaging, false) .pipe(takeUntil(this.onDestroy$)) .subscribe(flag => { - this.vodafoneEnabled = flag; + this.instantMessagingEnabled = flag; }); this.isAdminConsultation = false; this.loadingData = true;