@hmcts/ccd-case-ui-toolkit 7.0.12 → 7.0.13-address-validation-fix

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

@@ -8,7 +8,7 @@ import * as i1$1 from '@angular/router';
 import { RouterModule, NavigationStart, NavigationEnd } from '@angular/router';
 import * as i3 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Validators, ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { throwError, Subject, EMPTY, Observable, of, BehaviorSubject, timer, fromEvent, forkJoin, Subscription, combineLatest } from 'rxjs';
+import { throwError, Subject, EMPTY, Observable, BehaviorSubject, of, timer, fromEvent, forkJoin, Subscription, combineLatest } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
 import { catchError, map, publish, refCount, switchMap, debounceTime, delay, distinctUntilChanged, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, first, takeUntil, filter } from 'rxjs/operators';
@@ -4534,6 +4534,7 @@ class Constants {
 }
 Constants.MANDATORY = 'MANDATORY';
 Constants.REGEX_WHITESPACES = '^[^ ]+(?:\\s+[^ ]+)*$';
+Constants.TASK_COMPLETION_ERROR = 'The associated task for this event failed to complete automatically. Please complete the task manually in the Tasks tab on the case';
 Constants.ɵfac = function Constants_Factory(t) { return new (t || Constants)(); };
 Constants.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: Constants, factory: Constants.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(Constants, [{
@@ -6252,6 +6253,7 @@ class AddressesService {
     constructor(http, appConfig) {
         this.http = http;
         this.appConfig = appConfig;
+        this.mandatoryError = new BehaviorSubject(false);
     }
     getAddressesForPostcode(postcode) {
         return this.http
@@ -6260,6 +6262,12 @@ class AddressesService {
             .pipe(map(res => res.results))
             .pipe(map(output => output.map(addresses => this.format(new AddressParser().parse(addresses[AddressType.DPA])))));
     }
+    getMandatoryError() {
+        return this.mandatoryError.asObservable();
+    }
+    setMandatoryError(value) {
+        this.mandatoryError.next(value);
+    }
     format(addressModel) {
         return this.formatAddressLines(this.shiftAddressLinesUp(addressModel));
     }
@@ -8656,7 +8664,7 @@ ValidPageListCaseFieldsService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({
     }], function () { return [{ type: FieldsUtils }]; }, null); })();
 
 class CaseEditComponent {
-    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService) {
+    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService, alertService) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
         this.router = router;
@@ -8672,6 +8680,7 @@ class CaseEditComponent {
         this.loadingService = loadingService;
         this.validPageListCaseFieldsService = validPageListCaseFieldsService;
         this.workAllocationService = workAllocationService;
+        this.alertService = alertService;
         this.cancelled = new EventEmitter();
         this.submitted = new EventEmitter();
         this.isEventCompletionChecksRequired = false;
@@ -8960,6 +8969,7 @@ class CaseEditComponent {
         const loadingSpinnerToken = this.loadingService.register();
         // keep the initial event response to finalise process after task completion
         let eventResponse;
+        this.sessionStorageService.setItem('taskCompletionError', 'false');
         submit(caseEventData).pipe(switchMap((response) => {
             eventResponse = response;
             return this.postCompleteTaskIfRequired();
@@ -8981,10 +8991,13 @@ class CaseEditComponent {
                 this.isSubmitting = false;
             }
             else {
+                this.sessionStorageService.setItem('taskCompletionError', 'true');
                 // task assignment/completion error - handled within workallocation service
                 // could set task to be deleted (or completed later)?
-                // note: think error messages only shown if user is caseworker - might reqauire changing
                 this.finishEventCompletionLogic(eventResponse);
+                // below allows error to be shown on navigation to confirmation page
+                this.alertService.setPreserveAlerts(true);
+                this.alertService.error({ phrase: Constants.TASK_COMPLETION_ERROR });
             }
         });
     }
@@ -9040,14 +9053,14 @@ class CaseEditComponent {
 }
 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.ɵɵdirectiveInject(i3.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService)); };
+CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i3.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService)); };
 CaseEditComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵ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.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelement(0, "router-outlet");
     } }, dependencies: [i1$1.RouterOutlet], styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{border-bottom:0px}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.no-bottom-border[_ngcontent-%COMP%]{border-bottom:none}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-edit', providers: [GreyBarService], template: "<router-outlet></router-outlet>\n", styles: ["#fieldset-case-data{margin-bottom:30px}#fieldset-case-data th{width:1%;white-space:nowrap;vertical-align:top}.compound-field td{padding:0}#confirmation-header{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body{width:630px;background-color:#fff}.valign-top{vertical-align:top}.summary-fields{margin-bottom:30px}.summary-fields tbody tr th,.summary-fields tbody tr td{border-bottom:0px}a.disabled{pointer-events:none;cursor:default}.case-field-label{width:45%}.case-field-content{width:50%}.no-bottom-border{border-bottom:none}.case-field-change{width:5%}\n"] }]
