@hmcts/ccd-case-ui-toolkit 7.0.0-NodeAndNgUpgrades.1 → 7.0.0-NodeAndNgUpgrades.1.1.1

package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Component, Input, EventEmitter, Output, NgModule, ViewEncapsulation, forwardRef, Pipe, ViewChildren, ContentChildren, Injectable, Inject, Directive, ViewChild, HostListener, Injector, ViewContainerRef, ChangeDetectorRef, NO_ERRORS_SCHEMA, InjectionToken } from '@angular/core';
+import { Component, Input, EventEmitter, Output, NgModule, ViewEncapsulation, forwardRef, Pipe, ViewChildren, ContentChildren, Injectable, Inject, Directive, ViewChild, HostListener, Injector, ViewContainerRef, ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA, InjectionToken } from '@angular/core';
 import * as i1 from '@angular/common';
 import { CommonModule, DOCUMENT, CurrencyPipe, formatDate } from '@angular/common';
 import * as i1$1 from 'rpx-xui-translation';
@@ -7,7 +7,7 @@ import { RpxTranslationModule, RpxTranslatePipe } from 'rpx-xui-translation';
 import * as i1$2 from '@angular/router';
 import { RouterModule, NavigationStart, NavigationEnd } from '@angular/router';
 import * as i3 from '@angular/forms';
-import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, UntypedFormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import polling from 'rx-polling';
 import { throwError, Subject, EMPTY, Observable, of, BehaviorSubject, timer, fromEvent, forkJoin } from 'rxjs';
 import * as i1$3 from '@angular/common/http';
