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

package/fesm2015/hmcts-rpx-xui-common-lib.js

@@ -1,5 +1,6 @@
-import { MatInputModule, MatTabsModule } from '@angular/material';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatInputModule } from '@angular/material/input';
+import { MatTabsModule } from '@angular/material/tabs';
 import { NgxPaginationModule, PaginatePipe } from 'ngx-pagination';
 import { HttpClient } from '@angular/common/http';
 import { FormArray, FormBuilder, FormControl, FormGroup, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -8,10 +9,10 @@ import { formatDate, DOCUMENT, CommonModule } from '@angular/common';
 import { Title } from '@angular/platform-browser';
 import { DocumentInterruptSource, Idle } from '@ng-idle/core';
 import { Keepalive } from '@ng-idle/keepalive';
-import { RouterModule, Router, NavigationEnd } from '@angular/router';
-import { Component, EventEmitter, Input, Output, ViewEncapsulation, Injectable, Pipe, Directive, TemplateRef, ViewContainerRef, ElementRef, Inject, ViewChild, ChangeDetectorRef, InjectionToken, ChangeDetectionStrategy, defineInjectable, inject, NgModule } from '@angular/core';
+import { Router, RouterModule, NavigationEnd } from '@angular/router';
+import { Component, EventEmitter, Input, Output, ViewEncapsulation, Injectable, Directive, TemplateRef, ViewContainerRef, ElementRef, Inject, ViewChild, ChangeDetectorRef, InjectionToken, ChangeDetectionStrategy, defineInjectable, inject, NgModule } from '@angular/core';
 import { BehaviorSubject, of, zip, Subject, combineLatest } from 'rxjs';
-import { distinctUntilChanged, map, debounceTime, filter, mergeMap, tap, catchError, switchMap, delay, skipWhile } from 'rxjs/operators';
+import { distinctUntilChanged, map, tap, debounceTime, filter, mergeMap, catchError, switchMap, delay } from 'rxjs/operators';
 
 /**
  * @fileoverview added by tsickle
@@ -493,7 +494,7 @@ class FilterService {
             return this.filterSettings[id];
         }
         if (sessionStorage.getItem(id)) {
-            return JSON.parse(sessionStorage.getItem(id));
+            return JSON.parse(window.sessionStorage.getItem(id));
         }
         if (localStorage.getItem(id)) {
             if (this.isSameUser(id)) {
@@ -524,20 +525,6 @@ class FilterService {
         }
         return this.streams[id].asObservable();
     }
-    /**
-     * @param {?} id
-     * @return {?}
-     */
-    clearSessionAndLocalPersistance(id) {
-        sessionStorage.removeItem(id);
-        localStorage.removeItem(id);
-        if (this.filterSettings[id] !== undefined) {
-            this.filterSettings[id] = null;
-        }
-        if (this.streams[id] !== undefined) {
-            this.streams[id].next(null);
-        }
-    }
     /**
      * @private
      * @param {?} setting
@@ -553,7 +540,7 @@ class FilterService {
      * @return {?}
      */
     persistSession(setting) {
-        sessionStorage.setItem(setting.id, JSON.stringify(setting));
+        window.sessionStorage.setItem(setting.id, JSON.stringify(setting));
     }
     /**
      * @private
@@ -618,7 +605,7 @@ function minSelectedValidator(min) {
          * @param {?} value
          * @return {?}
          */
-        value => value)).length >= min ? null : { minlength: true };
+        value => value)).length >= min ? null : { minLength: true };
     });
 }
 /**
@@ -675,7 +662,6 @@ class GenericFilterComponent {
         this.filterService = filterService;
         this.fb = fb;
         this.submitted = false;
-        this.previousSelectedNestedCheckbox = [];
     }
     /**
      * @return {?}
@@ -722,10 +708,10 @@ class GenericFilterComponent {
     static addFormValidators(field) {
         /** @type {?} */
         const validators = [];
-        if (field && field.minSelected > 0) {
+        if (field && field.minSelected) {
             validators.push(minSelectedValidator(field.minSelected));
         }
-        if (field && field.maxSelected > 0) {
+        if (field && field.maxSelected) {
             validators.push(maxSelectedValidator(field.maxSelected));
         }
         return validators;
@@ -743,17 +729,6 @@ class GenericFilterComponent {
          * @return {?}
          */
         () => this.submitted = false));
-        this.filterSkillsByServices(null, this.config);
-        /** @type {?} */
-        const services = this.config.fields.find((/**
-         * @param {?} field
-         * @return {?}
-         */
-        field => field.name === 'user-services'));
-        if (services) {
-            this.startFilterSkillsByServices(this.form, services);
-            this.initValuesFromCacheForSkillsByServices();
-        }
     }
     /**
      * @return {?}
@@ -885,11 +860,6 @@ class GenericFilterComponent {
      * @return {?}
      */
     inputChanged(field) {
-        if (field.name === 'user-services') {
-            /** @type {?} */
-            const selectedServices = this.getSelectedValuesForFields(this.form.controls, field);
-            this.filterSkillsByServices(selectedServices, this.config);
-        }
         if (field.radioSelectionChange && typeof field.radioSelectionChange === 'string') {
             const [name, value] = field.enableCondition.split('=');
             this.form.get(name).patchValue(value);
@@ -908,9 +878,6 @@ class GenericFilterComponent {
         this.filterService.persist(settings, this.config.persistence);
         this.filterService.givenErrors.next(null);
         this.submitted = false;
-        if (this.config.cancelButtonCallback) {
-            this.config.cancelButtonCallback();
-        }
     }
     /**
      * @param {?} values
@@ -934,22 +901,6 @@ class GenericFilterComponent {
             }
         }
     }
-    /**
-     * @param {?} field
-     * @param {?} i
-     * @return {?}
-     */
-    checkBoxChecked(field, i) {
-        return ((/** @type {?} */ (this.form.get(field.name))))['controls'][i]['value'];
-    }
-    /**
-     * @param {?} values
-     * @param {?} field
-     * @return {?}
-     */
-    updateTaskNameControls(values, field) {
-        this.form.get(field.name).patchValue(values);
-    }
     /**
      * @param {?} event
      * @param {?} form
@@ -1033,52 +984,6 @@ class GenericFilterComponent {
                 this.resetField(resetField, form);
             }
         }
-        if (field.name === 'user-services') {
-            this.startFilterSkillsByServices(form, field);
-        }
-        else if (field.name === 'user-skills') {
-            if (isChecked) {
-                /** @type {?} */
-                const selectedIndex = field.options.findIndex((/**
-                 * @param {?} option
-                 * @return {?}
-                 */
-                option => Number(option.key) === Number(event.target.value)));
-                /** @type {?} */
-                const selectedCheckbox = this.form.get('user-skills').value;
-                selectedCheckbox[selectedIndex] = true;
-                this.form.get('user-skills').setValue(selectedCheckbox);
-                this.previousSelectedNestedCheckbox.push(event.target.value);
-            }
-            else {
-                /** @type {?} */
-                const index = this.previousSelectedNestedCheckbox.indexOf(event.target.value);
-                if (index !== -1) {
-                    this.previousSelectedNestedCheckbox.splice(index, 1);
-                }
-            }
-        }
-    }
-    /**
-     * @private
-     * @param {?} form
-     * @param {?} field
-     * @return {?}
-     */
-    startFilterSkillsByServices(form, field) {
-        /** @type {?} */
-        const servicesArray = [];
-        form.value[field.name].map((/**
-         * @param {?} service
-         * @param {?} index
-         * @return {?}
-         */
-        (service, index) => {
-            if (service) {
-                servicesArray.push(field.options[index].key);
-            }
-        }));
-        this.filterSkillsByServices(servicesArray, this.config);
     }
     /**
      * @private
@@ -1152,14 +1057,14 @@ class GenericFilterComponent {
             this.form.addControl('findPersonControl', findPersonControl);
         }
         for (const field of config.fields) {
-            if (field.type === 'checkbox' || field.type === 'checkbox-large' || field.type === 'nested-checkbox') {
+            if (field.type === 'checkbox' || field.type === 'checkbox-large') {
                 /** @type {?} */
                 const formArray = this.buildCheckBoxFormArray(field, settings);
                 this.form.addControl(field.name, formArray);
             }
