Mc release ci/cd

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "scripts": {
     "ng": "ng",
     "build:library": "ng build exui-common-lib --configuration production",

projects/exui-common-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^2.15.2",
     "ngx-pagination": "^3.2.1",

projects/exui-common-lib/src/lib/components/accessibility/accessibility.component.ts

@@ -1,12 +1,26 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
 @Component({
-    selector: 'xuilib-accessibility',
-    templateUrl: './accessibility.component.html',
-    styleUrls: ['./accessibility.component.scss']
+  selector: 'xuilib-accessibility',
+  templateUrl: './accessibility.component.html',
+  styleUrls: ['./accessibility.component.scss']
 })
 
-export class AccessibilityComponent {
+export class AccessibilityComponent implements OnInit {
+  public isEndpointMC: boolean;
   constructor() {
   }
+
+  public ngOnInit(): void {
+    const urlRef = window.location.href;
+    // pointing to MC & preview. May need to refactor this if
+    // more applications added than MO & MC
+    if (urlRef.includes('manage-case')
+      || urlRef.includes('xui-webapp')
+      && !urlRef.includes('xui-mo-webapp')) {
+      this.isEndpointMC = true;
+    } else {
+      this.isEndpointMC = false;
+    }
+  }
 }

projects/exui-common-lib/src/lib/components/search-location/search-location.component.html

@@ -1,6 +1,7 @@
 <div class="auto-complete-container">
   <input
     id="inputLocationSearch"
+    (keyup)="RemoveInvalidString($event)"
     (input)="onInput()"
     [formControl]="searchTermFormControl"
     [matAutocomplete]="autoSearchLocation"

projects/exui-common-lib/src/lib/components/search-location/search-location.component.spec.ts

@@ -240,9 +240,9 @@ describe('SearchLocationComponent', () => {
         RpxTranslateMockPipe
       ],
       providers: [
-        {provide: LocationService, useValue: locationServiceMock},
-        {provide: SessionStorageService, useValue: sessionServiceMock},
-        {provide: RefDataService, useValue: refDataServiceMock}
+        { provide: LocationService, useValue: locationServiceMock },
+        { provide: SessionStorageService, useValue: sessionServiceMock },
+        { provide: RefDataService, useValue: refDataServiceMock }
       ],
     }).compileComponents();
 
@@ -287,16 +287,16 @@ describe('SearchLocationComponent', () => {
   describe('lookup by jurisdiction (i.e. servicesField does not exist)', () => {
     it('should return false and should not call the api when ' +
       'input characters are less then three', fakeAsync(() => {
-      // @ts-expect-error - private property
-      const debounceTime = component.debounceTimeInput;
+        // @ts-expect-error - private property
+        const debounceTime = component.debounceTimeInput;
 
-      component.filteredList$.subscribe((result) => {
-        expect(result).toBe(false);
-      });
-      component.searchTermFormControl.setValue('');
-      tick(debounceTime);
-      flush();
-    }));
+        component.filteredList$.subscribe((result) => {
+          expect(result).toBe(false);
+        });
+        component.searchTermFormControl.setValue('');
+        tick(debounceTime);
+        flush();
+      }));
 
     it('should call get locations with the correct parameters', () => {
       component.serviceIds = 'IA,SSCS';
@@ -306,22 +306,22 @@ describe('SearchLocationComponent', () => {
       // checks that civil added to userLocations as well
       component.serviceIds = 'IA,CIVIL';
       component.bookingCheck = BookingCheckType.BOOKINGS_AND_BASE;
-      const bookingsAndBase = [{service: 'IA', locations: [dummyLocations[0]]}, {
+      const bookingsAndBase = [{ service: 'IA', locations: [dummyLocations[0]] }, {
         service: 'CIVIL',
         locations: [dummyLocations[1]]
       }];
       const bookingsAndBaseString = JSON.stringify(bookingsAndBase);
       sessionServiceMock.getItem.and.returnValues(bookingsAndBaseString);
       component.getLocations('exampleString2');
       expect(locationServiceMock.getAllLocations).toHaveBeenCalledWith(
-        'api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{service: 'IA', locations: [dummyLocations[0]]}, {
+        'api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{ service: 'IA', locations: [dummyLocations[0]] }, {
           service: 'CIVIL',
           locations: [dummyLocations[1]]
         }]
       );
       // check user locations filtered for bookable correctly
       component.bookingCheck = BookingCheckType.POSSIBLE_BOOKINGS;
-      const bookableLocations = [{service: 'IA', locations: [dummyLocations[0]]}, {
+      const bookableLocations = [{ service: 'IA', locations: [dummyLocations[0]] }, {
         service: 'CIVIL',
         locations: [dummyLocations[1]]
       }];
@@ -345,7 +345,7 @@ describe('SearchLocationComponent', () => {
         };
         component.form = new FormGroup({
           [serviceCodesFormControlName]: new FormControl(
-            [{key: serviceCodesValues[0], label: 'some label'}, {key: serviceCodesValues[1], label: 'some other label'}]
+            [{ key: serviceCodesValues[0], label: 'some label' }, { key: serviceCodesValues[1], label: 'some other label' }]
           )
         });
         component.ngOnInit();
@@ -355,7 +355,7 @@ describe('SearchLocationComponent', () => {
       describe('filteredList$', () => {
         it('should call getLocationsByServiceCodes as part of the switchMap when subscribing with the service codes from the form', fakeAsync(() => {
           component.form.get(serviceCodesFormControlName)
-            .setValue([{key: serviceCodesValues[0], label: 'some label'}, {
+            .setValue([{ key: serviceCodesValues[0], label: 'some label' }, {
               key: serviceCodesValues[1],
               label: 'some other label'
             }]);
@@ -439,15 +439,23 @@ describe('SearchLocationComponent', () => {
     // checks that civil added to userLocations as well
     component.serviceIds = 'IA,CIVIL';
     component.bookingCheck = BookingCheckType.BOOKINGS_AND_BASE;
-    const emptyLocationString = JSON.stringify([{service: 'IA', locations: []}]);
+    const emptyLocationString = JSON.stringify([{ service: 'IA', locations: [] }]);
     sessionServiceMock.getItem.and.returnValues(emptyLocationString, `["12345"]`, '["CIVIL"]');
     component.getLocations('exampleString2');
-    expect(locationServiceMock.getAllLocations).toHaveBeenCalledWith('api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{service: 'IA', locations: []}]);
+    expect(locationServiceMock.getAllLocations).toHaveBeenCalledWith('api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{ service: 'IA', locations: [] }]);
     // check user locations filtered for bookable correctly
     component.bookingCheck = BookingCheckType.POSSIBLE_BOOKINGS;
-    const bookableLocationString = JSON.stringify([{service: 'IA', locations: [{epimms_id: '12345'}]}, {service: 'CIVIL', locations: [{epimms_id: '32456'}]}]);
+    const bookableLocationString = JSON.stringify([{ service: 'IA', locations: [{ epimms_id: '12345' }] }, { service: 'CIVIL', locations: [{ epimms_id: '32456' }] }]);
     sessionServiceMock.getItem.and.returnValues(bookableLocationString);
     component.getLocations('exampleString2');
-    expect(locationServiceMock.getAllLocations).toHaveBeenCalledWith('api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{service: 'IA', locations: [{epimms_id: '12345'}]}, {service: 'CIVIL', locations: [{epimms_id: '32456'}]}]);
+    expect(locationServiceMock.getAllLocations).toHaveBeenCalledWith('api/locations/getLocations', 'IA,CIVIL', '', 'exampleString2', [{ service: 'IA', locations: [{ epimms_id: '12345' }] }, { service: 'CIVIL', locations: [{ epimms_id: '32456' }] }]);
   });
+
+  it('should call RemoveInvalidString on change input', () => {
+    let spyInvalidString = spyOn(component, 'RemoveInvalidString')
+    let input = fixture.debugElement.query(By.css('.govuk-input'));
+    input.triggerEventHandler('keyup', {});
+    fixture.detectChanges();
+    expect(spyInvalidString).toHaveBeenCalled();
+  })
 });

projects/exui-common-lib/src/lib/components/search-location/search-location.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { iif, Observable, of } from 'rxjs';
 import { debounceTime, map, switchMap, tap } from 'rxjs/operators';
 import {
@@ -33,12 +33,13 @@ export class SearchLocationComponent implements OnInit {
   @Output() public locationSelected = new EventEmitter<LocationByEPIMMSModel>();
   @Output() public locationTermSearchInputChanged: EventEmitter<string> = new EventEmitter<string>();
   @Output() public searchLocationChanged: EventEmitter<void> = new EventEmitter<void>();
-  public searchTermFormControl = new FormControl('');
+  public searchTermFormControl = new FormControl('', Validators.pattern('/[^a-zA-Z]/'));
   public readonly minSearchCharacters = 3;
   public term: string = '';
   private pReset: boolean = true;
   public filteredList$: Observable<LocationByEPIMMSModel[] | boolean>;
   private readonly debounceTimeInput = 300;
+  private binaryValue = '';
 
   public get reset(): boolean {
     return this.pReset;
@@ -51,9 +52,9 @@ export class SearchLocationComponent implements OnInit {
   }
 
   constructor(private readonly locationService: LocationService,
-              private readonly sessionStorageService: SessionStorageService,
-              private readonly refDataService: RefDataService
-  ) {}
+    private readonly sessionStorageService: SessionStorageService,
+    private readonly refDataService: RefDataService
+  ) { }
 
   public ngOnInit(): void {
     const searchInputChanges$ = this.searchTermFormControl.valueChanges
@@ -67,21 +68,21 @@ export class SearchLocationComponent implements OnInit {
         switchMap((term: string) => iif(
           // Seems more responsive to do length 0 if locationsByServiceCodes are cached
           () => (!!term && term.length >= 0),
-            this.refDataService.getLocationsByServiceCodes(
-              (this.form.get(this.field.servicesField)?.value as FilterConfigOption[]).map((service) => service.key)
-            ).pipe(
-              // Filter locations by the search input term and the chosen property name
-              map((locations) => locations
-                .filter((location) => location[this.propertyNameFilter].toLowerCase().includes(term.toLowerCase()))),
-              // Filter out locations that are already selected
-              map((locations) => this.filterUnselectedLocations(locations, this.selectedLocations, this.singleMode)),
-              // Filter out duplicate locations (by propertyNameFilter)
-              map((locations) => locations.filter((location, index, array) =>
-                index === array.findIndex((item) => item[this.propertyNameFilter] === location[this.propertyNameFilter])
-              )),
-            ),
-            // Returns false if the search term is empty to not show the autocomplete field i.e. ngIf should be false
-            of(false)
+          this.refDataService.getLocationsByServiceCodes(
+            (this.form.get(this.field.servicesField)?.value as FilterConfigOption[]).map((service) => service.key)
+          ).pipe(
+            // Filter locations by the search input term and the chosen property name
+            map((locations) => locations
+              .filter((location) => location[this.propertyNameFilter].toLowerCase().includes(term.toLowerCase()))),
+            // Filter out locations that are already selected
+            map((locations) => this.filterUnselectedLocations(locations, this.selectedLocations, this.singleMode)),
+            // Filter out duplicate locations (by propertyNameFilter)
+            map((locations) => locations.filter((location, index, array) =>
+              index === array.findIndex((item) => item[this.propertyNameFilter] === location[this.propertyNameFilter])
+            )),
+          ),
+          // Returns false if the search term is empty to not show the autocomplete field i.e. ngIf should be false
+          of(false)
         )),
       );
     } else {
@@ -100,12 +101,12 @@ export class SearchLocationComponent implements OnInit {
 
     if (this.singleMode && this.selectedLocations.length > 0) {
       const location = this.selectedLocations[0];
-      this.searchTermFormControl.patchValue(location[this.propertyNameFilter], {emitEvent: false, onlySelf: true});
+      this.searchTermFormControl.patchValue(location[this.propertyNameFilter], { emitEvent: false, onlySelf: true });
     }
   }
 
   public onSelectedLocation(location: LocationByEPIMMSModel): void {
-    this.searchTermFormControl.patchValue(location[this.propertyNameFilter], {emitEvent: false, onlySelf: true});
+    this.searchTermFormControl.patchValue(location[this.propertyNameFilter], { emitEvent: false, onlySelf: true });
     this.locationSelected.emit(location);
   }
   public onInput(): void {
@@ -147,4 +148,16 @@ export class SearchLocationComponent implements OnInit {
       location => !selectedLocations.map(selectedLocation => selectedLocation.epimms_id).includes(location.epimms_id) && location[this.propertyNameFilter]
     );
   }
+
+  public RemoveInvalidString(formInputValue: any) {
+    const element = formInputValue.target as HTMLInputElement;
+    const newInputValue = element.value;
+    if (/[^a-zA-Z]/.test(newInputValue)) {
+      element.value = this.binaryValue;
+    } else {
+      this.binaryValue = newInputValue;
+    }
+  }
+
+
 }