@hmcts/ccd-case-ui-toolkit 7.0.4-mv-upgrade → 7.0.4-task-completion-error-message

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

@@ -8,7 +8,7 @@ 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, FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { throwError, Subject, EMPTY, Observable, of, BehaviorSubject, timer, fromEvent, forkJoin } from 'rxjs';
+import { throwError, Subject, EMPTY, Observable, of, BehaviorSubject, timer, fromEvent, forkJoin, Subscription } from 'rxjs';
 import * as i1$3 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
 import { catchError, map, publish, refCount, debounceTime, delay, distinctUntilChanged, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, first, switchMap, takeUntil, filter } from 'rxjs/operators';
@@ -4325,6 +4325,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, [{
@@ -4953,11 +4954,21 @@ class FieldsPurger {
      * @returns A new array with the mapped values
      */
     mapArrayValuesToNull(array) {
-        return array.map(element => {
-            return typeof element === 'object'
-                ? Object.assign({}, ...Object.keys(element).map(k => ({ [k]: null })))
-                : null;
-        });
+        if (array && array.length > 0) {
+            return array.map(element => {
+                if (element !== undefined && element !== null) {
+                    return typeof element === 'object'
+                        ? Object.assign({}, ...Object.keys(element).map(k => ({ [k]: null })))
+                        : null;
+                }
+                else {
+                    return {};
+                }
+            });
+        }
+        else {
+            return array;
+        }
     }
 }
 FieldsPurger.ɵfac = function FieldsPurger_Factory(t) { return new (t || FieldsPurger)(i0.ɵɵinject(FieldsUtils)); };
@@ -5429,7 +5440,7 @@ class FormValueService {
      * @param clearEmpty Whether or not we should clear out empty, optional, complex objects.
      * @param clearNonCase Whether or not we should clear out non-case fields at the top level.
      */
-    removeUnnecessaryFields(data, caseFields, clearEmpty = false, clearNonCase = false, fromPreviousPage = false, currentPageCaseFields = []) {
+    removeUnnecessaryFields(data, caseFields, clearEmpty = false, clearNonCase = false, fromPreviousPage = false, currentPageCaseFields = [], isCalledFromSubmit = false) {
         if (data && caseFields && caseFields.length > 0) {
             // check if there is any data at the top level of the form that's not in the caseFields
             if (clearNonCase) {
@@ -5440,10 +5451,13 @@ class FormValueService {
                     // Retain anything that is readonly and not a label.
                     continue;
                 }
-                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
+                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks') {
                     // Delete anything that is hidden (that is NOT readonly), and that
                     // hasn't had its display_context overridden to make it hidden.
-                    delete data[field.id];
+                    // in event submission check for field's retain_hidden_value defore deletion
+                    if ((isCalledFromSubmit && !field.retain_hidden_value) || !isCalledFromSubmit) {
+                        delete data[field.id];
+                    }
                 }
                 else if (field.field_type) {
                     switch (field.field_type.type) {
@@ -5457,7 +5471,7 @@ class FormValueService {
                             }
                             break;
                         case 'Complex':
-                            this.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty);
+                            this.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty, false, false, [], isCalledFromSubmit);
                             // Also remove any optional complex objects that are completely empty.
                             // EUI-4244: Ritesh's fix, passing true instead of clearEmpty.
                             if (FormValueService.clearOptionalEmpty(true, data[field.id], field)) {
@@ -5480,8 +5494,8 @@ class FormValueService {
                                 if (field.field_type.collection_field_type.type === 'Complex') {
                                     // Iterate through the elements and remove any unnecessary fields within.
                                     for (const item of collection) {
-                                        this.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty);
-                                        this.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false);
+                                        this.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty, false, false, [], isCalledFromSubmit);
+                                        this.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false, false, false, [], isCalledFromSubmit);
                                     }
                                 }
                             }
@@ -6725,7 +6739,6 @@ class ArtificialDelayContext {
         this.artificialDelayOn = true;
         this.selectedDelay = this.selectActualDelayTime();
     }
-    ;
     switchArtificialDelays(status) {
         this.artificialDelayOn = status;
         this.selectedDelay = this.selectActualDelayTime();
@@ -8049,18 +8062,9 @@ class EventCompletionStateMachineService {
         state.trigger(EventCompletionStates.Final);
         const taskStr = context.sessionStorageService.getItem('taskToComplete');
         if (taskStr) {
-            // Task is in session storage
-            const task = JSON.parse(taskStr);
-            // Task already assigned to current user, just complete task
-            context.workAllocationService.completeTask(task.id).subscribe(response => {
-                // Emit event can be completed event
-                context.component.eventCanBeCompleted.emit(true);
-            }, error => {
-                // Emit event cannot be completed event
-                context.component.eventCanBeCompleted.emit(false);
-                context.alertService.error(error.message);
-                return throwError(error);
-            });
+            context.sessionStorageService.setItem('assignNeeded', 'false');
+            // just set event can be completed
+            context.component.eventCanBeCompleted.emit(true);
         }
         else {
             // Emit event cannot be completed event
@@ -8079,18 +8083,8 @@ class EventCompletionStateMachineService {
         // Get task details
         const taskStr = context.sessionStorageService.getItem('taskToComplete');
         if (taskStr) {
-            // Task is in session storage
-            const task = JSON.parse(taskStr);
-            // Assign and complete task
-            context.workAllocationService.assignAndCompleteTask(task.id).subscribe(response => {
-                // Emit event can be completed event
-                context.component.eventCanBeCompleted.emit(true);
-            }, error => {
-                // Emit event cannot be completed event
-                context.component.eventCanBeCompleted.emit(false);
-                context.alertService.error(error.message);
-                return throwError(error);
-            });
+            context.sessionStorageService.setItem('assignNeeded', 'true');
+            context.component.eventCanBeCompleted.emit(true);
         }
         else {
             // Emit event cannot be completed event
@@ -8436,7 +8430,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) {
+    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;
@@ -8451,6 +8445,8 @@ class CaseEditComponent {
         this.formErrorService = formErrorService;
         this.loadingService = loadingService;
         this.validPageListCaseFieldsService = validPageListCaseFieldsService;
+        this.workAllocationService = workAllocationService;
+        this.alertService = alertService;
         this.cancelled = new EventEmitter();
         this.submitted = new EventEmitter();
         this.isEventCompletionChecksRequired = false;
@@ -8624,7 +8620,7 @@ class CaseEditComponent {
         const pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
         // Remove unnecessary case fields which are hidden, only if the submission is *not* for Case Flags
         if (!this.isCaseFlagSubmission) {
-            this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
+            this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true, false, [], true);
         }
         caseEventData.event_token = eventTrigger.event_token;
         caseEventData.ignore_warning = this.ignoreWarning;
@@ -8737,31 +8733,68 @@ class CaseEditComponent {
     }
     caseSubmit({ form, caseEventData, submit }) {
         const loadingSpinnerToken = this.loadingService.register();
-        submit(caseEventData)
-            .pipe(finalize(() => {
+        // keep the initial event response to finalise process after task completion
+        let eventResponse;
+        submit(caseEventData).pipe(switchMap((response) => {
+            eventResponse = response;
+            return this.postCompleteTaskIfRequired();
+        }), finalize(() => {
+            this.sessionStorageService.removeItem('taskToComplete');
+            this.sessionStorageService.removeItem('assignNeeded');
             this.loadingService.unregister(loadingSpinnerToken);
         }))
-            .subscribe(response => {
-            this.caseNotifier.cachedCaseView = null;
-            this.sessionStorageService.removeItem('eventUrl');
-            const confirmation = this.buildConfirmation(response);
-            if (confirmation && (confirmation.getHeader() || confirmation.getBody())) {
-                this.confirm(confirmation);
+            .subscribe(() => {
+            this.finishEventCompletionLogic(eventResponse);
+            /* NOTE: Uncomment this to test event confirmation page display of error
+              Replicates lines 458-459
+            this.alertService.setPreserveAlerts(true);
+            this.alertService.error({phrase: 'The associated task for this event failed to complete automatically. Please complete the task manually in the Tasks tab on the case'}); */
+        }, error => {
+            if (!eventResponse) {
+                // event submission error
+                this.error = error;
+                this.callbackErrorsSubject.next(error);
+                /* istanbul ignore else */
+                if (this.error.details) {
+                    this.formErrorService
+                        .mapFieldErrors(this.error.details.field_errors, form.controls['data'], 'validation');
+                }
+                this.isSubmitting = false;
             }
             else {
-                this.emitSubmitted(response);
-            }
-        }, error => {
-            this.error = error;
-            this.callbackErrorsSubject.next(error);
-            /* istanbul ignore else */
-            if (this.error.details) {
-                this.formErrorService
-                    .mapFieldErrors(this.error.details.field_errors, form.controls['data'], 'validation');
+                // task assignment/completion error - handled within workallocation service
+                // could set task to be deleted (or completed later)?
+                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 });
             }
-            this.isSubmitting = false;
         });
     }
+    postCompleteTaskIfRequired() {
+        const taskStr = this.sessionStorageService.getItem('taskToComplete');
+        const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
+        if (taskStr && assignNeeded) {
+            const task = JSON.parse(taskStr);
+            return this.workAllocationService.assignAndCompleteTask(task.id);
+        }
+        else if (taskStr) {
+            const task = JSON.parse(taskStr);
+            return this.workAllocationService.completeTask(task.id);
+        }
+        return of(true);
+    }
+    finishEventCompletionLogic(eventResponse) {
+        this.caseNotifier.cachedCaseView = null;
+        this.sessionStorageService.removeItem('eventUrl');
+        const confirmation = this.buildConfirmation(eventResponse);
+        if (confirmation && (confirmation.getHeader() || confirmation.getBody())) {
+            this.confirm(confirmation);
+        }
+        else {
+            this.emitSubmitted(eventResponse);
+        }
+    }
     buildConfirmation(response) {
         if (response['after_submit_callback_response']) {
             return new Confirmation(response['id'], response['callback_response_status'], response['after_submit_callback_response']['confirmation_header'], response['after_submit_callback_response']['confirmation_body']);
@@ -8790,14 +8823,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$2.Router), i0.ɵɵdirectiveInject(i1$2.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)); };
+CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i3.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$2.Router), i0.ɵɵdirectiveInject(i1$2.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$2.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%}.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%}.case-field-change{width:5%}\n"] }]
-    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$2.Router }, { type: i1$2.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, { eventTrigger: [{
+    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$2.Router }, { type: i1$2.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
@@ -9564,6 +9597,7 @@ class CaseEditPageComponent {
     }
     submit() {
         this.caseEditDataService.clearFormValidationErrors();
+        console.log('Page submit event fired!');
         if (this.currentPageIsNotValid()) {
             // The generateErrorMessage method filters out the hidden fields.
             // The error message for LinkedCases journey will never get displayed because the
@@ -9577,6 +9611,7 @@ class CaseEditPageComponent {
             }
         }
         if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+            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);
             }
@@ -9766,6 +9801,7 @@ class CaseEditPageComponent {
             this.formErrorService
                 .mapFieldErrors(this.caseEdit.error.details.field_errors, this.editForm?.controls?.['data'], 'validation');
         }
+        console.log('handleError ', error);
     }
     resetErrors() {
         this.caseEdit.error = null;
@@ -12697,7 +12733,19 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         if (0 === error.status || 502 === error.status) {
             return WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE;
         }
-        return error.error;
+        let errorMsg = 'Error uploading file';
+        if (error?.error) {
+            const fullError = error.error;
+            const start = fullError.indexOf('{');
+            if (start >= 0) {
+                const json = fullError.substring(start, fullError.length - 1).split('<EOL>').join('');
+                const obj = JSON.parse(json);
+                if (obj?.error) {
+                    errorMsg = obj.error;
+                }
+            }
+        }
+        return errorMsg;
     }
     buildDocumentUploadData(selectedFile) {
         const documentUpload = new FormData();
@@ -15785,6 +15833,12 @@ class CommonDataService {
         }
         return of(null);
     }
+    getServiceOrgData(url) {
+        if (url) {
+            return this.http.get(url, { observe: 'body' });
+        }
+        return of(null);
+    }
 }
 CommonDataService.ɵfac = function CommonDataService_Factory(t) { return new (t || CommonDataService)(i0.ɵɵinject(i1$3.HttpClient)); };
 CommonDataService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CommonDataService, factory: CommonDataService.ɵfac });
@@ -15996,6 +16050,7 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
         this.linkedCasesPages = LinkedCasesPages;
         this.linkedCasesEventTriggers = LinkedCasesEventTriggers;
         this.linkedCases = [];
+        this.subscriptions = new Subscription();
     }
     ngOnInit() {
         // This is required to enable Continue button validation
@@ -16004,17 +16059,17 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
         // Clear validation errors
         this.caseEditDataService.clearFormValidationErrors();
         // Get linked case reasons from ref data
-        this.getLinkedCaseReasons();
         this.linkedCasesService.editMode = false;
-        this.caseEditDataService.caseDetails$.subscribe({
-            next: caseDetails => this.initialiseCaseDetails(caseDetails)
-        });
-        this.caseEditDataService.caseEventTriggerName$.subscribe({
+        this.subscriptions.add(this.caseEditDataService.caseDetails$.subscribe({
+            next: caseDetails => { this.initialiseCaseDetails(caseDetails); }
+        }));
+        this.getOrgService();
+        this.subscriptions.add(this.caseEditDataService.caseEventTriggerName$.subscribe({
             next: name => this.linkedCasesService.isLinkedCasesEventTrigger = (name === LinkedCasesEventTriggers.LINK_CASES)
-        });
-        this.caseEditDataService.caseEditForm$.subscribe({
+        }));
+        this.subscriptions.add(this.caseEditDataService.caseEditForm$.subscribe({
             next: editForm => this.caseEditForm = editForm
-        });
+        }));
     }
     initialiseCaseDetails(caseDetails) {
         if (caseDetails) {
@@ -16050,18 +16105,26 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
             }
         }
     }
-    getLinkedCaseReasons() {
-        const reasonCodeAPIurl = `${this.appConfig.getRDCommonDataApiUrl()}/lov/categories/CaseLinkingReasonCode`;
+    getLinkedCaseReasons(serviceId) {
+        const reasonCodeAPIurl = `${this.appConfig.getRDCommonDataApiUrl()}/lov/categories/CaseLinkingReasonCode?serviceId=${serviceId}`;
         this.commonDataService.getRefData(reasonCodeAPIurl).subscribe({
             next: reasons => {
                 // Sort in ascending order
                 const linkCaseReasons = reasons.list_of_values.sort((a, b) => (a.value_en > b.value_en) ? 1 : -1);
-                // Move Other option to the end of the list
                 this.linkedCasesService.linkCaseReasons = linkCaseReasons?.filter(reason => reason.value_en !== 'Other');
+                // Move Other option to the end of the list
                 this.linkedCasesService.linkCaseReasons.push(linkCaseReasons?.find(reason => reason.value_en === 'Other'));
             }
         });
     }
+    getOrgService() {
+        const servicesApiUrl = `refdata/location/orgServices?ccdCaseType=${this.caseDetails?.case_type?.id}`;
+        this.commonDataService.getServiceOrgData(servicesApiUrl).subscribe(result => {
+            result.forEach(ids => {
+                this.getLinkedCaseReasons(ids.service_id);
+            });
+        });
+    }
     proceedToNextPage() {
         if (this.isAtFinalPage()) {
             // Continue button event must be allowed in final page
@@ -16116,6 +16179,9 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
                 : LinkedCasesPages.NO_LINKED_CASES;
         });
     }
+    ngOnDestroy() {
+        this.subscriptions.unsubscribe();
+    }
 }
 WriteLinkedCasesFieldComponent.ɵfac = function WriteLinkedCasesFieldComponent_Factory(t) { return new (t || WriteLinkedCasesFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CommonDataService), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(LinkedCasesService), i0.ɵɵdirectiveInject(CaseEditDataService)); };
 WriteLinkedCasesFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteLinkedCasesFieldComponent, selectors: [["ccd-write-linked-cases-field"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 7, vars: 7, consts: [[1, "form-group", "govuk-!-margin-bottom-2", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], [4, "ngSwitchCase"], [3, "linkedCasesStateEmitter"]], template: function WriteLinkedCasesFieldComponent_Template(rf, ctx) { if (rf & 1) {
@@ -20770,10 +20836,10 @@ WriteDateFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Wri
 
 const CUSTOM_MOMENT_FORMATS = {
     parse: {
-        dateInput: 'YYYY MM DD HH:mm:ss'
+        dateInput: 'DD-MM-YYYY HH:mm:ss'
     },
     display: {
-        dateInput: 'YYYY MM DD HH:mm:ss',
+        dateInput: 'DD-MM-YYYY HH:mm:ss',
         monthYearLabel: 'MMMM YYYY',
         dateA11yLabel: 'EEE/MMM/YYYY',
         monthYearA11yLabel: 'MMMM YYYY',
@@ -21901,8 +21967,9 @@ class ReadFieldsFilterPipe {
         return isNotEmpty;
     }
     static isEmpty(value) {
-        return ReadFieldsFilterPipe.EMPTY_VALUES.indexOf(value) !== -1
-            || value.length === 0;
+        const fieldValue = value?.hasOwnProperty('list_items') && value?.hasOwnProperty('value') ? value.value : value;
+        return ReadFieldsFilterPipe.EMPTY_VALUES.indexOf(fieldValue) !== -1
+            || fieldValue.length === 0;
     }
     static isCompound(field) {
         return ReadFieldsFilterPipe.NESTED_TYPES[field.field_type.type];
@@ -23698,18 +23765,9 @@ class CaseEventCompletionTaskReassignedComponent {
         // Get task details
         const taskStr = this.sessionStorageService.getItem('taskToComplete');
         if (taskStr) {
-            // Task is in session storage
-            const task = JSON.parse(taskStr);
-            // Assign and complete task
-            this.subscription = this.workAllocationService.assignAndCompleteTask(task.id).subscribe(response => {
-                // Emit event can be completed event
-                this.parentComponent.eventCanBeCompleted.emit(true);
-            }, error => {
-                // Emit event cannot be completed event
-                this.parentComponent.eventCanBeCompleted.emit(false);
-                this.alertService.error(error.message);
-                return throwError(error);
-            });
+            this.sessionStorageService.setItem('assignNeeded', 'true');
+            // set event can be completed to true
+            this.parentComponent.eventCanBeCompleted.emit(true);
         }
         else {
             // Emit event cannot be completed event
@@ -25994,7 +26052,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;
@@ -26003,6 +26061,7 @@ class CaseEventTriggerComponent {
         this.route = route;
         this.caseReferencePipe = caseReferencePipe;
         this.activityPollingService = activityPollingService;
+        this.sessionStorageService = sessionStorageService;
         this.BANNER = DisplayMode.BANNER;
     }
     ngOnInit() {
@@ -26064,21 +26123,30 @@ class CaseEventTriggerComponent {
     }
     submitted(event) {
         const eventStatus = event['status'];
+        const task = this.sessionStorageService.getItem('taskToComplete');
         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 (task) {
+                // 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('taskToComplete');
+            }
+            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
                 });
@@ -26097,7 +26165,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$2.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$2.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$2.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$2.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) {
@@ -26106,7 +26176,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$2.Router }, { type: AlertService }, { type: i1$2.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }]; }, null); })();
+    }], function () { return [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$2.Router }, { type: AlertService }, { type: i1$2.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }, { type: SessionStorageService }]; }, null); })();
 
 function CaseViewComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div");