@hmcts/ccd-case-ui-toolkit 6.19.5-secure-doc-case-creation.1 → 6.19.6-rc1

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -9892,8 +9892,38 @@
             }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null);
     })();
 
+    var ValidPageListCaseFieldsService = /** @class */ (function () {
+        function ValidPageListCaseFieldsService() {
+        }
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, notFromEventSubmit, fromPreviousPage) {
+            if (fromPreviousPage === void 0) { fromPreviousPage = false; }
+            var validPageListCaseFields = [];
+            validPageList.forEach(function (page) {
+                if (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
+                    page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
+                }
+            });
+            if (!fromPreviousPage && validPageListCaseFields.length > 0) {
+                Object.keys(data).forEach(function (key) {
+                    if (validPageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
+                        delete data[key];
+                        ;
+                    }
+                });
+            }
+        };
+        return ValidPageListCaseFieldsService;
+    }());
+    ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(); };
+    ValidPageListCaseFieldsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
+                type: i0.Injectable
+            }], null, null);
+    })();
+
     var CaseEditComponent = /** @class */ (function () {
-        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
+        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService) {
             this.fb = fb;
             this.caseNotifier = caseNotifier;
             this.router = router;
@@ -9907,6 +9937,7 @@
             this.formValueService = formValueService;
             this.formErrorService = formErrorService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.cancelled = new i0.EventEmitter();
             this.submitted = new i0.EventEmitter();
             this.isEventCompletionChecksRequired = false;
@@ -9914,6 +9945,7 @@
             this.ignoreWarning = false;
             this.isLinkedCasesSubmission = false;
             this.callbackErrorsSubject = new rxjs.Subject();
+            this.validPageList = [];
         }
         CaseEditComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -10078,6 +10110,8 @@
             this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
             // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
             this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
+            // delete fields which are not part of the case event journey wizard pages case fields
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, false);
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -10245,7 +10279,7 @@
     }());
     CaseEditComponent.ORIGIN_QUERY_PARAM = 'origin';
     CaseEditComponent.ALERT_MESSAGE = 'Page is being refreshed so you will be redirected to the first page of this event.';
-    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditComponent, selectors: [["ccd-case-edit"]], inputs: { eventTrigger: "eventTrigger", submit: "submit", validate: "validate", saveDraft: "saveDraft", caseDetails: "caseDetails" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, features: [i0__namespace.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "router-outlet");
@@ -10260,7 +10294,7 @@
                         styleUrls: ['../case-edit.scss'],
                         providers: [GreyBarService]
                     }]
