@hmcts/ccd-case-ui-toolkit 7.0.39-case-consolidated-link → 7.0.39-task-event-completion-fix

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

@@ -8854,17 +8854,26 @@ class CaseEditComponent {
         // We have to run the event completion checks if task in session storage
         // and if the task is in session storage, then is it associated to the case
         let taskInSessionStorage;
+        let taskEventInSessionStorage;
         const taskStr = this.sessionStorageService.getItem('taskToComplete');
+        const taskEventStr = this.sessionStorageService.getItem('taskEvent');
         if (taskStr) {
             taskInSessionStorage = JSON.parse(taskStr);
         }
-        if (taskInSessionStorage && taskInSessionStorage.case_id === this.getCaseId(caseDetails)) {
+        if (taskEventStr) {
+            taskEventInSessionStorage = JSON.parse(taskEventStr);
+        }
+        const eventId = this.getEventId(form);
+        const caseId = this.getCaseId(caseDetails);
+        if (this.taskExistsForThisEventAndCase(taskInSessionStorage, taskEventInSessionStorage, eventId, caseId)) {
             // Show event completion component to perform event completion checks
             this.eventCompletionParams = ({
                 caseId: this.getCaseId(caseDetails),
-                eventId: this.getEventId(form),
+                eventId,
                 task: taskInSessionStorage
             });
+            const taskEvent = { eventId, taskId: taskInSessionStorage.id };
+            this.sessionStorageService.setItem('taskEvent', JSON.stringify(taskEvent));
             this.isEventCompletionChecksRequired = true;
         }
         else {
@@ -9029,6 +9038,9 @@ class CaseEditComponent {
             return this.postCompleteTaskIfRequired();
         }), finalize(() => {
             this.loadingService.unregister(loadingSpinnerToken);
+            // on event completion ensure the previous event taskToComplete/taskEvent removed
+            this.sessionStorageService.removeItem('taskToComplete');
+            this.sessionStorageService.removeItem('taskEvent');
         }))
             .subscribe(() => {
             this.finishEventCompletionLogic(eventResponse);
@@ -9087,6 +9099,25 @@ class CaseEditComponent {
             return null;
         }
     }
+    // checks whether current taskToComplete relevant for the event
+    taskExistsForThisEventAndCase(taskInSessionStorage, taskEvent, eventId, caseId) {
+        if (!taskInSessionStorage || taskInSessionStorage.case_id !== caseId) {
+            return false;
+        }
+        if (!taskEvent) {
+            // if no task event present then there is no task to complete from previous event present
+            return true;
+        }
+        else {
+            if (taskEvent.taskId === taskInSessionStorage.id && taskEvent.eventId !== eventId) {
+                // if the session storage not related to event, ignore it and remove
+                this.sessionStorageService.removeItem('taskToComplete');
+                this.sessionStorageService.removeItem('taskEvent');
+                return false;
+            }
+            return true;
+        }
+    }
     onEventCanBeCompleted({ eventTrigger, eventCanBeCompleted, caseDetails, form, submit }) {
         if (eventCanBeCompleted) {
             // Submit
@@ -16008,43 +16039,20 @@ function LinkedCasesFromTableComponent_a_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(ctx_r0.showHideLinkText);
 } }
-function LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_a_4_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "a", 20);
-    i0.ɵɵtext(1);
-    i0.ɵɵelementEnd();
-} if (rf & 2) {
-    const case_r7 = i0.ɵɵnextContext(3).$implicit;
-    const ctx_r14 = i0.ɵɵnextContext(3);
-    i0.ɵɵpropertyInterpolate1("href", "cases/case-details/", case_r7.caseReference, "", i0.ɵɵsanitizeUrl);
-    i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(ctx_r14.getCaseReferenceLink(case_r7.caseReference));
-} }
-function LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_br_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelement(0, "br");
-} }
 function LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span");
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "ccdLinkCasesFromReasonValue");
-    i0.ɵɵelementStart(3, "span");
-    i0.ɵɵtemplate(4, LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_a_4_Template, 2, 2, "a", 18);
-    i0.ɵɵelementEnd();
-    i0.ɵɵtemplate(5, LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_br_5_Template, 1, 0, "br", 19);
+    i0.ɵɵelement(3, "br");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const reason_r11 = ctx.$implicit;
-    const isLast_r13 = ctx.last;
-    const ctx_r10 = i0.ɵɵnextContext(5);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 3, reason_r11), "");
-    i0.ɵɵadvance(3);
-    i0.ɵɵproperty("ngIf", ctx_r10.hasLeadCaseOrConsolidated(reason_r11.reasonCode));
-    i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngIf", !isLast_r13);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, reason_r11), " ");
 } }
 function LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "td", 14);
