@hmcts/ccd-case-ui-toolkit 7.0.44 → 7.0.46-exui-2086-rc1

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

@@ -9326,17 +9326,27 @@ 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),
+                caseId,
+                eventId,
                 task: taskInSessionStorage
             });
+            // add taskEvent to link current event with task id
+            const taskEvent = { eventId, taskId: taskInSessionStorage.id };
+            this.sessionStorageService.setItem('taskEvent', JSON.stringify(taskEvent));
             this.isEventCompletionChecksRequired = true;
         }
         else {
@@ -9501,6 +9511,10 @@ 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');
+            this.isSubmitting = false;
         }))
             .subscribe(() => {
             this.finishEventCompletionLogic(eventResponse);
@@ -9514,7 +9528,6 @@ class CaseEditComponent {
                     this.formErrorService
                         .mapFieldErrors(this.error.details.field_errors, form.controls['data'], 'validation');
                 }
-                this.isSubmitting = false;
             }
             else {
                 this.sessionStorageService.setItem('taskCompletionError', 'true');
@@ -9559,6 +9572,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
@@ -10425,7 +10457,6 @@ 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
@@ -10451,6 +10482,7 @@ class CaseEditPageComponent {
             this.validateSub = this.caseEdit.validate(caseEventData, this.currentPage.id)
                 .pipe(finalize(() => {
                 this.loadingService.unregister(loadingSpinnerToken);
+                this.caseEdit.isSubmitting = false;
             }))
                 .subscribe((jsonData) => {
                 /* istanbul ignore else */
@@ -11875,7 +11907,7 @@ function CaseFileViewFieldComponent_div_2_ng_container_8_Template(rf, ctx) { if
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("url", ctx_r1.currentDocument.document_binary_url)("downloadFileName", ctx_r1.currentDocument.document_filename)("showToolbar", true)("contentType", ctx_r1.currentDocument.content_type)("enableAnnotations", true)("enableRedactions", true)("height", "94.5vh")("enableICP", ctx_r1.isIcpEnabled());
+    i0.ɵɵproperty("url", ctx_r1.currentDocument.document_binary_url)("downloadFileName", ctx_r1.currentDocument.document_filename)("showToolbar", true)("contentType", ctx_r1.currentDocument.content_type)("enableAnnotations", true)("enableRedactions", true)("height", "94.5vh")("caseId", ctx_r1.caseId)("enableICP", ctx_r1.isIcpEnabled());
 } }
 function CaseFileViewFieldComponent_div_2_Template(rf, ctx) { if (rf & 1) {
     const _r3 = i0.ɵɵgetCurrentView();
@@ -11887,7 +11919,7 @@ function CaseFileViewFieldComponent_div_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementEnd()();
     i0.ɵɵelement(6, "div", 16);
     i0.ɵɵelementStart(7, "div", 17);
-    i0.ɵɵtemplate(8, CaseFileViewFieldComponent_div_2_ng_container_8_Template, 2, 8, "ng-container", 0);
+    i0.ɵɵtemplate(8, CaseFileViewFieldComponent_div_2_ng_container_8_Template, 2, 9, "ng-container", 0);
     i0.ɵɵelementEnd()()();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext();
@@ -11916,6 +11948,7 @@ class CaseFileViewFieldComponent {
     caseField;
     icp_jurisdictions = [];
     icpEnabled = false;
+    caseId;
     constructor(elementRef, route, caseFileViewService, documentManagementService, loadingService, sessionStorageService, caseNotifier, abstractConfig) {
         this.elementRef = elementRef;
         this.route = route;
@@ -11927,8 +11960,8 @@ class CaseFileViewFieldComponent {
         this.abstractConfig = abstractConfig;
     }
     ngOnInit() {
-        const cid = this.route.snapshot.paramMap.get(CaseFileViewFieldComponent.PARAM_CASE_ID);
-        this.categoriesAndDocuments$ = this.caseFileViewService.getCategoriesAndDocuments(cid);
+        this.caseId = this.route.snapshot.paramMap.get(CaseFileViewFieldComponent.PARAM_CASE_ID);
+        this.categoriesAndDocuments$ = this.caseFileViewService.getCategoriesAndDocuments(this.caseId);
         this.categoriesAndDocumentsSubscription = this.categoriesAndDocuments$.subscribe({
             next: data => {
                 this.caseVersion = data.case_version;
@@ -12005,7 +12038,7 @@ class CaseFileViewFieldComponent {
         return this.icpEnabled && ((this.icp_jurisdictions?.length < 1) || this.icp_jurisdictions.includes(this.caseNotifier?.cachedCaseView?.case_type?.jurisdiction.id));
     }
     static ɵfac = function CaseFileViewFieldComponent_Factory(t) { return new (t || CaseFileViewFieldComponent)(i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseFileViewService), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(AbstractAppConfig)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseFileViewFieldComponent, selectors: [["ccd-case-file-view-field"]], decls: 3, vars: 3, consts: [[4, "ngIf"], ["class", "govuk-grid-column-two-thirds", 4, "ngIf"], ["id", "case-file-view-field-errors", "data-module", "govuk-error-summary", 1, "govuk-error-summary", "govuk-!-margin-bottom-4"], ["role", "alert"], [1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [4, "ngFor", "ngForOf"], ["href", "javascript:void(0);"], [1, "govuk-grid-column-two-thirds"], [1, "govuk-heading-xl"], [1, "govuk-body"], [1, "govuk-heading-l"], ["id", "case-file-view", 1, "govuk-form-group"], [1, "document-tree-container"], [1, "document-tree-container__tree", 3, "clickedDocument", "moveDocument", "categoriesAndDocuments", "allowMoving"], [1, "slider"], [1, "media-viewer-container"], [3, "url", "downloadFileName", "showToolbar", "contentType", "enableAnnotations", "enableRedactions", "height", "enableICP"]], template: function CaseFileViewFieldComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseFileViewFieldComponent, selectors: [["ccd-case-file-view-field"]], decls: 3, vars: 3, consts: [[4, "ngIf"], ["class", "govuk-grid-column-two-thirds", 4, "ngIf"], ["id", "case-file-view-field-errors", "data-module", "govuk-error-summary", 1, "govuk-error-summary", "govuk-!-margin-bottom-4"], ["role", "alert"], [1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [4, "ngFor", "ngForOf"], ["href", "javascript:void(0);"], [1, "govuk-grid-column-two-thirds"], [1, "govuk-heading-xl"], [1, "govuk-body"], [1, "govuk-heading-l"], ["id", "case-file-view", 1, "govuk-form-group"], [1, "document-tree-container"], [1, "document-tree-container__tree", 3, "clickedDocument", "moveDocument", "categoriesAndDocuments", "allowMoving"], [1, "slider"], [1, "media-viewer-container"], [3, "url", "downloadFileName", "showToolbar", "contentType", "enableAnnotations", "enableRedactions", "height", "caseId", "enableICP"]], template: function CaseFileViewFieldComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵtemplate(0, CaseFileViewFieldComponent_ng_container_0_Template, 8, 1, "ng-container", 0)(1, CaseFileViewFieldComponent_div_1_Template, 5, 0, "div", 1)(2, CaseFileViewFieldComponent_div_2_Template, 9, 3, "div", 0);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.errorMessages == null ? null : ctx.errorMessages.length);
@@ -12017,7 +12050,7 @@ class CaseFileViewFieldComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseFileViewFieldComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-file-view-field', template: "<ng-container *ngIf=\"errorMessages?.length\">\n  <div\n    id=\"case-file-view-field-errors\"\n    class=\"govuk-error-summary govuk-!-margin-bottom-4\" data-module=\"govuk-error-summary\">\n    <div role=\"alert\">\n      <h2 class=\"govuk-error-summary__title\">\n        There is a problem\n      </h2>\n      <div class=\"govuk-error-summary__body\">\n        <ul class=\"govuk-list govuk-error-summary__list\">\n          <li *ngFor=\"let errorMessage of errorMessages\">\n            <a href=\"javascript:void(0);\">{{ errorMessage }}</a>\n          </li>\n        </ul>\n      </div>\n    </div>\n  </div>\n</ng-container>\n\n<div *ngIf=\"getCategoriesAndDocumentsError\" class=\"govuk-grid-column-two-thirds\">\n  <h1 class=\"govuk-heading-xl\">Sorry, there is a problem with the service</h1>\n  <p class=\"govuk-body\">Try again later.</p>\n</div>\n<div *ngIf=\"!getCategoriesAndDocumentsError\">\n  <h2 class=\"govuk-heading-l\">Case file</h2>\n  <div class=\"govuk-form-group\" id=\"case-file-view\">\n    <!-- Document tree -->\n    <div class=\"document-tree-container\">\n      <ccd-case-file-view-folder\n        class=\"document-tree-container__tree\"\n        [categoriesAndDocuments]=\"categoriesAndDocuments$\"\n        (clickedDocument)=\"setMediaViewerFile($event); resetErrorMessages()\"\n        (moveDocument)=\"moveDocument($event)\"\n        [allowMoving]=\"allowMoving\"\n      ></ccd-case-file-view-folder>\n    </div>\n    <!-- Slider -->\n    <div class=\"slider\"></div>\n    <!-- Media viewer -->\n    <div class=\"media-viewer-container\">\n      <ng-container *ngIf=\"currentDocument\">\n        <mv-media-viewer [url]=\"currentDocument.document_binary_url\"\n                         [downloadFileName]=\"currentDocument.document_filename\"\n                         [showToolbar]=\"true\"\n                         [contentType]=\"currentDocument.content_type\"\n                         [enableAnnotations]=\"true\"\n                         [enableRedactions]=\"true\"\n                         [height]=\"'94.5vh'\"\n                         [enableICP]=\"isIcpEnabled()\">\n        </mv-media-viewer>\n      </ng-container>\n    </div>\n  </div>\n</div>\n", styles: ["#case-file-view{display:flex;border:2px solid #C9C9C9;height:100vh;position:relative}#case-file-view .document-tree-container{background-color:#faf8f8;width:30%;min-height:400px;min-width:10%}#case-file-view .slider{width:.2%;background-color:#6b6b6b}#case-file-view .slider:hover,#case-file-view .slider:focus{cursor:col-resize}#case-file-view .media-viewer-container{background-color:#dee0e2;flex:1 1 0;overflow:hidden}\n"] }]
+        args: [{ selector: 'ccd-case-file-view-field', template: "<ng-container *ngIf=\"errorMessages?.length\">\n  <div\n    id=\"case-file-view-field-errors\"\n    class=\"govuk-error-summary govuk-!-margin-bottom-4\" data-module=\"govuk-error-summary\">\n    <div role=\"alert\">\n      <h2 class=\"govuk-error-summary__title\">\n        There is a problem\n      </h2>\n      <div class=\"govuk-error-summary__body\">\n        <ul class=\"govuk-list govuk-error-summary__list\">\n          <li *ngFor=\"let errorMessage of errorMessages\">\n            <a href=\"javascript:void(0);\">{{ errorMessage }}</a>\n          </li>\n        </ul>\n      </div>\n    </div>\n  </div>\n</ng-container>\n\n<div *ngIf=\"getCategoriesAndDocumentsError\" class=\"govuk-grid-column-two-thirds\">\n  <h1 class=\"govuk-heading-xl\">Sorry, there is a problem with the service</h1>\n  <p class=\"govuk-body\">Try again later.</p>\n</div>\n<div *ngIf=\"!getCategoriesAndDocumentsError\">\n  <h2 class=\"govuk-heading-l\">Case file</h2>\n  <div class=\"govuk-form-group\" id=\"case-file-view\">\n    <!-- Document tree -->\n    <div class=\"document-tree-container\">\n      <ccd-case-file-view-folder\n        class=\"document-tree-container__tree\"\n        [categoriesAndDocuments]=\"categoriesAndDocuments$\"\n        (clickedDocument)=\"setMediaViewerFile($event); resetErrorMessages()\"\n        (moveDocument)=\"moveDocument($event)\"\n        [allowMoving]=\"allowMoving\"\n      ></ccd-case-file-view-folder>\n    </div>\n    <!-- Slider -->\n    <div class=\"slider\"></div>\n    <!-- Media viewer -->\n    <div class=\"media-viewer-container\">\n      <ng-container *ngIf=\"currentDocument\">\n        <mv-media-viewer [url]=\"currentDocument.document_binary_url\"\n                         [downloadFileName]=\"currentDocument.document_filename\"\n                         [showToolbar]=\"true\"\n                         [contentType]=\"currentDocument.content_type\"\n                         [enableAnnotations]=\"true\"\n                         [enableRedactions]=\"true\"\n                         [height]=\"'94.5vh'\"\n                         [caseId]=\"caseId\"\n                         [enableICP]=\"isIcpEnabled()\">\n        </mv-media-viewer>\n      </ng-container>\n    </div>\n  </div>\n</div>\n", styles: ["#case-file-view{display:flex;border:2px solid #C9C9C9;height:100vh;position:relative}#case-file-view .document-tree-container{background-color:#faf8f8;width:30%;min-height:400px;min-width:10%}#case-file-view .slider{width:.2%;background-color:#6b6b6b}#case-file-view .slider:hover,#case-file-view .slider:focus{cursor:col-resize}#case-file-view .media-viewer-container{background-color:#dee0e2;flex:1 1 0;overflow:hidden}\n"] }]
     }], () => [{ type: i0.ElementRef }, { type: i1$1.ActivatedRoute }, { type: CaseFileViewService }, { type: DocumentManagementService }, { type: LoadingService }, { type: SessionStorageService }, { type: CaseNotifier }, { type: AbstractAppConfig }], null); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseFileViewFieldComponent, { className: "CaseFileViewFieldComponent", filePath: "lib/shared/components/palette/case-file-view/case-file-view-field.component.ts", lineNumber: 17 }); })();