-            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }]; }, { eventTrigger: [{
+            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, { eventTrigger: [{
                     type: i0.Input
                 }], submit: [{
                     type: i0.Input
@@ -10956,7 +10990,7 @@
         }
     }
     var CaseEditPageComponent = /** @class */ (function () {
-        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService) {
+        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService) {
             this.caseEdit = caseEdit;
             this.route = route;
             this.formValueService = formValueService;
@@ -10967,6 +11001,7 @@
             this.caseFieldService = caseFieldService;
             this.caseEditDataService = caseEditDataService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
             this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
             this.formValuesChanged = false;
@@ -11177,6 +11212,9 @@
                 }
             }
             if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+                if (this.caseEdit.validPageList.findIndex(function (page) { return page.id === _this.currentPage.id; }) === -1) {
+                    this.caseEdit.validPageList.push(this.currentPage);
+                }
                 this.caseEdit.isSubmitting = true;
                 this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
@@ -11445,6 +11483,8 @@
             this.formValueService.sanitiseDynamicLists(caseFields, formFields);
             // Get hold of the CaseEventData.
             var caseEventData = this.formValueService.sanitise(formFields);
+            // delete fields which are not part of the case event journey wizard pages case fields
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, true, fromPreviousPage);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -11487,7 +11527,7 @@
     CaseEditPageComponent.TRIGGER_TEXT_START = 'Continue';
     CaseEditPageComponent.TRIGGER_TEXT_SAVE = 'Save and continue';
     CaseEditPageComponent.TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Continue';
-    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditPageComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditPageComponent, selectors: [["ccd-case-edit-page"]], decls: 12, vars: 11, consts: [[4, "ngIf"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], [3, "error"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [1, "width-50"], ["class", "form", 3, "formGroup", "submit", 4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], ["class", "govuk-heading-l", 4, "ngIf"], [1, "govuk-heading-l"], [1, "govuk-caption-l"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form", 3, "formGroup", "submit"], ["id", "fieldset-case-data"], [2, "display", "none"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged"], [1, "grid-row"], [1, "column-two-thirds", "rightBorderSeparator"], ["id", "caseEditForm1", 3, "fields", "formGroup", "caseFields"], [1, "column-one-third"], ["id", "caseEditForm2", 3, "fields", "formGroup", "caseFields"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditPageComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
@@ -11530,7 +11570,7 @@
                         templateUrl: 'case-edit-page.html',
                         styleUrls: ['./case-edit-page.scss']
                     }]
-            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }]; }, null);
+            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, null);
     })();
 
     var CallbackErrorsContext = /** @class */ (function () {
@@ -14635,19 +14675,18 @@
     var _c1$k = function (a0) { return { "form-group-error bottom-30": a0 }; };
     var WriteDocumentFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDocumentFieldComponent, _super);
-        function WriteDocumentFieldComponent(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
+        function WriteDocumentFieldComponent(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService) {
             var _this = _super.call(this) || this;
             _this.appConfig = appConfig;
             _this.caseNotifier = caseNotifier;
             _this.documentManagement = documentManagement;
             _this.dialog = dialog;
             _this.fileUploadStateService = fileUploadStateService;
-            _this.jurisdictionService = jurisdictionService;
             _this.valid = true;
             return _this;
         }
         WriteDocumentFieldComponent.prototype.clickout = function (event) {
-            // Capturing the event of the associated  ElementRef <input type="file" #fileInpu
+            // Capturing the event of of the associated  ElementRef <input type="file" #fileInpu
             if (this.fileInput.nativeElement.contains(event.target)) {
                 this.clickInsideTheDocument = true;
             }
@@ -14657,10 +14696,6 @@
         };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             this.secureModeOn = this.appConfig.getDocumentSecureMode();
-            console.info('writeDocumentField.ngInit: secure mode = ' + this.secureModeOn);
-            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.
@@ -14673,6 +14708,9 @@
             else {
                 this.createDocumentForm(document);
             }
+            if (this.appConfig.getDocumentSecureMode()) {
+                this.subscribeToCaseDetails();
+            }
         };
         WriteDocumentFieldComponent.prototype.ngOnDestroy = function () {
             if (this.fileUploadSubscription) {
@@ -14681,11 +14719,8 @@
             if (this.dialogSubscription) {
                 this.dialogSubscription.unsubscribe();
             }
-            if (this.caseNotifierSubscription) {
-                this.caseNotifierSubscription.unsubscribe();
-            }
-            if (this.jurisdictionSubs) {
-                this.jurisdictionSubs.unsubscribe();
+            if (this.caseEventSubscription) {
+                this.caseEventSubscription.unsubscribe();
             }
         };
         WriteDocumentFieldComponent.prototype.isUploadInProgress = function () {
@@ -14737,9 +14772,7 @@
         WriteDocumentFieldComponent.prototype.triggerReplace = function () {
             if (this.confirmReplaceResult === 'Replace') {
                 this.openFileDialog();
-                return true;
             }
-            return false;
         };
         WriteDocumentFieldComponent.prototype.getUploadedFileName = function () {
             if (this.uploadedDocument) {
@@ -14774,30 +14807,11 @@
                 _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
         WriteDocumentFieldComponent.prototype.subscribeToCaseDetails = function () {
             var _this = this;
-            this.caseNotifierSubscription = this.caseNotifier.caseView.subscribe({
+            this.caseEventSubscription = this.caseNotifier.caseView.subscribe({
                 next: function (caseDetails) {
-                    var _a, _b;
-                    _this.caseTypeId = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_id;
-                    _this.jurisdictionId = (_b = (_a = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_type) === null || _a === void 0 ? void 0 : _a.jurisdiction) === null || _b === void 0 ? void 0 : _b.id;
-                    console.info("caseNotifier.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
-                }
-            });
-            this.jurisdictionSubs = this.jurisdictionService.selectedJurisdictionBS.subscribe({
-                next: function (jurisdiction) {
-                    if (jurisdiction) {
-                        _this.jurisdictionId = jurisdiction.id;
-                        if (jurisdiction.currentCaseType) {
-                            _this.caseTypeId = jurisdiction.currentCaseType.id;
-                        }
-                    }
-                    console.info("selectedJurisdiction.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
+                    _this.caseDetails = caseDetails;
                 }
             });
         };
@@ -14861,8 +14875,13 @@
             documentUpload.append('files', selectedFile, selectedFile.name);
             documentUpload.append('classification', 'PUBLIC');
             if (this.appConfig.getDocumentSecureMode()) {
-                var caseTypeId = this.caseTypeId ? this.caseTypeId : null;
-                var caseTypeJurisdictionId = this.jurisdictionId ? this.jurisdictionId : null;
+                var caseTypeId = this.caseDetails &&
+                    this.caseDetails.case_type &&
+                    this.caseDetails.case_type.id ? this.caseDetails.case_type.id : null;
+                var 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;
                 documentUpload.append('caseTypeId', caseTypeId);
                 documentUpload.append('jurisdictionId', caseTypeJurisdictionId);
             }
@@ -14910,7 +14929,7 @@
     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__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService), i0__namespace.ɵɵdirectiveInject(JurisdictionService)); };
+    WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService)); };
     WriteDocumentFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵviewQuery(_c0$N, 1);
@@ -14988,7 +15007,7 @@
                         selector: 'ccd-write-document-field',
                         templateUrl: './write-document-field.html'
                     }]
-            }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
+            }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: FileUploadStateService }]; }, { fileInput: [{
                     type: i0.ViewChild,
                     args: ['fileInput', { static: false }]
                 }], clickout: [{
@@ -16425,12 +16444,24 @@
             }
         };
         WriteJudicialUserFieldComponent.prototype.setJurisdictionAndCaseType = function () {
+            var _this = this;
             var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
             if (caseInfoStr) {
                 var caseInfo = JSON.parse(caseInfoStr);
                 this.jurisdiction = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.jurisdiction;
                 this.caseType = caseInfo === null || caseInfo === void 0 ? void 0 : 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(function (jurisdiction) {
+                    if (jurisdiction) {
+                        _this.jurisdiction = jurisdiction.id;
+                        if (jurisdiction.currentCaseType) {
+                            _this.caseType = jurisdiction.currentCaseType.id;
+                        }
+                    }
+                });
+            }
         };
         WriteJudicialUserFieldComponent.prototype.displayJudicialUser = function (judicialUser) {
             return judicialUser
@@ -16476,6 +16507,10 @@
                 this.judicialUserControl.setValidators(i2$1.Validators.required);
             }
         };
