@hmcts/rpx-xui-common-lib 1.8.5-angular-upgrade-r4 → 1.8.7-fix-wrong-services

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

@@ -1,22 +1,14 @@
-import { EventEmitter, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FilterConfigOption, FilterFieldConfig } from '../../models';
-export declare class FindServiceComponent implements OnInit {
+import { FilterFieldConfig } from '../../models';
+export declare class FindServiceComponent {
     field: FilterFieldConfig;
     fields: FilterFieldConfig[];
     serviceTitle: string;
     form: FormGroup;
-    services: FilterConfigOption[];
-    selectedServices: FilterConfigOption[];
+    services: any;
+    selectedServices: any;
+    disabled: any;
     enableAddServiceButton: boolean;
-    disabled: boolean;
-    serviceFieldChanged: EventEmitter<void>;
-    tempSelectedService: FilterConfigOption;
-    ngOnInit(): void;
+    disableInputField: boolean;
     addService(): void;
-    removeService(service: FilterConfigOption): void;
-    onServiceSelected(service: FilterConfigOption): void;
-    private removeSelectedValues;
-    private addSelectedServicesToForm;
-    private SortAnOptions;
 }

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

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

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

@@ -1,7 +1,7 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { Subscription } from 'rxjs';
-import { FilterConfig, FilterConfigOption, FilterFieldConfig, FilterSetting, GroupOptions } from '../../models';
+import { FilterConfig, FilterFieldConfig, FilterSetting } from '../../models';
 import { FilterService } from './../../services/filter/filter.service';
 export declare class GenericFilterComponent implements OnInit, OnDestroy {
     private readonly filterService;
@@ -9,9 +9,6 @@ export declare class GenericFilterComponent implements OnInit, OnDestroy {
     form: FormGroup;
     submitted: boolean;
     formSub: Subscription;
-    filteredSkillsByServices: GroupOptions[];
-    filteredSkillsByServicesCheckbox: FilterConfigOption[];
-    previousSelectedNestedCheckbox: string[];
     constructor(filterService: FilterService, fb: FormBuilder);
     private _config;
     config: FilterConfig;
@@ -27,24 +24,17 @@ export declare class GenericFilterComponent implements OnInit, OnDestroy {
     inputChanged(field: FilterFieldConfig): void;
     cancelFilter(): void;
     updatePersonControls(values: any, field: FilterFieldConfig): void;
-    checkBoxChecked(field: any, i: number): any;
-    updateTaskNameControls(values: string, field: FilterFieldConfig): void;
     toggleSelectAll(event: any, form: FormGroup, item: {
         key: string;
         label: string;
         selectAll?: true;
     }, field: FilterFieldConfig): void;
-    private startFilterSkillsByServices;
     private resetField;
     private mergeDefaultFields;
     private getSettings;
     private buildForm;
     private buildCheckBoxFormArray;
-    private buildFormArray;
+    private buildFindLocationFormArray;
     private getSelectedValues;
     private emitFormErrors;
-    initValuesFromCacheForSkillsByServices(): void;
-    filterSkillsByServices(services: string[], config: FilterConfig): FilterConfigOption[] | GroupOptions[];
-    private getSelectedValuesForFields;
-    private sortGroupOptions;
 }

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

@@ -3,7 +3,7 @@ import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { BookingCheckType, LocationByEPIMMSModel } from '../../models';
 import { LocationService } from '../../services/locations/location.service';
-import { SessionStorageService } from '../../services/storage/session-storage/session-storage.service';
+import { SessionStorageService } from '../../services/session-storage/session-storage.service';
 export declare class SearchLocationComponent implements OnInit {
     private readonly locationService;
     private readonly sessionStorageService;

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

@@ -1,7 +1,13 @@
-import { EventEmitter } from '@angular/core';
-import { FilterConfigOption } from '../../models';
+import { FormGroup } from '@angular/forms';
 export declare class SearchServiceComponent {
-    services: FilterConfigOption[];
-    serviceChanged: EventEmitter<FilterConfigOption>;
-    onSelectionChanged(key: string): void;
+    services: any;
+    selectedServices: any;
+    disabled: any;
+    delay: any;
+    form: FormGroup;
+    showAutocomplete: boolean;
+    readonly minSearchCharacters = 3;
+    term: string;
+    onInput(): void;
+    onSelectionChange(): void;
 }

package/lib/components/selected-case/selected-case.component.d.ts

@@ -18,7 +18,6 @@ export declare class SelectedCaseComponent implements OnInit, OnChanges {
     constructor(stateService: CaseSharingStateService);
     ngOnInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
-    onUnselect(): void;
     onDeselect(c: SharedCase): void;
     trackByUserId(user: UserDetails): string;
     canRemove(caseId: string, user: UserDetails): Observable<boolean>;

package/lib/components/share-case/share-case.component.d.ts

@@ -1,28 +1,61 @@
 import { EventEmitter, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { ErrorMessagesModel, GovUiConfigModel } from '../../gov-ui/models';
 import { SharedCase } from '../../models/case-share.model';
 import { UserDetails } from '../../models/user-details.model';
 import { CaseSharingStateService } from '../../services/case-sharing-state/case-sharing-state.service';
 export declare class ShareCaseComponent implements OnInit {
     private readonly stateService;
+    private readonly router;
     shareCases: SharedCase[];
+    selectedCasesErrorMessageConfig: GovUiConfigModel;
+    continueAllowed: boolean;
+    assignedUsers: UserDetails[];
+    selectedUserToRemove: UserDetails;
     removeUserFromCaseToggleOn: boolean;
     shareCases$: Observable<SharedCase[]>;
     users: UserDetails[];
     confirmLink: string;
+    cancelLink: string;
     addUserLabel: string;
     showRemoveUsers: boolean;
+    fnTitle: string;
+    title: string;
     unselect: EventEmitter<SharedCase>;
     synchronizeStore: EventEmitter<any>;
     private selectedUser;
     private readonly userSelect;
-    constructor(stateService: CaseSharingStateService);
+    validationErrors: {
+        id: string;
+        message: string;
+    }[];
+    shareCaseErrorMessage: ErrorMessagesModel;
+    constructor(stateService: CaseSharingStateService, router: Router);
     ngOnInit(): void;
     onUnselect(c: SharedCase): void;
     onSynchronizeStore(event: any): void;
     onSelectedUser(user: UserDetails): void;
     addUser(): void;
+    removeUser(): void;
     isDisabledAdd(): boolean;
-    isDisabledContinue(): boolean;
+    /**
+     * Function originally used to set disabled state of "Continue" button, now called by the button click handler to
+     * control whether navigation to the confirmation page is allowed. It is prevented if no changes have been made
+     */
+    setContinueAllowed(): void;
     onDeselect(sharedCase: SharedCase): void;
+    onContinue(): void;
+    /**
+     * Gets a unique list of all users that have been assigned, or are pending assigment to, at least one case
+     * @param sharedCases The list of shared cases from which to get users these are shared with, or are to be shared with
+     */
+    getAssignedUsers(sharedCases: SharedCase[]): void;
+    /**
+     * Checks if any shared cases have been left unassigned. This occurs if a shared case has a number of pending
+     * unshares equal to the number of current shares, and there are no pending shares.
+     * @param sharedCases The array of shared cases to check
+     * @returns `true` if at least one case has the condition described above; `false` otherwise
+     */
+    hasCasesLeftUnassigned(sharedCases: SharedCase[]): boolean;
 }

package/lib/exui-common-lib.module.d.ts

@@ -1,7 +1,6 @@
 import { AccessibilityComponent } from './components/accessibility/accessibility.component';
 import { CookieBannerComponent } from './components/cookie-banner/cookie-banner.component';
 import { FindPersonComponent } from './components/find-person/find-person.component';
-import { FindTaskNameComponent } from './components/find-task-name/find-task-name.component';
 import { GenericFilterComponent } from './components/generic-filter/generic-filter.component';
 import { SearchJudicialsComponent } from './components/search-judicials/search-judicials.component';
 import { SearchLocationComponent } from './components/search-location/search-location.component';
@@ -14,11 +13,11 @@ import { ShareCaseConfirmComponent } from './components/share-case-confirm/share
 import { ShareCaseComponent } from './components/share-case/share-case.component';
 import { FeatureToggleDirective } from './directives/feature-toggle/feature-toggle.directive';
 import { LetDirective } from './directives/let/let.directive';
+import { GovUkCheckboxesComponent } from './gov-ui/components/gov-uk-checkboxes/gov-uk-checkboxes.component';
 import { GovUkErrorMessageComponent } from './gov-ui/components/gov-uk-error-message/gov-uk-error-message.component';
 import { GovUkFormGroupWrapperComponent } from './gov-ui/components/gov-uk-form-group-wrapper/gov-uk-form-group-wrapper.component';
 import { GovUkLabelComponent } from './gov-ui/components/gov-uk-label/gov-uk-label.component';
 import { GovUkRadioComponent } from './gov-ui/components/gov-uk-radio/gov-uk-radio.component';
-import { GovUkRadiosComponent } from './gov-ui/components/gov-uk-radios/gov-uk-radios.component';
 import { GovukTableComponent } from './gov-ui/components/gov-uk-table/gov-uk-table.component';
 import { HmctsBannerComponent } from './gov-ui/components/hmcts-banner/hmcts-banner.component';
 import { HmctsErrorSummaryComponent } from './gov-ui/components/hmcts-error-summary/hmcts-error-summary.component';
@@ -28,7 +27,7 @@ import { HmctsPaginationComponent } from './gov-ui/components/hmcts-pagination/h
 import { HmctsPrimaryNavigationComponent } from './gov-ui/components/hmcts-primary-navigation/hmcts-primary-navigation.component';
 import { HmctsSubNavigationComponent } from './gov-ui/components/hmcts-sub-navigation/hmcts-sub-navigation.component';
 import { RemoveHostDirective } from './gov-ui/directives/remove-host.directive';
-export declare const COMMON_COMPONENTS: (typeof AccessibilityComponent | typeof GenericFilterComponent | typeof SelectedCaseConfirmComponent | typeof SelectedCaseListComponent | typeof SelectedCaseComponent | typeof ServiceMessagesComponent | typeof ShareCaseConfirmComponent | typeof ShareCaseComponent | typeof CookieBannerComponent | typeof SearchLocationComponent | typeof FeatureToggleDirective | typeof LetDirective | typeof FindPersonComponent | typeof SearchJudicialsComponent | typeof FindTaskNameComponent | typeof SearchVenueComponent)[];
-export declare const GOV_UI_COMPONENTS: (typeof HmctsIdentityBarComponent | typeof HmctsPaginationComponent | typeof HmctsSubNavigationComponent | typeof HmctsPrimaryNavigationComponent | typeof HmctsErrorSummaryComponent | typeof HmctsMainWrapperComponent | typeof HmctsBannerComponent | typeof GovukTableComponent | typeof GovUkFormGroupWrapperComponent | typeof GovUkLabelComponent | typeof GovUkErrorMessageComponent | typeof GovUkRadioComponent | typeof GovUkRadiosComponent | typeof RemoveHostDirective)[];
+export declare const COMMON_COMPONENTS: (typeof AccessibilityComponent | typeof GenericFilterComponent | typeof SelectedCaseConfirmComponent | typeof SelectedCaseListComponent | typeof SelectedCaseComponent | typeof ServiceMessagesComponent | typeof ShareCaseConfirmComponent | typeof ShareCaseComponent | typeof CookieBannerComponent | typeof SearchLocationComponent | typeof FeatureToggleDirective | typeof LetDirective | typeof FindPersonComponent | typeof SearchJudicialsComponent | typeof SearchVenueComponent)[];
+export declare const GOV_UI_COMPONENTS: (typeof HmctsIdentityBarComponent | typeof HmctsPaginationComponent | typeof HmctsSubNavigationComponent | typeof HmctsPrimaryNavigationComponent | typeof HmctsErrorSummaryComponent | typeof HmctsMainWrapperComponent | typeof HmctsBannerComponent | typeof GovukTableComponent | typeof GovUkFormGroupWrapperComponent | typeof GovUkLabelComponent | typeof GovUkErrorMessageComponent | typeof GovUkCheckboxesComponent | typeof GovUkRadioComponent | typeof RemoveHostDirective)[];
 export declare class ExuiCommonLibModule {
 }

package/lib/gov-ui/components/gov-uk-checkboxes/gov-uk-checkboxes.component.d.ts

@@ -1,15 +1,6 @@
-import { OnInit } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { CheckboxesModel, ErrorMessagesModel, GovUiConfigModel } from '../../models';
-export declare class GovUkCheckboxesComponent implements OnInit {
-    group: FormGroup;
-    config: GovUiConfigModel;
-    items: CheckboxesModel[];
-    errorMessage: ErrorMessagesModel;
-    columns: CheckboxesModel[][];
-    ngOnInit(): void;
-    setDescribedBy(): string;
-    onChecked(checked: boolean, value: string): void;
-    isChecked(value: string): any;
-    private setColumns;
+import { ErrorMessagesModel } from '../../models';
+import { CheckboxesModel } from '../../models/checkboxes-model';
+export declare class GovUkCheckboxesComponent {
+    options: CheckboxesModel;
+    errors: ErrorMessagesModel;
 }

package/lib/gov-ui/components/gov-uk-input/gov-uk-input.component.d.ts

@@ -1,6 +1,7 @@
 import { OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { ErrorMessagesModel, GovUiConfigModel } from '../../models';
+import { ErrorMessagesModel } from '../../models';
+import { GovUiConfigModel } from '../../models/gov-ui-config-model';
 export declare class GovUkInputComponent implements OnInit {
     constructor();
     errorMessage: ErrorMessagesModel;

package/lib/gov-ui/components/gov-uk-label/gov-uk-label.component.d.ts

@@ -6,6 +6,5 @@ export declare class GovUkLabelComponent {
         id: string;
         isPageHeading: boolean;
         classes: string;
-        optional?: string;
     };
 }

package/lib/gov-ui/components/gov-uk-radios/gov-uk-radios.component.d.ts

@@ -1,6 +1,6 @@
 import { ErrorMessagesModel } from '../../models';
-import { RadioButtonsModel } from '../../models/radio-buttons.model';
+import { CheckboxesModel } from '../../models/checkboxes-model';
 export declare class GovUkRadiosComponent {
-    options: RadioButtonsModel;
+    options: CheckboxesModel;
     errors: ErrorMessagesModel;
 }

package/lib/gov-ui/components/hmcts-banner/hmcts-banner.component.d.ts

@@ -1,7 +1,5 @@
 export declare class HmctsBannerComponent {
+    constructor();
+    type: string;
     message: string;
-    type: 'warning' | 'success' | 'information';
-    title?: string;
-    showMessageIcon?: boolean;
-    messageBoldText?: boolean;
 }

package/lib/gov-ui/components/hmcts-main-wrapper/hmcts-main-wrapper.component.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter, OnInit } from '@angular/core';
-import { HmctsBannerInfo } from '../hmcts-banner/hmcts-banner-info.interface';
+import { BannerDataModel } from '../../models/banner-data-model';
 export declare class HmctsMainWrapperComponent implements OnInit {
-    bannerData: HmctsBannerInfo;
+    bannerData: BannerDataModel;
     backLink: string;
     title: string;
     summaryErrors: {
@@ -12,7 +12,7 @@ export declare class HmctsMainWrapperComponent implements OnInit {
             message: any;
         }[];
     };
-    banner: HmctsBannerInfo;
+    banner: BannerDataModel;
     actionButtons: {
         name: string;
         class: string;

package/lib/gov-ui/components/public_api.d.ts

@@ -1,2 +1 @@
 export * from './hmcts-sub-navigation/hmcts-sub-navigation.component';
-export * from './hmcts-banner/hmcts-banner.component';

package/lib/gov-ui/models/banner-data-model.d.ts

@@ -0,0 +1,4 @@
+export interface BannerDataModel {
+    type: string;
+    message: string;
+}

package/lib/gov-ui/models/checkboxes-model.d.ts

@@ -1,6 +1,9 @@
+import { FormGroup } from '@angular/forms';
+import { GovUiConfigModel } from './gov-ui-config-model';
 export interface CheckboxesModel {
-    id: string;
-    value: string;
-    label: string;
-    hint?: string;
+    key: string;
+    group: FormGroup;
+    config: GovUiConfigModel;
+    errors: any;
+    items: GovUiConfigModel[];
 }

package/lib/gov-ui/models/gov-ui-config-model.d.ts

@@ -11,6 +11,4 @@ export interface GovUiConfigModel {
     type?: string;
     isPageHeading?: boolean;
     rows?: number;
-    fullWidth?: boolean;
-    optional?: boolean;
 }

package/lib/gov-ui/models/public_api.d.ts

@@ -1,3 +1,4 @@
 export * from './checkboxes-model';
 export * from './error-messages-model';
+export * from './banner-data-model';
 export * from './gov-ui-config-model';

package/lib/models/case-share.model.d.ts

@@ -8,3 +8,8 @@ export interface SharedCase {
     pendingShares?: UserDetails[];
     pendingUnshares?: UserDetails[];
 }
+export declare enum SharedCaseErrorMessages {
+    OneCaseMustBeSelected = "At least one case must be selected",
+    NoChangesRequested = "You have not requested any changes to case sharing",
+    OnePersonMustBeAssigned = "At least one person must be assigned to each case"
+}

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

@@ -1,71 +1,49 @@
 import { BookingCheckType } from './location.model';
 import { PersonRole } from './person.model';
-export declare type FilterFieldType = 'group-title' | 'checkbox' | 'radio' | 'select' | 'find-person' | 'find-location' | 'checkbox-large' | 'find-service' | 'text-input' | 'email-input' | 'group-select' | 'nested-checkbox' | 'find-task-name';
+export declare type FilterFieldType = 'checkbox' | 'radio' | 'select' | 'find-person' | 'find-location' | 'checkbox-large' | 'find-service';
 export declare type FilterPersistence = 'local' | 'session' | 'memory';
-export interface FilterConfigOption {
-    key: string;
-    label: string;
-    selectAll?: boolean;
-}
 export interface FilterConfig {
     id: string;
     fields: FilterFieldConfig[];
     persistence: FilterPersistence;
     applyButtonText: string;
-    enableDisabledButton?: boolean;
     cancelButtonText: string;
     cancelSetting?: FilterSetting;
+    enableDisabledButton?: boolean;
     showCancelFilterButton?: boolean;
-    cancelButtonCallback?(): void;
-}
-export interface FilterFieldOption {
-    key: string;
-    label: string;
-    selectAll?: true;
 }
 export interface FilterFieldConfig {
     name: string;
-    options: FilterConfigOption[];
+    options: {
+        key: string;
+        label: string;
+        selectAll?: true;
+    }[];
     minSelected: number;
     maxSelected: number;
     minSelectedError?: string;
     maxSelectedError?: string;
     displayMaxSelectedError?: boolean;
     displayMinSelectedError?: boolean;
-    emailError?: string;
     lineBreakBefore?: boolean;
     showCondition?: string;
     enableCondition?: string;
-    enableAddLocationButton?: boolean;
-    enableAddTaskNameButton?: boolean;
     enableAddButton?: boolean;
+    enableAddLocationButton?: boolean;
     changeResetFields?: string[];
     findPersonField?: string;
     findLocationField?: string;
-    findTaskNameField?: string;
     domainField?: string;
     disable?: boolean;
     disabledText?: string;
     type: FilterFieldType;
     domain?: PersonRole;
     title?: string;
-    titleClasses?: string;
-    titleHint?: string;
     subTitle?: string;
     locationTitle?: string;
     radioSelectionChange?: string;
     bookingCheckType?: BookingCheckType;
     placeholderContent?: string;
-    maxWidth480px?: boolean;
-    maxRows?: number;
-    groupOptions?: GroupOptions[];
-    maxlength?: number;
-    defaultOption?: FilterConfigOption;
-}
-export interface GroupOptions {
-    group: string;
-    options: FilterFieldOption[];
-    placeholderContent?: string;
 }
 export interface FilterSetting {
     id: string;

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

@@ -34,7 +34,7 @@ export declare enum PersonRole {
     JUDICIAL = "Judicial",
     CASEWORKER = "Legal Ops",
     ADMIN = "Admin",
-    CTSC = "CTSC User",
+    CTSC = "CTSC",
     ALL = "All"
 }
 export declare enum RoleCategory {

package/lib/services/case-sharing-state/case-sharing-state.service.d.ts

@@ -8,7 +8,7 @@ export declare class CaseSharingStateService {
     setCases(cases: SharedCase[]): void;
     getCases(): SharedCase[];
     requestShare(user: UserDetails): SharedCase[];
-    requestUnshare(caseId: string, user: UserDetails): void;
+    requestUnshare(user: UserDetails, caseId?: string): SharedCase[];
     requestCancel(caseId: string, user: UserDetails): void;
     removeCase(caseId: string): void;
     userHasAccess(c: SharedCase, user: UserDetails): boolean;

package/lib/services/filter/filter.service.d.ts

@@ -9,7 +9,6 @@ export declare class FilterService {
     get(id: string): FilterSetting | null;
     isSameUser(id: string): boolean;
     getStream(id: string): Observable<FilterSetting>;
-    clearSessionAndLocalPersistance(id: string): void;
     private persistLocal;
     private persistSession;
     private persistMemory;

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

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Caseworker, JudicialUserModel, Person, SearchOptions } from '../../models';
-import { SessionStorageService } from '../storage/session-storage/session-storage.service';
+import { SessionStorageService } from '../session-storage/session-storage.service';
 export declare class FindAPersonService {
     private readonly http;
     private readonly sessionStorageService;

package/lib/services/role-guard/role.guard.d.ts

@@ -1,5 +1,4 @@
 import { ActivatedRouteSnapshot, CanActivate, Router, UrlTree } from '@angular/router';
-import { Observable } from 'rxjs';
 import { RoleService } from './role.service';
 export declare enum RoleMatching {
     ALL = 0,
@@ -9,5 +8,5 @@ export declare class RoleGuard implements CanActivate {
     private readonly roleService;
     private readonly router;
     constructor(roleService: RoleService, router: Router);
-    canActivate(route: ActivatedRouteSnapshot): Observable<boolean | UrlTree>;
+    canActivate(route: ActivatedRouteSnapshot): boolean | UrlTree;
 }

package/lib/services/role-guard/role.service.d.ts

@@ -1,8 +1,6 @@
-import { BehaviorSubject } from 'rxjs';
 export declare type Role = string;
 export declare type Roles = Role[];
 export declare class RoleService {
-    readonly pRoles: BehaviorSubject<string[]>;
-    roles$: import("rxjs").Observable<string[]>;
+    private pRoles;
     roles: Roles;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "1.8.5-angular-upgrade-r4",
+  "version": "1.8.7-fix-wrong-services",
   "peerDependencies": {
     "@angular/common": "^7.2.0",
     "@angular/core": "^7.2.0",