-    i0.ɵɵtemplate(1, LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_Template, 6, 5, "span", 17);
+    i0.ɵɵtemplate(1, LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_td_18_span_1_Template, 4, 3, "span", 17);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const details_r9 = ctx.$implicit;
@@ -16091,7 +16099,7 @@ function LinkedCasesFromTableComponent_table_1_tbody_13_tr_1_Template(rf, ctx) {
     i0.ɵɵproperty("ngForOf", case_r7.linkDetails);
 } }
 function LinkedCasesFromTableComponent_table_1_tbody_13_tr_2_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "tr", 5)(1, "td", 21);
+    i0.ɵɵelementStart(0, "tr", 5)(1, "td", 18);
     i0.ɵɵtext(2, " None ");
     i0.ɵɵelementEnd()();
 } }
@@ -16190,13 +16198,6 @@ class LinkedCasesFromTableComponent {
     mapLookupIDToValueFromJurisdictions(fieldName, fieldValue) {
         return this.linkedCasesService.mapLookupIDToValueFromJurisdictions(fieldName, fieldValue);
     }
-    getCaseReferenceLink(caseRef) {
-        return caseRef.slice(this.caseId.length - 4);
-    }
-    hasLeadCaseOrConsolidated(reasonCode) {
-        return reasonCode === LinkedCasesFromTableComponent.CASE_PROGRESS_REASON_CODE ||
-            reasonCode === LinkedCasesFromTableComponent.CASE_CONSOLIDATED_REASON_CODE;
-    }
     onClick() {
         this.showHideLinkText = this.showHideLinkText === 'Show'
             ? 'Hide'
@@ -16204,10 +16205,8 @@ class LinkedCasesFromTableComponent {
     }
 }
 LinkedCasesFromTableComponent.CASE_NAME_MISSING_TEXT = 'Case name missing';
-LinkedCasesFromTableComponent.CASE_CONSOLIDATED_REASON_CODE = 'CLRC015';
-LinkedCasesFromTableComponent.CASE_PROGRESS_REASON_CODE = 'CLRC016';
 LinkedCasesFromTableComponent.ɵfac = function LinkedCasesFromTableComponent_Factory(t) { return new (t || LinkedCasesFromTableComponent)(i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(LinkedCasesService)); };
-LinkedCasesFromTableComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: LinkedCasesFromTableComponent, selectors: [["ccd-linked-cases-from-table"]], inputs: { caseField: "caseField" }, outputs: { notifyAPIFailure: "notifyAPIFailure" }, decls: 2, vars: 2, consts: [["id", "show-hide-link", "class", "govuk-link", "href", "javascript:void(0)", 3, "click", 4, "ngIf"], ["aria-describedby", "table to display cases linked from", 4, "ngIf"], ["id", "show-hide-link", "href", "javascript:void(0)", 1, "govuk-link", 3, "click"], ["aria-describedby", "table to display cases linked from"], [1, "govuk-table__head"], [1, "govuk-table__row"], ["scope", "col", "width", "20%", 1, "govuk-table__header", "case-table-column"], ["class", "govuk-table__body", 4, "ngIf"], [1, "govuk-table__body"], ["class", "govuk-table__row", 4, "ngFor", "ngForOf"], ["class", "govuk-table__row", 4, "ngIf"], [1, "govuk-table__header", "case-table-column", "width-20"], [1, "govuk-body"], ["target", "_blank", "rel", "noopener", 1, "govuk-link", 3, "href"], [1, "case-table-column"], [3, "title"], ["class", "case-table-column", 4, "ngFor", "ngForOf"], [4, "ngFor", "ngForOf"], ["class", "govuk-!-padding-left-1", 3, "href", 4, "ngIf"], [4, "ngIf"], [1, "govuk-!-padding-left-1", 3, "href"], ["colspan", "5", 1, "govuk-table__cell"]], template: function LinkedCasesFromTableComponent_Template(rf, ctx) { if (rf & 1) {
+LinkedCasesFromTableComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: LinkedCasesFromTableComponent, selectors: [["ccd-linked-cases-from-table"]], inputs: { caseField: "caseField" }, outputs: { notifyAPIFailure: "notifyAPIFailure" }, decls: 2, vars: 2, consts: [["id", "show-hide-link", "class", "govuk-link", "href", "javascript:void(0)", 3, "click", 4, "ngIf"], ["aria-describedby", "table to display cases linked from", 4, "ngIf"], ["id", "show-hide-link", "href", "javascript:void(0)", 1, "govuk-link", 3, "click"], ["aria-describedby", "table to display cases linked from"], [1, "govuk-table__head"], [1, "govuk-table__row"], ["scope", "col", "width", "20%", 1, "govuk-table__header", "case-table-column"], ["class", "govuk-table__body", 4, "ngIf"], [1, "govuk-table__body"], ["class", "govuk-table__row", 4, "ngFor", "ngForOf"], ["class", "govuk-table__row", 4, "ngIf"], [1, "govuk-table__header", "case-table-column", "width-20"], [1, "govuk-body"], ["target", "_blank", "rel", "noopener", 1, "govuk-link", 3, "href"], [1, "case-table-column"], [3, "title"], ["class", "case-table-column", 4, "ngFor", "ngForOf"], [4, "ngFor", "ngForOf"], ["colspan", "5", 1, "govuk-table__cell"]], template: function LinkedCasesFromTableComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵtemplate(0, LinkedCasesFromTableComponent_a_0_Template, 2, 1, "a", 0);
         i0.ɵɵtemplate(1, LinkedCasesFromTableComponent_table_1_Template, 14, 1, "table", 1);
     } if (rf & 2) {
@@ -16217,7 +16216,7 @@ LinkedCasesFromTableComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ typ
     } }, styles: [".case-table-column[_ngcontent-%COMP%]{min-width:20%;max-width:20%}.heading-h2[_ngcontent-%COMP%]{margin-bottom:0}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LinkedCasesFromTableComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-linked-cases-from-table', template: "<a *ngIf=\"!noLinkedCases && !isServerError\" id=\"show-hide-link\" class=\"govuk-link\" href=\"javascript:void(0)\"\n  (click)=\"onClick()\">{{showHideLinkText}}</a>\n<table *ngIf=\"(getLinkedCasesResponse && showHideLinkText === 'Hide') || noLinkedCases\"\n  aria-describedby=\"table to display cases linked from\">\n  <thead class=\"govuk-table__head\">\n    <tr class=\"govuk-table__row\">\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Case name and number</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Case type </th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Service</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">State</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Reasons for case link</th>\n    </tr>\n  </thead>\n  <tbody class=\"govuk-table__body\" *ngIf=\"getLinkedCasesResponse && (!isServerError && !isServerReasonCodeError)\">\n    <tr class=\"govuk-table__row\" *ngFor=\"let case of getLinkedCasesResponse\">\n      <td class=\"govuk-table__header case-table-column width-20\">\n        <p class=\"govuk-body\"><a target=\"_blank\" class=\"govuk-link\" href=\"cases/case-details/{{case.caseReference}}\"\n            rel=\"noopener\"><span>{{case.caseNameHmctsInternal}} <br>\n              {{case.caseReference | ccdCaseReference}}</span></a></p>\n      </td>\n      <td class=\"case-table-column\"><span [title]=\"case.ccdCaseTypeDescription\">{{case.ccdCaseType}}</span></td>\n      <td class=\"case-table-column\"><span>{{case.ccdJurisdiction}}</span></td>\n      <td class=\"case-table-column\"><span [title]=\"case.stateDescription\">{{case.state}}</span></td>\n      <td class=\"case-table-column\" *ngFor=\"let details of case.linkDetails\">\n        <span *ngFor=\"let reason of details.reasons; let i = index; let isLast = last\">\n          {{reason | ccdLinkCasesFromReasonValue}}<span><a class=\"govuk-!-padding-left-1\"\n            href=\"cases/case-details/{{ case.caseReference }}\"\n            *ngIf=\"hasLeadCaseOrConsolidated(reason.reasonCode)\">{{getCaseReferenceLink(case.caseReference)}}</a></span>\n        <br *ngIf=\"!isLast\" />\n        </span>\n      </td>\n    </tr>\n    <tr class=\"govuk-table__row\" *ngIf=\"noLinkedCases\">\n      <td class=\"govuk-table__cell\" colspan=\"5\">\n        None\n      </td>\n    </tr>\n    </tbody>  \n</table>\n", styles: [".case-table-column{min-width:20%;max-width:20%}.heading-h2{margin-bottom:0}\n"] }]