+        WriteJudicialUserFieldComponent.prototype.ngOnDestroy = function () {
+            var _a;
+            (_a = this.jurisdictionSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        };
         return WriteJudicialUserFieldComponent;
     }(WriteComplexFieldComponent));
     WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0__namespace.ɵɵdirectiveInject(JurisdictionService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService), i0__namespace.ɵɵdirectiveInject(IsCompoundPipe), i0__namespace.ɵɵdirectiveInject(FormValidatorsService)); };
@@ -28609,7 +28644,8 @@
             JudicialworkerService,
             CaseworkerService,
             SessionStorageService,
-            EventCompletionStateMachineService
+            EventCompletionStateMachineService,
+            ValidPageListCaseFieldsService
         ], imports: [[
                 i2.CommonModule,
                 i1$1.RouterModule,
@@ -28725,7 +28761,8 @@
                             JudicialworkerService,
                             CaseworkerService,
                             SessionStorageService,
-                            EventCompletionStateMachineService
+                            EventCompletionStateMachineService,
+                            ValidPageListCaseFieldsService
                         ]
                     }]
             }], null, null);
@@ -29820,6 +29857,7 @@
             });
         };
         WorkbasketFiltersComponent.prototype.apply = function (init) {
+            var _this = this;
             // Save filters as query parameters for current route
             var queryParams = {};
             if (this.selected.jurisdiction) {
@@ -29851,9 +29889,20 @@
             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
+                    var judicialUserControlValuesToRemove = Object.keys(this.formGroup.controls).filter(function (key) { return key.endsWith('_judicialUserControl'); });
+                    judicialUserControlValuesToRemove.forEach(function (controlKey) { return 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: queryParams });
             this.setFocusToTop();