-    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }]; }, { eventTrigger: [{
+    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }, { type: AlertService }]; }, { eventTrigger: [{
             type: Input
         }], submit: [{
             type: Input
@@ -9610,7 +9623,7 @@ function CaseEditPageComponent_ccd_case_event_completion_11_Template(rf, ctx) {
     i0.ɵɵproperty("eventCompletionParams", ctx_r8.caseEdit.eventCompletionParams);
 } }
 class CaseEditPageComponent {
-    constructor(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService) {
+    constructor(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService, addressService) {
         this.caseEdit = caseEdit;
         this.route = route;
         this.formValueService = formValueService;
@@ -9622,6 +9635,7 @@ class CaseEditPageComponent {
         this.caseEditDataService = caseEditDataService;
         this.loadingService = loadingService;
         this.validPageListCaseFieldsService = validPageListCaseFieldsService;
+        this.addressService = addressService;
         this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
         this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
         this.formValuesChanged = false;
@@ -9744,7 +9758,14 @@ class CaseEditPageComponent {
                     }
                 }
                 if (fieldElement.hasError('required')) {
-                    this.caseEditDataService.addFormValidationError({ id, message: `%FIELDLABEL% is required`, label });
+                    if (casefield.id === 'AddressLine1') {
+                        // EUI-1067 - Display more relevant error message to user and correctly navigate to the field
+                        this.addressService.setMandatoryError(true);
+                        this.caseEditDataService.addFormValidationError({ id: `${path}_${path}`, message: `An address is required` });
+                    }
+                    else {
+                        this.caseEditDataService.addFormValidationError({ id, message: `%FIELDLABEL% is required`, label });
+                    }
                     fieldElement.markAsDirty();
                     // For the JudicialUser field type, an error needs to be set on the component so that an error message
                     // can be displayed at field level
@@ -9819,6 +9840,7 @@ class CaseEditPageComponent {
             }
         }
         if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+            this.addressService.setMandatoryError(false);
             console.log('Case Edit Error', this.caseEdit.error);
             if (this.caseEdit.validPageList.findIndex(page => page.id === this.currentPage.id) === -1) {
                 this.caseEdit.validPageList.push(this.currentPage);
@@ -10118,7 +10140,7 @@ CaseEditPageComponent.RESUMED_FORM_SAVE = 'RESUMED_FORM_SAVE';
 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.ɵɵdirectiveInject(CaseEditComponent), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(PageValidationService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(CaseFieldService), i0.ɵɵdirectiveInject(CaseEditDataService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
+CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0.ɵɵdirectiveInject(CaseEditComponent), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(PageValidationService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(CaseFieldService), i0.ɵɵdirectiveInject(CaseEditDataService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(AddressesService)); };
 CaseEditPageComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵ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.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
         i0.ɵɵtemplate(1, CaseEditPageComponent_div_1_Template, 1, 0, "div", 1);
@@ -10153,7 +10175,7 @@ CaseEditPageComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseE
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditPageComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-edit-page', template: "<ng-container *ngIf=\"currentPage\">\n  <h1 *ngIf=\"!currentPage.label\" class=\"govuk-heading-l\">{{eventTrigger.name | rpxTranslate}}</h1>\n  <ng-container *ngIf=\"currentPage.label\">\n    <span class=\"govuk-caption-l\">{{ eventTrigger.name | rpxTranslate}}</span>\n    <h1 class=\"govuk-heading-l\">{{currentPage.label | rpxTranslate}}</h1>\n  </ng-container>\n</ng-container>\n\n<!--Case ID or Title -->\n<div *ngIf=\"getCaseTitle(); then titleBlock; else idBlock\"></div>\n<ng-template #titleBlock>\n  <ccd-markdown [content]=\"getCaseTitle() | ccdCaseTitle: caseFields : editForm.controls['data']\"></ccd-markdown>\n</ng-template>\n<ng-template #idBlock>\n  <h2 *ngIf=\"getCaseId()\" class=\"heading-h2\">#{{ getCaseId() | ccdCaseReference }}</h2>\n</ng-template>\n\n<!-- Error message summary -->\n<div *ngIf=\"validationErrors.length > 0\" class=\"govuk-error-summary\" aria-labelledby=\"error-summary-title\" role=\"alert\" tabindex=\"-1\" data-module=\"govuk-error-summary\">\n  <h2 class=\"govuk-error-summary__title\" id=\"error-summary-title\">\n    {{'There is a problem' | rpxTranslate}}\n  </h2>\n  <div *ngFor=\"let validationError of validationErrors\" class=\"govuk-error-summary__body\">\n    <ul class=\"govuk-list govuk-error-summary__list\">\n      <li>\n        <a (click)=\"navigateToErrorElement(validationError.id)\" class=\"validation-error\">\n          {{ validationError.message | rpxTranslate: getRpxTranslatePipeArgs(validationError.label | rpxTranslate): null }}\n        </a>\n      </li>\n    </ul>\n  </div>\n</div>\n\n<ccd-case-edit-generic-errors [error]=\"caseEdit.error\"></ccd-case-edit-generic-errors>\n\n<ccd-callback-errors\n  [triggerTextContinue]=\"triggerTextStart\"\n  [triggerTextIgnore]=\"triggerTextIgnoreWarnings\"\n  [callbackErrorsSubject]=\"caseEdit.callbackErrorsSubject\"\n  (callbackErrorsContext)=\"callbackErrorsNotify($event)\">\n</ccd-callback-errors>\n<div class=\"width-50\">\n  <form *ngIf=\"currentPage\" class=\"form\" [formGroup]=\"editForm\" (submit)=\"submit()\">\n    <fieldset id=\"fieldset-case-data\">\n      <legend style=\"display: none;\"></legend>\n      <!-- single column -->\n      <ccd-case-edit-form id='caseEditForm' *ngIf=\"!currentPage.isMultiColumn()\" [fields]=\"currentPage.getCol1Fields()\"\n                          [formGroup]=\"editForm.controls['data']\" [caseFields]=\"caseFields\"\n                          [pageChangeSubject]=\"pageChangeSubject\"\n                          (valuesChanged)=\"applyValuesChanged($event)\"></ccd-case-edit-form>\n      <!-- two columns -->\n      <div *ngIf=\"currentPage.isMultiColumn()\" class=\"grid-row\">\n        <div class=\"column-two-thirds rightBorderSeparator\">\n          <ccd-case-edit-form id='caseEditForm1' [fields]=\"currentPage.getCol1Fields()\"\n                              [formGroup]=\"editForm.controls['data']\" [caseFields]=\"caseFields\"></ccd-case-edit-form>\n        </div>\n        <div class=\"column-one-third\">\n          <ccd-case-edit-form id='caseEditForm2' [fields]=\"currentPage.getCol2Fields()\"\n                              [formGroup]=\"editForm.controls['data']\" [caseFields]=\"caseFields\"></ccd-case-edit-form>\n        </div>\n      </div>\n    </fieldset>\n\n    <div class=\"form-group form-group-related\">\n      <button class=\"button button-secondary\" type=\"button\" [disabled]=\"!(hasPreviousPage$ | async)\" (click)=\"toPreviousPage()\">\n        {{'Previous' | rpxTranslate}}\n      </button>\n      <button class=\"button\" type=\"submit\" [disabled]=\"submitting()\">{{triggerText | rpxTranslate}}</button>\n    </div>\n\n    <p class=\"cancel\"><a (click)=\"cancel()\" href=\"javascript:void(0)\">{{getCancelText() | rpxTranslate}}</a></p>\n  </form>\n</div>\n\n<ccd-case-event-completion *ngIf=\"caseEdit.isEventCompletionChecksRequired\"\n  [eventCompletionParams]=\"caseEdit.eventCompletionParams\"\n  (eventCanBeCompleted)=\"onEventCanBeCompleted($event)\">\n</ccd-case-event-completion>\n", styles: [".rightBorderSeparator{border-right-width:4px;border-right-color:#ffcc02;border-right-style:solid}.validation-error{cursor:pointer;text-decoration:underline;color:#d4351c}\n"] }]
-    }], function () { return [{ type: CaseEditComponent }, { type: i1$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0.ChangeDetectorRef }, { type: PageValidationService }, { type: i1$3.MatLegacyDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, null); })();
+    }], function () { return [{ type: CaseEditComponent }, { type: i1$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0.ChangeDetectorRef }, { type: PageValidationService }, { type: i1$3.MatLegacyDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: AddressesService }]; }, null); })();
 
 class CallbackErrorsContext {
 }
@@ -10600,6 +10622,17 @@ class AddressOption {
     }
 }
 
