Merge branch 'master' into bug/cot-726-final

hmcts · Aug 20, 2024 · ff6465d · ff6465d
2 parents 3daac4c + ceb2781
commit ff6465d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html b/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
@@ -1,7 +1,7 @@
 <div class="location-picker-custom">
   <div class="search-location">
     <div>
-      <label id="input-selected-location-label" *ngIf="locationTitle">{{locationTitle}}</label>
+      <label id="input-selected-location-label" for="inputLocationSearch" *ngIf="locationTitle">{{locationTitle}}</label>
     </div>
     <exui-search-location class="search-location"
                           [form]="form"

diff --git a/projects/exui-common-lib/src/lib/components/search-location/search-location.component.ts b/projects/exui-common-lib/src/lib/components/search-location/search-location.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { iif, Observable, of } from 'rxjs';
-import { debounceTime, map, switchMap, tap } from 'rxjs/operators';
+import { catchError, debounceTime, map, switchMap, tap } from 'rxjs/operators';
 import {
   BookingCheckType, FilterConfigOption,
   FilterFieldConfig,
@@ -93,6 +93,10 @@ export class SearchLocationComponent implements OnInit {
           () => (!!term && term.length >= this.minSearchCharacters),
           this.getLocations(term).pipe(
             map((locations) => this.filterUnselectedLocations(locations, this.selectedLocations, this.singleMode)),
+            catchError(() => {
+              // returns false so the user is not shown the no results found message
+              return of(false);
+            }),
           ),
           of(false)
         )),

diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
@@ -21,7 +21,7 @@
             </xuilib-gov-label>
             <input class="govuk-input govuk-date-input__input govuk-input--width-2"
                    [ngClass]="{'govuk-input--error': errorMessage?.isInvalid}"
-                   [id]="config.id"
+                   [id]="config.id+'-day'"
                    [name]="config.id+'-day'" type="number" value="" pattern="[0-9]*"
                    [formControlName]="config.id+'_day'">
           </div>

diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
@@ -42,7 +42,7 @@ describe('GovUkDateComponent', () => {
   });
 
   it('should have input for day, month and year elements', () => {
-    const day = fixture.debugElement.query(By.css('#id'));
+    const day = fixture.debugElement.query(By.css('#id-day'));
     expect(day).toBeTruthy();
     const month = fixture.debugElement.query(By.css('#id-month'));
     expect(month).toBeTruthy();