Merge branch 'master' into renovate/java-4.x

hmcts · Feb 9, 2023 · 88fbdc4 · 88fbdc4
2 parents 411a2b9 + bbfe79f
commit 88fbdc4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.html
@@ -41,7 +41,7 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">Please complete
             >
           </div>
           <div class="govuk-form-group">
-            <label class="govuk-label govuk-!-width-full" [attr.for]="'defenceAdvocateLabel' + i">
+            <label class="govuk-label govuk-!-width-full" [attr.for]="'defenceAdvocate' + i">
               Link an advocate to this video access point?
             </label>
             <select class="govuk-select ddl-width" [id]="'defenceAdvocate' + i" formControlName="defenceAdvocate">

diff --git a/...e/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html b/...e/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html
@@ -138,7 +138,6 @@ <h1 class="govuk-heading-l">{{ title }}</h1>
       <div class="govuk-grid-row vh-row">
         <div class="rowbottom"></div>
       </div>
-
       <div
         *ngFor="let detail of booking.BookingsDetails; index as i"
         [ngClass]="{ 'vh-row-selected': detail.Selected, 'vh-row-cancelled': detail.isCancelled, 'vh-row-created': detail.isCreated }"
@@ -184,7 +183,7 @@ <h1 class="govuk-heading-l">{{ title }}</h1>
                 </span>
               </div>
             </div>
-            <div id="allocated-to" class="govuk-grid-row" *ngIf="vhoWorkAllocationFeature">
+            <div id="allocated-to-{{ detail.HearingId }}" class="govuk-grid-row" *ngIf="vhoWorkAllocationFeature">
               <div class="govuk-grid-column-full vh-l">
                 <div class="govuk-hint vh-xsml vh-font-black">Allocated to: {{ detail.AllocatedTo }}</div>
               </div>

diff --git a/...dminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.spec.ts b/...dminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.spec.ts
@@ -1272,6 +1272,8 @@ describe('BookingsListComponent', () => {
     });
 
     describe('onChangeNoAllocated', () => {
+        const bookingList = new BookingslistTestData();
+        const bookingData = bookingList.getTestData();
         beforeEach(() => {
             const formBuilder = new FormBuilder();
             const bookingPersistServiceSpy = jasmine.createSpyObj('BookingPersistService', ['selectedCaseTypes']);
@@ -1297,15 +1299,15 @@ describe('BookingsListComponent', () => {
             launchDarklyServiceSpy.flagChange.next({ 'vho-work-allocation': false });
             await component.ngOnInit();
             fixture.detectChanges();
-            const divToHide = fixture.debugElement.query(By.css('#allocated-to'));
+            const divToHide = fixture.debugElement.query(By.css('#allocated-to-' + bookingData.BookingsDetails[0].HearingId));
             expect(divToHide).toBeFalsy();
         });
 
         it('should show allocated label to if work allocation feature flag is on', async () => {
             launchDarklyServiceSpy.flagChange.next({ 'vho-work-allocation': true });
             await component.ngOnInit();
             fixture.detectChanges();
-            const divToHide = fixture.debugElement.query(By.css('#allocated-to'));
+            const divToHide = fixture.debugElement.query(By.css('#allocated-to-' + bookingData.BookingsDetails[0].HearingId));
             expect(divToHide).toBeTruthy();
         });
     });