-            else if (field.type === 'find-location' || field.type === 'find-service') {
+            else if (field.type === 'find-location') {
                 /** @type {?} */
-                const formArray = this.buildFormArray(field, settings);
+                const formArray = this.buildFindLocationFormArray(field, settings);
                 this.form.addControl(field.name, formArray);
             }
             else {
@@ -1167,12 +1072,6 @@ class GenericFilterComponent {
                 const validators = [];
                 if (field.minSelected && field.minSelected > 0) {
                     validators.push(Validators.required);
-                    if (field.type === 'text-input') {
-                        validators.push(Validators.minLength(field.minSelected));
-                    }
-                    if (field.type === 'email-input') {
-                        validators.push(Validators.email);
-                    }
                 }
                 /** @type {?} */
                 let defaultValue = null;
@@ -1206,7 +1105,7 @@ class GenericFilterComponent {
                     });
                     this.form.addControl(field.name, formGroup);
                 }
-                else if (field.type !== 'group-title') {
+                else {
                     /** @type {?} */
                     const control = new FormControl(defaultValue, validators);
                     this.form.addControl(field.name, control);
@@ -1258,7 +1157,7 @@ class GenericFilterComponent {
      * @param {?} settings
      * @return {?}
      */
-    buildFormArray(field, settings) {
+    buildFindLocationFormArray(field, settings) {
         /** @type {?} */
         const validators = GenericFilterComponent.addFormValidators(field);
         /** @type {?} */
@@ -1300,7 +1199,7 @@ class GenericFilterComponent {
                  * @return {?}
                  */
                 f => f.name === name));
-                if (field.type === 'find-location' || field.type === 'find-service') {
+                if (field.type === 'find-location') {
                     return { value: values, name };
                 }
                 else {
@@ -1319,281 +1218,29 @@ class GenericFilterComponent {
      */
     emitFormErrors(form) {
         /** @type {?} */
-        let errors = [];
+        const errors = [];
         for (const field of this.config.fields) {
             /** @type {?} */
             const formGroup = form.get(field.name);
-            if (formGroup && formGroup.errors && (formGroup.errors.minlength || formGroup.errors.required)) {
+            if (formGroup && formGroup.errors && formGroup.errors.minLength) {
                 errors.push({ name: field.name, error: field.minSelectedError });
             }
-            if (formGroup && formGroup.errors && formGroup.errors.maxlength) {
-                errors.push({ name: field.name, error: field.maxSelectedError });
+            if (formGroup && formGroup.errors && formGroup.errors.maxLength) {
+                errors.push({ name: field.name, error: field.minSelectedError });
             }
         }
-        // remove duplicates
-        errors = errors.filter((/**
-         * @param {?} filterError
-         * @param {?} i
-         * @param {?} arr
-         * @return {?}
-         */
-        (filterError, i, arr) => {
-            return errors.indexOf(arr.find((/**
-             * @param {?} item
-             * @return {?}
-             */
-            item => item.name === filterError.name))) === i;
-        }));
         if (errors.length) {
             this.filterService.givenErrors.next(errors);
         }
     }
-    /**
-     * @return {?}
-     */
-    initValuesFromCacheForSkillsByServices() {
-        /** @type {?} */
-        const cachedValues = this.filteredSkillsByServicesCheckbox.map((/**
-         * @param {?} skill
-         * @return {?}
-         */
-        skill => {
-            /** @type {?} */
-            let selected = false;
-            if (this.settings && this.settings.fields) {
-                /** @type {?} */
-                let isSelectedUserSkill;
-                /** @type {?} */
-                const selectedUserSkills = this.settings.fields.find((/**
-                 * @param {?} setting
-                 * @return {?}
-                 */
-                setting => setting.name === 'user-skills'));
-                if (selectedUserSkills && selectedUserSkills.value && selectedUserSkills.value.length > 0) {
-                    isSelectedUserSkill = selectedUserSkills.value.findIndex((/**
-                     * @param {?} val
-                     * @return {?}
-                     */
-                    val => {
-                        return String(val) === String(skill.key);
-                    }));
-                    selected = isSelectedUserSkill !== -1;
-                }
-            }
-            return selected;
-        }));
-        this.form.get('user-skills').setValue(cachedValues);
-    }
-    /**
-     * @param {?} services
-     * @param {?} config
-     * @return {?}
-     */
-    filterSkillsByServices(services, config) {
-        this.filteredSkillsByServices = [];
-        this.filteredSkillsByServicesCheckbox = [];
-        /** @type {?} */
-        const userSkillsSelectField = config.fields.find((/**
-         * @param {?} f
-         * @return {?}
-         */
-        f => f.name === 'user-skills' && f.type === 'group-select'));
-        /** @type {?} */
-        const userSkillsCheckboxField = config.fields.find((/**
-         * @param {?} f
-         * @return {?}
-         */
-        f => f.name === 'user-skills' && f.type === 'nested-checkbox'));
-        if (userSkillsSelectField) {
-            /** @type {?} */
-            const userSkills = userSkillsSelectField.groupOptions;
-            if (!services || services.length === 0) {
-                this.filteredSkillsByServices = userSkills;
-            }
-            else {
-                services.forEach((/**
-                 * @param {?} s
-                 * @return {?}
-                 */
-                s => {
-                    /** @type {?} */
-                    const groupOption = userSkills.find((/**
-                     * @param {?} u
-                     * @return {?}
-                     */
-                    u => u.group.toLowerCase() === s.toLowerCase()));
-                    if (groupOption) {
-                        this.filteredSkillsByServices.push(groupOption);
-                    }
-                }));
-            }
-        }
-        else if (userSkillsCheckboxField) {
-            /** @type {?} */
-            const userSkills = userSkillsCheckboxField.groupOptions;
-            if (!services || services.length === 0) {
-                this.filteredSkillsByServices = userSkills;
-            }
-            else {
-                services.forEach((/**
-                 * @param {?} s
-                 * @return {?}
-                 */
-                s => {
-                    /** @type {?} */
-                    const groupOption = userSkills.find((/**
-                     * @param {?} u
-                     * @return {?}
-                     */
-                    u => u.group.toLowerCase() === s.toLowerCase()));
-                    if (groupOption) {
-                        this.filteredSkillsByServices.push(groupOption);
-                    }
-                }));
-                this.filteredSkillsByServicesCheckbox = this.filteredSkillsByServices.map((/**
-                 * @param {?} skill
-                 * @return {?}
-                 */
-                skill => {
-                    return skill.options;
-                })).reduce((/**
-                 * @param {?} a
-                 * @param {?} b
-                 * @return {?}
-                 */
-                (a, b) => {
-                    return a.concat(b);
-                }), []);
-                userSkillsCheckboxField.options = [];
-                userSkillsCheckboxField.options = this.filteredSkillsByServicesCheckbox;
-                this.form.setControl('user-skills', new FormArray([]));
-                this.filteredSkillsByServicesCheckbox.forEach((/**
-                 * @return {?}
-                 */
-                () => {
-                    ((/** @type {?} */ (this.form.get('user-skills')))).push(new FormControl(false));
-                }));
-                /** @type {?} */
-                const prevValues = this.filteredSkillsByServicesCheckbox.map((/**
-                 * @param {?} skill
-                 * @return {?}
-                 */
-                skill => {
-                    /** @type {?} */
-                    let selected = false;
-                    if (this.settings && this.settings.fields) {
-                        if (this.previousSelectedNestedCheckbox.length > 0) {
-                            selected = this.previousSelectedNestedCheckbox.includes(skill.key);
-                        }
-                        /** @type {?} */
-                        let isSelectedUserSkill;
-                        /** @type {?} */
-                        const selectedUserSkills = this.settings.fields.find((/**
-                         * @param {?} setting
-                         * @return {?}
-                         */
-                        setting => setting.name === 'user-skills'));
-                        if (selectedUserSkills && selectedUserSkills.value && selectedUserSkills.value.length > 0) {
-                            isSelectedUserSkill = selectedUserSkills.value.findIndex((/**
-                             * @param {?} val
-                             * @return {?}
-                             */
-                            val => Number(val) === Number(skill.key)));
-                            selected = isSelectedUserSkill !== -1;
-                        }
-                        if (this.previousSelectedNestedCheckbox.length > 0) {
-                            // Pick up from previous selected
-                            selected = this.previousSelectedNestedCheckbox.includes(String(skill.key));
-                        }
-                    }
-                    return selected;
-                }));
-                this.form.get('user-skills').setValue(prevValues);
-                return this.filteredSkillsByServicesCheckbox;
-            }
-        }
-        this.filteredSkillsByServices = this.sortGroupOptions(this.filteredSkillsByServices);
-        return this.filteredSkillsByServices;
-    }
-    /**
-     * @private
-     * @param {?} formValues
-     * @param {?} field
-     * @return {?}
-     */
-    getSelectedValuesForFields(formValues, field) {
-        /** @type {?} */
-        const selectedValues = [];
-        Object.keys(formValues).map((/**
-         * @param {?} name
-         * @return {?}
-         */
-        (name) => {
-            /** @type {?} */
-            const values = formValues[name].value;
-            if (name === field.name) {
-                values.forEach((/**
-                 * @param {?} v
-                 * @return {?}
-                 */
-                (v) => {
-                    selectedValues.push(v.key);
-                }));
-            }
-        }));
-        return selectedValues;
-    }
-    /**
-     * @private
-     * @param {?} groupOptions
-     * @return {?}
-     */
-    sortGroupOptions(groupOptions) {
-        /** @type {?} */
-        const sortedResults = [];
-        /** @type {?} */
-        const groups = groupOptions.map((/**
-         * @param {?} go
-         * @return {?}
-         */
-        go => go.group));
-        groups.sort().forEach((/**
-         * @param {?} g
-         * @return {?}
-         */
-        g => {
-            /** @type {?} */
-            const options = groupOptions.find((/**
-             * @param {?} go
-             * @return {?}
-             */
-            (go) => go.group === g)).options;
-            /** @type {?} */
-            const sortedOptions = options.sort((/**
-             * @param {?} a
-             * @param {?} b
-             * @return {?}
-             */
-            (a, b) => {
-                return a.label.toLowerCase() > b.label.toLowerCase() ? 1 : (b.label.toLowerCase() > a.label.toLowerCase() ? -1 : 0);
-            }));
-            /** @type {?} */
-            const result = {
-                group: g,
-                options: sortedOptions
-            };
-            sortedResults.push(result);
-        }));
-        return sortedResults;
-    }
 }
 GenericFilterComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-generic-filter',
-                template: "<form [formGroup]=\"form\" (ngSubmit)=\"applyFilter(form)\">\n  <div class=\"contain-classes\" *ngFor=\"let field of config.fields\">\n    <hr *ngIf=\"field.lineBreakBefore\" class=\"govuk-section-break elevated-break\">\n    <ng-container [ngSwitch]=\"field.type\">\n      <ng-container *ngSwitchCase=\"'group-title'\">\n        <div [class]=\"field.titleClasses ? field.titleClasses: 'govuk-label govuk-label--m govuk-!-margin-bottom-4'\">\n          {{ field.name | capitalize }}\n        </div>\n    </ng-container>\n      <ng-container *ngSwitchDefault>\n        <div class=\"govuk-form-group xui-generic-filter\"\n             [hidden]=\"hidden(field, form)\"\n             [id]=\"field.name\"\n             [ngClass]=\"{'form-group-error': submitted && ((form.get(field.name).errors?.minlength || form.get(field.name).errors?.required) || form.get(field.name).errors?.maxlength || form.get(field.name).errors?.email)}\">\n          <div *ngIf=\"field.title\" class=\"xui-generic-filter__field-title\">\n            <h3 [class]=\"field.titleClasses ? field.titleClasses : 'govuk-heading-s'\" style=\"margin-bottom: 0!important\">\n              {{field.title | capitalize}}\n            </h3>\n            <div *ngIf=\"field?.titleHint\" class=\"govuk-!-margin-left-2\">\n              {{ field.titleHint }}\n            </div>\n          </div>\n          <p class=\"govuk-body\" *ngIf=\"field.subTitle\">{{field.subTitle}}</p>\n          <span [id]=\"field.name + '-error'\" class=\"govuk-error-message\"\n            *ngIf=\"field.displayMinSelectedError && submitted && (form.get(field.name).errors?.minlength || form.get(field.name).errors?.required)\">\n            <span class=\"govuk-visually-hidden\">Error:</span> {{field.minSelectedError}}\n          </span>\n          <span [id]=\"field.name + '-error'\" class=\"govuk-error-message\"\n            *ngIf=\"field.displayMaxSelectedError && submitted && form.get(field.name).errors?.maxlength\">\n            <span class=\"govuk-visually-hidden\">Error:</span> {{field.maxSelectedError}}\n          </span>\n          <span [id]=\"field.name + '-error'\" class=\"govuk-error-message\"\n                *ngIf=\"field.emailError && submitted && form.get(field.name).errors?.email\">\n            <span class=\"govuk-visually-hidden\">Error:</span> {{field.emailError}}\n          </span>\n          <div class=\"govuk-body\"  [class.govuk-body--maxWidth480px]=\"field.maxWidth480px\" [ngSwitch]=\"field.type\">\n            <ng-container *ngSwitchCase=\"'select'\">\n              <select class=\"govuk-select\" (change)=\"fieldChanged(field, form)\" [attr.disabled]=\"disabled(field, form)\" [name]=\"'select_' + field.name\" [id]=\"'select_' + field.name\" [formControlName]=\"field.name\">\n                <option disabled selected hidden value=\"\">{{field.disabledText}}</option>\n                <option *ngIf=\"field.defaultOption\" [attr.selected]=\"true\" [value]=\"field.defaultOption.key\">{{field.defaultOption.label}}</option>\n                <option class=\"govuk-radios__item\" *ngFor=\"let item of field.options\" [value]=\"item.key\">{{item.label}}</option>\n              </select>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'group-select'\">\n              <select class=\"govuk-select\" (change)=\"fieldChanged(field, form)\" [attr.disabled]=\"disabled(field, form)\" [name]=\"'select_' + field.name\" [id]=\"'select_' + field.name\" [formControlName]=\"field.name\">\n                <option disabled selected hidden value=\"\">{{field.disabledText}}</option>\n                <option *ngIf=\"field.defaultOption\" selected [value]=\"field.defaultOption.key\">{{field.defaultOption.label}}</option>\n                <optgroup *ngFor = 'let grp of filteredSkillsByServices' label=\"{{grp.group | titlecase}}\">\n                  <option *ngFor = 'let item of grp.options' [value]=\"item.key\">{{item.label}}</option>\n                </optgroup>\n              </select>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'checkbox'\">\n              <div class=\"govuk-checkboxes govuk-checkboxes--small\" [formGroupName]=\"field.name\" [attr.field]=\"field.name\" [id]=\"'checkbox_' + field.name\">\n                <div *ngFor=\"let item of field.options; let i = index\" class=\"govuk-checkboxes__item\">\n                  <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n                         [attr.disabled]=\"disabled(field, form)\"\n                         [formControlName]=\"i\"\n                         (change)=\"toggleSelectAll($event, form, item, field)\"\n                         [value]=\"item.key\" [id]=\"'checkbox_' + item.key\"\n                         [name]=\"'checkbox_' + item.key\"\n                  />\n                  <label\n                    [for]=\"'checkbox_' + item.key\"\n                    class=\"govuk-label govuk-checkboxes__label\"\n                    [ngClass]=\"{'govuk-!-font-weight-bold': item.selectAll}\"\n                  >{{item.label}}</label>\n                </div>\n              </div>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'nested-checkbox'\">\n              <div class=\"govuk-checkboxes govuk-checkboxes--small\" [formGroupName]=\"field.name\" [attr.field]=\"field.name\" [id]=\"'checkbox_' + field.name\">\n                <div *ngFor=\"let item of filteredSkillsByServicesCheckbox; let i = index\" class=\"govuk-checkboxes__item\">\n                  <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n                         [attr.disabled]=\"disabled(field, form)\"\n                         [formControlName]=\"i\"\n                         (change)=\"toggleSelectAll($event, form, item, field)\"\n                         [value]=\"item.key\" [id]=\"'checkbox_' + item.key\"\n                         [name]=\"'checkbox_' + item.key\"\n                  />\n                  <label\n                    [for]=\"'checkbox_' + item.key\"\n                    class=\"govuk-label govuk-checkboxes__label\"\n                    [ngClass]=\"{'govuk-!-font-weight-bold': item.selectAll}\"\n                  >{{item.label}}</label>\n                </div>\n              </div>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'checkbox-large'\">\n              <div class=\"govuk-checkboxes\" [formGroupName]=\"field.name\" [attr.field]=\"field.name\" [id]=\"'checkbox_' + field.name\">\n                <div *ngFor=\"let item of field.options; let i = index\" class=\"govuk-checkboxes__item\">\n                  <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n                         [attr.disabled]=\"disabled(field, form)\"\n                         [formControlName]=\"i\"\n                         (change)=\"toggleSelectAll($event, form, item, field)\"\n                         [value]=\"item.key\" [id]=\"'checkbox_' + item.key\"\n                         [name]=\"'checkbox_' + item.key\"\n                  />\n                  <label\n                    [for]=\"'checkbox_' + item.key\"\n                    class=\"govuk-label govuk-checkboxes__label\"\n                    [ngClass]=\"{'govuk-!-font-weight-bold': item.selectAll}\"\n                  >{{item.label}}</label>\n                </div>\n              </div>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'radio'\">\n              <div class=\"govuk-radios\">\n                <div *ngFor=\"let item of field.options\" class=\"govuk-radios__item\">\n                  <input type=\"radio\"\n                         [formControlName]=\"field.name\"\n                         [id]=\"'radio_' + item.key\"\n                         [attr.disabled]=\"disabled(field, form)\"\n                         [checked]=\"item.key === form.get(field.name).value\"\n                         class=\"govuk-radios__input\"\n                         [value]=\"item.key\"\n                         (change)=\"fieldChanged(field, form)\"\n                  />\n                  <label [for]=\"'radio_' + item.key\" class=\"govuk-label govuk-radios__label\">{{item.label}}</label>\n                </div>\n              </div>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'find-person'\">\n              <xuilib-find-person subTitle=\"\" (personSelected)=\"updatePersonControls($event, field)\"\n                                  (personFieldChanged)=\"inputChanged(field)\"\n                                  [submitted]=\"submitted\"\n                                  [disabled]=\"disabled(field, form)\"\n                                  [domain]=\"form.get(field.domainField)?.value\"\n                                  [findPersonGroup]=\"form\"\n                                  [selectedPerson]=\"form.get(field.name)?.value?.email\"\n                                  [userIncluded]=\"false\"\n                                  [placeholderContent]=\"field.placeholderContent ? field.placeholderContent : ''\"\n              ></xuilib-find-person>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'find-location'\">\n              <xuilib-find-location (locationFieldChanged)=\"inputChanged(field)\"\n                                    [form]=\"form\"\n                                    [fields]=\"config.fields\"\n                                    [locationTitle]=\"field.locationTitle\"\n                                    [enableAddLocationButton]=\"field.enableAddButton\"\n                                    [disabled]=\"disabled(field, form)\"\n                                    [disableInputField]=\"field.disable\"\n                                    [selectedLocations]=\"form.get(field.name)?.value\"\n                                    [submitted]=\"submitted\"\n                                    [services]=\"form.get(field.findLocationField)?.value\"\n                                    [field]=\"field\"\n              ></xuilib-find-location>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'find-task-name'\">\n              <xuilib-find-task-name subTitle=\"\" (taskNameSelected)=\"updateTaskNameControls($event, field)\"\n                                  (taskNameFieldChanged)=\"inputChanged(field)\"\n                                  [submitted]=\"submitted\"\n                                  [disabled]=\"disabled(field, form)\"\n                                  [domain]=\"form.get(field.domainField)?.value\"\n                                  [findTaskNameGroup]=\"form\"\n                                  [selectedTaskName]=\"form.get(field.name).value.taskName\"\n                                  [userIncluded]=\"false\"\n              ></xuilib-find-task-name>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'find-service'\">\n              <xuilib-find-service (serviceFieldChanged)=\"inputChanged(field)\"\n                                    [form]=\"form\"\n                                    [enableAddServiceButton]=\"field.enableAddButton\"\n                                    [disabled]=\"disabled(field, form)\"\n                                    [selectedServices]=\"form.get(field.name)?.value\"\n                                    [services]=\"field.options\"\n                                    [field]=\"field\"\n              ></xuilib-find-service>\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'text-input'\">\n              <input class=\"govuk-input\" type=\"text\"\n                     [formControlName]=\"field.name\"\n                     [id]=\"field.name\"\n                     [attr.disabled]=\"disabled(field, form)\"\n                     (change)=\"fieldChanged(field, form)\"\n                     [attr.maxlength]=\"field.maxlength ? field.maxlength : null\"\n              />\n            </ng-container>\n            <ng-container *ngSwitchCase=\"'email-input'\">\n              <input class=\"govuk-input\" type=\"email\"\n                     [formControlName]=\"field.name\"\n                     [id]=\"field.name\"\n                     [attr.disabled]=\"disabled(field, form)\"\n                     (change)=\"fieldChanged(field, form)\"\n              />\n            </ng-container>\n          </div>\n        </div>\n      </ng-container>\n    </ng-container>\n  </div>\n  <hr class=\"govuk-section-break govuk-section-break--m\"/>\n  <div class=\"govuk-grid-row\">\n    <div class=\"govuk-grid-column-full\">\n      <button\n        class=\"govuk-button govuk-!-margin-right-1 govuk-!-margin-bottom-0\"\n        type=\"submit\"\n        id=\"applyFilter\"\n        [disabled]=\"config.enableDisabledButton && form.invalid\"\n      >{{config.applyButtonText || 'Apply'}}</button>\n      <button *ngIf=\"config.showCancelFilterButton\"\n        class=\"govuk-button govuk-button--secondary govuk-!-margin-bottom-0\"\n        type=\"button\"\n        id=\"cancelFilter\"\n        (click)=\"cancelFilter()\">{{ config.cancelButtonText || 'Cancel'}}</button>\n    </div>\n  </div>\n</form>\n",
+                template: "<form [formGroup]=\"form\" (ngSubmit)=\"applyFilter(form)\">\n  <div class=\"contain-classes\" *ngFor=\"let field of config.fields\">\n    <hr *ngIf=\"field.lineBreakBefore\" class=\"govuk-section-break govuk-section-break--visible elevated-break\">\n    <div class=\"govuk-form-group xui-generic-filter\"\n         [hidden]=\"hidden(field, form)\"\n         [id]=\"field.name\"\n         [ngClass]=\"{'form-group-error': submitted && (form.get(field.name).errors?.minLength || form.get(field.name).errors?.maxLength)}\">\n      <h3 *ngIf=\"field.title\" class=\"govuk-heading-s\">{{field.title}}</h3>\n      <p class=\"govuk-body\" *ngIf=\"field.subTitle\">{{field.subTitle}}</p>\n      <span [id]=\"field.name + '-error'\" class=\"govuk-error-message\" *ngIf=\"field.displayMinSelectedError && submitted && form.get(field.name).errors?.minLength\">\n        <span class=\"govuk-visually-hidden\">Error:</span> {{field.minSelectedError}}\n      </span>\n      <span [id]=\"field.name + '-error'\" class=\"govuk-error-message\" *ngIf=\"field.displayMaxSelectedError && submitted && form.get(field.name).errors?.maxLength\">\n        <span class=\"govuk-visually-hidden\">Error:</span> {{field.maxSelectedError}}\n      </span>\n      <div class=\"govuk-body\" [ngSwitch]=\"field.type\">\n        <ng-container *ngSwitchCase=\"'select'\">\n          <select class=\"govuk-select\" (change)=\"fieldChanged(field, form)\" [attr.disabled]=\"disabled(field, form)\" [name]=\"'select_' + field.name\" [id]=\"'select_' + field.name\" [formControlName]=\"field.name\">\n            <option disabled selected hidden value=\"\">{{field.disabledText}}</option>\n            <option class=\"govuk-radios__item\" *ngFor=\"let item of field.options\" [value]=\"item.key\">{{item.label}}</option>\n          </select>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'checkbox'\">\n          <div class=\"govuk-checkboxes govuk-checkboxes--small\" [formGroupName]=\"field.name\" [attr.field]=\"field.name\" [id]=\"'checkbox_' + field.name\">\n            <div *ngFor=\"let item of field.options; let i = index\" class=\"govuk-checkboxes__item\">\n              <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n                     [attr.disabled]=\"disabled(field, form)\"\n                     [formControlName]=\"i\"\n                     (change)=\"toggleSelectAll($event, form, item, field)\"\n                     [value]=\"item.key\" [id]=\"'checkbox_' + item.key\"\n                     [name]=\"'checkbox_' + item.key\"\n              />\n              <label\n                [for]=\"'checkbox_' + item.key\"\n                class=\"govuk-label govuk-checkboxes__label\"\n                [ngClass]=\"{'govuk-!-font-weight-bold': item.selectAll}\"\n              >{{item.label}}</label>\n            </div>\n          </div>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'checkbox-large'\">\n          <div class=\"govuk-checkboxes\" [formGroupName]=\"field.name\" [attr.field]=\"field.name\" [id]=\"'checkbox_' + field.name\">\n            <div *ngFor=\"let item of field.options; let i = index\" class=\"govuk-checkboxes__item\">\n              <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n                     [attr.disabled]=\"disabled(field, form)\"\n                     [formControlName]=\"i\"\n                     (change)=\"toggleSelectAll($event, form, item, field)\"\n                     [value]=\"item.key\" [id]=\"'checkbox_' + item.key\"\n                     [name]=\"'checkbox_' + item.key\"\n              />\n              <label\n                [for]=\"'checkbox_' + item.key\"\n                class=\"govuk-label govuk-checkboxes__label\"\n                [ngClass]=\"{'govuk-!-font-weight-bold': item.selectAll}\"\n              >{{item.label}}</label>\n            </div>\n          </div>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'radio'\">\n          <div class=\"govuk-radios\">\n            <div *ngFor=\"let item of field.options\" class=\"govuk-radios__item\">\n              <input type=\"radio\"\n                     [formControlName]=\"field.name\"\n                     [id]=\"'radio_' + item.key\"\n                     [attr.disabled]=\"disabled(field, form)\"\n                     [checked]=\"item.key === form.get(field.name).value\"\n                     class=\"govuk-radios__input\"\n                     [value]=\"item.key\"\n                     (change)=\"fieldChanged(field, form)\"\n              />\n              <label [for]=\"'radio_' + item.key\" class=\"govuk-label govuk-radios__label\">{{item.label}}</label>\n            </div>\n          </div>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'find-person'\">\n          <xuilib-find-person subTitle=\"\" (personSelected)=\"updatePersonControls($event, field)\"\n                              (personFieldChanged)=\"inputChanged(field)\"\n                              [submitted]=\"submitted\"\n                              [disabled]=\"disabled(field, form)\"\n                              [domain]=\"form.get(field.domainField)?.value\"\n                              [findPersonGroup]=\"form\"\n                              [selectedPerson]=\"form.get(field.name)?.value?.email\"\n                              [userIncluded]=\"false\"\n                              [placeholderContent]=\"field.placeholderContent ? field.placeholderContent : ''\"\n          ></xuilib-find-person>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'find-location'\">\n          <xuilib-find-location (locationFieldChanged)=\"inputChanged(field)\"\n                                [form]=\"form\"\n                                [fields]=\"config.fields\"\n                                [locationTitle]=\"field.locationTitle\"\n                                [enableAddLocationButton]=\"field.enableAddButton\"\n                                [disabled]=\"disabled(field, form)\"\n                                [disableInputField]=\"field.disable\"\n                                [selectedLocations]=\"form.get(field.name)?.value\"\n                                [submitted]=\"submitted\"\n                                [field]=\"field\"\n                                [services]=\"form.get(field.findLocationField)?.value\"\n          ></xuilib-find-location>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'find-service'\">\n          <xuilib-find-service (serviceFieldChanged)=\"inputChanged(field)\"\n                                [form]=\"form\"\n                                [fields]=\"config.fields\"\n                                [title]=\"field.title\"\n                                [enableAddServiceButton]=\"field.enableAddButton\"\n                                [disabled]=\"disabled(field, form)\"\n                                [disableInputField]=\"field.disable\"\n                                [field]=\"field\"\n                                [selectedServices]=\"form.get(field.name)?.value\"                                \n          ></xuilib-find-service>\n        </ng-container>\n      </div>\n    </div>\n  </div>\n  <hr class=\"govuk-section-break govuk-section-break--m govuk-section-break--visible\"/>\n  <div class=\"govuk-grid-row\">\n    <div class=\"govuk-grid-column-full\">\n      <button\n        class=\"govuk-button govuk-!-margin-right-1 govuk-!-margin-bottom-0\"\n        type=\"submit\"\n        id=\"applyFilter\"\n        [disabled]=\"config.enableDisabledButton && form.invalid\"\n      >{{config.applyButtonText || 'Apply'}}</button>\n      <button *ngIf=\"config.showCancelFilterButton\"\n        class=\"govuk-button govuk-button--secondary govuk-!-margin-bottom-0\"\n        type=\"button\"\n        id=\"cancelFilter\"\n        (click)=\"cancelFilter()\">{{ config.cancelButtonText || 'Cancel'}}</button>\n    </div>\n  </div>\n</form>\n",
                 changeDetection: ChangeDetectionStrategy.OnPush,
                 encapsulation: ViewEncapsulation.None,
-                styles: [".contain-classes .elevated-break{margin-bottom:20px}@media (min-width:40.0625em){.contain-classes .elevated-break{margin-bottom:30px}}.contain-classes .govuk-body--maxWidth480px{max-width:480px}.contain-classes .xui-generic-filter .select-all{margin-bottom:10px}.contain-classes .xui-generic-filter .govuk-checkboxes{display:flex;flex-direction:column;flex-wrap:wrap}.contain-classes .xui-generic-filter .govuk-checkboxes>div{flex-grow:1;flex-shrink:0}.contain-classes .xui-generic-filter__field-title{display:flex;align-items:center;margin-bottom:10px}.contain-classes .govuk-select{width:100%}"]
+                styles: [".contain-classes .elevated-break{position:relative;top:-10px}.contain-classes .xui-generic-filter .select-all{margin-bottom:10px}.contain-classes .xui-generic-filter .govuk-checkboxes{display:flex;flex-wrap:wrap}.contain-classes .xui-generic-filter .govuk-checkboxes>div{flex-grow:1;flex-shrink:0}"]
             }] }
 ];
 /** @nocollapse */
@@ -1809,21 +1456,44 @@ class CaseSharingStateService {
         return newSharedCases;
     }
     /**
-     * @param {?} caseId
      * @param {?} user
+     * @param {?=} caseId
      * @return {?}
      */
-    requestUnshare(caseId, user) {
+    requestUnshare(user, caseId) {
         /** @type {?} */
         const newSharedCases = [];
         for (const sharedCase of this.caseState) {
-            if (sharedCase.caseId === caseId) {
+            // If no caseId, then request unshare from all shared cases
+            if (caseId === undefined || sharedCase.caseId === caseId) {
                 if (!sharedCase.pendingUnshares) {
                     sharedCase.pendingUnshares = [];
                 }
                 /** @type {?} */
                 const newPendingUnshares = sharedCase.pendingUnshares.slice();
-                if (newPendingUnshares) {
+                // If the user is pending shared access, just remove them from pendingShares
+                /** @type {?} */
+                let newPendingShares;
+                /** @type {?} */
+                let indexOfPreviouslyAddedUser = -1;
+                if (sharedCase.pendingShares) {
+                    indexOfPreviouslyAddedUser = sharedCase.pendingShares.findIndex((/**
+                     * @param {?} u
+                     * @return {?}
+                     */
+                    u => u.idamId === user.idamId));
+                    if (indexOfPreviouslyAddedUser > -1) {
+                        newPendingShares = sharedCase.pendingShares.slice();
+                        newPendingShares.splice(indexOfPreviouslyAddedUser, 1);
+                    }
+                }
+                // If the user does not exist in pendingShares, and already has shared access (i.e. exists in sharedWith),
+                // request removal of shared access
+                if (indexOfPreviouslyAddedUser === -1 && sharedCase.sharedWith && sharedCase.sharedWith.findIndex((/**
+                 * @param {?} u
+                 * @return {?}
+                 */
+                u => u.idamId === user.idamId)) > -1) {
                     if (!newPendingUnshares.some((/**
                      * @param {?} u
                      * @return {?}
@@ -1832,11 +1502,10 @@ class CaseSharingStateService {
                         newPendingUnshares.push(user);
                     }
                 }
-                else {
-                    newPendingUnshares.push(user);
-                }
                 /** @type {?} */
-                const newSharedCase = Object.assign({}, sharedCase, { pendingUnshares: newPendingUnshares });
+                const newSharedCase = Object.assign({}, sharedCase, { pendingUnshares: newPendingUnshares }, (newPendingShares && {
+                    pendingShares: newPendingShares
+                }));
                 newSharedCases.push(newSharedCase);
             }
             else {
@@ -1844,7 +1513,7 @@ class CaseSharingStateService {
             }
         }
         this.subject.next(newSharedCases);
-        return;
+        return newSharedCases;
     }
     /**
      * @param {?} caseId
@@ -1894,11 +1563,13 @@ class CaseSharingStateService {
      * @return {?}
      */
     removeCase(caseId) {
-        for (let i = 0, l = this.caseState.length; i < l; i++) {
-            if (this.caseState[i].caseId === caseId) {
-                this.caseState.splice(i, 1);
-                this.subject.next(this.caseState);
-                return;
+        if (this.caseState.length > 1) {
+            for (let i = 0, l = this.caseState.length; i < l; i++) {
+                if (this.caseState[i].caseId === caseId) {
+                    this.caseState.splice(i, 1);
+                    this.subject.next(this.caseState);
+                    return;
+                }
             }
         }
     }
@@ -1972,7 +1643,7 @@ class SelectedCaseConfirmComponent {
 SelectedCaseConfirmComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-selected-case-confirm',
-                template: "<div id=\"user-access-block-{{ sharedCase.caseId }}\" *ngIf=\"showUserAccessBlock()\">\n  <h2 class=\"govuk-heading-m case-share-confirm__title\">{{ sharedCase.caseTitle }}</h2>\n  <div class=\"case-share-confirm__caption-area\">\n    <div class=\"govuk-caption-m case-share-confirm__caption\">\n      {{ sharedCase.caseId }}\n    </div>\n    <a [routerLink]=\"changeLink\" class=\"case-share-confirm__change-link govuk-link govuk-!-font-size-19\">Change</a>\n  </div>\n  <table class=\"govuk-table\">\n    <thead class=\"govuk-table__head\">\n    <tr class=\"govuk-table__row\">\n      <th class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Name</th>\n      <th class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Email address</th>\n      <th class=\"govuk-table__header govuk-table-column-actions\" scope=\"col\">Actions</th>\n    </tr>\n    </thead>\n    <tbody class=\"govuk-table__body\">\n    <tr class=\"govuk-table__row\" *ngFor=\"let user of sharedCase.pendingShares; trackBy: trackByUserId\">\n      <td class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n      <td class=\"govuk-table__cell\">{{ user.email }}</td>\n      <td class=\"govuk-table__cell\">\n        <span class=\"hmcts-badge\">To be added</span>\n      </td>\n    </tr>\n    <tr class=\"govuk-table__row\" *ngFor=\"let user of sharedCase.pendingUnshares; trackBy: trackByUserId\">\n      <td class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n      <td class=\"govuk-table__cell\">{{ user.email }}</td>\n      <td class=\"govuk-table__cell\">\n        <span class=\"hmcts-badge hmcts-badge--red\">to be removed</span>\n      </td>\n    </tr>\n    </tbody>\n  </table>\n</div>\n",
+                template: "<div id=\"user-access-block-{{ sharedCase.caseId }}\" *ngIf=\"showUserAccessBlock()\">\n  <h2 class=\"govuk-heading-m case-share-confirm__title\">{{ sharedCase.caseTitle }}</h2>\n  <div class=\"case-share-confirm__caption-area\">\n    <div class=\"govuk-caption-m case-share-confirm__caption\">\n      {{ sharedCase.caseId }}\n    </div>\n    <a [routerLink]=\"changeLink\" class=\"case-share-confirm__change-link govuk-link govuk-!-font-size-19\">Change</a>\n  </div>\n  <table class=\"govuk-table\">\n    <thead class=\"govuk-table__head\">\n    <tr class=\"govuk-table__row\">\n      <th class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Name</th>\n      <th class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Email address</th>\n      <th class=\"govuk-table__header govuk-table-column-actions\" scope=\"col\">Actions</th>\n    </tr>\n    </thead>\n    <tbody class=\"govuk-table__body\">\n    <tr class=\"govuk-table__row\" *ngFor=\"let user of sharedCase.pendingShares; trackBy: trackByUserId\">\n      <td class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n      <td class=\"govuk-table__cell\">{{ user.email }}</td>\n      <td class=\"govuk-table__cell\">\n        <span class=\"hmcts-badge\">To be added</span>\n      </td>\n    </tr>\n    <tr class=\"govuk-table__row\" *ngFor=\"let user of sharedCase.pendingUnshares; trackBy: trackByUserId\">\n      <td class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n      <td class=\"govuk-table__cell\">{{ user.email }}</td>\n      <td class=\"govuk-table__cell\">\n        <span class=\"hmcts-badge hmcts-badge--red\">To be removed</span>\n      </td>\n    </tr>\n    </tbody>\n  </table>\n</div>\n",
                 styles: [".case-share-confirm__title{margin-bottom:0}.case-share-confirm__caption-area{border-bottom:1px solid #b1b4b6;padding-bottom:10px;display:inline-block;width:100%;clear:both}.case-share-confirm__caption{float:left}.case-share-confirm__change-link{float:right}.govuk-table-column-header{width:45%}.govuk-table-column-actions{width:10%}"]
             }] }
 ];
@@ -2098,12 +1769,6 @@ class SelectedCaseComponent {
             this.combinedSortedShares = this.combineAndSortShares(sharedWith, pendingShares);
         }
     }
-    /**
-     * @return {?}
-     */
-    onUnselect() {
-        this.unselect.emit(this.sharedCase);
-    }
     /**
      * @param {?} c
      * @return {?}
@@ -2234,7 +1899,7 @@ class SelectedCaseComponent {
      * @return {?}
      */
     onRemove(user, sharedCase) {
-        this.stateService.requestUnshare(sharedCase.caseId, user);
+        this.stateService.requestUnshare(user, sharedCase.caseId);
         this.synchronizeStore.emit(this.shareCases);
     }
     /**
@@ -2330,8 +1995,8 @@ class SelectedCaseComponent {
 SelectedCaseComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-selected-case',
-                template: "<div id=\"{{buildElementId('govuk-accordion__section')}}\" class=\"govuk-accordion__section\">\n  <div class=\"govuk-grid-row govuk-case-header\">\n    <div class=\"govuk-grid-column-three-quarters\">\n      <h3 id=\"{{buildElementId('case-title')}}\" class=\"govuk-case-title\">{{ sharedCase.caseTitle }}</h3>\n      <h1 id=\"{{buildElementId('case-id')}}\" class=\"govuk-case-sub-title\">{{ sharedCase.caseId }}</h1>\n    </div>\n    <div class=\"govuk-grid-column-twenty-percent\">\n      <button *ngIf=\"caseCount > 1\"\n        id=\"{{buildElementId('btn-deselect-case')}}\" \n        class=\"govuk-button hmcts-button--secondary\" \n        (click)=\"onDeselect(sharedCase)\" \n        title=\"Deselect case\">Deselect case\n      </button>\n    </div>\n    <div class=\"govuk-accordion__section-header govuk-grid-column-five-percent\">\n      <div class=\"govuk-accordion__section-heading\">\n        <button type=\"button\" id=\"{{buildElementId('accordion-with-summary-sections-heading')}}\"\n              aria-controls=\"accordion-with-summary-sections-content-1\" class=\"govuk-accordion__section-button\"\n              aria-describedby=\"accordion-with-summary-sections-summary-1\" aria-expanded=\"false\" title=\"Expand or Collapse\">\n        <span class=\"govuk-accordion__icon\" aria-hidden=\"true\"></span></button>\n      </div>\n    </div>\n  </div>\n  <div id=\"{{buildElementId('accordion-with-summary-sections-content')}}\" class=\"govuk-accordion__section-content\"\n       aria-labelledby=\"buildElementId('accordion-with-summary-sections-heading')\" >\n    <div class=\"govuk-grid-row\" *ngIf=\"showNoUsersAccessInfo()\">\n      <span id=\"{{buildElementId('access-info-no-user')}}\" class=\"govuk-div-align-left\">No users from your organisation currently have access to this case.</span>\n    </div>\n    <div class=\"govuk-grid-row\" *ngIf=\"showUserHasAccessInfo()\">\n      <span id=\"{{buildElementId('access-info-has-users')}}\" class=\"govuk-div-align-left\">Users from your organisation with access to this case.</span>\n    </div>\n    <table class=\"govuk-table\" *ngIf=\"showUserAccessTable()\">\n      <thead class=\"govuk-table__head\">\n      <tr class=\"govuk-table__row\">\n        <th id=\"{{buildElementId('name-heading')}}\" class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Name</th>\n        <th id=\"{{buildElementId('email-heading')}}\" class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Email address</th>\n        <th id=\"{{buildElementId('action-heading')}}\" class=\"govuk-table__header govuk-table-column-actions\" scope=\"col\">Actions</th>\n        <th id=\"{{buildElementId('label-heading')}}\" class=\"govuk-table__header govuk-table-column-label\" scope=\"col\">&nbsp;&nbsp;</th>\n      </tr>\n      </thead>\n      <tbody class=\"govuk-table__body\">\n        <tr class=\"govuk-table__row\" *ngFor=\"let user of combinedSortedShares; index as idx; trackBy: trackByUserId\">\n          <td id=\"user-full-name-{{ userIdSetter(canCancel(sharedCase.caseId, user) | async, idx) }}\" class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n          <td id=\"user-email-{{ userIdSetter(canCancel(sharedCase.caseId, user) | async, idx) }}\" class=\"govuk-table__cell\">{{ user.email }}</td>\n          <td class=\"govuk-table__cell\">\n            <a *ngIf=\"canRemove(sharedCase.caseId, user) | async\" (click)=\"onRemove(user, sharedCase)\" href=\"javascript:void(0);\">Remove <span class=\"govuk-visually-hidden\">{{ user.firstName + ' ' + user.lastName }} from case</span></a>\n            <a *ngIf=\"canCancel(sharedCase.caseId, user) | async\" (click)=\"onCancel(user, sharedCase)\" href=\"javascript:void(0);\">Cancel <span class=\"govuk-visually-hidden\">adding {{ user.firstName + ' ' + user.lastName }} to case</span></a>\n          </td>\n          <td class=\"govuk-table__cell\">\n            <span *ngIf=\"isToBeRemoved(sharedCase.caseId, user) | async\" class=\"hmcts-badge hmcts-badge--red\">To be removed</span>\n            <span *ngIf=\"isToBeAdded(sharedCase.caseId, user) | async\" class=\"hmcts-badge\">To be added</span>\n          </td>\n        </tr>\n      </tbody>\n    </table>\n  </div>\n</div>\n",
-                styles: [".govuk-case-header{border-top:1px solid #bfc1c3}.govuk-case-title{font-family:nta,Arial,sans-serif;font-size:24px;color:#005ea5;font-weight:700;padding-left:0}.govuk-case-sub-title{font-family:nta,Arial,sans-serif;font-size:1rem!important;color:#6f777b;font-weight:400;padding-left:0}.govuk-grid-row{margin-left:0;margin-right:0}.govuk-grid-column-three-quarters{padding-top:5px;padding-left:0}.govuk-grid-column-twenty-percent{box-sizing:border-box;padding-top:10px;width:20%;float:left}.govuk-grid-column-five-percent{box-sizing:border-box;padding-top:15px;width:5%;float:left}.govuk-table-column-header{width:40%}.govuk-table-column-actions,.govuk-table-column-label{width:10%}.govuk-div-align-left{font-family:nta,Arial,sans-serif;font-size:1.1875rem!important;line-height:1.31579!important;text-align:left;margin-bottom:20px;padding-left:0;color:#0b0c0c}.govuk-accordion__section-header{border-top:0}.govuk-accordion__section-content{padding-top:0}"]
+                template: "<div id=\"{{buildElementId('govuk-accordion__section')}}\" class=\"govuk-accordion__section\">\n  <div class=\"govuk-grid-row govuk-case-header\">\n    <div class=\"govuk-grid-column-three-quarters\">\n      <h3 id=\"{{buildElementId('case-title')}}\" class=\"govuk-case-title\">{{ sharedCase.caseTitle }}</h3>\n      <h1 id=\"{{buildElementId('case-id')}}\" class=\"govuk-case-sub-title\">{{ sharedCase.caseId }}</h1>\n    </div>\n    <div class=\"govuk-grid-column-twenty-percent\">\n      <button *ngIf=\"caseCount > 1\"\n        id=\"{{buildElementId('btn-deselect-case')}}\" \n        class=\"govuk-button hmcts-button--secondary\" \n        (click)=\"onDeselect(sharedCase)\" \n        title=\"Deselect case\">Deselect case\n      </button>\n    </div>\n    <div class=\"govuk-accordion__section-header govuk-grid-column-five-percent\">\n      <div class=\"govuk-accordion__section-heading\">\n        <button type=\"button\" id=\"{{buildElementId('accordion-with-summary-sections-heading')}}\"\n              aria-controls=\"accordion-with-summary-sections-content-1\" class=\"govuk-accordion__section-button\"\n              aria-describedby=\"accordion-with-summary-sections-summary-1\" aria-expanded=\"false\" title=\"Expand or Collapse\">\n        <span class=\"govuk-accordion__icon\" aria-hidden=\"true\"></span></button>\n      </div>\n    </div>\n  </div>\n  <div id=\"{{buildElementId('accordion-with-summary-sections-content')}}\" class=\"govuk-accordion__section-content\"\n       aria-labelledby=\"buildElementId('accordion-with-summary-sections-heading')\" >\n    <div class=\"govuk-grid-row\" *ngIf=\"showNoUsersAccessInfo()\">\n      <span id=\"{{buildElementId('access-info-no-user')}}\" class=\"govuk-div-align-left\">No users from your organisation currently have access to this case.</span>\n    </div>\n    <div class=\"govuk-grid-row\" *ngIf=\"showUserHasAccessInfo()\">\n      <span id=\"{{buildElementId('access-info-has-users')}}\" class=\"govuk-div-align-left\">Users from your organisation with access to this case.</span>\n    </div>\n    <table class=\"govuk-table\" *ngIf=\"showUserAccessTable()\">\n      <thead class=\"govuk-table__head\">\n      <tr class=\"govuk-table__row\">\n        <th id=\"{{buildElementId('name-heading')}}\" class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Name</th>\n        <th id=\"{{buildElementId('email-heading')}}\" class=\"govuk-table__header govuk-table-column-header\" scope=\"col\">Email address</th>\n        <th id=\"{{buildElementId('action-heading')}}\" class=\"govuk-table__header govuk-table-column-actions\" scope=\"col\">Actions</th>\n        <th id=\"{{buildElementId('label-heading')}}\" class=\"govuk-table__header govuk-table-column-label\" scope=\"col\">Status</th>\n      </tr>\n      </thead>\n      <tbody class=\"govuk-table__body\">\n        <tr class=\"govuk-table__row\" *ngFor=\"let user of combinedSortedShares; index as idx; trackBy: trackByUserId\">\n          <td id=\"user-full-name-{{ userIdSetter(canCancel(sharedCase.caseId, user) | async, idx) }}\" class=\"govuk-table__cell\">{{ user.firstName + ' ' + user.lastName }}</td>\n          <td id=\"user-email-{{ userIdSetter(canCancel(sharedCase.caseId, user) | async, idx) }}\" class=\"govuk-table__cell\">{{ user.email }}</td>\n          <td class=\"govuk-table__cell\">\n            <a *ngIf=\"canRemove(sharedCase.caseId, user) | async\" (click)=\"onRemove(user, sharedCase)\" href=\"javascript:void(0);\">Remove <span class=\"govuk-visually-hidden\">{{ user.firstName + ' ' + user.lastName }} from case</span></a>\n            <a *ngIf=\"canCancel(sharedCase.caseId, user) | async\" (click)=\"onCancel(user, sharedCase)\" href=\"javascript:void(0);\">Cancel <span class=\"govuk-visually-hidden\">adding {{ user.firstName + ' ' + user.lastName }} to case</span></a>\n          </td>\n          <td class=\"govuk-table__cell\">\n            <span *ngIf=\"isToBeRemoved(sharedCase.caseId, user) | async\" class=\"hmcts-badge hmcts-badge--red\">To be removed</span>\n            <span *ngIf=\"isToBeAdded(sharedCase.caseId, user) | async\" class=\"hmcts-badge\">To be added</span>\n          </td>\n        </tr>\n      </tbody>\n    </table>\n  </div>\n</div>\n",
+                styles: [".govuk-case-header{border-top:1px solid #bfc1c3}.govuk-case-title{font-family:nta,Arial,sans-serif;font-size:24px;color:#005ea5;font-weight:700;padding-left:0}.govuk-case-sub-title{font-family:nta,Arial,sans-serif;font-size:1rem!important;color:#6f777b;font-weight:400;padding-left:0}.govuk-grid-row{margin-left:0;margin-right:0}.govuk-grid-column-three-quarters{padding-top:5px;padding-left:0}.govuk-grid-column-twenty-percent{box-sizing:border-box;padding-top:10px;width:20%;float:left}.govuk-grid-column-five-percent{box-sizing:border-box;padding-top:15px;width:5%;float:left}.govuk-table-column-header{width:38%}.govuk-table-column-actions,.govuk-table-column-label{width:12%}.govuk-div-align-left{font-family:nta,Arial,sans-serif;font-size:1.1875rem!important;line-height:1.31579!important;text-align:left;margin-bottom:20px;padding-left:0;color:#0b0c0c}.govuk-accordion__section-header{border-top:0}.govuk-accordion__section-content{padding-top:0}"]
             }] }
 ];
 /** @nocollapse */
@@ -2560,6 +2225,18 @@ ShareCaseConfirmComponent.propDecorators = {
     completeLink: [{ type: Input }]
 };
 
+/**
+ * @fileoverview added by tsickle
+ * Generated from: lib/models/case-share.model.ts
+ * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/** @enum {string} */
+const 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",
+};
+
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/components/user-select/user-select.component.ts
@@ -2660,40 +2337,76 @@ UserSelectComponent.propDecorators = {
 class ShareCaseComponent {
     /**
      * @param {?} stateService
+     * @param {?} router
      */
-    constructor(stateService) {
+    constructor(stateService, router) {
         this.stateService = stateService;
+        this.router = router;
         this.shareCases = []; // cases selected for sharing
-        // cases selected for sharing
+        this.continueAllowed = false;
+        this.selectedUserToRemove = null;
         this.removeUserFromCaseToggleOn = false;
         this.users = []; // users of this organisation the cases can be shared with
         // users of this organisation the cases can be shared with
         this.confirmLink = '';
+        this.cancelLink = '';
         this.showRemoveUsers = false;
+        this.fnTitle = '';
+        this.title = '';
         this.unselect = new EventEmitter();
         this.synchronizeStore = new EventEmitter();
+        this.validationErrors = [];
     }
     /**
      * @return {?}
      */
     ngOnInit() {
-        this.shareCases$.subscribe((/**
+        this.shareCases$
+            .pipe(tap((/**
+         * @param {?} sharedCases
+         * @return {?}
+         */
+        sharedCases => {
+            // Update the list of users assigned to at least one case
+            this.getAssignedUsers(sharedCases.filter((/**
+             * @param {?} sharedCase
+             * @return {?}
+             */
+            sharedCase => sharedCase.sharedWith && sharedCase.sharedWith.length > 0)));
+        })))
+            .subscribe((/**
          * @param {?} shareCases
          * @return {?}
          */
         shareCases => {
             this.shareCases = shareCases;
             this.stateService.setCases(shareCases);
+            // Set the config to be used by the xuilib-gov-uk-error-message component, in particular the element ID to
+            // which the error message is associated
+            if (shareCases) {
+                this.selectedCasesErrorMessageConfig = {
+                    id: shareCases.length > 0 ? 'cases' : 'noCaseDisplay'
+                };
+            }
         }));
         this.shareCases$ = this.stateService.state;
+        this.shareCaseErrorMessage = { isInvalid: false, messages: [] };
     }
     /**
      * @param {?} c
      * @return {?}
      */
     onUnselect(c) {
-        this.unselect.emit(c);
-        this.stateService.removeCase(c.caseId);
+        this.validationErrors = [];
+        if (this.stateService.getCases().length === 1) {
+            this.validationErrors.push({ id: 'cases', message: SharedCaseErrorMessages.OneCaseMustBeSelected });
+            this.shareCaseErrorMessage = { isInvalid: true, messages: [SharedCaseErrorMessages.OneCaseMustBeSelected] };
+            window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+        }
+        else {
+            this.unselect.emit(c);
+            this.stateService.removeCase(c.caseId);
+        }
     }
     /**
      * @param {?} event
@@ -2720,6 +2433,18 @@ class ShareCaseComponent {
             this.userSelect.clear();
         }
         this.synchronizeStore.emit(newSharedCases);
+        // Update the list of assigned users (which includes pending users)
+        this.getAssignedUsers(newSharedCases);
+    }
+    /**
+     * @return {?}
+     */
+    removeUser() {
+        if (this.selectedUserToRemove) {
+            /** @type {?} */
+            const newSharedCases = this.stateService.requestUnshare(this.selectedUserToRemove);
+            this.synchronizeStore.emit(newSharedCases);
+        }
     }
     /**
      * @return {?}
@@ -2728,11 +2453,15 @@ class ShareCaseComponent {
         return this.selectedUser === null || this.shareCases.length === 0;
     }
     /**
+     * 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
      * @return {?}
      */
-    isDisabledContinue() {
-        /** @type {?} */
-        let isDisabled = true;
+    setContinueAllowed() {
+        // Always start with continueAllowed = false. This covers the scenario where a user might add someone for sharing
+        // a case (so, continueAllowed = true), then removes the same user before trying to continue. This would
+        // erroneously leave continueAllowed as true
+        this.continueAllowed = false;
         this.shareCases$.subscribe((/**
          * @param {?} shareCases
          * @return {?}
@@ -2740,16 +2469,15 @@ class ShareCaseComponent {
         shareCases => {
             for (const caseState of shareCases) {
                 if (caseState.pendingShares && caseState.pendingShares.length > 0) {
-                    isDisabled = false;
+                    this.continueAllowed = true;
                     break;
                 }
                 if (caseState.pendingUnshares && caseState.pendingUnshares.length > 0) {
-                    isDisabled = false;
+                    this.continueAllowed = true;
                     break;
                 }
             }
         }));
-        return isDisabled;
     }
     /**
      * @param {?} sharedCase
@@ -2768,35 +2496,130 @@ class ShareCaseComponent {
         }
         this.stateService.setCases(this.shareCases);
     }
-}
-ShareCaseComponent.decorators = [
-    { type: Component, args: [{
-                selector: 'xuilib-share-case',
-                template: "<div id=\"add-user\">\n  <div class=\"govuk-form-group\">\n    <label class=\"govuk-label govuk-!-font-weight-bold\" for=\"add-user-input\">{{addUserLabel}}</label>\n    <span id=\"add-user-hint\" class=\"govuk-hint\">\n      Search by name or email address. You can share access with as many people as you need.\n    </span>\n    <div class=\"govuk-grid-row\">\n      <div class=\"govuk-grid-column-two-thirds\">\n        <xuilib-user-select\n          id=\"add-user-input\"\n          aria-describedby=\"add-user-hint\"\n          [users]=\"users\"\n          (selected)=\"onSelectedUser($event)\">\n        </xuilib-user-select>\n      </div>\n      <div class=\"govuk-grid-column-one-thirds\">\n        <button id=\"btn-add-user\" (click)=\"addUser()\" class=\"govuk-button govuk-button--secondary\" [disabled]=\"isDisabledAdd()\" title=\"Add user to selected cases\">Add</button>\n      </div>\n    </div>\n    <details id=\"add-user-help\" class=\"govuk-details\" data-module=\"govuk-details\">\n      <summary class=\"govuk-details__summary\">\n      <span id=\"content-why-can-not-find-email\" class=\"govuk-details__summary-text\">\n        Can't find an email address?\n      </span>\n      </summary>\n      <div id=\"content-reason-can-not-find-email\" class=\"govuk-details__text\">\n        If you can't find your colleague's email address, they will need to complete their registration. Contact your\n        administrator for help.\n      </div>\n    </details>\n  </div>\n  <div class=\"govuk-form-group\" *ngIf=\"showRemoveUsers\">\n    <label class=\"govuk-label govuk-!-font-weight-bold\" for=\"remove-user-input\">Remove a person from all cases</label>\n    <span id=\"remove-user-hint\" class=\"govuk-hint\">\n      Select a person to remove them from all selected cases.\n    </span>\n    <div class=\"govuk-grid-row\">\n      <div class=\"govuk-grid-column-two-thirds\">\n        <select class=\"govuk-select\" id=\"remove-user-input\" aria-describedby=\"remove-user-hint\">\n          <option value=\"{{user}}\" *ngFor=\"let user of users\">{{user.email}}</option>\n        </select>\n      </div>\n      <div class=\"govuk-grid-column-one-thirds\">\n        <button id=\"btn-remove-user\" class=\"govuk-button govuk-button--secondary\" title=\"Remove user from selected cases\">Remove</button>\n      </div>\n    </div>\n  </div>\n</div>\n\n<div id=\"cases\">\n  <h3 id=\"title-selected-cases\" class=\"govuk-heading-m\">Selected cases</h3>\n  <div *ngIf=\"shareCases && shareCases.length > 0\"  class=\"govuk-accordion\" data-module=\"govuk-accordion\" id=\"accordion-with-summary-sections\">\n    <xuilib-selected-case-list\n      [shareCases$]=\"shareCases$\"\n      [removeUserFromCaseToggleOn]=\"removeUserFromCaseToggleOn\"\n      (unselect)=\"onUnselect($event)\"\n      (synchronizeStore)=\"onSynchronizeStore($event)\"\n    >\n    </xuilib-selected-case-list>\n  </div>\n\n  <div id=\"noCaseDisplay\" *ngIf=\"shareCases && shareCases.length === 0\" class=\"govuk-hint\">\n    No cases to display.\n  </div>\n\n</div>\n\n<div id=\"share-case-nav\" class=\"govuk-button-group\">\n  <button class=\"govuk-button\" data-module=\"govuk-button\" [disabled]=\"isDisabledContinue()\" title=\"Continue\" [routerLink]=\"confirmLink\">Continue</button>\n  <button class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\" title=\"Cancel\">Cancel</button>\n</div>\n",
-                styles: ["select{width:100%}"]
-            }] }
-];
-/** @nocollapse */
-ShareCaseComponent.ctorParameters = () => [
-    { type: CaseSharingStateService }
-];
-ShareCaseComponent.propDecorators = {
-    removeUserFromCaseToggleOn: [{ type: Input }],
-    shareCases$: [{ type: Input }],
-    users: [{ type: Input }],
-    confirmLink: [{ type: Input }],
-    addUserLabel: [{ type: Input }],
-    showRemoveUsers: [{ type: Input }],
-    unselect: [{ type: Output }],
-    synchronizeStore: [{ type: Output }],
-    userSelect: [{ type: ViewChild, args: [UserSelectComponent,] }]
-};
-
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/components/tab/tab.component.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
+    /**
+     * @return {?}
+     */
+    onContinue() {
+        this.setContinueAllowed();
+        // If continuation is not allowed, set an error message
+        if (!this.continueAllowed) {
+            this.validationErrors = [];
+            this.validationErrors.push({ id: 'cases', message: SharedCaseErrorMessages.NoChangesRequested });
+            this.shareCaseErrorMessage = { isInvalid: true, messages: [SharedCaseErrorMessages.NoChangesRequested] };
+            window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+        }
+        // Navigate to confirmation page only if allowed to continue
+        if (this.continueAllowed) {
+            // Check that no case is left unassigned; a user can be removed only if there is another current user, or if at
+            // least one user is to be added. Prevent navigation to confirmation page if there is at least one case left in
+            // an unassigned state
+            if (this.hasCasesLeftUnassigned(this.shareCases)) {
+                this.validationErrors = [];
+                this.validationErrors.push({ id: 'cases', message: SharedCaseErrorMessages.OnePersonMustBeAssigned });
+                this.shareCaseErrorMessage = { isInvalid: true, messages: [SharedCaseErrorMessages.OnePersonMustBeAssigned] };
+                window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+            }
+            else {
+                this.router.navigate([this.confirmLink]);
+            }
+        }
+    }
+    /**
+     * 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
+     * @return {?}
+     */
+    getAssignedUsers(sharedCases) {
+        /** @type {?} */
+        const users = [];
+        sharedCases.forEach((/**
+         * @param {?} sharedCase
+         * @return {?}
+         */
+        sharedCase => {
+            if (sharedCase.sharedWith) {
+                sharedCase.sharedWith.forEach((/**
+                 * @param {?} user
+                 * @return {?}
+                 */
+                user => {
+                    if (!users.some((/**
+                     * @param {?} existingUser
+                     * @return {?}
+                     */
+                    existingUser => user.idamId === existingUser.idamId))) {
+                        users.push(user);
+                    }
+                }));
+            }
+            if (sharedCase.pendingShares) {
+                sharedCase.pendingShares.forEach((/**
+                 * @param {?} user
+                 * @return {?}
+                 */
+                user => {
+                    if (!users.some((/**
+                     * @param {?} existingUser
+                     * @return {?}
+                     */
+                    existingUser => user.idamId === existingUser.idamId))) {
+                        users.push(user);
+                    }
+                }));
+            }
+        }));
+        this.assignedUsers = users;
+    }
+    /**
+     * 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
+     * @return {?} `true` if at least one case has the condition described above; `false` otherwise
+     */
+    hasCasesLeftUnassigned(sharedCases) {
+        return sharedCases.some((/**
+         * @param {?} sharedCase
+         * @return {?}
+         */
+        sharedCase => {
+            return sharedCase.pendingUnshares && sharedCase.sharedWith &&
+                sharedCase.pendingUnshares.length === sharedCase.sharedWith.length &&
+                (!sharedCase.pendingShares || sharedCase.pendingShares.length === 0);
+        }));
+    }
+}
+ShareCaseComponent.decorators = [
+    { type: Component, args: [{
+                selector: 'xuilib-share-case',
+                template: "<xuilib-hmcts-error-summary\n  [errorMessages]=\"validationErrors\"\n  [header]=\"'There is a problem'\"\n></xuilib-hmcts-error-summary>\n<h1 *ngIf=\"title\" class=\"govuk-heading-xl govuk-!-margin-top-2\">\n  <span *ngIf=\"fnTitle\" class=\"govuk-caption-xl\">{{fnTitle}}</span>\n  {{title}}\n</h1>\n<div id=\"add-user\">\n  <div class=\"govuk-form-group\">\n    <label class=\"govuk-label govuk-!-font-weight-bold\" for=\"add-user-input\">{{addUserLabel}}</label>\n    <span id=\"add-user-hint\" class=\"govuk-hint\">\n      Search by name or email address. You can share access with as many people as you need.\n    </span>\n    <div class=\"govuk-grid-row\">\n      <div class=\"govuk-grid-column-two-thirds\">\n        <xuilib-user-select\n          id=\"add-user-input\"\n          aria-describedby=\"add-user-hint\"\n          [users]=\"users\"\n          (selected)=\"onSelectedUser($event)\">\n        </xuilib-user-select>\n      </div>\n      <div class=\"govuk-grid-column-one-thirds\">\n        <button id=\"btn-add-user\" (click)=\"addUser()\" class=\"govuk-button govuk-button--secondary\" [disabled]=\"isDisabledAdd()\" title=\"Add user to selected cases\">Add</button>\n      </div>\n    </div>\n    <details id=\"add-user-help\" class=\"govuk-details\" data-module=\"govuk-details\">\n      <summary class=\"govuk-details__summary\">\n      <span id=\"content-why-can-not-find-email\" class=\"govuk-details__summary-text\">\n        Can't find an email address?\n      </span>\n      </summary>\n      <div id=\"content-reason-can-not-find-email\" class=\"govuk-details__text\">\n        If you can't find your colleague's email address, they will need to complete their registration. Contact your\n        administrator for help.\n      </div>\n    </details>\n  </div>\n  <div class=\"govuk-form-group\" *ngIf=\"showRemoveUsers\">\n    <label class=\"govuk-label govuk-!-font-weight-bold\" for=\"remove-user-input\">Remove a person from all cases</label>\n    <span id=\"remove-user-hint\" class=\"govuk-hint\">\n      Select a person to remove them from all selected cases.\n    </span>\n    <div class=\"govuk-grid-row\">\n      <div class=\"govuk-grid-column-two-thirds\">\n        <select [(ngModel)]=\"selectedUserToRemove\" class=\"govuk-select\" id=\"remove-user-input\" aria-describedby=\"remove-user-hint\">\n          <option [ngValue]=\"null\" selected>Select a person</option>\n          <option *ngFor=\"let user of assignedUsers\" [ngValue]=\"user\">{{user.firstName}} {{user.lastName}} - {{user.email}}</option>\n        </select>\n      </div>\n      <div class=\"govuk-grid-column-one-thirds\">\n        <button id=\"btn-remove-user\" (click)=\"removeUser()\" class=\"govuk-button govuk-button--secondary\" title=\"Remove user from selected cases\">Remove</button>\n      </div>\n    </div>\n  </div>\n</div>\n\n<div id=\"cases\" [ngClass]=\"{'govuk-form-group--error': shareCaseErrorMessage.messages && shareCaseErrorMessage.messages.length > 0}\">\n  <h3 id=\"title-selected-cases\" class=\"govuk-heading-m\">Selected cases</h3>\n  <xuilib-gov-uk-error-message [config]=\"selectedCasesErrorMessageConfig\" [errorMessage]=\"shareCaseErrorMessage\"></xuilib-gov-uk-error-message>\n  <div *ngIf=\"shareCases && shareCases.length > 0\" class=\"govuk-accordion\" data-module=\"govuk-accordion\" id=\"accordion-with-summary-sections\">\n    <xuilib-selected-case-list\n      [shareCases$]=\"shareCases$\"\n      [removeUserFromCaseToggleOn]=\"removeUserFromCaseToggleOn\"\n      (unselect)=\"onUnselect($event)\"\n      (synchronizeStore)=\"onSynchronizeStore($event)\"\n    >\n    </xuilib-selected-case-list>\n  </div>\n\n  <div id=\"noCaseDisplay\" *ngIf=\"shareCases && shareCases.length === 0\" class=\"govuk-hint\"\n    [ngClass]=\"{'govuk-form-group--error': shareCaseErrorMessage.messages && shareCaseErrorMessage.messages.length > 0}\">\n    No cases to display.\n  </div>\n\n</div>\n\n<div id=\"share-case-nav\" class=\"govuk-button-group\">\n  <button id=\"btn-continue\" class=\"govuk-button\" data-module=\"govuk-button\" (click)=\"onContinue()\" title=\"Continue\">Continue</button>\n  <button id=\"btn-cancel\" class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\" title=\"Cancel\" [routerLink]=\"cancelLink\">Cancel</button>\n</div>\n",
+                styles: ["select{width:100%}"]
+            }] }
+];
+/** @nocollapse */
+ShareCaseComponent.ctorParameters = () => [
+    { type: CaseSharingStateService },
+    { type: Router }
+];
+ShareCaseComponent.propDecorators = {
+    removeUserFromCaseToggleOn: [{ type: Input }],
+    shareCases$: [{ type: Input }],
+    users: [{ type: Input }],
+    confirmLink: [{ type: Input }],
+    cancelLink: [{ type: Input }],
+    addUserLabel: [{ type: Input }],
+    showRemoveUsers: [{ type: Input }],
+    fnTitle: [{ type: Input }],
+    title: [{ type: Input }],
+    unselect: [{ type: Output }],
+    synchronizeStore: [{ type: Output }],
+    userSelect: [{ type: ViewChild, args: [UserSelectComponent,] }]
+};
+
+/**
+ * @fileoverview added by tsickle
+ * Generated from: lib/components/tab/tab.component.ts
+ * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
 class TabComponent {
     constructor() {
         this.tabChange = new EventEmitter();
@@ -3229,12 +3052,6 @@ CookieBannerComponent.propDecorators = {
     acceptanceNotifier: [{ type: Output }]
 };
 
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/models/case-share.model.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/models/contact-details.model.ts
@@ -3291,7 +3108,7 @@ const PersonRole = {
     JUDICIAL: "Judicial",
     CASEWORKER: "Legal Ops",
     ADMIN: "Admin",
-    CTSC: "CTSC User",
+    CTSC: "CTSC",
     ALL: "All",
 };
 /** @enum {string} */
@@ -3401,7 +3218,7 @@ LocationService.ctorParameters = () => [
 
 /**
  * @fileoverview added by tsickle
- * Generated from: lib/services/storage/session-storage/session-storage.service.ts
+ * Generated from: lib/services/session-storage/session-storage.service.ts
  * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 class SessionStorageService {
@@ -3646,7 +3463,7 @@ SearchLocationComponent.decorators = [
     { type: Component, args: [{
                 selector: 'exui-search-location',
                 template: "<div class=\"auto-complete-container\">\n  <input\n    id=\"inputLocationSearch\"\n    (input)=\"onInput()\"\n    [formControl]=\"form.controls.searchTerm\"\n    [matAutocomplete]=\"autoSearchLocation\"\n    class=\"govuk-input\"\n    [attr.disabled]=\"disabled\">\n  <mat-autocomplete class=\"mat-autocomplete-panel-extend\" autoActiveFirstOption #autoSearchLocation=\"matAutocomplete\">\n    <mat-option *ngFor=\"let location of locations\"\n                (onSelectionChange)=\"onSelectionChange(location)\">\n      {{ location.site_name }}\n    </mat-option>\n    <mat-option *ngIf=\"!locations.length && showAutocomplete && term && term.length >= this.minSearchCharacters\">No results found</mat-option>\n  </mat-autocomplete>\n</div>\n",
-                styles: [".autocomplete__input--show-all-values{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{box-shadow:rgba(0,0,0,.256863) 0 2px 6px;left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:solid #b1b4b6;border-width:1px 0;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#fafafa}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.25}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.31579}}.div-action{display:inline-block}.add-location{display:inline}.remove-location-button{margin:5px}.hide-autocomplete{display:none}.auto-complete-container{display:inline-block;margin-right:4px;width:calc(100% - 4px)}.autocomplete__input{line-height:24px;font-size:19px}"]
+                styles: [".autocomplete__input--show-all-values{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{box-shadow:rgba(0,0,0,.256863) 0 2px 6px;left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:solid #b1b4b6;border-width:1px 0;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#fafafa}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.25}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.31579}}.div-action{display:inline-block}.add-location{display:inline}.remove-location-button{margin:5px}.hide-autocomplete{display:none}.auto-complete-container{min-width:550px;display:inline-block;margin-right:4px}.autocomplete__input{line-height:24px;font-size:19px}"]
             }] }
 ];
 /** @nocollapse */
@@ -3854,8 +3671,8 @@ class FindLocationComponent {
 FindLocationComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-find-location',
-                template: "<div class=\"location-picker-custom\">\n  <div class=\"search-location\">\n    <div>\n      <label id=\"input-selected-location-label\" *ngIf=\"locationTitle\">{{locationTitle}}</label>\n    </div>\n\n    <div class=\"search-location__input-container\">\n      <exui-search-location class=\"search-location__input\"\n                            [locations]=\"locations\"\n                            [selectedLocations]=\"selectedLocations\"\n                            [singleMode]=\"field.maxSelected === 1\"\n                            [bookingCheck]=\"field.bookingCheckType\"\n                            [delay]=\"300\"\n                            [disabled]=\"disabled\"\n                            [serviceIds]=\"serviceIds\"\n                            (locationInputChanged)=\"onInputChanged($event)\"\n                            (locationSelected)=\"onLocationSelected($event)\"\n                            (searchLocationChanged)=\"onSearchInputChanged()\"\n                            [locationType]=\"'case-management'\"></exui-search-location>\n      <a href=\"javascript:void(0)\" (click)=\"addLocation()\"\n         class=\"govuk-button govuk-button--secondary govuk-!-margin-bottom-0\" data-module=\"govuk-button\"\n         *ngIf=\"enableAddLocationButton\">\n        Add\n      </a>\n    </div>\n  </div>\n  <ul class=\"hmcts-filter-tags selection-container\" *ngIf=\"field.maxSelected != 1\">\n    <li class=\"location-selection\"  *ngFor=\"let selection of selectedLocations\">\n      <a class=\"hmcts-filter__tag\" (click)=\"removeLocation(selection)\" href=\"javascript:void(0)\">\n        {{ selection.site_name }}\n      </a>\n    </li>\n  </ul>\n</div>\n",
-                styles: [".search-location__input-container{display:flex}.search-location .auto-complete-container{min-width:unset;width:calc(100% - 4px)}.search-location__input{flex:1 0 auto}.search-location .govuk-button--secondary{background-color:#ddd}"]
+                template: "<div class=\"location-picker-custom\">\n  <div class=\"search-location\">\n    <div>\n      <label id=\"input-selected-location-label\" *ngIf=\"locationTitle\">{{locationTitle}}</label>\n    </div>\n    <exui-search-location class=\"search-location\"\n                          [locations]=\"locations\"\n                          [selectedLocations]=\"selectedLocations\"\n                          [singleMode]=\"field.maxSelected === 1\"\n                          [bookingCheck]=\"field.bookingCheckType\"\n                          [delay]=\"300\"\n                          [disabled]=\"disabled\"\n                          [serviceIds]=\"serviceIds\"\n                          (locationInputChanged)=\"onInputChanged($event)\"\n                          (locationSelected)=\"onLocationSelected($event)\"\n                          (searchLocationChanged)=\"onSearchInputChanged()\"\n                          [locationType]=\"'case-management'\"></exui-search-location>\n    <a href=\"javascript:void(0)\" (click)=\"addLocation()\" class=\"govuk-button\" data-module=\"govuk-button\" *ngIf=\"enableAddLocationButton\">\n      Add location\n    </a>\n  </div>\n  <ul class=\"hmcts-filter-tags selection-container\" *ngIf=\"field.maxSelected != 1\">\n    <li class=\"location-selection\"  *ngFor=\"let selection of selectedLocations\">\n      <a class=\"hmcts-filter__tag\" (click)=\"removeLocation(selection)\" href=\"javascript:void(0)\">\n        {{ selection.site_name }}\n      </a>\n    </li>\n  </ul>\n</div>\n",
+                styles: [""]
             }] }
 ];
 FindLocationComponent.propDecorators = {
@@ -4426,445 +4243,129 @@ class FindPersonComponent {
                         ({ id }) => id));
                         return persons.filter((/**
                          * @param {?} __0
-                         * @return {?}
-                         */
-                        ({ id }) => !ids.includes(id)));
-                    })));
-                }
-                case PersonRole.ALL: {
-                    return zip(findJudicialOrCTSCPeople, findCaseworkersOrAdminsOrCtsc).pipe(map((/**
-                     * @param {?} separatePeople
-                     * @return {?}
-                     */
-                    separatePeople => separatePeople[0].concat(separatePeople[1]))));
-                }
-                case PersonRole.CTSC:
-                case PersonRole.CASEWORKER:
-                case PersonRole.ADMIN: {
-                    return findCaseworkersOrAdminsOrCtsc;
-                }
-                default: {
-                    return of([]);
-                }
-            }
-        }
-        return of([]);
-    }
-    /**
-     * @param {?} selectedPerson
-     * @return {?}
-     */
-    onSelectionChange(selectedPerson) {
-        this.personSelected.emit(selectedPerson);
-        this.findPersonControl.setValue(this.getDisplayName(selectedPerson), { emitEvent: false, onlySelf: true });
-    }
-    /**
-     * @param {?} selectedPerson
-     * @return {?}
-     */
-    getDisplayName(selectedPerson) {
-        if (!selectedPerson) {
-            return '';
-        }
-        if (selectedPerson.domain === PersonRole.JUDICIAL && selectedPerson.fullName) {
-            return `${selectedPerson.fullName} (${selectedPerson.email})`;
-        }
-        return selectedPerson.email ? `${selectedPerson.name} (${selectedPerson.email})` : selectedPerson.name;
-    }
-    /**
-     * @return {?}
-     */
-    onInput() {
-        this.personFieldChanged.emit();
-    }
-}
-FindPersonComponent.decorators = [
-    { type: Component, args: [{
-                selector: 'xuilib-find-person',
-                template: "<h1 class=\"govuk-heading-l\" *ngIf=\"title && title.length\">\n  <span class=\"govuk-caption-l\">{{title}}</span>\n  {{boldTitle}}\n</h1>\n<div class=\"govuk-form-group\" [formGroup]=\"findPersonGroup\"\n     [ngClass]=\"{'form-group-error': findPersonGroup.get('findPersonControl').invalid && submitted}\">\n  <fieldset class=\"govuk-fieldset\" aria-describedby=\"sub-title-hint\">\n    <div id=\"sub-title-hint\" class=\"govuk-hint\" *ngIf=\"subTitle && subTitle.length\">\n      {{subTitle}}\n    </div>\n    <span id=\"validation-error\" class=\"govuk-error-message\" *ngIf=\"findPersonGroup && findPersonGroup.errors\">\n        <span class=\"govuk-visually-hidden\">Error:</span>{{findPersonGroup.errors.error ? findPersonGroup.errors.error : errorMessage}}\n    </span>\n    <input id=\"inputSelectPerson{{idValue}}\" type=\"text\" aria-label=\"select a person\"\n           formControlName=\"findPersonControl\"\n           [matAutocomplete]=\"auto\"\n           class=\"govuk-input govuk-!-width-one-third\"\n           [placeholder]=\"placeholderContent\"\n           [attr.disabled]=\"disabled\"\n           (input)=\"onInput()\">\n    <mat-autocomplete autoActiveFirstOption #auto=\"matAutocomplete\" (optionSelected)=\"onSelectionChange($event.option.value)\">\n      <mat-option *ngFor=\"let option of filteredOptions\"\n                  [value]=\"option\"\n                  [ngClass]=\"{'hide-autocomplete': !showAutocomplete, 'select-option': showUpdatedColor}\">\n        {{getDisplayName(option)}}\n      </mat-option>\n      <mat-option [ngClass]=\"{'select-option': showUpdatedColor}\" *ngIf=\"isNoResultsShown && !filteredOptions.length && showAutocomplete\">No results found</mat-option>\n    </mat-autocomplete>\n  </fieldset>\n</div>\n",
-                styles: [".mat-option:hover{background:#2596be}.mat-option.select-option:hover{background:#1d70b8;color:#fff}.hide-autocomplete{display:none}"]
-            }] }
-];
-/** @nocollapse */
-FindPersonComponent.ctorParameters = () => [
-    { type: FindAPersonService },
-    { type: ChangeDetectorRef }
-];
-FindPersonComponent.propDecorators = {
-    personSelected: [{ type: Output }],
-    personFieldChanged: [{ type: Output }],
-    title: [{ type: Input }],
-    boldTitle: [{ type: Input }],
-    subTitle: [{ type: Input }],
-    domain: [{ type: Input }],
-    findPersonGroup: [{ type: Input }],
-    selectedPerson: [{ type: Input }],
-    submitted: [{ type: Input }],
-    userIncluded: [{ type: Input }],
-    assignedUser: [{ type: Input }],
-    placeholderContent: [{ type: Input }],
-    isNoResultsShown: [{ type: Input }],
-    showUpdatedColor: [{ type: Input }],
-    selectedPersons: [{ type: Input }],
-    errorMessage: [{ type: Input }],
-    idValue: [{ type: Input }],
-    services: [{ type: Input }],
-    disabled: [{ type: Input }]
-};
-
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/components/find-service/find-service.component.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class FindServiceComponent {
-    constructor() {
-        this.services = [];
-        this.selectedServices = [];
-        this.enableAddServiceButton = true;
-        this.disabled = false;
-        this.serviceFieldChanged = new EventEmitter();
-        this.tempSelectedService = null;
-    }
-    /**
-     * @return {?}
-     */
-    ngOnInit() {
-        this.selectedServices = this.selectedServices !== null ? this.selectedServices.filter((/**
-         * @param {?} service
-         * @return {?}
-         */
-        (service) => service.key)) : [];
-        this.SortAnOptions();
-    }
-    /**
-     * @return {?}
-     */
-    addService() {
-        if (this.tempSelectedService === null) {
-            return;
-        }
-        this.selectedServices = [...this.selectedServices, this.tempSelectedService];
-        this.addSelectedServicesToForm([this.tempSelectedService]);
-        this.services = this.services.filter((/**
-         * @param {?} s
-         * @return {?}
-         */
-        s => s.key !== this.tempSelectedService.key));
-        this.tempSelectedService = null;
-        this.serviceFieldChanged.emit();
-    }
-    /**
-     * @param {?} service
-     * @return {?}
-     */
-    removeService(service) {
-        if (service.key) {
-            this.selectedServices = this.selectedServices !== null ? this.selectedServices.filter((/**
-             * @param {?} selectedService
-             * @return {?}
-             */
-            (selectedService) => selectedService.key !== service.key)) : [];
-            /** @type {?} */
-            const formArray = (/** @type {?} */ (this.form.get(this.field.name)));
-            /** @type {?} */
-            const index = (formArray.value).findIndex((/**
-             * @param {?} selectedService
-             * @return {?}
-             */
-            (selectedService) => selectedService.key === service.key));
-            if (index > -1) {
-                formArray.removeAt(index);
-                this.services.splice(index, 0, service);
-                this.SortAnOptions();
-            }
-            this.serviceFieldChanged.emit();
-        }
-    }
-    /**
-     * @param {?} service
-     * @return {?}
-     */
-    onServiceSelected(service) {
-        if (!service) {
-            this.tempSelectedService = null;
-            return;
-        }
-        if (this.field.maxSelected === 1) {
-            this.removeSelectedValues();
-            this.addSelectedServicesToForm([service]);
-        }
-        else {
-            if (!this.selectedServices.find((/**
-             * @param {?} s
-             * @return {?}
-             */
-            s => s.key === service.key))) {
-                if (service.key) {
-                    this.tempSelectedService = service;
-                }
-            }
-        }
-    }
-    /**
-     * @private
-     * @return {?}
-     */
-    removeSelectedValues() {
-        /** @type {?} */
-        const formArray = (/** @type {?} */ (this.form.get(this.field.name)));
-        for (let i = 0; i < formArray.length; i++) {
-            formArray.removeAt(i);
-        }
-        this.selectedServices = [];
-    }
-    /**
-     * @private
-     * @param {?} services
-     * @return {?}
-     */
-    addSelectedServicesToForm(services) {
-        /** @type {?} */
-        const formArray = (/** @type {?} */ (this.form.get(this.field.name)));
-        for (const service of services) {
-            formArray.push(new FormControl(service));
-        }
-    }
-    /**
-     * @private
-     * @return {?}
-     */
-    SortAnOptions() {
-        return this.services.sort((/**
-         * @param {?} a
-         * @param {?} b
-         * @return {?}
-         */
-        (a, b) => {
-            return a.label.toLowerCase() > b.label.toLowerCase() ? 1 : (b.label.toLowerCase() > a.label.toLowerCase() ? -1 : 0);
-        }));
-    }
-}
-FindServiceComponent.decorators = [
-    { type: Component, args: [{
-                selector: 'xuilib-find-service',
-                template: "<div class=\"service-picker-custom\">\n  <div class=\"search-service\">\n    <div class=\"govuk-body\">\n      <label id=\"selectServiceSearch-label\" for=\"serviceSearch__select\" *ngIf=\"serviceTitle\">\n        {{ serviceTitle}}\n      </label>\n    </div>\n    <div class=\"search-service__input-container\">\n      <exui-search-service class=\"search-service__input\" [services]=\"services\"\n        (serviceChanged)=\"onServiceSelected($event)\">\n      </exui-search-service>\n      <a href=\"javascript:void(0)\" (click)=\"addService()\"\n        class=\"govuk-button govuk-button--secondary govuk-!-margin-bottom-0\" data-module=\"govuk-button\"\n        *ngIf=\"enableAddServiceButton\" id=\"add-service\">\n        Add\n      </a>\n    </div>\n  </div>\n  <ul class=\"hmcts-filter-tags selection-container\" *ngIf=\"field.maxSelected != 1\">\n    <li class=\"location-selection\" *ngFor=\"let selection of selectedServices\">\n      <a class=\"hmcts-filter__tag\" (click)=\"removeService(selection)\" href=\"javascript:void(0)\">\n        {{ selection.label }}\n      </a>\n    </li>\n  </ul>\n</div>",
-                styles: ["#add-service{background-color:#ddd}.search-service__input-container{display:flex}.search-service__input{flex:1 0 auto}"]
-            }] }
-];
-FindServiceComponent.propDecorators = {
-    field: [{ type: Input }],
-    fields: [{ type: Input }],
-    serviceTitle: [{ type: Input }],
-    form: [{ type: Input }],
-    services: [{ type: Input }],
-    selectedServices: [{ type: Input }],
-    enableAddServiceButton: [{ type: Input }],
-    disabled: [{ type: Input }],
-    serviceFieldChanged: [{ type: Output }]
-};
-
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/services/task-name/task-name.service.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class TaskNameService {
-    /**
-     * @param {?} http
-     * @param {?} sessionStorageService
-     */
-    constructor(http, sessionStorageService) {
-        this.http = http;
-        this.sessionStorageService = sessionStorageService;
-    }
-    /**
-     * @return {?} Observable<any[]>: Array of taskName in Observable
-     */
-    getTaskName() {
-        if (this.sessionStorageService.getItem(TaskNameService.taskNamesKey)) {
-            /** @type {?} */
-            const taskNames = JSON.parse(this.sessionStorageService.getItem(TaskNameService.taskNamesKey));
-            return of((/** @type {?} */ (taskNames)));
-        }
-        return this.http.get(`/workallocation/taskNames`).pipe(tap((/**
-         * @param {?} taskNames
-         * @return {?}
-         */
-        taskNames => this.sessionStorageService.setItem(TaskNameService.taskNamesKey, JSON.stringify(taskNames)))));
-    }
-}
-TaskNameService.taskNamesKey = 'taskNames';
-TaskNameService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-TaskNameService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: SessionStorageService }
-];
-/** @nocollapse */ TaskNameService.ngInjectableDef = defineInjectable({ factory: function TaskNameService_Factory() { return new TaskNameService(inject(HttpClient), inject(SessionStorageService)); }, token: TaskNameService, providedIn: "root" });
-
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/components/find-task-name/find-task-name.component.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class FindTaskNameComponent {
-    /**
-     * @param {?} cd
-     * @param {?} taskService
-     */
-    constructor(cd, taskService) {
-        this.cd = cd;
-        this.taskService = taskService;
-        this.taskNameSelected = new EventEmitter();
-        this.taskNameFieldChanged = new EventEmitter();
-        this.boldTitle = 'Find the task name';
-        this.subTitle = 'Type the name of the task name and select them.';
-        this.domain = PersonRole.ALL;
-        this.findTaskNameGroup = new FormGroup({});
-        this.submitted = true;
-        this.userIncluded = false;
-        this.placeholderContent = '';
-        this.isNoResultsShown = true;
-        this.showUpdatedColor = false;
-        this.selectedTaskNames = [];
-        this.errorMessage = 'You must select a name';
-        this.idValue = '';
-        this.services = ['IA'];
-        this.disabled = null;
-        this.showAutocomplete = false;
-        this.filteredOptions = [];
-        this.minSearchCharacters = 1;
-        this.searchTerm = '';
-    }
-    /**
-     * @return {?}
-     */
-    ngOnDestroy() {
-        if (this.sub) {
-            this.sub.unsubscribe();
-        }
-    }
-    /**
-     * @return {?}
-     */
-    ngOnChanges() {
-        this.findTaskNameControl = new FormControl(this.selectedTaskName);
-        this.findTaskNameGroup.addControl('findTaskNameControl', this.findTaskNameControl);
-        this.sub = this.findTaskNameControl.valueChanges
-            .pipe(tap((/**
-         * @return {?}
-         */
-        () => this.showAutocomplete = false)), tap((/**
-         * @return {?}
-         */
-        () => this.filteredOptions = [])), tap((/**
-         * @param {?} term
-         * @return {?}
-         */
-        (term) => this.searchTerm = term)), debounceTime(300), tap((/**
-         * @param {?} searchTerm
-         * @return {?}
-         */
-        (searchTerm) => {
-            if (!searchTerm) {
-                this.taskNameSelected.emit('');
-            }
-            return searchTerm;
-        })), 
-        // tap((searchTerm) => typeof searchTerm === 'string' ? this.taskNameSelected.emit('null') : void 0),
-        filter((/**
-         * @param {?} searchTerm
-         * @return {?}
-         */
-        (searchTerm) => searchTerm && searchTerm.length >= this.minSearchCharacters)), mergeMap((/**
-         * @return {?}
-         */
-        () => this.getTaskName()))).subscribe((/**
-         * @param {?} taskNameModel
-         * @return {?}
-         */
-        (taskNameModel) => {
-            this.filteredOptions = taskNameModel.map((/**
-             * @param {?} task
-             * @return {?}
-             */
-            task => task.taskName));
-            if (this.searchTerm) {
-                this.filteredOptions = this.filteredOptions.filter((/**
-                 * @param {?} taskName
-                 * @return {?}
-                 */
-                (taskName) => taskName.toLocaleLowerCase().includes(this.searchTerm.toLocaleLowerCase()))).map((/**
-                 * @param {?} taskName
-                 * @return {?}
-                 */
-                taskName => taskName));
+                         * @return {?}
+                         */
+                        ({ id }) => !ids.includes(id)));
+                    })));
+                }
+                case PersonRole.ALL: {
+                    return zip(findJudicialOrCTSCPeople, findCaseworkersOrAdminsOrCtsc).pipe(map((/**
+                     * @param {?} separatePeople
+                     * @return {?}
+                     */
+                    separatePeople => separatePeople[0].concat(separatePeople[1]))));
+                }
+                case PersonRole.CTSC:
+                case PersonRole.CASEWORKER:
+                case PersonRole.ADMIN: {
+                    return findCaseworkersOrAdminsOrCtsc;
+                }
+                default: {
+                    return of([]);
+                }
             }
