@hmcts/rpx-xui-common-lib 1.6.1-adding-location-filter-bugfix → 1.6.1-all-work-filter

package/lib/components/find-location/find-location.component.d.ts

@@ -1,21 +1,26 @@
-import { OnInit } from '@angular/core';
-import { FormArray, FormGroup } from '@angular/forms';
+import { FormGroup } from '@angular/forms';
 import { FilterFieldConfig } from '../../models';
 import { LocationByEPIMSModel } from '../../models/location.model';
-export declare class FindLocationComponent implements OnInit {
+import { SearchLocationComponent } from '../search-location/search-location.component';
+export declare class FindLocationComponent {
     selectedLocations: LocationByEPIMSModel[];
     submitted: boolean;
+    enableAddLocationButton: boolean;
     form: FormGroup;
     field: FilterFieldConfig;
     fields: FilterFieldConfig[];
+    title: string;
     locations: LocationByEPIMSModel[];
-    locationsForm: FormArray;
+    tempSelectedLocation: LocationByEPIMSModel;
     serviceIds: string;
+    searchLocationComponent: SearchLocationComponent;
     private pServices;
+    private pDisabled;
+    disabled: boolean;
     services: string[];
-    private static initForm;
-    ngOnInit(): void;
     addLocation(): void;
     removeLocation(location: LocationByEPIMSModel): void;
     onLocationSelected(location: LocationByEPIMSModel): void;
+    private removeSelectedValues;
+    private addSelectedLocationsToForm;
 }

package/lib/components/find-person/find-person.component.d.ts

@@ -1,10 +1,11 @@
-import { EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { Person, PersonRole } from '../../models';
 import { FindAPersonService } from '../../services/find-person/find-person.service';
 export declare class FindPersonComponent implements OnInit, OnChanges {
     private readonly findPersonService;
+    private readonly cd;
     personSelected: EventEmitter<Person>;
     title: string;
     boldTitle: string;
@@ -12,8 +13,8 @@ export declare class FindPersonComponent implements OnInit, OnChanges {
     domain: PersonRole;
     findPersonGroup: FormGroup;
     selectedPerson: string;
-    submitted?: boolean;
-    disabled?: boolean;
+    submitted: boolean;
+    disabled: boolean;
     userIncluded?: boolean;
     placeholderContent: string;
     isNoResultsShown: boolean;
@@ -21,18 +22,19 @@ export declare class FindPersonComponent implements OnInit, OnChanges {
     selectedPersons: Person[];
     errorMessage: string;
     idValue: string;
+    services: string[];
     isPersonSelectionCompleted: boolean;
     showAutocomplete: boolean;
     currentInputValue: string;
-    choosenPerson: Person;
-    constructor(findPersonService: FindAPersonService);
+    chosenPerson: Person;
     findPersonControl: FormControl;
-    filteredOptions: Observable<Person[]>;
-    private readonly minSearchCharacters;
+    filteredOptions: Person[];
+    readonly minSearchCharacters = 2;
+    constructor(findPersonService: FindAPersonService, cd: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
     filter(searchTerm: string): Observable<Person[]>;
-    onSelectionChange(selectedPerson?: Person): void;
+    onSelectionChange(selectedPerson: Person): void;
     updatedVal(currentValue: string): void;
     getDisplayName(selectedPerson: Person): string;
 }

package/lib/components/generic-filter/generic-filter-utils.d.ts

@@ -1,8 +1,8 @@
 import { ValidatorFn } from '@angular/forms';
 export declare function minSelectedValidator<T>(min: number): ValidatorFn;
 export declare function maxSelectedValidator<T>(max: number): ValidatorFn;
-export declare function getCheckBoxesValues(options: {
+export declare function getValues(options: {
     key: string;
     label: string;
     selectAll?: true;
-}[], values: any): any[];
+}[], values: any[]): any[];

package/lib/components/generic-filter/generic-filter.component.d.ts

@@ -20,9 +20,7 @@ export declare class GenericFilterComponent implements OnInit, OnDestroy {
     hidden(field: FilterFieldConfig, form: FormGroup): boolean;
     disabled(field: FilterFieldConfig, form: FormGroup): boolean;
     applyFilter(form: FormGroup): void;
-    selectChanged(field: FilterFieldConfig, form: FormGroup): void;
-    radiosChanged(field: FilterFieldConfig): void;
-    removePersonField(field: FilterFieldConfig): void;
+    fieldChanged(field: FilterFieldConfig, form: FormGroup): void;
     cancelFilter(): void;
     updatePersonControls(values: any, field: FilterFieldConfig): void;
     toggleSelectAll(event: any, form: FormGroup, item: {
@@ -30,6 +28,7 @@ export declare class GenericFilterComponent implements OnInit, OnDestroy {
         label: string;
         selectAll?: true;
     }, field: FilterFieldConfig): void;
+    private resetField;
     private mergeDefaultFields;
     private getSettings;
     private buildForm;

package/lib/components/search-location/search-location.component.d.ts

@@ -1,35 +1,35 @@
-import { AfterContentInit, ChangeDetectorRef, EventEmitter, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { LocationByEPIMSModel } from '../../models/location.model';
 import { LocationService } from '../../services/locations/location.service';
-export declare class SearchLocationComponent implements OnInit, AfterContentInit {
+export declare class SearchLocationComponent implements OnInit {
     private readonly locationService;
     private readonly fb;
     private readonly cd;
     control: AbstractControl;
     disabled: boolean;
+    singleMode: boolean;
     locationType: string;
     serviceIds: string;
     submitted?: boolean;
     delay?: number;
-    findLocationFormGroup: FormGroup;
+    form: FormGroup;
     showAutocomplete: boolean;
     locations: LocationByEPIMSModel[];
     locationSelected: EventEmitter<LocationByEPIMSModel>;
-    term: string;
-    readyAfterContent: boolean;
     readonly minSearchCharacters = 3;
+    term: string;
     private pSelectedLocations;
+    private pReset;
     constructor(locationService: LocationService, fb: FormBuilder, cd: ChangeDetectorRef);
+    reset: boolean;
     selectedLocations: any[];
-    ngAfterContentInit(): void;
     ngOnInit(): void;
-    onKeyDown(): void;
     filter(term: string): void;
-    onSelectionChange(selection?: LocationByEPIMSModel): void;
+    onSelectionChange(location: LocationByEPIMSModel): void;
     search(): void;
     getLocations(term: string): Observable<LocationByEPIMSModel[]>;
-    getControlCourtNameValue(): string;
+    resetSearchTerm(): void;
     private removeSelectedLocations;
 }

package/lib/gov-ui/models/isession-storage.interface.d.ts

@@ -0,0 +1,4 @@
+export interface ISessionStorageService {
+    getItem(key: string, removeAfterRead?: boolean): string;
+    setItem(key: string, value: string): void;
+}

package/lib/gov-ui/util/session-storage/session-storage-utils.d.ts

@@ -0,0 +1,6 @@
+import { Caseworker, CaseworkersByService } from '../../../models';
+import { ISessionStorageService } from '../../models/isession-storage.interface';
+export declare const getAllCaseworkersFromServices: (caseworkersByService: CaseworkersByService[]) => Caseworker[];
+export declare const getSessionStorageKeyForServiceId: (serviceId: string) => string;
+export declare const getCaseworkers: (serviceId: string, sessionStorageService: ISessionStorageService) => Caseworker[];
+export declare const setCaseworkers: (serviceId: string, caseworkers: Caseworker[], sessionStorageService: ISessionStorageService) => void;

package/lib/models/filter.model.d.ts

@@ -26,7 +26,11 @@ export interface FilterFieldConfig {
     lineBreakBefore?: boolean;
     showCondition?: string;
     enableCondition?: string;
+    enableAddLocationButton?: boolean;
+    changeResetFields?: string[];
     findPersonField?: string;
+    findLocationField?: string;
+    domainField?: string;
     disabledText?: string;
     type: FilterFieldType;
     domain?: PersonRole;

package/lib/models/person.model.d.ts

@@ -5,6 +5,10 @@ export interface Person {
     domain: string;
     knownAs?: string;
 }
+export interface CaseworkersByService {
+    service: string;
+    caseworkers: Caseworker[];
+}
 export interface Caseworker {
     idamId: string;
     firstName: string;

package/lib/models/search-options.model.d.ts

@@ -1,6 +1,7 @@
 import { PersonRole } from './person.model';
 export interface SearchOptions {
     searchTerm: string;
-    jurisdiction: PersonRole;
+    userRole: PersonRole;
+    services: string[];
     userIncluded?: boolean;
 }

package/lib/services/find-person/find-person.service.d.ts

@@ -1,7 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { Caseworker, Person } from '../../models/person.model';
-import { SearchOptions } from '../../models/search-options.model';
+import { Caseworker, Person, SearchOptions } from '../../models';
 import { SessionStorageService } from '../session-storage/session-storage.service';
 export declare class FindAPersonService {
     private readonly http;
@@ -12,4 +11,5 @@ export declare class FindAPersonService {
     find(searchOptions: SearchOptions): Observable<Person[]>;
     findCaseworkers(searchOptions: SearchOptions): Observable<Person[]>;
     mapCaseworkers(caseworkers: Caseworker[], roleCategory: string): Person[];
+    searchInCaseworkers(caseworkers: Caseworker[], searchOptions: SearchOptions): Person[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "1.6.1-adding-location-filter-bugfix",
+  "version": "1.6.1-all-work-filter",
   "peerDependencies": {
     "@angular/common": "^7.2.0",
     "@angular/core": "^7.2.0",