@hmcts/ccd-case-ui-toolkit 7.0.3-error-message-fix → 7.0.3-event-before-task-with-logic

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

@@ -3239,6 +3239,11 @@ class WorkbasketInput {
 
 // @dynamic
 class FieldsUtils {
+    static isValidDisplayContext(ctx) {
+        return (ctx === 'MANDATORY' || ctx === 'READONLY'
+            || ctx === 'OPTIONAL' || ctx === 'HIDDEN'
+            || ctx === 'COMPLEX');
+    }
     static convertToCaseField(obj) {
         if (!(obj instanceof CaseField)) {
             return plainToClassFromExist(new CaseField(), obj);
@@ -5435,7 +5440,7 @@ class FormValueService {
                     // Retain anything that is readonly and not a label.
                     continue;
                 }
-                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
+                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
                     // 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];
@@ -7269,7 +7274,8 @@ class WizardPageFieldToCaseFieldMapper {
         childrenCaseFields.forEach(e => this.hideParentIfAllChildrenHidden(e));
         if (childrenCaseFields.length > 0 && this.allCaseFieldsHidden(childrenCaseFields)) {
             caseField.hidden = true;
-            caseField.display_context = 'HIDDEN';
+            // marking display_context as special hidden so field not being deleted in event submission
+            caseField.display_context = 'HIDDEN_TEMP';
         }
     }
     getCaseFieldChildren(caseField) {
@@ -7283,7 +7289,7 @@ class WizardPageFieldToCaseFieldMapper {
         return childrenCaseFields;
     }
     allCaseFieldsHidden(children) {
-        return !children.some(e => e.hidden !== true);
+        return children.every(e => e.display_context === 'HIDDEN' || e.display_context === 'HIDDEN_TEMP');
     }
 }
 WizardPageFieldToCaseFieldMapper.ɵfac = function WizardPageFieldToCaseFieldMapper_Factory(t) { return new (t || WizardPageFieldToCaseFieldMapper)(); };
@@ -8043,18 +8049,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
@@ -8073,18 +8070,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
@@ -8430,7 +8417,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) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
         this.router = router;
@@ -8445,6 +8432,7 @@ class CaseEditComponent {
         this.formErrorService = formErrorService;
         this.loadingService = loadingService;
         this.validPageListCaseFieldsService = validPageListCaseFieldsService;
+        this.workAllocationService = workAllocationService;
         this.cancelled = new EventEmitter();
         this.submitted = new EventEmitter();
         this.isEventCompletionChecksRequired = false;
@@ -8731,31 +8719,60 @@ 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.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);
+        }, 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);
+                // 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);
             }
-        }, 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;
         });
     }
+    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']);
@@ -8784,14 +8801,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)); };
 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 }]; }, { eventTrigger: [{
             type: Input
         }], submit: [{
             type: Input
@@ -10146,7 +10163,9 @@ class FieldsFilterPipe {
             .filter(f => keepEmpty || FieldsFilterPipe.keepField(f))
             .map(f => {
             if (!f.display_context) {
-                f.display_context = complexField.display_context;
+                if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                    f.display_context = complexField.display_context;
+                }
             }
             return f;
         });
@@ -12689,19 +12708,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         if (0 === error.status || 502 === error.status) {
             return WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE;
         }
-        let errorMsg = 'Error uploading file';
-        if (error && 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 && obj?.error) {
-                    errorMsg = obj.error;
-                }
-            }
-        }
-        return errorMsg;
+        return error.error;
     }
     buildDocumentUploadData(selectedFile) {
         const documentUpload = new FormData();
@@ -22005,7 +22012,9 @@ class ReadFieldsFilterPipe {
         })
             .map(f => {
             if (!f.display_context) {
-                f.display_context = complexField.display_context;
+                if (FieldsUtils.isValidDisplayContext(complexField.display_context)) {
+                    f.display_context = complexField.display_context;
+                }
             }
             if (setupHidden) {
                 ReadFieldsFilterPipe.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);
@@ -23700,18 +23709,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