-            this.cd.detectChanges();
-        }));
+        }
+        return of([]);
     }
     /**
+     * @param {?} selectedPerson
      * @return {?}
      */
-    getTaskName() {
-        return this.taskService.getTaskName();
+    onSelectionChange(selectedPerson) {
+        this.personSelected.emit(selectedPerson);
+        this.findPersonControl.setValue(this.getDisplayName(selectedPerson), { emitEvent: false, onlySelf: true });
     }
     /**
-     * @param {?} selectedTaskName
+     * @param {?} selectedPerson
      * @return {?}
      */
-    onSelectionChange(selectedTaskName) {
-        if (selectedTaskName) {
-            this.taskNameSelected.emit(selectedTaskName);
-            this.findTaskNameControl.setValue(selectedTaskName);
+    getDisplayName(selectedPerson) {
+        if (!selectedPerson) {
+            return '';
         }
+        if (selectedPerson.domain === PersonRole.JUDICIAL && selectedPerson.fullName) {
+            return `${selectedPerson.fullName} (${selectedPerson.email})`;
+        }
+        return selectedPerson.email ? `${selectedPerson.name} (${selectedPerson.email})` : selectedPerson.name;
     }
     /**
      * @return {?}
      */
     onInput() {
-        this.taskNameFieldChanged.emit();
+        this.personFieldChanged.emit();
     }
 }
-FindTaskNameComponent.decorators = [
+FindPersonComponent.decorators = [
     { type: Component, args: [{
-                selector: 'xuilib-find-task-name',
-                template: "<h1 class=\"govuk-heading-l\" *ngIf=\"title && title.length\">\n  <span class=\"govuk-caption-l\">{{title}}</span>\n  {{boldTitle}}\n</h1>\n<div class=\"govuk-form-group\" [formGroup]=\"findTaskNameGroup\"\n     [ngClass]=\"{'form-group-error': findTaskNameGroup.get('findTaskNameControl')?.invalid && submitted}\">\n  <fieldset class=\"govuk-fieldset\" aria-describedby=\"sub-title-hint\">\n    <div id=\"sub-title-hint\" class=\"govuk-hint\" *ngIf=\"subTitle && subTitle.length\">\n      {{subTitle}}\n    </div>\n    <span id=\"validation-error\" class=\"govuk-error-message\" *ngIf=\"findTaskNameGroup && findTaskNameGroup.errors\">\n        <span class=\"govuk-visually-hidden\">Error:</span>{{findTaskNameGroup.errors.error ? findTaskNameGroup.errors.error : errorMessage}}\n    </span>\n    <input id=\"inputSelectTaskName{{idValue}}\" type=\"text\" aria-label=\"select a task name\"\n           formControlName=\"findTaskNameControl\"\n           [matAutocomplete]=\"auto\"\n           class=\"govuk-input govuk-!-width-one-third\"\n           [placeholder]=\"placeholderContent\"\n           [attr.disabled]=\"disabled\"\n           (input)=\"onInput()\">\n    <mat-autocomplete autoActiveFirstOption #auto=\"matAutocomplete\" (optionSelected)=\"onSelectionChange($event.option.value)\">\n      <mat-option *ngFor=\"let option of filteredOptions\"\n                  [value]=\"option\"\n                  [ngClass]=\"{'hide-autocomplete': !showAutocomplete, 'select-option': showUpdatedColor}\">\n                  {{ option }}\n      </mat-option>\n      <mat-option [ngClass]=\"{'select-option': showUpdatedColor}\" *ngIf=\"isNoResultsShown && !filteredOptions.length && showAutocomplete\">No results found</mat-option>\n    </mat-autocomplete>\n  </fieldset>\n</div>\n",
-                styles: [""]
+                selector: 'xuilib-find-person',
+                template: "<h1 class=\"govuk-heading-l\" *ngIf=\"title && title.length\">\n  <span class=\"govuk-caption-l\">{{title}}</span>\n  {{boldTitle}}\n</h1>\n<div class=\"govuk-form-group\" [formGroup]=\"findPersonGroup\"\n     [ngClass]=\"{'form-group-error': findPersonGroup.get('findPersonControl').invalid && submitted}\">\n  <fieldset class=\"govuk-fieldset\" aria-describedby=\"sub-title-hint\">\n    <div id=\"sub-title-hint\" class=\"govuk-hint\" *ngIf=\"subTitle && subTitle.length\">\n      {{subTitle}}\n    </div>\n    <span id=\"validation-error\" class=\"govuk-error-message\" *ngIf=\"findPersonGroup && findPersonGroup.errors\">\n        <span class=\"govuk-visually-hidden\">Error:</span>{{findPersonGroup.errors.error ? findPersonGroup.errors.error : errorMessage}}\n    </span>\n    <input id=\"inputSelectPerson{{idValue}}\" type=\"text\" aria-label=\"select a person\"\n           formControlName=\"findPersonControl\"\n           [matAutocomplete]=\"auto\"\n           class=\"govuk-input govuk-!-width-one-third\"\n           [placeholder]=\"placeholderContent\"\n           [attr.disabled]=\"disabled\"\n           (input)=\"onInput()\">\n    <mat-autocomplete autoActiveFirstOption #auto=\"matAutocomplete\" (optionSelected)=\"onSelectionChange($event.option.value)\">\n      <mat-option *ngFor=\"let option of filteredOptions\"\n                  [value]=\"option\"\n                  [ngClass]=\"{'hide-autocomplete': !showAutocomplete, 'select-option': showUpdatedColor}\">\n        {{getDisplayName(option)}}\n      </mat-option>\n      <mat-option [ngClass]=\"{'select-option': showUpdatedColor}\" *ngIf=\"isNoResultsShown && !filteredOptions.length && showAutocomplete\">No results found</mat-option>\n    </mat-autocomplete>\n  </fieldset>\n</div>\n",
+                styles: [".mat-option:hover{background:#2596be}.mat-option.select-option:hover{background:#1d70b8;color:#fff}.hide-autocomplete{display:none}"]
             }] }
 ];
 /** @nocollapse */
-FindTaskNameComponent.ctorParameters = () => [
-    { type: ChangeDetectorRef },
-    { type: TaskNameService }
+FindPersonComponent.ctorParameters = () => [
+    { type: FindAPersonService },
+    { type: ChangeDetectorRef }
 ];
-FindTaskNameComponent.propDecorators = {
-    taskNameSelected: [{ type: Output }],
-    taskNameFieldChanged: [{ type: Output }],
+FindPersonComponent.propDecorators = {
+    personSelected: [{ type: Output }],
+    personFieldChanged: [{ type: Output }],
     title: [{ type: Input }],
     boldTitle: [{ type: Input }],
     subTitle: [{ type: Input }],
     domain: [{ type: Input }],
-    findTaskNameGroup: [{ type: Input }],
-    selectedTaskName: [{ type: Input }],
+    findPersonGroup: [{ type: Input }],
+    selectedPerson: [{ type: Input }],
     submitted: [{ type: Input }],
     userIncluded: [{ type: Input }],
     assignedUser: [{ type: Input }],
     placeholderContent: [{ type: Input }],
     isNoResultsShown: [{ type: Input }],
     showUpdatedColor: [{ type: Input }],
-    selectedTaskNames: [{ type: Input }],
+    selectedPersons: [{ type: Input }],
     errorMessage: [{ type: Input }],
     idValue: [{ type: Input }],
     services: [{ type: Input }],
     disabled: [{ type: Input }]
 };
 
+/**
+ * @fileoverview added by tsickle
+ * Generated from: lib/components/find-service/find-service.component.ts
+ * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class FindServiceComponent {
+    constructor() {
+        this.serviceTitle = 'Search for a service by name';
+        this.enableAddServiceButton = true;
+        this.disableInputField = false;
+    }
+    /**
+     * @return {?}
+     */
+    addService() {
+        // Todo
+    }
+}
+FindServiceComponent.decorators = [
+    { type: Component, args: [{
+                selector: 'xuilib-find-service',
+                template: "<div class=\"service-picker-custom\">\n    <div class=\"search-service\">\n      <div>\n        <label id=\"input-selected-service-label\" *ngIf=\"serviceTitle\">{{serviceTitle}}</label>\n      </div>\n      <exui-search-service class=\"search-service\"\n                            [services]=\"services\"\n                            [selectedServices]=\"selectedServices\"\n                            [delay]=\"300\"\n                            [disabled]=\"disabled\"></exui-search-service>\n      <a href=\"javascript:void(0)\" (click)=\"addService()\" class=\"govuk-button govuk-button--secondary govuk-!-margin-bottom-0\" \n        data-module=\"govuk-button\" *ngIf=\"enableAddServiceButton\" id=\"add-service\">\n        Add\n      </a>\n    </div>\n    <ul class=\"hmcts-filter-tags selection-container\" *ngIf=\"field.maxSelected != 1\">\n      <li class=\"service-selection\"  *ngFor=\"let selection of selectedServices\">\n        <a class=\"hmcts-filter__tag\" href=\"javascript:void(0)\">\n          {{ selection.name }}\n        </a>\n      </li>\n    </ul>\n  </div>",
+                styles: ["#add-service{background-color:#ddd}"]
+            }] }
+];
+FindServiceComponent.propDecorators = {
+    field: [{ type: Input }],
+    fields: [{ type: Input }],
+    serviceTitle: [{ type: Input }],
+    form: [{ type: Input }],
+    services: [{ type: Input }],
+    selectedServices: [{ type: Input }],
+    disabled: [{ type: Input }],
+    enableAddServiceButton: [{ type: Input }],
+    disableInputField: [{ type: Input }]
+};
+
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/components/search-judicials/search-judicials.component.ts
@@ -5072,33 +4573,37 @@ SearchJudicialsComponent.propDecorators = {
  */
 class SearchServiceComponent {
     constructor() {
-        this.services = [];
-        this.serviceChanged = new EventEmitter();
+        this.showAutocomplete = false;
+        this.minSearchCharacters = 3;
+        this.term = '';
     }
     /**
-     * @param {?} key
      * @return {?}
      */
-    onSelectionChanged(key) {
-        /** @type {?} */
-        const selectedService = this.services.find((/**
-         * @param {?} s
-         * @return {?}
-         */
-        s => s.key === key));
-        this.serviceChanged.emit(selectedService);
+    onInput() {
+        // Todo
+    }
+    /**
+     * @return {?}
+     */
+    onSelectionChange() {
+        // Todo
     }
 }
 SearchServiceComponent.decorators = [
     { type: Component, args: [{
                 selector: 'exui-search-service',
-                template: "<div class=\"govuk-form-group\">\n  <select id=\"serviceSearch__select\" class=\"govuk-select\" name=\"serviceSearch__select\"\n    (change)=\"onSelectionChanged($event.target.value)\">\n    <option [value]=\"null\">All</option>\n    <option *ngFor=\"let service of services\" [value]=\"service.key\">\n      {{ service.label }}\n    </option>\n  </select>\n</div>",
-                styles: [".autocomplete__input--show-all-values{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{box-shadow:rgba(0,0,0,.256863) 0 2px 6px;left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:solid #b1b4b6;border-width:1px 0;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#fafafa}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.25}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.31579}}.div-action{display:inline-block}.add-location{display:inline}.remove-location-button{margin:5px}.hide-autocomplete{display:none}.auto-complete-container{width:calc(100% - 4px);display:inline-block;margin-right:4px}.autocomplete__input{line-height:24px;font-size:19px}"]
+                template: "<div class=\"auto-complete-container\">\n  <input\n    id=\"inputServiceSearch\"\n    (input)=\"onInput()\"\n    [formControl]=\"form?.controls.searchTerm\"\n    [matAutocomplete]=\"autoSearchService\"\n    class=\"govuk-input\"\n    [attr.disabled]=\"disabled\">\n  <mat-autocomplete class=\"mat-autocomplete-panel-extend\" autoActiveFirstOption #autoSearchService=\"matAutocomplete\">\n    <mat-option *ngFor=\"let service of services\" (onSelectionChange)=\"onSelectionChange()\">\n      {{ service.name }}\n    </mat-option>\n    <mat-option *ngIf=\"!services?.length && showAutocomplete && term && term.length >= this.minSearchCharacters\">No results found</mat-option>\n  </mat-autocomplete>\n</div>\n",
+                styles: [".autocomplete__input--show-all-values{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{box-shadow:rgba(0,0,0,.256863) 0 2px 6px;left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:solid #b1b4b6;border-width:1px 0;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#fafafa}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.25}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:13px;line-height:1.31579}}.div-action{display:inline-block}.add-location{display:inline}.remove-location-button{margin:5px}.hide-autocomplete{display:none}.auto-complete-container{min-width:250px;display:inline-block;margin-right:4px}.autocomplete__input{line-height:24px;font-size:19px}"]
             }] }
 ];
 SearchServiceComponent.propDecorators = {
     services: [{ type: Input }],
-    serviceChanged: [{ type: Output }]
+    selectedServices: [{ type: Input }],
+    disabled: [{ type: Input }],
+    delay: [{ type: Input }],
+    form: [{ type: Input }],
+    showAutocomplete: [{ type: Input }]
 };
 
 /**
@@ -5339,38 +4844,6 @@ GovUkCheckboxComponent.propDecorators = {
     isChecked: [{ type: Input }]
 };
 
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/gov-ui/util/helpers/html-templates.helper.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/*
- * Helper Class
- * Used for dynamic templates manipulation
- * */
-class HtmlTemplatesHelper {
-    /*
-      * Sets described by string depending if
-      * there is an error, error and hit or nothing
-      * */
-    /**
-     * @param {?} errorMessage
-     * @param {?} config
-     * @return {?}
-     */
-    static setDescribedBy(errorMessage, config) {
-        if (!errorMessage) {
-            return config.hint ? `${config.id}-hint` : null;
-        }
-        else if (errorMessage && errorMessage.isInvalid) {
-            return config.hint ? `${config.id}-hint ${config.id}-error` : `${config.id}-error`;
-        }
-        else {
-            return config.hint ? `${config.id}-hint` : null;
-        }
-    }
-}
-
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/gov-ui/components/gov-uk-checkboxes/gov-uk-checkboxes.component.ts
@@ -5384,82 +4857,16 @@ class HtmlTemplatesHelper {
 * @param: errors - array of error stings
 * */
 class GovUkCheckboxesComponent {
-    /**
-     * @return {?}
-     */
-    ngOnInit() {
-        this.columns = this.setColumns();
-    }
-    /**
-     * @return {?}
-     */
-    setDescribedBy() {
-        return HtmlTemplatesHelper.setDescribedBy(this.errorMessage, this.config);
-    }
-    /**
-     * @param {?} checked
-     * @param {?} value
-     * @return {?}
-     */
-    onChecked(checked, value) {
-        /** @type {?} */
-        const formControl = this.group.get(this.config.name);
-        /** @type {?} */
-        const array = formControl.value ? formControl.value : [];
-        if (!checked) {
-            /** @type {?} */
-            const modifiedArray = array.filter((/**
-             * @param {?} item
-             * @return {?}
-             */
-            (item) => item !== value));
-            formControl.setValue(modifiedArray);
-        }
-        else {
-            formControl.setValue([...array, value]);
-        }
-    }
-    /**
-     * @param {?} value
-     * @return {?}
-     */
-    isChecked(value) {
-        /** @type {?} */
-        const formControl = this.group.get(this.config.name);
-        return formControl.value && formControl.value.includes(value);
-    }
-    /**
-     * @private
-     * @return {?}
-     */
-    setColumns() {
-        if (this.config.rows && this.config.rows > 1) {
-            /** @type {?} */
-            const array = [];
-            for (let i = 0; i < this.items.length; i += this.config.rows) {
-                /** @type {?} */
-                const arrayChunk = this.items.slice(i, i + this.config.rows);
-                array.push(arrayChunk);
-            }
-            return array;
-        }
-        else {
-            return [this.items];
-        }
-    }
 }
 GovUkCheckboxesComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-gov-uk-checkboxes',
-                template: "<div class=\"govuk-form-group gov-uk-input\" [formGroup]=\"group\"\n     [ngClass]=\"{'govuk-form-group--error': errorMessage?.isInvalid}\">\n\n  <xuilib-gov-label [config]=\"config\"></xuilib-gov-label>\n\n  <span *ngIf=\"config.hint\" [id]=\"config.id +'-hint'\" class=\"govuk-hint\">\n    {{config.hint}}\n  </span>\n\n  <xuilib-gov-uk-error-message [config]=\"config\" [errorMessage]=\"errorMessage\"></xuilib-gov-uk-error-message>\n\n  <div class=\"govuk-checkboxes govuk-checkboxes--small govuk-checkboxes-multi-column\" data-module=\"govuk-checkboxes\">\n    <div class=\"govuk-checkboxes-multi-column__single\" *ngFor=\"let columnItems of columns\">\n      <div class=\"govuk-checkboxes__item\" *ngFor=\"let item of columnItems\">\n        <input type=\"checkbox\" class=\"govuk-checkboxes__input\"\n               [id]=\"item.id\" [name]=\"item.id\" [checked]=\"isChecked(item.value)\" [value]=\"item.value\"\n               [attr.aria-describedby]=\"setDescribedBy()\"\n               (change)=\"onChecked($event.target.checked, item.value)\"\n        >\n        <label class=\"govuk-label govuk-checkboxes__label\" [for]=\"item.id\">\n          {{ item.label }}\n        </label>\n        <div *ngIf=\"item.hint\" class=\"govuk-hint govuk-checkboxes__hint\">\n          {{ item.hint }}\n        </div>\n      </div>\n    </div>\n  </div>\n</div>\n",
-                styles: [".govuk-checkboxes-multi-column{display:flex;flex-wrap:wrap;margin-left:-20px;margin-right:-20px}.govuk-checkboxes-multi-column__single{padding-left:20px;padding-right:20px}"]
+                template: "<xuilib-gov-uk-form-group-wrapper\n[error]=\"errors\"\n[config]=\"options.config\"\n[group]=\"options.key\">\n<div class=\"govuk-checkboxes\">\n  <xuilib-gov-checkbox *ngFor=\"let item of options.items\"\n    [group]=\"item.group\"\n    [config]=\"item.config\">\n  </xuilib-gov-checkbox>\n</div>\n</xuilib-gov-uk-form-group-wrapper>"
             }] }
 ];
 GovUkCheckboxesComponent.propDecorators = {
-    group: [{ type: Input }],
-    config: [{ type: Input }],
-    items: [{ type: Input }],
-    errorMessage: [{ type: Input }]
+    options: [{ type: Input }],
+    errors: [{ type: Input }]
 };
 
 /**
@@ -5586,6 +4993,38 @@ GovUkErrorMessageComponent.propDecorators = {
     errorMessage: [{ type: Input }]
 };
 
+/**
+ * @fileoverview added by tsickle
+ * Generated from: lib/gov-ui/util/helpers/html-templates.helper.ts
+ * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/*
+ * Helper Class
+ * Used for dynamic templates manipulation
+ * */
+class HtmlTemplatesHelper {
+    /*
+      * Sets described by string depending if
+      * there is an error, error and hit or nothing
+      * */
+    /**
+     * @param {?} errorMessage
+     * @param {?} config
+     * @return {?}
+     */
+    static setDescribedBy(errorMessage, config) {
+        if (!errorMessage) {
+            return config.hint ? `${config.id}-hint` : null;
+        }
+        else if (errorMessage && errorMessage.isInvalid) {
+            return config.hint ? `${config.id}-hint ${config.id}-error` : `${config.id}-error`;
+        }
+        else {
+            return config.hint ? `${config.id}-hint` : null;
+        }
+    }
+}
+
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/gov-ui/components/gov-uk-fieldset/gov-uk-fieldset.component.ts
@@ -5712,7 +5151,7 @@ class GovUkInputComponent {
      * @return {?}
      */
     ngOnInit() {
-        this.config.classes = typeof (this.config.classes) === 'string' ? this.config.classes : 'govuk-label govuk-label--m';
+        this.config.classes = 'govuk-label--m';
     }
     /**
      * @return {?}
@@ -5724,7 +5163,7 @@ class GovUkInputComponent {
 GovUkInputComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-gov-uk-input',
-                template: "<div class=\"govuk-form-group gov-uk-input\" [formGroup]=\"group\"\n[ngClass]=\"{'govuk-form-group--error': errorMessage?.isInvalid}\">\n\n<xuilib-gov-label [config]=\"config\"></xuilib-gov-label>\n\n<span *ngIf=\"config.hint\" [id]=\"config.id +'-hint'\" class=\"govuk-hint\">\n  {{config.hint}}\n</span>\n\n<xuilib-gov-uk-error-message [config]=\"config\" [errorMessage]=\"errorMessage\"></xuilib-gov-uk-error-message>\n\n<input class=\"govuk-input\"\n       [class.govuk-!-width-full]=\"config.fullWidth\"\n       [ngClass]=\"{'govuk-input--error': errorMessage?.isInvalid}\"\n       [id]=\"config.id\"\n       [name]=\"config.name\"\n       [type]=\"config.type\"\n       [attr.aria-invalid]=\"errorMessage?.isInvalid\"\n       [formControlName]=\"config.name\"\n       [attr.aria-describedby]='setDescribedBy()'>\n</div>\n",
+                template: "<div class=\"govuk-form-group gov-uk-input\" [formGroup]=\"group\"\n[ngClass]=\"{'govuk-form-group--error': errorMessage?.isInvalid}\">\n\n<xuilib-gov-label [config]=\"config\"></xuilib-gov-label>\n\n<span *ngIf=\"config.hint\" [id]=\"config.id +'-hint'\" class=\"govuk-hint\">\n  {{config.hint}}\n</span>\n\n<xuilib-gov-uk-error-message [config]=\"config\" [errorMessage]=\"errorMessage\"></xuilib-gov-uk-error-message>\n\n<input class=\"govuk-input\"\n       [ngClass]=\"{'govuk-input--error': errorMessage?.isInvalid}\"\n       [id]=\"config.id\"\n       [name]=\"config.name\"\n       [type]=\"config.type\"\n       [attr.aria-invalid]=\"errorMessage?.isInvalid\"\n       [formControlName]=\"config.name\"\n       [attr.aria-describedby]='setDescribedBy()'>\n</div>\n",
                 styles: [".gov-uk-input input:disabled{background:#b1b4b6}"]
             }] }
 ];
@@ -5753,8 +5192,7 @@ class GovUkLabelComponent {
 GovUkLabelComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-gov-label',
-                template: "<h1 *ngIf=\"config.isPageHeading else noHeading\">\n  <label *ngIf=\"config.label\" [for]=\"config.id\" [class]=\"config.classes + ' govuk-label'\">\n    <span>{{ config.label }}</span>\n    <span class=\"govuk-label__optional\" *ngIf=\"config.optional\">(optional)</span>\n  </label>\n</h1>\n<ng-template #noHeading>\n  <label *ngIf=\"config.label\" [for]=\"config.id\" [class]=\"config.classes + ' govuk-label'\">\n    <span>{{ config.label }}</span>\n    <span class=\"govuk-label__optional\" *ngIf=\"config.optional\">(optional)</span>\n  </label>\n</ng-template>\n",
-                styles: [".govuk-label{display:flex;align-items:center;flex-wrap:wrap}.govuk-label__optional{font-weight:400;font-size:16px;display:inline-block;margin-left:.75rem}"]
+                template: "<h1 *ngIf=\"config.isPageHeading else noHeading\">\n  <label *ngIf=\"config.label\" [class]=\"config.classes + ' govuk-label'\"\n         [for]=\"config.id\" [innerHTML]=\"config.label\">\n  </label>\n</h1>\n<ng-template #noHeading>\n  <label *ngIf=\"config.label\" [class]=\"config.classes + ' govuk-label'\"\n         [for]=\"config.id\" [innerHTML]=\"config.label\">\n  </label>\n</ng-template>"
             }] }
 ];
 /** @nocollapse */
@@ -5850,7 +5288,7 @@ class GovUkSelectComponent {
 GovUkSelectComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-gov-select',
-                template: "<div class=\"govuk-form-group\" [formGroup]=\"group\"\n[ngClass]=\"{'govuk-form-group--error': errorMessage?.isInvalid}\">\n<xuilib-gov-label [config]=\"config\"></xuilib-gov-label>\n<span *ngIf=\"config.hint\" [id]=\"config.id +'-hint'\" class=\"govuk-hint\">\n {{config.hint}}\n</span>\n<xuilib-gov-uk-error-message [config]=\"config\" [errorMessage]=\"errorMessage\"></xuilib-gov-uk-error-message>\n\n<select class=\"govuk-select\"\n        [class.govuk-!-width-full]=\"config.fullWidth\"\n        [id]=\"config.id\" [name]=\"config.id\" [formControlName]=\"config.id\" [attr.aria-describedby]='setDescribedBy()'>\n  <option value=\"{{item.value}}\" *ngFor=\"let item of items\">{{item.label}}</option>\n</select>\n</div>\n"
+                template: "<div class=\"govuk-form-group\" [formGroup]=\"group\"\n[ngClass]=\"{'govuk-form-group--error': errorMessage?.isInvalid}\">\n<xuilib-gov-label [config]=\"config\"></xuilib-gov-label>\n<span *ngIf=\"config.hint\" [id]=\"config.id +'-hint'\" class=\"govuk-hint\">\n {{config.hint}}\n</span>\n<xuilib-gov-uk-error-message [config]=\"config\" [errorMessage]=\"errorMessage\"></xuilib-gov-uk-error-message>\n\n<select class=\"govuk-select\" [id]=\"config.id\" [name]=\"config.id\" [formControlName]=\"config.id\" [attr.aria-describedby]='setDescribedBy()'>\n<option value=\"{{item.value}}\" *ngFor=\"let item of items\">{{item.label}}</option>\n</select>\n</div>"
             }] }
 ];
 /** @nocollapse */
@@ -5939,26 +5377,27 @@ GovUkTextareaComponent.propDecorators = {
  * Generated from: lib/gov-ui/components/hmcts-banner/hmcts-banner.component.ts
  * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
+/*
+* Hmcts Banner
+* Responsible for displaying prominent message and related actions
+* @prop message to display
+* @prop type
+* */
 class HmctsBannerComponent {
-    constructor() {
-        this.title = '';
-        this.showMessageIcon = false;
-        this.messageBoldText = false;
-    }
+    constructor() { }
 }
 HmctsBannerComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-hmcts-banner',
-                template: "<ng-container *ngIf=\"message && type\">\n  <div *ngIf=\"title\"\n    class=\"hmcts-banner-title hmcts-banner-title--{{ type }}\">\n    {{ title }}\n  </div>\n  <div class=\"hmcts-banner hmcts-banner--{{ type }}\">\n    <ng-container *ngIf=\"showMessageIcon\">\n      <ng-container [ngSwitch]=\"type\">\n        <ng-container *ngSwitchCase=\"'warning'\">\n          <svg class=\"hmcts-banner__icon hmcts-banner__icon--warning\" fill=\"currentColor\" role=\"presentation\" focusable=\"false\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 25 25\" height=\"25\" width=\"25\">\n            <path d=\"M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z\"></path>\n          </svg>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'success'\">\n          <svg class=\"hmcts-banner__icon hmcts-banner__icon--success\" fill=\"currentColor\" role=\"presentation\" focusable=\"false\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 25 25\" height=\"25\" width=\"25\">\n            <path d=\"M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z\"></path>\n          </svg>\n        </ng-container>\n        <ng-container *ngSwitchCase=\"'information'\">\n          <svg class=\"hmcts-banner__icon hmcts-banner__icon--information\" fill=\"currentColor\" role=\"presentation\" focusable=\"false\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 25 25\" height=\"25\" width=\"25\">\n            <path d=\"M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8\n  C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z\"></path>\n          </svg>\n        </ng-container>\n      </ng-container>\n    </ng-container>\n\n    <div class=\"hmcts-banner__message\" [class.hmcts-banner__message--bold]=\"messageBoldText\">\n      <span class=\"hmcts-banner__assistive\">{{ type }}</span>\n      <span class=\"hmcts-banner__message-text govuk-!-font-weight-bold\">{{ message }}</span>\n    </div>\n  </div>\n</ng-container>\n",
-                styles: [".hmcts-banner-title{color:#fff;background-color:#1d70b8;font-weight:700;padding:10px 15px 5px}.hmcts-banner-title--success{background-color:#00703c}.hmcts-banner-title--warning{background-color:#d4351c}.hmcts-banner__message--bold{font-weight:700}"]
+                template: "<div class=\"hmcts-banner hmcts-banner--{{type}}\">\n  <svg class=\"hmcts-banner__icon\" fill=\"currentColor\" role=\"presentation\" focusable=\"false\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 25 25\" height=\"25\" width=\"25\">\n      <path d=\"M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z\" /></svg>\n  <div class=\"hmcts-banner__message\">\n      <span class=\"hmcts-banner__assistive\">{{type}}</span>\n      {{message}}\n  </div>\n</div>",
+                styles: [":host{display:block;width:100%}"]
             }] }
 ];