+class AddressValidationConstants {
+}
+// allow alpha-numeric characters and spaces possibly between a connecting - character
+// this applies validation while allowing partial postcodes
+AddressValidationConstants.REGEX_POSTCODE = /^([A-Za-z0-9]-*| )+$/;
+AddressValidationConstants.ɵfac = function AddressValidationConstants_Factory(t) { return new (t || AddressValidationConstants)(); };
+AddressValidationConstants.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AddressValidationConstants, factory: AddressValidationConstants.ɵfac });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AddressValidationConstants, [{
+        type: Injectable
+    }], null, null); })();
+
 class FieldsFilterPipe {
     /**
      * Complex type should have at least on simple field descendant with a value.
@@ -10866,8 +10899,9 @@ function WriteAddressFieldComponent_div_1_div_4_span_5_Template(rf, ctx) { if (r
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
+    const ctx_r5 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, "Enter the Postcode"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r5.errorMessage));
 } }
 const _c1$n = function (a0) { return { "form-group-error": a0 }; };
 const _c2$2 = function (a0) { return { "govuk-input--error": a0 }; };
@@ -10898,42 +10932,56 @@ function WriteAddressFieldComponent_div_1_div_4_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(9, 11, "Find address"));
 } }
-function WriteAddressFieldComponent_div_1_div_5_option_6_Template(rf, ctx) { if (rf & 1) {
+function WriteAddressFieldComponent_div_1_div_5_span_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "span", 14);
+    i0.ɵɵtext(1);
+    i0.ɵɵpipe(2, "rpxTranslate");
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r8 = i0.ɵɵnextContext(3);
+    i0.ɵɵadvance(1);
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r8.errorMessage));
+} }
+function WriteAddressFieldComponent_div_1_div_5_option_7_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "option", 18);
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const addressOption_r9 = ctx.$implicit;
-    i0.ɵɵproperty("ngValue", addressOption_r9.value);
+    const addressOption_r10 = ctx.$implicit;
+    i0.ɵɵproperty("ngValue", addressOption_r10.value);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 2, addressOption_r9.description), " ");
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 2, addressOption_r10.description), " ");
 } }
 function WriteAddressFieldComponent_div_1_div_5_Template(rf, ctx) { if (rf & 1) {
-    const _r11 = i0.ɵɵgetCurrentView();
+    const _r12 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div", 15)(1, "label", 9)(2, "span", 10);
     i0.ɵɵtext(3);
     i0.ɵɵpipe(4, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(5, "select", 16);
-    i0.ɵɵlistener("change", function WriteAddressFieldComponent_div_1_div_5_Template_select_change_5_listener() { i0.ɵɵrestoreView(_r11); const ctx_r10 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r10.addressSelected()); });
-    i0.ɵɵtemplate(6, WriteAddressFieldComponent_div_1_div_5_option_6_Template, 3, 4, "option", 17);
+    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_5_span_5_Template, 3, 3, "span", 11);
+    i0.ɵɵelementStart(6, "select", 16);
+    i0.ɵɵlistener("change", function WriteAddressFieldComponent_div_1_div_5_Template_select_change_6_listener() { i0.ɵɵrestoreView(_r12); const ctx_r11 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r11.addressSelected()); });
+    i0.ɵɵtemplate(7, WriteAddressFieldComponent_div_1_div_5_option_7_Template, 3, 4, "option", 17);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const ctx_r3 = i0.ɵɵnextContext(2);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$n, ctx_r3.noAddressSelected));
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("for", ctx_r3.createElementId("addressList"));
     i0.ɵɵadvance(2);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 5, "Select an address"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 7, "Select an address"));
     i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r3.noAddressSelected);
+    i0.ɵɵadvance(1);
     i0.ɵɵproperty("id", ctx_r3.createElementId("addressList"))("formControl", ctx_r3.addressList);
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngForOf", ctx_r3.addressOptions);
 } }
 function WriteAddressFieldComponent_div_1_a_6_Template(rf, ctx) { if (rf & 1) {
-    const _r13 = i0.ɵɵgetCurrentView();
+    const _r14 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "a", 19);
-    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_a_6_Template_a_click_0_listener() { i0.ɵɵrestoreView(_r13); const ctx_r12 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r12.blankAddress()); });
+    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_a_6_Template_a_click_0_listener() { i0.ɵɵrestoreView(_r14); const ctx_r13 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r13.blankAddress()); });
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -10947,7 +10995,7 @@ function WriteAddressFieldComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵpipe(3, "ccdFieldLabel");
     i0.ɵɵelementEnd();
     i0.ɵɵtemplate(4, WriteAddressFieldComponent_div_1_div_4_Template, 10, 17, "div", 5);
-    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_5_Template, 7, 7, "div", 6);
+    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_5_Template, 8, 11, "div", 6);
     i0.ɵɵtemplate(6, WriteAddressFieldComponent_div_1_a_6_Template, 3, 3, "a", 7);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
@@ -10966,19 +11014,30 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
         super();
         this.isCompoundPipe = isCompoundPipe;
         this.addressFormGroup = new FormGroup({});
+        this.errorMessage = WriteAddressFieldComponent.REQUIRED_ERROR_MESSAGE;
         this.missingPostcode = false;
+        this.noAddressSelected = false;
         this.addressesService = addressesService;
     }
     ngOnInit() {
         if (!this.isComplexWithHiddenFields()) {
-            this.postcode = new FormControl('');
-            this.addressFormGroup.addControl('postcode', this.postcode);
+            this.postcode = new FormControl('', [Validators.required]);
+            this.formGroup.addControl('postcode', this.postcode);
             this.addressList = new FormControl('');
-            this.addressFormGroup.addControl('address', this.addressList);
+            this.formGroup.addControl('address', this.addressList);
         }
+        this.addressesService.getMandatoryError().subscribe((value) => {
+            this.updateErrorsOnContinue(value);
+        });
     }
     findAddress() {
+        this.noAddressSelected = false;
         if (!this.postcode.value) {
+            this.errorMessage = WriteAddressFieldComponent.REQUIRED_ERROR_MESSAGE;
+            this.missingPostcode = true;
+        }
+        else if (!this.postcode.value.trim().match(AddressValidationConstants.REGEX_POSTCODE)) {
+            this.errorMessage = WriteAddressFieldComponent.INVALID_ERROR_MESSAGE;
             this.missingPostcode = true;
         }
         else {
@@ -11007,6 +11066,8 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
     blankAddress() {
         this.caseField.value = new AddressModel();
         this.setFormValue();
+        this.missingPostcode = false;
+        this.noAddressSelected = false;
     }
     isComplexWithHiddenFields() {
         if (this.caseField.isComplex() && this.caseField.field_type.complex_fields
@@ -11038,6 +11099,7 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
     addressSelected() {
         this.caseField.value = this.addressList.value;
         this.setFormValue();
+        this.noAddressSelected = false;
     }
     ngOnChanges(changes) {
         super.ngOnChanges(changes);
@@ -11058,7 +11120,14 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
             this.writeComplexFieldComponent.complexGroup.setValue(this.caseField.value);
         }
     }
+    updateErrorsOnContinue(value) {
+        this.missingPostcode = value && !this.shouldShowDetailFields() && !this.addressOptions;
+        this.noAddressSelected = value && !this.shouldShowDetailFields() && !!this.addressOptions;
+        this.errorMessage = this.noAddressSelected ? 'Select an address' : this.errorMessage;
+    }
 }
+WriteAddressFieldComponent.REQUIRED_ERROR_MESSAGE = 'Enter a Postcode';
+WriteAddressFieldComponent.INVALID_ERROR_MESSAGE = 'Enter a valid Postcode';
 WriteAddressFieldComponent.ɵfac = function WriteAddressFieldComponent_Factory(t) { return new (t || WriteAddressFieldComponent)(i0.ɵɵdirectiveInject(AddressesService), i0.ɵɵdirectiveInject(IsCompoundPipe)); };
 WriteAddressFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteAddressFieldComponent, selectors: [["ccd-write-address-field"]], viewQuery: function WriteAddressFieldComponent_Query(rf, ctx) { if (rf & 1) {
         i0.ɵɵviewQuery(_c0$U, 5);
@@ -11067,7 +11136,7 @@ WriteAddressFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.writeComplexFieldComponent = _t.first);
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.focusElementDirectives = _t);
-    } }, inputs: { formGroup: "formGroup" }, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 4, vars: 9, consts: [[1, "form-group", 3, "id"], [4, "ngIf"], [3, "hidden", "caseField", "renderLabel", "parent", "formGroup", "ignoreMandatory", "idPrefix"], ["writeComplexFieldComponent", ""], [1, "heading-h2"], ["class", "form-group bottom-30 postcodeLookup", 3, "id", "ngClass", 4, "ngIf"], ["class", "form-group", "id", "selectAddress", 4, "ngIf"], ["class", "manual-link bottom-30", "href", "javascript:void(0)", 3, "click", 4, "ngIf"], [1, "form-group", "bottom-30", "postcodeLookup", 3, "id", "ngClass"], [3, "for"], [1, "form-label"], ["class", "error-message", 4, "ngIf"], ["type", "text", "name", "postcode", 1, "form-control", "postcodeinput", "inline-block", 3, "ngClass", "id", "formControl"], ["type", "button", 1, "button", "button-30", 3, "click"], [1, "error-message"], ["id", "selectAddress", 1, "form-group"], ["name", "address", "focusElement", "", 1, "form-control", "ccd-dropdown", "addressList", 3, "id", "formControl", "change"], [3, "ngValue", 4, "ngFor", "ngForOf"], [3, "ngValue"], ["href", "javascript:void(0)", 1, "manual-link", "bottom-30", 3, "click"]], template: function WriteAddressFieldComponent_Template(rf, ctx) { if (rf & 1) {
+    } }, inputs: { formGroup: "formGroup" }, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 4, vars: 9, consts: [[1, "form-group", 3, "id"], [4, "ngIf"], [3, "hidden", "caseField", "renderLabel", "parent", "formGroup", "ignoreMandatory", "idPrefix"], ["writeComplexFieldComponent", ""], [1, "heading-h2"], ["class", "form-group bottom-30 postcodeLookup", 3, "id", "ngClass", 4, "ngIf"], ["class", "form-group", "id", "selectAddress", 3, "ngClass", 4, "ngIf"], ["class", "manual-link bottom-30", "href", "javascript:void(0)", 3, "click", 4, "ngIf"], [1, "form-group", "bottom-30", "postcodeLookup", 3, "id", "ngClass"], [3, "for"], [1, "form-label"], ["class", "error-message", 4, "ngIf"], ["type", "text", "name", "postcode", 1, "form-control", "postcodeinput", "inline-block", 3, "ngClass", "id", "formControl"], ["type", "button", 1, "button", "button-30", 3, "click"], [1, "error-message"], ["id", "selectAddress", 1, "form-group", 3, "ngClass"], ["name", "address", "focusElement", "", 1, "form-control", "ccd-dropdown", "addressList", 3, "id", "formControl", "change"], [3, "ngValue", 4, "ngFor", "ngForOf"], [3, "ngValue"], ["href", "javascript:void(0)", 1, "manual-link", "bottom-30", 3, "click"]], template: function WriteAddressFieldComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵtemplate(1, WriteAddressFieldComponent_div_1_Template, 7, 6, "div", 1);
         i0.ɵɵelement(2, "ccd-write-complex-type-field", 2, 3);
@@ -11081,7 +11150,7 @@ WriteAddressFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
     } }, styles: [".manual-link[_ngcontent-%COMP%]{cursor:pointer;display:block;text-decoration:underline}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteAddressFieldComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-write-address-field', template: "<div class=\"form-group\" [id]=\"id()\">\n  <div *ngIf=\"!isComplexWithHiddenFields()\">\n    <h2 class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n\n    <div class=\"form-group bottom-30 postcodeLookup\" [id]=\"createElementId('postcodeLookup')\" [ngClass]=\"{'form-group-error': missingPostcode}\" *ngIf=\"!isExpanded\">\n      <label [for]=\"createElementId('postcodeInput')\">\n        <span class=\"form-label\">{{'Enter a UK postcode' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"missingPostcode\">{{'Enter the Postcode' | rpxTranslate}}</span>\n      <input type=\"text\" [ngClass]=\"{'govuk-input--error': missingPostcode}\"\n      [id]=\"createElementId('postcodeInput')\" name=\"postcode\" class=\"form-control postcodeinput inline-block\" [formControl]=\"postcode\">\n      <button type=\"button\" class=\"button button-30\" (click)=\"findAddress()\">{{'Find address' | rpxTranslate}}</button>\n    </div>\n\n    <div class=\"form-group\" *ngIf=\"addressOptions\" id=\"selectAddress\">\n      <label [for]=\"createElementId('addressList')\">\n        <span class=\"form-label\">{{'Select an address' | rpxTranslate}}</span>\n      </label>\n\n      <select class=\"form-control ccd-dropdown addressList\" [id]=\"createElementId('addressList')\" name=\"address\" [formControl]=\"addressList\" (change)=\"addressSelected()\" focusElement>\n        <option *ngFor=\"let addressOption of addressOptions\" [ngValue]=\"addressOption.value\">\n          {{addressOption.description | rpxTranslate}}\n        </option>\n      </select>\n    </div>\n\n    <a class=\"manual-link bottom-30\" *ngIf=\"!shouldShowDetailFields()\" (click)=\"blankAddress()\" href=\"javascript:void(0)\">\n      {{\"I can't enter a UK postcode\" | rpxTranslate}}\n    </a>\n  </div>\n\n  <ccd-write-complex-type-field\n    [hidden]=\"!shouldShowDetailFields()\"\n    [caseField]=\"caseField\"\n    [renderLabel]=\"false\"\n    [parent]=\"parent\"\n    [formGroup]=\"formGroup\"\n    [ignoreMandatory]=\"true\"\n    [idPrefix]=\"buildIdPrefix('detail')\"\n    #writeComplexFieldComponent>\n  </ccd-write-complex-type-field>\n</div>\n", styles: [".manual-link{cursor:pointer;display:block;text-decoration:underline}\n"] }]
+        args: [{ selector: 'ccd-write-address-field', template: "<div class=\"form-group\" [id]=\"id()\">\n  <div *ngIf=\"!isComplexWithHiddenFields()\">\n    <h2 class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n\n    <div class=\"form-group bottom-30 postcodeLookup\" [id]=\"createElementId('postcodeLookup')\" [ngClass]=\"{'form-group-error': missingPostcode}\" *ngIf=\"!isExpanded\">\n      <label [for]=\"createElementId('postcodeInput')\">\n        <span class=\"form-label\">{{'Enter a UK postcode' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"missingPostcode\">{{errorMessage | rpxTranslate}}</span>\n      <input type=\"text\" [ngClass]=\"{'govuk-input--error': missingPostcode}\"\n      [id]=\"createElementId('postcodeInput')\" name=\"postcode\" class=\"form-control postcodeinput inline-block\" [formControl]=\"postcode\">\n      <button type=\"button\" class=\"button button-30\" (click)=\"findAddress()\">{{'Find address' | rpxTranslate}}</button>\n    </div>\n\n    <div class=\"form-group\" *ngIf=\"addressOptions\" id=\"selectAddress\" [ngClass]=\"{'form-group-error': noAddressSelected}\">\n      <label [for]=\"createElementId('addressList')\">\n        <span class=\"form-label\">{{'Select an address' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"noAddressSelected\">{{errorMessage | rpxTranslate}}</span>\n      <select class=\"form-control ccd-dropdown addressList\" [id]=\"createElementId('addressList')\" name=\"address\" [formControl]=\"addressList\" (change)=\"addressSelected()\" focusElement>\n        <option *ngFor=\"let addressOption of addressOptions\" [ngValue]=\"addressOption.value\">\n          {{addressOption.description | rpxTranslate}}\n        </option>\n      </select>\n    </div>\n\n    <a class=\"manual-link bottom-30\" *ngIf=\"!shouldShowDetailFields()\" (click)=\"blankAddress()\" href=\"javascript:void(0)\">\n      {{\"I can't enter a UK postcode\" | rpxTranslate}}\n    </a>\n  </div>\n\n  <ccd-write-complex-type-field\n    [hidden]=\"!shouldShowDetailFields()\"\n    [caseField]=\"caseField\"\n    [renderLabel]=\"false\"\n    [parent]=\"parent\"\n    [formGroup]=\"formGroup\"\n    [ignoreMandatory]=\"true\"\n    [idPrefix]=\"buildIdPrefix('detail')\"\n    #writeComplexFieldComponent>\n  </ccd-write-complex-type-field>\n</div>\n", styles: [".manual-link{cursor:pointer;display:block;text-decoration:underline}\n"] }]
     }], function () { return [{ type: AddressesService }, { type: IsCompoundPipe }]; }, { writeComplexFieldComponent: [{
             type: ViewChild,
             args: ['writeComplexFieldComponent', { static: false }]
@@ -11788,7 +11857,7 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         // Extract all flags-related data from the CaseEventTrigger object in the snapshot data
         if (this.route.snapshot.data.eventTrigger) {
             // Get the HMCTSServiceId from supplementary data, if it exists (required for retrieving the available flag types in
-            // the first instance, only falling back on case type ID or jurisidiction if it's not present)
+            // the first instance, only falling back on case type ID or jurisdiction if it's not present)
             if (this.route.snapshot.data.eventTrigger.supplementary_data
                 && this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId) {
                 this.hmctsServiceId = this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId;
@@ -12129,32 +12198,36 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         this.flagCommentsOptional = true;
     }
     populateNewFlagDetailInstance() {
+        const langSearchTerm = this.caseFlagParentFormGroup?.value['languageSearchTerm'];
+        const manualLangEntry = this.caseFlagParentFormGroup?.value['manualLanguageEntry'];
+        const flagType = this.caseFlagParentFormGroup?.value['flagType'];
+        const otherDesc = this.caseFlagParentFormGroup?.value['otherDescription'];
         const formValues = this.caseFlagParentFormGroup?.value;
         return {
-            name: formValues?.flagType?.name,
-            name_cy: formValues?.flagType?.name_cy,
+            name: this.flagType?.name,
+            name_cy: flagType?.name_cy,
             // Currently, subTypeValue, subTypeValue_cy and subTypeKey are applicable only to language flag types
-            subTypeValue: formValues?.languageSearchTerm && this.rpxTranslationService.language === 'en'
-                ? formValues?.languageSearchTerm.value
-                : formValues?.manualLanguageEntry && this.rpxTranslationService.language === 'en'
-                    ? formValues?.manualLanguageEntry
+            subTypeValue: langSearchTerm && this.rpxTranslationService.language === 'en'
+                ? langSearchTerm.value
+                : manualLangEntry && this.rpxTranslationService.language === 'en'
+                    ? manualLangEntry
                     : null,
-            subTypeValue_cy: formValues?.languageSearchTerm && this.rpxTranslationService.language === 'cy'
-                ? formValues?.languageSearchTerm.value_cy
-                : formValues?.manualLanguageEntry && this.rpxTranslationService.language === 'cy'
-                    ? formValues?.manualLanguageEntry
+            subTypeValue_cy: langSearchTerm && this.rpxTranslationService.language === 'cy'
+                ? langSearchTerm?.value_cy
+                : manualLangEntry && this.rpxTranslationService.language === 'cy'
+                    ? manualLangEntry
                     : null,
             // For user-entered (i.e. non-Reference Data) languages, there is no key
-            subTypeKey: formValues?.languageSearchTerm
-                ? formValues?.languageSearchTerm.key
+            subTypeKey: langSearchTerm
+                ? langSearchTerm.key
                 : null,
-            otherDescription: formValues?.flagType?.flagCode === this.otherFlagTypeCode &&
-                formValues?.otherDescription && this.rpxTranslationService.language === 'en'
-                ? formValues?.otherDescription
+            otherDescription: flagType?.flagCode === this.otherFlagTypeCode &&
+                otherDesc && this.rpxTranslationService.language === 'en'
+                ? otherDesc
                 : null,
-            otherDescription_cy: formValues?.flagType?.flagCode === this.otherFlagTypeCode &&
-                formValues?.otherDescription && this.rpxTranslationService.language === 'cy'
-                ? formValues?.otherDescription
+            otherDescription_cy: flagType?.flagCode === this.otherFlagTypeCode &&
+                otherDesc && this.rpxTranslationService.language === 'cy'
+                ? otherDesc
                 : null,
             flagComment: this.rpxTranslationService.language === 'en'
                 ? formValues?.flagComments
@@ -12164,18 +12237,18 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
                 : null,
             flagUpdateComment: formValues?.statusReason,
             dateTimeCreated: new Date().toISOString(),
-            path: formValues?.flagType?.Path &&
-                formValues?.flagType?.Path.map(pathValue => Object.assign({ id: null, value: pathValue })),
-            hearingRelevant: formValues?.flagType?.hearingRelevant ? 'Yes' : 'No',
-            flagCode: formValues?.flagType?.flagCode,
+            path: flagType?.Path &&
+                flagType?.Path.map(pathValue => Object.assign({ id: null, value: pathValue })),
+            hearingRelevant: flagType?.hearingRelevant ? 'Yes' : 'No',
+            flagCode: flagType?.flagCode,
             // Status should be set to whatever the default is for this flag type, if flag is being created by an external
             // user, otherwise it should be set to "Active" if Case Flags v2.1 is NOT enabled, or the selected status if it is
             status: this.isDisplayContextParameterExternal
-                ? formValues?.flagType?.defaultStatus
+                ? flagType?.defaultStatus
                 : !this.isDisplayContextParameter2Point1Enabled
                     ? CaseFlagStatus.ACTIVE
                     : CaseFlagStatus[formValues?.selectedStatus],
-            availableExternally: formValues?.flagType?.externallyAvailable ? 'Yes' : 'No'
+            availableExternally: flagType?.externallyAvailable ? 'Yes' : 'No'
         };
     }
     moveToFinalReviewStage() {
@@ -30099,7 +30172,7 @@ function CaseEventTriggerComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵproperty("caseDetails", ctx_r0.caseDetails)("submit", ctx_r0.submit())("validate", ctx_r0.validate())("eventTrigger", ctx_r0.eventTrigger);
 } }
 class CaseEventTriggerComponent {
-    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService) {
+    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService, sessionStorageService) {
         this.ngZone = ngZone;
         this.casesService = casesService;
         this.caseNotifier = caseNotifier;
@@ -30108,6 +30181,7 @@ class CaseEventTriggerComponent {
         this.route = route;
         this.caseReferencePipe = caseReferencePipe;
         this.activityPollingService = activityPollingService;
+        this.sessionStorageService = sessionStorageService;
         this.BANNER = DisplayMode.BANNER;
     }
     ngOnInit() {
@@ -30156,21 +30230,30 @@ class CaseEventTriggerComponent {
     }
     submitted(event) {
         const eventStatus = event['status'];
+        const taskCompletionFailed = this.sessionStorageService.getItem('taskCompletionError') === 'true';
         this.router
             .navigate([this.parentUrl])
             .then(() => {
             const caseReference = this.caseReferencePipe.transform(this.caseDetails.case_id.toString());
             const replacements = { CASEREFERENCE: caseReference, NAME: this.eventTrigger.name };
-            if (EventStatusService.isIncomplete(eventStatus)) {
+            this.alertService.setPreserveAlerts(true);
+            if (taskCompletionFailed) {
+                // if task still present in session storage, we know that the task has not been correctly completed
+                this.alertService.warning({
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE + '. ' + Constants.TASK_COMPLETION_ERROR,
+                    replacements
+                });
+                this.sessionStorageService.removeItem('taskCompletionError');
+            }
+            else if (EventStatusService.isIncomplete(eventStatus)) {
                 this.alertService.warning({
-                    phrase: `Case #%CASEREFERENCE% has been updated with event: %NAME%
-            but the callback service cannot be completed`,
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE + CaseEventTriggerComponent.CALLBACK_FAILED_MESSAGE,
                     replacements
                 });
             }
             else {
                 this.alertService.success({
-                    phrase: 'Case #%CASEREFERENCE% has been updated with event: %NAME%',
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE,
                     replacements,
                     preserve: true
                 });
@@ -30189,7 +30272,9 @@ class CaseEventTriggerComponent {
         return !!(this.eventTrigger && this.caseDetails);
     }
 }
-CaseEventTriggerComponent.ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService)); };
+CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE = `Case #%CASEREFERENCE% has been updated with event: %NAME%`;
+CaseEventTriggerComponent.CALLBACK_FAILED_MESSAGE = ' but the callback service cannot be completed';
+CaseEventTriggerComponent.ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(SessionStorageService)); };
 CaseEventTriggerComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventTriggerComponent, selectors: [["ccd-case-event-trigger"]], decls: 1, vars: 1, consts: [["class", "screen-990", 4, "ngIf"], [1, "screen-990"], [3, "caseId", "displayMode"], [3, "caseDetails", "submit", "validate", "eventTrigger", "cancelled", "submitted"]], template: function CaseEventTriggerComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵtemplate(0, CaseEventTriggerComponent_div_0_Template, 3, 6, "div", 0);
     } if (rf & 2) {
@@ -30198,7 +30283,7 @@ CaseEventTriggerComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: C
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventTriggerComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-event-trigger', template: "<div *ngIf=\"isDataLoaded()\" class=\"screen-990\">\n  <ccd-activity [caseId]=\"caseDetails.case_id\" [displayMode]=\"BANNER\"></ccd-activity>\n  <ccd-case-edit [caseDetails]=\"caseDetails\"\n                 [submit]=\"submit()\"\n                 [validate]=\"validate()\"\n                 [eventTrigger]=\"eventTrigger\"\n                 (cancelled)=\"cancel()\"\n                 (submitted)=\"submitted($event)\"></ccd-case-edit>\n</div>\n" }]
-    }], function () { return [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }]; }, null); })();
+    }], function () { return [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }, { type: SessionStorageService }]; }, null); })();
 
 function CaseViewComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div");