+        args: [{ selector: 'ccd-linked-cases-from-table', template: "<a *ngIf=\"!noLinkedCases && !isServerError\" id=\"show-hide-link\" class=\"govuk-link\" href=\"javascript:void(0)\"\n  (click)=\"onClick()\">{{showHideLinkText}}</a>\n<table *ngIf=\"(getLinkedCasesResponse && showHideLinkText === 'Hide') || noLinkedCases\"\n  aria-describedby=\"table to display cases linked from\">\n  <thead class=\"govuk-table__head\">\n    <tr class=\"govuk-table__row\">\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Case name and number</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Case type </th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Service</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">State</th>\n      <th scope=\"col\" class=\"govuk-table__header case-table-column\" width=\"20%\">Reasons for case link</th>\n    </tr>\n  </thead>\n  <tbody class=\"govuk-table__body\" *ngIf=\"getLinkedCasesResponse && (!isServerError && !isServerReasonCodeError)\">\n    <tr class=\"govuk-table__row\" *ngFor=\"let case of getLinkedCasesResponse\">\n      <td class=\"govuk-table__header case-table-column width-20\">\n        <p class=\"govuk-body\"><a target=\"_blank\" class=\"govuk-link\" href=\"cases/case-details/{{case.caseReference}}\"\n            rel=\"noopener\"><span>{{case.caseNameHmctsInternal}} <br>\n              {{case.caseReference | ccdCaseReference}}</span></a></p>\n      </td>\n      <td class=\"case-table-column\"><span [title]=\"case.ccdCaseTypeDescription\">{{case.ccdCaseType}}</span></td>\n      <td class=\"case-table-column\"><span>{{case.ccdJurisdiction}}</span></td>\n      <td class=\"case-table-column\"><span [title]=\"case.stateDescription\">{{case.state}}</span></td>\n      <td class=\"case-table-column\" *ngFor=\"let details of case.linkDetails\">\n        <span *ngFor=\"let reason of details.reasons; let i = index; let isLast = last\">\n          {{reason | ccdLinkCasesFromReasonValue}} <br>\n        </span>\n      </td>\n    </tr>\n    <tr class=\"govuk-table__row\" *ngIf=\"noLinkedCases\">\n      <td class=\"govuk-table__cell\" colspan=\"5\">\n        None\n      </td>\n    </tr>\n    </tbody>  \n</table>\n", styles: [".case-table-column{min-width:20%;max-width:20%}.heading-h2{margin-bottom:0}\n"] }]
     }], function () { return [{ type: i1$1.ActivatedRoute }, { type: CasesService }, { type: LinkedCasesService }]; }, { caseField: [{
             type: Input
         }], notifyAPIFailure: [{