+/** @nocollapse */
+HmctsBannerComponent.ctorParameters = () => [];
 HmctsBannerComponent.propDecorators = {
-    message: [{ type: Input }],
     type: [{ type: Input }],
-    title: [{ type: Input }],
-    showMessageIcon: [{ type: Input }],
-    messageBoldText: [{ type: Input }]
+    message: [{ type: Input }]
 };
 
 /**
@@ -6105,7 +5544,7 @@ class HmctsMainWrapperComponent {
 HmctsMainWrapperComponent.decorators = [
     { type: Component, args: [{
                 selector: 'xuilib-hmcts-main-wrapper',
-                template: "<a *ngIf=\"hasBackLink\" [routerLink]=\"backLink\" (click)=\"onGoBack()\" class=\"govuk-back-link\">Back</a>\n<main id=\"content\" role=\"main\" class=\"govuk-main-wrapper\">\n  <div class=\"govuk-grid-row\">\n    <div class=\"govuk-grid-column-two-thirds\">\n      <xuilib-hmcts-error-summary\n        *ngIf=\"summaryErrors && !summaryErrors.isFromValid\"\n        [errorMessages]=\"summaryErrors.items\"\n        [header]=\"summaryErrors.header\"\n        [showWarningMessage]=\"showWarningMessage\">\n      </xuilib-hmcts-error-summary>\n      <xuilib-hmcts-banner *ngIf=\"bannerData\"\n                           [type]=\"bannerData.type\"\n                           [message]=\"bannerData.message\"\n      ></xuilib-hmcts-banner>\n      <h1 *ngIf=\"title\" class=\"govuk-heading-xl\">{{title}}</h1>\n      <ng-content></ng-content>\n    </div>\n    <div class=\"govuk-grid-column-one-third\" *ngIf=\"actionButtons?.length > 0\">\n      <div class=\"hmcts-page-heading__actions-wrapper\">\n        <a\n          *ngFor=\"let actionButton of actionButtons\"\n          (click)=\"actionButton.action()\"\n          role=\"button\"\n          draggable=\"false\"\n          class=\"govuk-button {{ actionButton.class }}\"\n        >{{ actionButton.name }}</a>\n      </div>\n    </div>\n  </div>\n</main>\n"
+                template: "<a *ngIf=\"hasBackLink\" [routerLink]=\"backLink\" (click)=\"onGoBack()\" class=\"govuk-back-link\">Back</a>\n<main id=\"content\" role=\"main\" class=\"govuk-main-wrapper\">\n  <div class=\"govuk-grid-row\">\n    <div class=\"govuk-grid-column-two-thirds\">\n      <xuilib-hmcts-error-summary\n        *ngIf=\"summaryErrors && !summaryErrors.isFromValid\"\n        [errorMessages]=\"summaryErrors.items\"\n        [header]=\"summaryErrors.header\"\n        [showWarningMessage]=\"showWarningMessage\">\n      </xuilib-hmcts-error-summary>\n      <xuilib-hmcts-banner *ngIf=\"bannerData\" [message]=\"bannerData.message\" [type]=\"bannerData.type\"></xuilib-hmcts-banner>\n      <h1 *ngIf=\"title\" class=\"govuk-heading-xl\">{{title}}</h1>\n      <ng-content></ng-content>\n    </div>\n    <div class=\"govuk-grid-column-one-third\" *ngIf=\"actionButtons?.length > 0\">\n      <div class=\"hmcts-page-heading__actions-wrapper\">\n        <a\n          *ngFor=\"let actionButton of actionButtons\"\n          (click)=\"actionButton.action()\"\n          role=\"button\"\n          draggable=\"false\"\n          class=\"govuk-button {{ actionButton.class }}\"\n        >{{ actionButton.name }}</a>\n      </div>\n    </div>\n  </div>\n</main>\n"
             }] }
 ];
 /** @nocollapse */