@@ -3489,10 +3489,10 @@ class FieldsUtils {
      * Extract flags data from a `CaseField` instance, recursing and iterating through sub-fields of a Complex field or
      * each field in a Collection field.
      *
-     * @param flags An array for accumulating extracted flags data and derived `UntypedFormGroup` paths
+     * @param flags An array for accumulating extracted flags data and derived `FormGroup` paths
      * @param caseField A `CaseField` instance from which to extract the flags data
      * @param pathToFlagsFormGroup A (dot-delimited) string for concatenating the name of each control that forms the path
-     * to the `UntypedFormGroup` for the `Flags` instance
+     * to the `FormGroup` for the `Flags` instance
      * @param topLevelCaseField The top-level `CaseField` that contains the value property. This is required because _only
      * top-level_ `CaseField`s contain actual values and a reference needs to be maintained to such a field
      * @param currentValue The current value object of a `CaseField` that is a sub-field of a non root-level Complex field.
@@ -3500,7 +3500,7 @@ class FieldsUtils {
      * only the _root-level_ `CaseField` contains a value property - all sub-fields, including any nested Complex fields,
      * do *not* contain any values themselves.)
      * @returns An array of `FlagsWithFormGroupPath`, each instance comprising a `Flags` object derived from a `CaseField`
-     * of type "Flags", and the dot-delimited path string to the corresponding `UntypedFormGroup`
+     * of type "Flags", and the dot-delimited path string to the corresponding `FormGroup`
      */
     static extractFlagsDataFromCaseField(flags, caseField, pathToFlagsFormGroup, topLevelCaseField, currentValue) {
         const fieldType = caseField.field_type;
@@ -3698,7 +3698,7 @@ class FieldsUtils {
         if (aControl instanceof FormArray) { // We're in a collection
             formArrayFn(aControl);
         }
-        else if (aControl instanceof UntypedFormGroup) { // We're in a complex type.
+        else if (aControl instanceof FormGroup) { // We're in a complex type.
             formGroupFn(aControl);
         }
         else if (aControl instanceof FormControl) { // FormControl
@@ -4508,7 +4508,7 @@ class ConditionalShowFormDirective {
         this.handleFormGroup = (formGroup) => {
             this.evaluateControl(formGroup);
             let groupControl = formGroup;
-            if (formGroup.get('value') && formGroup.get('value') instanceof UntypedFormGroup) { // Complex Field
+            if (formGroup.get('value') && formGroup.get('value') instanceof FormGroup) { // Complex Field
                 groupControl = formGroup.get('value');
             }
             else if (formGroup.controls) {
@@ -4530,7 +4530,7 @@ class ConditionalShowFormDirective {
     }
     ngOnInit() {
         if (!this.formGroup) {
-            this.formGroup = new UntypedFormGroup({});
+            this.formGroup = new FormGroup({});
         }
     }
     /**
@@ -4755,7 +4755,7 @@ class FieldsPurger {
                 for (const complexSubField of field.field_type.complex_fields) {
                     if ((complexSubField.field_type.type === 'Complex' && complexSubField.field_type.complex_fields.length > 0) ||
                         !complexSubField.retain_hidden_value) {
-                        // Check for the existence of the parent UntypedFormGroup corresponding to the Complex field; if it exists, call
+                        // Check for the existence of the parent FormGroup corresponding to the Complex field; if it exists, call
                         // deleteFieldValue() to delete the sub-field
                         const parentFormGroup = form.get('data').controls[field.id];
                         if (parentFormGroup) {
@@ -4787,7 +4787,7 @@ class FieldsPurger {
                                 }
                             }
                             // Recursively delete the sub-field value if retain_hidden_value is false, OR if the sub-field type is
-                            // Complex and regardless of retain_hidden_value, passing in the parent UntypedFormGroup
+                            // Complex and regardless of retain_hidden_value, passing in the parent FormGroup
                             if (subCaseField &&
                                 ((subCaseField.field_type.type === 'Complex' && subCaseField.field_type.complex_fields.length > 0) ||
                                     !subCaseField.retain_hidden_value)) {
@@ -4826,7 +4826,7 @@ class FieldsPurger {
      * types, this recursive method is called until simple or "base" field types are reached. For `Document` field
      * types, its _sub-field_ `FormControl` values are set to null.
      *
-     * @param UntypedFormGroup The `UntypedFormGroup` instance containing the `FormControl` for the specified field
+     * @param FormGroup The `FormGroup` instance containing the `FormControl` for the specified field
      * @param field The `CaseField` whose value is to be deleted in the backend
      * @param parentField Reference to the parent `CaseField`. Used for checking specifically where a Complex field and
      * its sub-fields have `retain_hidden_value` set to `true`, but the field's parent has it set to `false` or undefined
@@ -4855,7 +4855,7 @@ class FieldsPurger {
                                     (field.retain_hidden_value
                                         ? !complexSubField.retain_hidden_value || (parentField && !parentField.retain_hidden_value)
                                         : true))) {
-                                // The fieldControl is cast to a UntypedFormGroup because a Complex field type uses this as its underlying
+                                // The fieldControl is cast to a FormGroup because a Complex field type uses this as its underlying
                                 // implementation
                                 this.deleteFieldValue(fieldControl, complexSubField, field);
                             }
@@ -4882,7 +4882,7 @@ class FieldsPurger {
                                         break;
                                     }
                                 }
-                                // Recursively delete the sub-field value, passing in the parent UntypedFormGroup
+                                // Recursively delete the sub-field value, passing in the parent FormGroup
                                 const parentFormGroup = fieldControl.at(index).get('value');
                                 this.deleteFieldValue(parentFormGroup, subCaseField);
                             }));
@@ -4897,7 +4897,7 @@ class FieldsPurger {
                         // the single Document case)
                         if (documentFieldValues) {
                             documentFieldValues.forEach((fieldValue, index) => Object.keys(fieldValue.value).forEach(subFieldId => {
-                                // Get the UntypedFormGroup containing the FormControl for the sub-field and set its value to null
+                                // Get the FormGroup containing the FormControl for the sub-field and set its value to null
                                 fieldControl.at(index).get(`value.${subFieldId}`).setValue(null);
                             }));
                         }
@@ -4916,8 +4916,8 @@ class FieldsPurger {
                     }
                     break;
                 case 'Document':
-                    // NOTE: The field control (a UntypedFormGroup in this case) cannot just be set to null because Angular checks that
-                    // all existing values of a UntypedFormGroup are present; setting the control's value to null causes a runtime error
+                    // NOTE: The field control (a FormGroup in this case) cannot just be set to null because Angular checks that
+                    // all existing values of a FormGroup are present; setting the control's value to null causes a runtime error
                     const documentFieldValue = fieldControl.value;
                     for (const key in documentFieldValue) {
                         if (fieldControl.get(key)) {
@@ -5795,7 +5795,7 @@ class LabelSubstitutorDirective {
     ngOnInit() {
         this.initialLabel = this.caseField.label;
         this.initialHintText = this.caseField.hint_text;
-        this.formGroup = this.formGroup || new UntypedFormGroup({});
+        this.formGroup = this.formGroup || new FormGroup({});
         const fields = this.getReadOnlyAndFormFields();
         if (this.shouldSubstitute('label')) {
             this.caseField.label = this.resolvePlaceholders(fields, this.caseField.label);
@@ -6377,7 +6377,9 @@ FormErrorService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: FormErr
 class JurisdictionService {
     constructor(httpService) {
         this.httpService = httpService;
+        // We retain the Subject observable because subscribing code couldn't happen a null value
         this.selectedJurisdictionSource = new Subject();
+        this.selectedJurisdictionBS = new BehaviorSubject(null);
         this.selectedJurisdiction = this.selectedJurisdictionSource.asObservable();
     }
     getJurisdictions() {
@@ -6385,6 +6387,7 @@ class JurisdictionService {
     }
     announceSelectedJurisdiction(jurisdiction) {
         this.selectedJurisdictionSource.next(jurisdiction);
+        this.selectedJurisdictionBS.next(jurisdiction);
     }
     searchJudicialUsers(searchTerm, serviceId) {
         return this.httpService.post('api/prd/judicial/getJudicialUsersSearch', { searchString: searchTerm, serviceCode: serviceId });
@@ -7898,22 +7901,15 @@ class CaseNotifier {
         this.cachedCaseView = null;
     }
     announceCase(c) {
-        console.info('announceCase started.');
         this.caseViewSource.next(c);
-        console.info('announceCase finished.');
     }
     fetchAndRefresh(cid) {
-        console.info('fetchAndRefresh started.');
         return this.casesService
             .getCaseViewV2(cid)
             .pipe(map(caseView => {
-            console.info('mapping caseView started.');
-            // this.casesService.syncWait(10);
-            // throw new Error('******************************************************');
             this.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.setBasicFields(this.cachedCaseView.tabs);
             this.announceCase(this.cachedCaseView);
-            console.info('mapping caseView finished. Returning it.');
             return this.cachedCaseView;
         }));
     }
@@ -8423,7 +8419,7 @@ class CaseEditComponent {
             this.sessionStorageService.setItem('eventUrl', this.router.url);
         }
         this.form = this.fb.group({
-            data: new UntypedFormGroup({}),
+            data: new FormGroup({}),
             event: this.fb.group({
                 id: [this.eventTrigger.id, Validators.required],
                 summary: [''],
@@ -8596,7 +8592,7 @@ class CaseEditComponent {
         return data;
     }
     /**
-     * Traverse *all* values of a {@link UntypedFormGroup}, including those for disabled fields (i.e. hidden ones), replacing the
+     * Traverse *all* values of a {@link FormGroup}, including those for disabled fields (i.e. hidden ones), replacing the
      * value of any that are hidden AND have `retain_hidden_value` set to `true` in the corresponding `CaseField`, with
      * the *original* value held in the `CaseField` object.
      *
@@ -8609,8 +8605,8 @@ class CaseEditComponent {
      * * For Collection field types, including collections of Complex and Document field types, the replacement is
      * performed for all fields in the collection.
      *
-     * @param UntypedFormGroup The `UntypedFormGroup` instance whose raw values are to be traversed
-     * @param caseFields The array of {@link CaseField} domain model objects corresponding to fields in `UntypedFormGroup`
+     * @param FormGroup The `FormGroup` instance whose raw values are to be traversed
+     * @param caseFields The array of {@link CaseField} domain model objects corresponding to fields in `FormGroup`
      * @param parentField Reference to the parent `CaseField`. Used for retrieving the sub-field values of a Complex field
      * to perform recursive replacement - the sub-field `CaseField`s themselves do *not* contain any values
      * @returns An object with the *raw* form value data (as key-value pairs), with any value replacements as necessary
@@ -8653,8 +8649,8 @@ class CaseEditComponent {
                         // CaseField itself (the sub-fields do not contain any values, so these need to be obtained from the
                         // parent)
                         // Update rawFormValueData for this field
-                        // creating form group and adding control into it in case caseField is of complext type and and part of UntypedFormGroup
-                        const form = new UntypedFormGroup({});
+                        // creating form group and adding control into it in case caseField is of complext type and and part of FormGroup
+                        const form = new FormGroup({});
                         if (formGroup.controls[key].value) {
                             Object.keys(formGroup.controls[key].value).forEach((item) => {
                                 form.addControl(item, new FormControl(formGroup.controls[key].value[item]));
@@ -10163,7 +10159,7 @@ class WriteComplexFieldComponent extends AbstractFieldWriteComponent {
         this.caseFields = [];
         this.renderLabel = true;
         this.ignoreMandatory = false;
-        this.complexGroup = new UntypedFormGroup({});
+        this.complexGroup = new FormGroup({});
     }
     ngOnInit() {
         // Are we inside of a collection? If so, the parent is the complexGroup we want.
@@ -10381,7 +10377,7 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
     constructor(addressesService, isCompoundPipe) {
         super();
         this.isCompoundPipe = isCompoundPipe;
-        this.addressFormGroup = new UntypedFormGroup({});
+        this.addressFormGroup = new FormGroup({});
         this.missingPostcode = false;
         this.addressesService = addressesService;
     }
@@ -10866,7 +10862,7 @@ class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent {
     }
     ngOnInit() {
         // If the context is PaletteContext.DEFAULT, the Flags fields need to be located by CaseTab (they won't be present
-        // in the UntypedFormGroup - only the FlagLauncher field is present)
+        // in the FormGroup - only the FlagLauncher field is present)
         if (this.context === PaletteContext.DEFAULT) {
             // Determine the tab this CaseField belongs to (should be only one), from the CaseView object in the snapshot
             // data, and extract all flags-related data from its Flags fields
@@ -10885,7 +10881,7 @@ class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent {
         else if (this.context === PaletteContext.CHECK_YOUR_ANSWER) {
             // If the context is PaletteContext.CHECK_YOUR_ANSWER, the Flags data is already present within the formGroup.
             // The FlagLauncher component, WriteCaseFlagFieldComponent, holds a reference to:
-            // i) the parent UntypedFormGroup for the Flags instance where changes have been made;
+            // i) the parent FormGroup for the Flags instance where changes have been made;
             // ii) the currently selected flag (selectedFlag) if one exists
             const flagLauncherControlName = Object.keys(this.formGroup.controls).find(controlName => FieldsUtils.isFlagLauncherCaseField(this.formGroup.get(controlName)['caseField']));
             if (flagLauncherControlName && this.formGroup.get(flagLauncherControlName)['component']) {
@@ -11094,7 +11090,7 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         this.caseEditDataService = caseEditDataService;
         this.caseFlagFieldState = CaseFlagFieldState;
         this.errorMessages = [];
-        this.caseFlagParentFormGroup = new UntypedFormGroup({});
+        this.caseFlagParentFormGroup = new FormGroup({});
         this.flagCommentsOptional = false;
         this.listOfValues = null;
         this.allCaseFlagStagesCompleted = false;
@@ -11111,11 +11107,11 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         if (this.formGroup && this.formGroup.get(this.caseField.id)) {
             this.formGroup.removeControl(this.caseField.id);
         }
-        // From this point, this.formGroup refers to the UntypedFormGroup for the FlagLauncher field, not the parent UntypedFormGroup
-        this.formGroup = this.registerControl(new UntypedFormGroup({}, {
+        // From this point, this.formGroup refers to the FormGroup for the FlagLauncher field, not the parent FormGroup
+        this.formGroup = this.registerControl(new FormGroup({}, {
             validators: (_) => {
                 if (!this.allCaseFlagStagesCompleted) {
-                    // Return an error to mark the UntypedFormGroup as invalid if not all Case Flag stages have been completed
+                    // Return an error to mark the FormGroup as invalid if not all Case Flag stages have been completed
                     return { notAllCaseFlagStagesCompleted: true };
                 }
                 return null;
@@ -11164,7 +11160,7 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
     onCaseFlagStateEmitted(caseFlagState) {
         this.caseEditDataService.clearFormValidationErrors();
         // If the current state is CaseFlagFieldState.FLAG_LOCATION and a flag location (a Flags instance) has been selected,
-        // set the parent Case Flag UntypedFormGroup for this component's children by using the provided pathToFlagsFormGroup, and
+        // set the parent Case Flag FormGroup for this component's children by using the provided pathToFlagsFormGroup, and
         // set the selected flag location on this component
         if (caseFlagState.currentCaseFlagFieldState === CaseFlagFieldState.FLAG_LOCATION
             && caseFlagState.selectedFlagsLocation
@@ -11182,7 +11178,7 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
             this.listOfValues = caseFlagState.listOfValues;
         }
         // If the current state is CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS and a flag has been selected, set the parent
-        // Case Flag UntypedFormGroup for this component's children by using the provided pathToFlagsFormGroup
+        // Case Flag FormGroup for this component's children by using the provided pathToFlagsFormGroup
         if (caseFlagState.currentCaseFlagFieldState === CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS
             && caseFlagState.selectedFlag
             && caseFlagState.selectedFlag.pathToFlagsFormGroup) {
@@ -11319,8 +11315,8 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         if (flagsCaseFieldValue) {
             const flagDetailToUpdate = flagsCaseFieldValue.details.find(detail => detail.id === this.selectedFlag.flagDetailDisplay.flagDetail.id);
             if (flagDetailToUpdate) {
-                flagDetailToUpdate.value.flagComment = this.caseFlagParentFormGroup.value.flagComments
-                    ? this.caseFlagParentFormGroup.value.flagComments
+                flagDetailToUpdate.value.flagComment = this.caseFlagParentFormGroup.value['flagComments']
+                    ? this.caseFlagParentFormGroup.value['flagComments']
                     : null;
                 flagDetailToUpdate.value.status = this.selectedFlag.flagDetailDisplay.flagDetail.status;
                 flagDetailToUpdate.value.dateTimeModified = new Date().toISOString();
@@ -11345,12 +11341,12 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         this.flagCommentsOptional = true;
     }
     /**
-     * Set the parent {@link UntypedFormGroup} for this component's children, depending on the `Flags` {@link CaseField} instance
-     * to which data should be attached. **Note:** The parent is not _this_ component's `UntypedFormGroup` (as might otherwise be
+     * Set the parent {@link FormGroup} for this component's children, depending on the `Flags` {@link CaseField} instance
+     * to which data should be attached. **Note:** The parent is not _this_ component's `FormGroup` (as might otherwise be
      * expected) because this component is not expected to have a value, given it is used for the empty `FlagLauncher` base
      * field type.
      *
-     * @param pathToFlagsFormGroup The dot-delimited string that is the path to the `UntypedFormGroup` for a `Flags` instance
+     * @param pathToFlagsFormGroup The dot-delimited string that is the path to the `FormGroup` for a `Flags` instance
      */
     setCaseFlagParentFormGroup(pathToFlagsFormGroup) {
         this.caseFlagParentFormGroup = this.formGroup.parent.get(pathToFlagsFormGroup);
@@ -11359,19 +11355,19 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         return {
             name: this.flagName,
             // Currently, subTypeValue and subTypeKey are applicable only to language flag types
-            subTypeValue: this.caseFlagParentFormGroup.value.languageSearchTerm
-                ? this.caseFlagParentFormGroup.value.languageSearchTerm.value
-                : this.caseFlagParentFormGroup.value.manualLanguageEntry
-                    ? this.caseFlagParentFormGroup.value.manualLanguageEntry
+            subTypeValue: this.caseFlagParentFormGroup.value['languageSearchTerm']
+                ? this.caseFlagParentFormGroup.value['languageSearchTerm'].value
+                : this.caseFlagParentFormGroup.value['mmanualLanguageEntry']
+                    ? this.caseFlagParentFormGroup.value['mmanualLanguageEntry']
                     : null,
             // For user-entered (i.e. non-Reference Data) languages, there is no key
-            subTypeKey: this.caseFlagParentFormGroup.value.languageSearchTerm
-                ? this.caseFlagParentFormGroup.value.languageSearchTerm.key
+            subTypeKey: this.caseFlagParentFormGroup.value['languageSearchTerm']
+                ? this.caseFlagParentFormGroup.value['languageSearchTerm'].key
                 : null,
-            otherDescription: this.flagCode === this.otherFlagTypeCode && this.caseFlagParentFormGroup.value.otherFlagTypeDescription
-                ? this.caseFlagParentFormGroup.value.otherFlagTypeDescription
+            otherDescription: this.flagCode === this.otherFlagTypeCode && this.caseFlagParentFormGroup.value['otherFlagTypeDescription']
+                ? this.caseFlagParentFormGroup.value['otherFlagTypeDescription']
                 : null,
-            flagComment: this.caseFlagParentFormGroup.value.flagComments ? this.caseFlagParentFormGroup.value.flagComments : null,
+            flagComment: this.caseFlagParentFormGroup.value['flagComments'] ? this.caseFlagParentFormGroup.value['flagComments'] : null,
             dateTimeCreated: new Date().toISOString(),
             path: this.flagPath,
             hearingRelevant: this.hearingRelevantFlag ? 'Yes' : 'No',
@@ -11498,12 +11494,12 @@ const _c1$m = function (a0) { return { "form-group-error": a0 }; };
 class WriteCaseLinkFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
         if (this.caseField.value) {
-            this.caseLinkGroup = this.registerControl(new UntypedFormGroup({
+            this.caseLinkGroup = this.registerControl(new FormGroup({
                 CaseReference: new FormControl(this.caseField.value.CaseReference, Validators.required),
             }), true);
         }
         else {
-            this.caseLinkGroup = this.registerControl(new UntypedFormGroup({
+            this.caseLinkGroup = this.registerControl(new FormGroup({
                 CaseReference: new FormControl(null, Validators.required),
             }), true);
         }
@@ -11829,7 +11825,7 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
          * this is what appears to be happening:
          *   1. this.formArray contains no controls at all.
          *      this.formArray.value = [];
-         *   2. this.formArray contains a UntypedFormGroup, which contains a single
+         *   2. this.formArray contains a FormGroup, which contains a single
          *      FormControl with the id 'code'.
          *      this.formArray.value = [{ code: null }]
          *   3. this.formArray contains what is being set up below.
@@ -11841,7 +11837,7 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
             group = this.formArray.at(index);
         }
         else {
-            group = new UntypedFormGroup({});
+            group = new FormGroup({});
         }
         let value;
         if (this.isCollectionOfSimpleType(this.caseField)) {
@@ -11855,14 +11851,14 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
         else {
             value = group.get('value');
             if (!value) {
-                value = new UntypedFormGroup({});
+                value = new FormGroup({});
                 for (const key of Object.keys(group.controls)) {
                     value.addControl(key, group.get(key));
                     // DON'T remove the control for this key from the outer group or it
                     // goes awry. So DON'T uncomment the below line!
                     // group.removeControl(key);
                 }
-                // Now add the value UntypedFormGroup to the outer group.
+                // Now add the value FormGroup to the outer group.
                 group.addControl('value', value);
             }
         }
@@ -11967,7 +11963,7 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
     }
     getContainer(index) {
         const value = this.formArray.at(index).get('value');
-        if (value instanceof UntypedFormGroup) {
+        if (value instanceof FormGroup) {
             return value;
         }
         else {
@@ -12076,7 +12072,7 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
      * Applied full solution as part of EUI-3505
      */
     getControlIdAt(index) {
-        // this.formArray contains [ UntypedFormGroup( id: FormControl, value: UntypedFormGroup ), ... ].
+        // this.formArray contains [ FormGroup( id: FormControl, value: FormGroup ), ... ].
         // Here, we need to get the value of the id FormControl.
         const group = this.formArray.at(index);
         const control = group.get('id');
@@ -12426,17 +12422,18 @@ function WriteDocumentFieldComponent_ccd_read_document_field_10_Template(rf, ctx
 } }
 const _c1$k = function (a0) { return { "form-group-error bottom-30": a0 }; };
 class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
-    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService) {
+    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
         super();
         this.appConfig = appConfig;
         this.caseNotifier = caseNotifier;
         this.documentManagement = documentManagement;
         this.dialog = dialog;
         this.fileUploadStateService = fileUploadStateService;
+        this.jurisdictionService = jurisdictionService;
         this.valid = true;
     }
     clickout(event) {
-        // Capturing the event of of the associated  ElementRef <input type="file" #fileInpu
+        // Capturing the event of the associated  ElementRef <input type="file" #fileInpu
         if (this.fileInput.nativeElement.contains(event.target)) {
             this.clickInsideTheDocument = true;
         }
@@ -12446,6 +12443,9 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     }
     ngOnInit() {
         this.secureModeOn = this.appConfig.getDocumentSecureMode();
+        if (this.secureModeOn) {
+            this.subscribeToCaseDetails();
+        }
         this.dialogConfig = initDialog();
         // EUI-3403. The field was not being registered when there was no value and the field
         // itself was not mandatory, which meant that show_conditions would not be evaluated.
@@ -12458,9 +12458,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         else {
             this.createDocumentForm(document);
         }
-        if (this.appConfig.getDocumentSecureMode()) {
-            this.subscribeToCaseDetails();
-        }
     }
     ngOnDestroy() {
         if (this.fileUploadSubscription) {
@@ -12469,8 +12466,11 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         if (this.dialogSubscription) {
             this.dialogSubscription.unsubscribe();
         }
-        if (this.caseEventSubscription) {
-            this.caseEventSubscription.unsubscribe();
+        if (this.caseNotifierSubscription) {
+            this.caseNotifierSubscription.unsubscribe();
+        }
+        if (this.jurisdictionSubs) {
+            this.jurisdictionSubs.unsubscribe();
         }
     }
     isUploadInProgress() {
@@ -12521,7 +12521,9 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     triggerReplace() {
         if (this.confirmReplaceResult === 'Replace') {
             this.openFileDialog();
+            return true;
         }
+        return false;
     }
     getUploadedFileName() {
         if (this.uploadedDocument) {
@@ -12555,10 +12557,26 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             this.triggerReplace();
         });
     }
+    // Depending on the context, we can get the case type and jurisdiction from different sources
+    // If we are running an event, the caseNotifier will have the current case
+    // If we are creating a case, the case doesn't exist yet, so the caseNotifier can't help
+    // Instead we can use the eventTrigger to get the case type, and the jurisdiction service to
+    // get the currently selected jurisdiction
     subscribeToCaseDetails() {
-        this.caseEventSubscription = this.caseNotifier.caseView.subscribe({
+        this.caseNotifierSubscription = this.caseNotifier.caseView.subscribe({
             next: (caseDetails) => {
-                this.caseDetails = caseDetails;
+                this.caseTypeId = caseDetails?.case_id;
+                this.jurisdictionId = caseDetails?.case_type?.jurisdiction?.id;
+            }
+        });
+        this.jurisdictionSubs = this.jurisdictionService.selectedJurisdictionBS.subscribe({
+            next: (jurisdiction) => {
+                if (jurisdiction) {
+                    this.jurisdictionId = jurisdiction.id;
+                    if (jurisdiction.currentCaseType) {
+                        this.caseTypeId = jurisdiction.currentCaseType.id;
+                    }
+                }
             }
         });
     }
@@ -12602,7 +12620,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             ...documentFormGroup,
             ...{ document_hash: new FormControl(document.document_hash) }
         } : documentFormGroup;
-        this.uploadedDocument = this.registerControl(new UntypedFormGroup(documentFormGroup), true);
+        this.uploadedDocument = this.registerControl(new FormGroup(documentFormGroup), true);
     }
     createDocumentForm(document) {
         let documentFormGroup = {
@@ -12614,7 +12632,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             ...documentFormGroup,
             ...{ document_hash: new FormControl(document.document_hash) }
         } : documentFormGroup;
-        this.uploadedDocument = this.registerControl(new UntypedFormGroup(documentFormGroup), true);
+        this.uploadedDocument = this.registerControl(new FormGroup(documentFormGroup), true);
     }
     getErrorMessage(error) {
         // Document Management unavailable
@@ -12628,13 +12646,8 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         documentUpload.append('files', selectedFile, selectedFile.name);
         documentUpload.append('classification', 'PUBLIC');
         if (this.appConfig.getDocumentSecureMode()) {
-            const caseTypeId = this.caseDetails &&
-                this.caseDetails.case_type &&
-                this.caseDetails.case_type.id ? this.caseDetails.case_type.id : null;
-            const caseTypeJurisdictionId = this.caseDetails &&
-                this.caseDetails.case_type &&
-                this.caseDetails.case_type.jurisdiction &&
-                this.caseDetails.case_type.jurisdiction.id ? this.caseDetails.case_type.jurisdiction.id : null;
+            const caseTypeId = this.caseTypeId ? this.caseTypeId : null;
+            const caseTypeJurisdictionId = this.jurisdictionId ? this.jurisdictionId : null;
             documentUpload.append('caseTypeId', caseTypeId);
             documentUpload.append('jurisdictionId', caseTypeJurisdictionId);
         }
@@ -12681,7 +12694,7 @@ WriteDocumentFieldComponent.DOCUMENT_HASH = 'document_hash';
 WriteDocumentFieldComponent.UPLOAD_ERROR_FILE_REQUIRED = 'File required';
 WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE = 'Document upload facility is not available at the moment';
 WriteDocumentFieldComponent.UPLOAD_WAITING_FILE_STATUS = 'Uploading...';
-WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$4.MatDialog), i0.ɵɵdirectiveInject(FileUploadStateService)); };
+WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$4.MatDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService)); };
 WriteDocumentFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) { if (rf & 1) {
         i0.ɵɵviewQuery(_c0$N, 5);
     } if (rf & 2) {
@@ -12739,7 +12752,7 @@ WriteDocumentFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteDocumentFieldComponent, [{
         type: Component,
         args: [{ selector: 'ccd-write-document-field', template: "<div class=\"form-group\" [ngClass]=\"{'form-group-error bottom-30': !valid}\">\n  <label [for]=\"id()\">\n    <span class=\"form-label\" attr.aria-label=\"{{caseField | ccdFieldLabel}}\">{{(caseField | ccdFieldLabel) | rpxTranslate}}</span>\n  </label>\n  <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">{{caseField.hint_text | rpxTranslate}}</span>\n  <span class=\"error-message\" *ngIf=\"fileUploadMessages && !valid\">{{fileUploadMessages | rpxTranslate}}</span>\n\n  <div>\n    <!--<span *ngIf=\"getUploadedFileName()\" class=\"text-16\">File name: {{getUploadedFileName()}}</span>-->\n    <ccd-read-document-field *ngIf=\"caseField\" [caseField]=\"caseField\"></ccd-read-document-field>\n  </div>\n\n  <div style='position:relative'>\n\n    <div [id]=\"createElementId('fileInputWrapper')\" (click)=\"fileSelectEvent()\"></div>\n    <input class=\"form-control bottom-30\" [id]=\"id()\" type=\"file\" (keydown.Tab)=\"fileValidationsOnTab()\" (change)=\"fileChangeEvent($event)\"\n           accept=\"{{caseField.field_type.regular_expression}}\" #fileInput/>\n  </div>\n</div>\n<div class=\"form-group bottom-30\">\n  <button class=\"button button-secondary\" type=\"button\" aria-label=\"Cancel upload\" (click)=\"cancelUpload()\" [disabled]=\"!isUploadInProgress()\">{{'Cancel upload' | rpxTranslate}}</button>\n</div>\n" }]
-    }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$4.MatDialog }, { type: FileUploadStateService }]; }, { fileInput: [{
+    }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$4.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
         }], clickout: [{
@@ -13786,7 +13799,7 @@ class WriteJudicialUserFieldComponent extends WriteComplexFieldComponent {
     ngOnInit() {
         super.ngOnInit();
         this.judicialUserControl = new FormControl(this.caseField.value);
-        // FormControl needs to be added to the main UntypedFormGroup so it can be picked up by the PageValidationService when
+        // FormControl needs to be added to the main FormGroup so it can be picked up by the PageValidationService when
         // checking if the page is valid. formGroup.setControl() is used here to ensure any existing JudicialUser
         // FormControl is replaced when the component is re-initialised, for example, if the user navigates away then
         // back to the page containing the JudicialUser field
@@ -13838,6 +13851,17 @@ class WriteJudicialUserFieldComponent extends WriteComplexFieldComponent {
             this.jurisdiction = caseInfo?.jurisdiction;
             this.caseType = caseInfo?.caseType;
         }
+        else {
+            // If there is no case info, attempt to get the current jurisdiction and case type via the JurisdictionService
+            this.jurisdictionSubscription = this.jurisdictionService.selectedJurisdictionBS.subscribe((jurisdiction) => {
+                if (jurisdiction) {
+                    this.jurisdiction = jurisdiction.id;
+                    if (jurisdiction.currentCaseType) {
+                        this.caseType = jurisdiction.currentCaseType.id;
+                    }
+                }
+            });
+        }
     }
     displayJudicialUser(judicialUser) {
         return judicialUser
@@ -13881,6 +13905,9 @@ class WriteJudicialUserFieldComponent extends WriteComplexFieldComponent {
             this.judicialUserControl.setValidators(Validators.required);
         }
     }
+    ngOnDestroy() {
+        this.jurisdictionSubscription?.unsubscribe();
+    }
 }
 WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(CaseFlagRefdataService), i0.ɵɵdirectiveInject(IsCompoundPipe), i0.ɵɵdirectiveInject(FormValidatorsService)); };
 WriteJudicialUserFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteJudicialUserFieldComponent, selectors: [["ccd-write-judicial-user-field"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 12, vars: 17, consts: [[1, "form-group", 3, "formGroup", "ngClass"], [3, "for"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [1, "form-control", "bottom-30", 3, "id", "formControl", "matAutocomplete", "blur"], ["autoActiveFirstOption", "", 3, "displayWith"], ["autoComplete", "matAutocomplete"], ["class", "select-option", 3, "ngClass", "value", "onSelectionChange", 4, "ngFor", "ngForOf"], ["class", "select-option", "disabled", "", 4, "ngIf"], [1, "form-label"], [1, "form-hint"], [1, "error-message"], [1, "select-option", 3, "ngClass", "value", "onSelectionChange"], ["disabled", "", 1, "select-option"]], template: function WriteJudicialUserFieldComponent_Template(rf, ctx) { if (rf & 1) {
@@ -16003,7 +16030,7 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
             this.linkedCasesService.caseFieldValue = caseFieldValue.filter(item => unlinkedCaseRefereneIds.indexOf(item.id) === -1);
         }
         this.formGroup.value.caseLinks = this.linkedCasesService.caseFieldValue;
-        this.caseEditForm.controls['data'] = new UntypedFormGroup({ caseLinks: new FormControl(this.linkedCasesService.caseFieldValue || []) });
+        this.caseEditForm.controls['data'] = new FormGroup({ caseLinks: new FormControl(this.linkedCasesService.caseFieldValue || []) });
         this.caseEditDataService.setCaseEditForm(this.caseEditForm);
     }
     isAtFinalPage() {
@@ -16619,7 +16646,7 @@ class WriteOrderSummaryFieldComponent extends AbstractFieldWriteComponent {
       and has to be built manually.
     */
     ngOnInit() {
-        const orderSummaryGroup = this.registerControl(new UntypedFormGroup({}), true);
+        const orderSummaryGroup = this.registerControl(new FormGroup({}), true);
         const paymentReference = new FormControl(this.caseField.value.PaymentReference);
         orderSummaryGroup.addControl('PaymentReference', paymentReference);
         const paymentTotal = new FormControl(this.caseField.value.PaymentTotal);
@@ -16631,12 +16658,12 @@ class WriteOrderSummaryFieldComponent extends AbstractFieldWriteComponent {
         orderSummaryGroup.addControl('Fees', feesArray);
     }
     getFeeValue(feeValue) {
-        const feeGroup = new UntypedFormGroup({});
+        const feeGroup = new FormGroup({});
         feeGroup.addControl('FeeCode', new FormControl(feeValue.FeeCode));
         feeGroup.addControl('FeeAmount', new FormControl(feeValue.FeeAmount));
         feeGroup.addControl('FeeDescription', new FormControl(feeValue.FeeDescription));
         feeGroup.addControl('FeeVersion', new FormControl(feeValue.FeeVersion));
-        const feeValueGroup = new UntypedFormGroup({});
+        const feeValueGroup = new FormGroup({});
         feeValueGroup.addControl('value', feeGroup);
         return feeValueGroup;
     }
@@ -16887,7 +16914,7 @@ class WriteOrganisationFieldComponent extends AbstractFieldWriteComponent {
         this.searchOrgTextFormControl = new FormControl('');
         this.searchOrgValue$ = this.searchOrgTextFormControl.valueChanges;
         this.searchOrgValue$.subscribe(value => this.onSearchOrg(value));
-        this.organisationFormGroup = this.registerControl(new UntypedFormGroup({}), true);
+        this.organisationFormGroup = this.registerControl(new FormGroup({}), true);
         if (this.parent && this.parent.controls && this.parent.controls.hasOwnProperty(WriteOrganisationFieldComponent.PRE_POPULATE_TO_USERS_ORGANISATION)
             && this.parent.controls[WriteOrganisationFieldComponent.PRE_POPULATE_TO_USERS_ORGANISATION].value
             && this.parent.controls[WriteOrganisationFieldComponent.PRE_POPULATE_TO_USERS_ORGANISATION].value.toUpperCase()
@@ -17711,7 +17738,7 @@ class FieldReadComponent extends AbstractFieldReadComponent {
         this.resolver = resolver;
         this.paletteService = paletteService;
         this.withLabel = false;
-        this.formGroup = new UntypedFormGroup({});
+        this.formGroup = new FormGroup({});
         this.caseFields = [];
     }
     ngOnInit() {
@@ -17734,7 +17761,7 @@ class FieldReadComponent extends AbstractFieldReadComponent {
             }
             component.instance['caseField'] = this.caseField;
             component.instance['caseFields'] = this.caseFields;
-            component.instance['UntypedFormGroup'] = this.formGroup;
+            component.instance['formGroup'] = this.formGroup;
             component.instance['topLevelFormGroup'] = this.topLevelFormGroup;
             component.instance['idPrefix'] = this.idPrefix;
             component.instance['parent'] = this.parent;
@@ -17808,7 +17835,7 @@ class FieldWriteComponent extends AbstractFieldWriteComponent {
         }
         component.instance['caseField'] = this.caseField;
         component.instance['caseFields'] = this.caseFields;
-        component.instance['UntypedFormGroup'] = this.formGroup;
+        component.instance['formGroup'] = this.formGroup;
         component.instance['parent'] = this.parent;
         component.instance['idPrefix'] = this.idPrefix;
         if (this.caseField.field_type.id === 'AddressGlobal') {
@@ -18439,7 +18466,7 @@ class CaseFileViewFolderComponent {
         }
     }
     ngOnInit() {
-        this.documentFilterFormGroup = new UntypedFormGroup({});
+        this.documentFilterFormGroup = new FormGroup({});
         this.documentSearchFormControl = new FormControl('');
         this.documentFilterFormGroup.addControl(CaseFileViewFolderComponent.DOCUMENT_SEARCH_FORM_CONTROL_NAME, this.documentSearchFormControl);
         // Listen to search input and initiate filter documents if at least three characters entered
@@ -22248,13 +22275,13 @@ PaletteModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         CaseFlagRefdataService,
         YesNoService,
         CollectionCreateCheckerService,
+        JurisdictionService,
         PaletteService,
         FormValidatorsService,
         FileUploadStateService,
         FileUploadProgressGuard,
         WindowService,
         CommonDataService,
-        JurisdictionService,
         LinkedCasesService,
         { provide: MAT_DATE_LOCALE, useValue: 'en-GB' }
     ], imports: [CommonModule,
@@ -22353,18 +22380,17 @@ PaletteModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
                     CaseFlagRefdataService,
                     YesNoService,
                     CollectionCreateCheckerService,
+                    JurisdictionService,
                     PaletteService,
                     FormValidatorsService,
                     FileUploadStateService,
                     FileUploadProgressGuard,
                     WindowService,
                     CommonDataService,
-                    JurisdictionService,
                     LinkedCasesService,
                     { provide: MAT_DATE_LOCALE, useValue: 'en-GB' }
                 ],
-                schemas: [NO_ERRORS_SCHEMA],
-                entryComponents: [CaseFileViewFolderSelectorComponent]
+                schemas: [CUSTOM_ELEMENTS_SCHEMA]
             }]
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(PaletteModule, { declarations: [FixedListPipe,
@@ -23693,13 +23719,13 @@ CaseEditorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         FormsModule,
         ReactiveFormsModule,
         CaseEditDataModule,
-        PaletteModule,
         LabelSubstitutorModule,
         ConditionalShowModule,
         ErrorsModule,
         PortalModule,
         LoadingSpinnerModule,
         BannersModule,
+        PaletteModule,
         RpxTranslationModule.forChild()] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditorModule, [{
         type: NgModule,
@@ -23710,13 +23736,13 @@ CaseEditorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
                     FormsModule,
                     ReactiveFormsModule,
                     CaseEditDataModule,
-                    PaletteModule,
                     LabelSubstitutorModule,
                     ConditionalShowModule,
                     ErrorsModule,
                     PortalModule,
                     LoadingSpinnerModule,
                     BannersModule,
+                    PaletteModule,
                     RpxTranslationModule.forChild()
                 ],
                 declarations: [
@@ -23788,13 +23814,13 @@ CaseEditorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         FormsModule,
         ReactiveFormsModule,
         CaseEditDataModule,
-        PaletteModule,
         LabelSubstitutorModule,
         ConditionalShowModule,
         ErrorsModule,
         PortalModule,
         LoadingSpinnerModule,
-        BannersModule, i1$1.RpxTranslationModule], exports: [CaseEditConfirmComponent,
+        BannersModule,
+        PaletteModule, i1$1.RpxTranslationModule], exports: [CaseEditConfirmComponent,
         CaseEditComponent,
         CaseEditPageComponent,
         CaseEditFormComponent,
@@ -23803,11 +23829,11 @@ CaseEditorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         CaseProgressComponent,
         CallbackErrorsComponent] }); })();
 i0.ɵɵsetComponentScope(CaseEditConfirmComponent, function () { return [i1.NgIf, i3.ɵNgNoValidate, i3.NgControlStatusGroup, i3.FormGroupDirective, MarkdownComponent]; }, function () { return [CaseReferencePipe, CcdCaseTitlePipe, i1$1.RpxTranslatePipe]; });
-i0.ɵɵsetComponentScope(CaseEditPageComponent, function () { return [i1.NgForOf, i1.NgIf, i3.ɵNgNoValidate, i3.NgControlStatusGroup, i3.FormGroupDirective, MarkdownComponent, CallbackErrorsComponent, CaseEditFormComponent,
+i0.ɵɵsetComponentScope(CaseEditPageComponent, function () { return [i1.NgForOf, i1.NgIf, i3.ɵNgNoValidate, i3.NgControlStatusGroup, i3.FormGroupDirective, CallbackErrorsComponent, MarkdownComponent, CaseEditFormComponent,
     CaseEventCompletionComponent,
     CaseEditGenericErrorsComponent]; }, function () { return [i1.AsyncPipe, CaseReferencePipe, CcdCaseTitlePipe, i1$1.RpxTranslatePipe]; });
-i0.ɵɵsetComponentScope(CaseEditFormComponent, function () { return [i1.NgForOf, i1.NgIf, i1.NgSwitch, i1.NgSwitchCase, i3.NgControlStatusGroup, i3.FormGroupDirective, FieldReadComponent, FieldWriteComponent, LabelSubstitutorDirective, ConditionalShowFormDirective]; }, function () { return [IsCompoundPipe, IsReadOnlyAndNotCollectionPipe]; });
-i0.ɵɵsetComponentScope(CaseEditSubmitComponent, function () { return [i1.NgForOf, i1.NgIf, i1.NgSwitch, i1.NgSwitchCase, i3.ɵNgNoValidate, i3.DefaultValueAccessor, i3.NgControlStatus, i3.NgControlStatusGroup, i3.MaxLengthValidator, i3.FormGroupDirective, i3.FormControlName, i3.FormGroupName, MarkdownComponent, FieldReadComponent, LabelSubstitutorDirective, CallbackErrorsComponent, CaseEventCompletionComponent,
+i0.ɵɵsetComponentScope(CaseEditFormComponent, function () { return [i1.NgForOf, i1.NgIf, i1.NgSwitch, i1.NgSwitchCase, i3.NgControlStatusGroup, i3.FormGroupDirective, LabelSubstitutorDirective, ConditionalShowFormDirective, FieldReadComponent, FieldWriteComponent]; }, function () { return [IsCompoundPipe, IsReadOnlyAndNotCollectionPipe]; });
+i0.ɵɵsetComponentScope(CaseEditSubmitComponent, function () { return [i1.NgForOf, i1.NgIf, i1.NgSwitch, i1.NgSwitchCase, i3.ɵNgNoValidate, i3.DefaultValueAccessor, i3.NgControlStatus, i3.NgControlStatusGroup, i3.MaxLengthValidator, i3.FormGroupDirective, i3.FormControlName, i3.FormGroupName, LabelSubstitutorDirective, CallbackErrorsComponent, MarkdownComponent, FieldReadComponent, CaseEventCompletionComponent,
     CaseEditGenericErrorsComponent]; }, function () { return [IsCompoundPipe, CaseReferencePipe, CcdCaseTitlePipe, CcdCYAPageLabelFilterPipe, ReadFieldsFilterPipe, CcdPageFieldsPipe, i1$1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(CaseCreateComponent, function () { return [i1.NgIf, CaseEditComponent]; }, []);
 i0.ɵɵsetComponentScope(CaseProgressComponent, function () { return [i1.NgIf, CaseEditComponent]; }, []);
@@ -24680,7 +24706,7 @@ class WorkbasketFiltersComponent {
         this.windowService = windowService;
         this.onApply = new EventEmitter();
         this.onReset = new EventEmitter();
-        this.formGroup = new UntypedFormGroup({});
+        this.formGroup = new FormGroup({});
         this.initialised = false;
     }
     ngOnInit() {
@@ -24724,9 +24750,20 @@ class WorkbasketFiltersComponent {
         if (init) {
             this.windowService.setLocalStorage(SAVED_QUERY_PARAM_LOC_STORAGE, JSON.stringify(queryParams));
             if (Object.keys(this.formGroup.controls).length > 0) {
+                // Find all "special case" JudicialUser FormControl keys and remove the corresponding values from the
+                // FormGroup value because these values are not intended to be stored and subsequently passed as query string
+                // parameters when calling searchCases API endpoint
+                const judicialUserControlValuesToRemove = Object.keys(this.formGroup.controls).filter((key) => key.endsWith('_judicialUserControl'));
+                judicialUserControlValuesToRemove.forEach((controlKey) => delete this.formGroup.value[controlKey]);
                 this.windowService.setLocalStorage(FORM_GROUP_VAL_LOC_STORAGE, JSON.stringify(this.formGroup.value));
             }
         }
+        // Announce selected jurisdiction via JurisdictionService
+        if (this.selected.jurisdiction) {
+            // Set the selected case type as the current case type of the selected jurisdiction
+            this.selected.jurisdiction.currentCaseType = this.selected.caseType;
+            this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
+        }
         // Apply filters
         this.onApply.emit({ selected: this.selected, queryParams });
         this.setFocusToTop();
@@ -24772,7 +24809,7 @@ class WorkbasketFiltersComponent {
         if (this.selected.caseType) {
             this.selectedCaseTypeStates = this.sortStates(this.selected.caseType.states);
             this.selected.caseState = null;
-            this.formGroup = new UntypedFormGroup({});
+            this.formGroup = new FormGroup({});
             this.clearWorkbasketInputs();
             if (!this.isApplyButtonDisabled()) {
                 this.workbasketInputFilterService.getWorkbasketInputs(this.selected.jurisdiction.id, this.selected.caseType.id).pipe(take(1)).subscribe(workbasketInputs => {
@@ -26894,8 +26931,8 @@ class CaseFullAccessViewComponent {
     }
     /**
      * For EUI-3825:
-     * Builds a UntypedFormGroup from all the CaseFields contained within the view.
-     * This UntypedFormGroup is necessary for evaluation the show/hide conditions of
+     * Builds a FormGroup from all the CaseFields contained within the view.
+     * This FormGroup is necessary for evaluation the show/hide conditions of
      * fields that are dependent on a field only available on a DIFFERENT tab.
      */
     buildFormGroup(caseFields) {
@@ -26908,7 +26945,7 @@ class CaseFullAccessViewComponent {
                 };
             });
         }
-        return new UntypedFormGroup({ data: new FormControl(value) });
+        return new FormGroup({ data: new FormControl(value) });
     }
     resetErrors() {
         this.error = null;
@@ -29407,13 +29444,14 @@ function CreateCaseFiltersComponent_option_27_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 2, e_r5.name));
 } }
 class CreateCaseFiltersComponent {
-    constructor(orderService, definitionsService, sessionStorageService) {
+    constructor(orderService, definitionsService, sessionStorageService, jurisdictionService) {
         this.orderService = orderService;
         this.definitionsService = definitionsService;
         this.sessionStorageService = sessionStorageService;
+        this.jurisdictionService = jurisdictionService;
         this.selectionSubmitted = new EventEmitter();
         this.selectionChanged = new EventEmitter();
-        this.formGroup = new UntypedFormGroup({});
+        this.formGroup = new FormGroup({});
     }
     ngOnInit() {
         this.selected = {};
@@ -29463,6 +29501,8 @@ class CreateCaseFiltersComponent {
             !this.isDisabled;
     }
     apply() {
+        this.selected.jurisdiction.currentCaseType = this.selected.caseType;
+        this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
         this.selectionSubmitted.emit({
             jurisdictionId: this.selected.jurisdiction.id,
             caseTypeId: this.selected.caseType.id,
@@ -29543,7 +29583,7 @@ class CreateCaseFiltersComponent {
         return value === null || value === undefined;
     }
 }
-CreateCaseFiltersComponent.ɵfac = function CreateCaseFiltersComponent_Factory(t) { return new (t || CreateCaseFiltersComponent)(i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(DefinitionsService), i0.ɵɵdirectiveInject(SessionStorageService)); };
+CreateCaseFiltersComponent.ɵfac = function CreateCaseFiltersComponent_Factory(t) { return new (t || CreateCaseFiltersComponent)(i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(DefinitionsService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(JurisdictionService)); };
 CreateCaseFiltersComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CreateCaseFiltersComponent, selectors: [["ccd-create-case-filters"]], inputs: { isDisabled: "isDisabled", startButtonText: "startButtonText" }, outputs: { selectionSubmitted: "selectionSubmitted", selectionChanged: "selectionChanged" }, decls: 31, vars: 28, consts: [[3, "ngSubmit"], [1, "form-group"], ["for", "cc-jurisdiction", 1, "form-label"], ["id", "cc-jurisdiction", "name", "jurisdiction", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["value", ""], [3, "value", 4, "ngFor", "ngForOf"], ["for", "cc-case-type", 1, "form-label"], ["id", "cc-case-type", "name", "case-type", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["for", "cc-event", 1, "form-label"], ["id", "cc-event", "name", "event", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["type", "submit", 1, "button", 3, "disabled"], [3, "value"]], template: function CreateCaseFiltersComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "form", 0);
         i0.ɵɵlistener("ngSubmit", function CreateCaseFiltersComponent_Template_form_ngSubmit_0_listener() { return ctx.apply(); });
@@ -29620,7 +29660,7 @@ CreateCaseFiltersComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CreateCaseFiltersComponent, [{
         type: Component,
         args: [{ selector: 'ccd-create-case-filters', template: "<form  (ngSubmit)=\"apply()\">\n  <div class=\"form-group\">\n    <label class=\"form-label\" for=\"cc-jurisdiction\">{{'Jurisdiction' | rpxTranslate}}</label>\n    <select class=\"form-control ccd-dropdown\" id=\"cc-jurisdiction\" name=\"jurisdiction\" [formControl]=\"filterJurisdictionControl\" (change)=\"onJurisdictionIdChange()\">\n      <option value=\"\">--{{'Select a value' | rpxTranslate}}--</option>\n      <option *ngFor=\"let j of jurisdictions\" [value]=\"j.id\">{{j.name | rpxTranslate}}</option>\n    </select>\n  </div>\n\n  <div class=\"form-group\">\n    <label class=\"form-label\" for=\"cc-case-type\">{{'Case type' | rpxTranslate}}</label>\n    <select class=\"form-control ccd-dropdown\" id=\"cc-case-type\" name=\"case-type\" [formControl]=\"filterCaseTypeControl\" (change)=\"onCaseTypeIdChange()\">\n      <option value=\"\">--{{'Select a value' | rpxTranslate}}--</option>\n      <option *ngFor=\"let ct of selectedJurisdictionCaseTypes\" [value]=\"ct.id\">{{ct.name | rpxTranslate}}</option>\n    </select>\n  </div>\n\n  <div class=\"form-group\">\n    <label class=\"form-label\" for=\"cc-event\">{{'Event' | rpxTranslate}}</label>\n    <select class=\"form-control ccd-dropdown\" id=\"cc-event\" name=\"event\" [formControl]=\"filterEventControl\" (change)=\"onEventIdChange()\">\n      <option value=\"\">--{{'Select a value' | rpxTranslate}}--</option>\n      <option *ngFor=\"let e of selectedCaseTypeEvents\" [value]=\"e.id\">{{e.name | rpxTranslate}}</option>\n    </select>\n  </div>\n\n  <button type=\"submit\" class=\"button\" [disabled]=\"!isCreatable()\">{{startButtonText | rpxTranslate}}</button>\n</form>\n" }]
-    }], function () { return [{ type: OrderService }, { type: DefinitionsService }, { type: SessionStorageService }]; }, { isDisabled: [{
+    }], function () { return [{ type: OrderService }, { type: DefinitionsService }, { type: SessionStorageService }, { type: JurisdictionService }]; }, { isDisabled: [{
             type: Input
         }], startButtonText: [{
             type: Input
@@ -29744,7 +29784,7 @@ class SearchFiltersComponent {
         this.onApply = new EventEmitter();
         this.onReset = new EventEmitter();
         this.onJurisdiction = new EventEmitter();
-        this.formGroup = new UntypedFormGroup({});
+        this.formGroup = new FormGroup({});
     }
     ngOnInit() {
         this.selected = {};
@@ -29820,7 +29860,7 @@ class SearchFiltersComponent {
         this.onJurisdiction.emit(this.selected.jurisdiction);
     }
     onCaseTypeIdChange() {
-        this.formGroup = new UntypedFormGroup({});
+        this.formGroup = new FormGroup({});
         this.searchInputsReady = false;
         this.searchInputs = [];
         this.searchService.getSearchInputs(this.selected.jurisdiction.id, this.selected.caseType.id).pipe(tap(() => this.searchInputsReady = true)).subscribe(searchInputs => {