@@ -6245,26 +5684,6 @@ RemoveHostDirective.ctorParameters = () => [
     { type: ElementRef }
 ];
 
-/**
- * @fileoverview added by tsickle
- * Generated from: lib/pipes/capitalize.pipe.ts
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class CapitalizePipe {
-    /**
-     * @param {?} value
-     * @return {?}
-     */
-    transform(value) {
-        /** @type {?} */
-        const lowerCaseString = value.toLowerCase();
-        return lowerCaseString.charAt(0).toUpperCase() + lowerCaseString.slice(1);
-    }
-}
-CapitalizePipe.decorators = [
-    { type: Pipe, args: [{ name: 'capitalize' },] }
-];
-
 /**
  * @fileoverview added by tsickle
  * Generated from: lib/exui-common-lib.module.ts
@@ -6303,7 +5722,6 @@ const COMMON_COMPONENTS = [
     FindPersonComponent,
     SearchJudicialsComponent,
     FindLocationComponent,
-    FindTaskNameComponent,
     SearchLocationComponent,
     FindServiceComponent,
     SearchServiceComponent,
@@ -6335,10 +5753,6 @@ const GOV_UI_COMPONENTS = [
     GovUkFileUploadComponent,
     RemoveHostDirective
 ];
-/** @type {?} */
-const pipes = [
-    CapitalizePipe
-];
 const ɵ0 = windowProvider;
 class ExuiCommonLibModule {
 }
@@ -6346,8 +5760,7 @@ ExuiCommonLibModule.decorators = [
     { type: NgModule, args: [{
                 declarations: [
                     ...COMMON_COMPONENTS,
-                    ...GOV_UI_COMPONENTS,
-                    ...pipes
+                    ...GOV_UI_COMPONENTS
                 ],
                 imports: [
                     CommonModule,
@@ -6365,8 +5778,7 @@ ExuiCommonLibModule.decorators = [
                 exports: [
                     ...COMMON_COMPONENTS,
                     ...GOV_UI_COMPONENTS,
-                    PaginatePipe,
-                    ...pipes
+                    PaginatePipe
                 ]
             },] }
 ];
@@ -7075,19 +6487,20 @@ TimeoutNotificationsService.ctorParameters = () => [
  */
 class RoleService {
     constructor() {
-        this.pRoles = new BehaviorSubject(null);
-        this.roles$ = this.pRoles.asObservable().pipe(skipWhile((/**
-         * @param {?} item
-         * @return {?}
-         */
-        item => item === null)));
+        this.pRoles = [];
+    }
+    /**
+     * @return {?}
+     */
+    get roles() {
+        return this.pRoles;
     }
     /**
      * @param {?} roles
      * @return {?}
      */
     set roles(roles) {
-        this.pRoles.next(roles);
+        this.pRoles = roles;
     }
 }
 RoleService.decorators = [
@@ -7123,31 +6536,25 @@ class RoleGuard {
      * @return {?}
      */
     canActivate(route) {
-        return this.roleService.roles$.pipe(map((/**
-         * @param {?} roles
+        /** @type {?} */
+        const roles = ((/** @type {?} */ (route.data.needsRole)));
+        /** @type {?} */
+        const check = (/**
+         * @param {?} roleRegEx
          * @return {?}
          */
-        roles => {
-            /** @type {?} */
-            const canActivateRoles = ((/** @type {?} */ (route.data.needsRole)));
+        (roleRegEx) => {
             /** @type {?} */
-            const check = (/**
-             * @param {?} roleRegEx
+            const regex = new RegExp(roleRegEx);
+            return this.roleService.roles.some((/**
+             * @param {?} role
              * @return {?}
              */
-            (roleRegEx) => {
-                /** @type {?} */
-                const regex = new RegExp(roleRegEx);
-                return roles.some((/**
-                 * @param {?} role
-                 * @return {?}
-                 */
-                role => regex.test(role)));
-            });
-            /** @type {?} */
-            const match = route.data.roleMatching === RoleMatching.ALL ? canActivateRoles.every(check) : canActivateRoles.some(check);
-            return match || this.router.parseUrl((/** @type {?} */ (route.data.noRoleMatchRedirect)));
-        })));
+            role => regex.test(role)));
+        });
+        /** @type {?} */
+        const match = route.data.roleMatching === RoleMatching.ALL ? roles.every(check) : roles.some(check);
+        return match || this.router.parseUrl((/** @type {?} */ (route.data.noRoleMatchRedirect)));
     }
 }
 RoleGuard.decorators = [
@@ -7248,6 +6655,6 @@ LoadingService.decorators = [
  * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 
-export { AccessibilityComponent, CheckboxListComponent, ContactDetailsComponent, DueDateComponent, GenericFilterComponent, HmctsSessionDialogComponent, InviteUserFormComponent, InviteUserPermissionComponent, LoadingSpinnerComponent, SelectedCaseConfirmComponent, SelectedCaseListComponent, SelectedCaseComponent, ServiceMessageComponent, ServiceMessagesComponent, ShareCaseConfirmComponent, ShareCaseComponent, TabComponent, TcConfirmComponent, TcDisplayHtmlComponent, TcDisplayPlainComponent, TermsAndConditionsComponent, UserDetailsComponent, UserListComponent, CookieBannerComponent, FindLocationComponent, SearchLocationComponent, PaginationComponent, FeatureToggleDirective, LetContext, LetDirective, COMMON_COMPONENTS, GOV_UI_COMPONENTS, ExuiCommonLibModule, GovUiService, checkboxesBeCheckedValidator, dateValidator, radioGroupValidator, HmctsSubNavigationComponent, HmctsBannerComponent, BadgeColour, DateBadgeColour, SECONDS_IN_A_DAY, AnonymousFeatureUser, LoggedInFeatureUser, BookingCheckType, PersonRole, RoleCategory, RadioFilterFieldConfig, FeatureToggleGuard, FeatureToggleService, LaunchDarklyService, GoogleAnalyticsService, GoogleTagManagerService, ManageSessionServices, TimeoutNotificationsService, RoleMatching, RoleGuard, RoleService, CookieService, HasLoadingState, LoadingService, FilterService, windowProvider, windowToken, AccessibilityComponent as ɵx, CheckboxListComponent as ɵz, ContactDetailsComponent as ɵf, CookieBannerComponent as ɵbf, DueDateComponent as ɵy, ExuiPageWrapperComponent as ɵa, FindLocationComponent as ɵbl, FindPersonComponent as ɵbh, FindServiceComponent as ɵbq, FindTaskNameComponent as ɵbo, GenericFilterComponent as ɵbd, HmctsSessionDialogComponent as ɵk, InviteUserFormComponent as ɵo, InviteUserPermissionComponent as ɵn, LoadingSpinnerComponent as ɵbc, PaginationComponent as ɵbt, SearchJudicialsComponent as ɵbk, SearchLocationComponent as ɵbm, SearchServiceComponent as ɵbr, SearchVenueComponent as ɵbs, SelectedCaseConfirmComponent as ɵv, SelectedCaseListComponent as ɵt, SelectedCaseComponent as ɵu, ServiceMessageComponent as ɵba, ServiceMessagesComponent as ɵbb, ShareCaseConfirmComponent as ɵs, ShareCaseComponent as ɵp, TabComponent as ɵw, TcConfirmComponent as ɵe, TcDisplayHtmlComponent as ɵc, TcDisplayPlainComponent as ɵd, TermsAndConditionsComponent as ɵb, UserDetailsComponent as ɵm, UserListComponent as ɵl, UserSelectComponent as ɵq, FeatureToggleDirective as ɵg, LetContext as ɵi, LetDirective as ɵj, GovUkCheckboxComponent as ɵcd, GovUkCheckboxesComponent as ɵcj, GovUkDateComponent as ɵci, GovUkErrorMessageComponent as ɵcg, GovUkFieldsetComponent as ɵch, GovUkFileUploadComponent as ɵco, GovUkFormGroupWrapperComponent as ɵce, GovUkInputComponent as ɵcc, GovUkLabelComponent as ɵcf, GovUkRadioComponent as ɵck, GovUkRadiosComponent as ɵcl, GovUkSelectComponent as ɵcm, GovukTableComponent as ɵcb, GovUkTextareaComponent as ɵcn, HmctsBannerComponent as ɵca, HmctsErrorSummaryComponent as ɵby, HmctsIdentityBarComponent as ɵbu, HmctsMainWrapperComponent as ɵbz, HmctsPaginationComponent as ɵbv, HmctsPrimaryNavigationComponent as ɵbx, HmctsSubNavigationComponent as ɵbw, RemoveHostDirective as ɵcp, CapitalizePipe as ɵcq, CaseSharingStateService as ɵr, CookieService as ɵbg, FeatureToggleService as ɵh, FilterService as ɵbe, FindAPersonService as ɵbi, LocationService as ɵbn, SessionStorageService as ɵbj, TaskNameService as ɵbp };
+export { AccessibilityComponent, CheckboxListComponent, ContactDetailsComponent, DueDateComponent, GenericFilterComponent, HmctsSessionDialogComponent, InviteUserFormComponent, InviteUserPermissionComponent, LoadingSpinnerComponent, SelectedCaseConfirmComponent, SelectedCaseListComponent, SelectedCaseComponent, ServiceMessageComponent, ServiceMessagesComponent, ShareCaseConfirmComponent, ShareCaseComponent, TabComponent, TcConfirmComponent, TcDisplayHtmlComponent, TcDisplayPlainComponent, TermsAndConditionsComponent, UserDetailsComponent, UserListComponent, CookieBannerComponent, FindLocationComponent, SearchLocationComponent, PaginationComponent, FeatureToggleDirective, LetContext, LetDirective, COMMON_COMPONENTS, GOV_UI_COMPONENTS, ExuiCommonLibModule, GovUiService, checkboxesBeCheckedValidator, dateValidator, radioGroupValidator, HmctsSubNavigationComponent, SharedCaseErrorMessages, BadgeColour, DateBadgeColour, SECONDS_IN_A_DAY, AnonymousFeatureUser, LoggedInFeatureUser, BookingCheckType, PersonRole, RoleCategory, RadioFilterFieldConfig, FeatureToggleGuard, FeatureToggleService, LaunchDarklyService, GoogleAnalyticsService, GoogleTagManagerService, ManageSessionServices, TimeoutNotificationsService, RoleMatching, RoleGuard, RoleService, CookieService, HasLoadingState, LoadingService, FilterService, windowProvider, windowToken, AccessibilityComponent as ɵx, CheckboxListComponent as ɵz, ContactDetailsComponent as ɵf, CookieBannerComponent as ɵbf, DueDateComponent as ɵy, ExuiPageWrapperComponent as ɵa, FindLocationComponent as ɵbl, FindPersonComponent as ɵbh, FindServiceComponent as ɵbo, GenericFilterComponent as ɵbd, HmctsSessionDialogComponent as ɵk, InviteUserFormComponent as ɵo, InviteUserPermissionComponent as ɵn, LoadingSpinnerComponent as ɵbc, PaginationComponent as ɵbr, SearchJudicialsComponent as ɵbk, SearchLocationComponent as ɵbm, SearchServiceComponent as ɵbp, SearchVenueComponent as ɵbq, SelectedCaseConfirmComponent as ɵv, SelectedCaseListComponent as ɵt, SelectedCaseComponent as ɵu, ServiceMessageComponent as ɵba, ServiceMessagesComponent as ɵbb, ShareCaseConfirmComponent as ɵs, ShareCaseComponent as ɵp, TabComponent as ɵw, TcConfirmComponent as ɵe, TcDisplayHtmlComponent as ɵc, TcDisplayPlainComponent as ɵd, TermsAndConditionsComponent as ɵb, UserDetailsComponent as ɵm, UserListComponent as ɵl, UserSelectComponent as ɵq, FeatureToggleDirective as ɵg, LetContext as ɵi, LetDirective as ɵj, GovUkCheckboxComponent as ɵcb, GovUkCheckboxesComponent as ɵch, GovUkDateComponent as ɵcg, GovUkErrorMessageComponent as ɵce, GovUkFieldsetComponent as ɵcf, GovUkFileUploadComponent as ɵcm, GovUkFormGroupWrapperComponent as ɵcc, GovUkInputComponent as ɵca, GovUkLabelComponent as ɵcd, GovUkRadioComponent as ɵci, GovUkRadiosComponent as ɵcj, GovUkSelectComponent as ɵck, GovukTableComponent as ɵbz, GovUkTextareaComponent as ɵcl, HmctsBannerComponent as ɵby, HmctsErrorSummaryComponent as ɵbw, HmctsIdentityBarComponent as ɵbs, HmctsMainWrapperComponent as ɵbx, HmctsPaginationComponent as ɵbt, HmctsPrimaryNavigationComponent as ɵbv, HmctsSubNavigationComponent as ɵbu, RemoveHostDirective as ɵcn, CaseSharingStateService as ɵr, CookieService as ɵbg, FeatureToggleService as ɵh, FilterService as ɵbe, FindAPersonService as ɵbi, LocationService as ɵbn, SessionStorageService as ɵbj };
 
 //# sourceMappingURL=hmcts-rpx-xui-common-lib.js.map