@hmcts/ccd-case-ui-toolkit 6.16.2-ccpay-upgrade → 6.18.0-restricted-case-access

package/fesm2015/hmcts-ccd-case-ui-toolkit.js

@@ -9227,7 +9227,7 @@ class CaseEditPageComponent {
         this.wizard = this.caseEdit.wizard;
         this.caseFields = this.getCaseFields();
         this.syncCaseEditDataService();
-        this.route.params
+        this.routeParamsSub = this.route.params
             .subscribe(params => {
             var _a, _b;
             const pageId = params['page'];
@@ -9249,13 +9249,14 @@ class CaseEditPageComponent {
             }
         });
         CaseEditPageComponent.setFocusToTop();
-        this.caseEditDataService.caseEditForm$.subscribe({
+        this.caseEditFormSub = this.caseEditDataService.caseEditForm$.subscribe({
             next: editForm => this.editForm = editForm
         });
-        this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
-            next: isLinkedCasesJourneyAtFinalStep => this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep
-        });
-        this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
+        this.caseIsLinkedCasesJourneyAtFinalStepSub =
+            this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
+                next: isLinkedCasesJourneyAtFinalStep => this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep
+            });
+        this.caseTriggerSubmitEventSub = this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
             next: state => {
                 if (state) {
                     this.caseEditDataService.setTriggerSubmitEvent(false);
@@ -9268,6 +9269,17 @@ class CaseEditPageComponent {
     ngAfterViewChecked() {
         this.cdRef.detectChanges();
     }
+    ngOnDestroy() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        (_a = this.routeParamsSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        (_b = this.caseEditFormSub) === null || _b === void 0 ? void 0 : _b.unsubscribe();
+        (_c = this.caseIsLinkedCasesJourneyAtFinalStepSub) === null || _c === void 0 ? void 0 : _c.unsubscribe();
+        (_d = this.caseTriggerSubmitEventSub) === null || _d === void 0 ? void 0 : _d.unsubscribe();
+        (_e = this.validateSub) === null || _e === void 0 ? void 0 : _e.unsubscribe();
+        (_f = this.dialogRefAfterClosedSub) === null || _f === void 0 ? void 0 : _f.unsubscribe();
+        (_g = this.saveDraftSub) === null || _g === void 0 ? void 0 : _g.unsubscribe();
+        (_h = this.caseFormValidationErrorsSub) === null || _h === void 0 ? void 0 : _h.unsubscribe();
+    }
     applyValuesChanged(valuesChanged) {
         this.formValuesChanged = valuesChanged;
     }
@@ -9341,7 +9353,7 @@ class CaseEditPageComponent {
                             this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'), id);
                         });
                     }
-                    else if (FieldsUtils.isFlagLauncherCaseField(casefield)) {
+                    else if (FieldsUtils.isCaseFieldOfType(casefield, ['FlagLauncher'])) {
                         // Check whether the case field DisplayContextParameter is signalling "create" mode or "update" mode
                         // (expected always to be one of the two), to set the correct error message
                         let action = '';
@@ -9395,7 +9407,7 @@ class CaseEditPageComponent {
             this.caseEdit.error = null;
             const caseEventData = this.buildCaseEventData();
             const loadingSpinnerToken = this.loadingService.register();
-            this.caseEdit.validate(caseEventData, this.currentPage.id)
+            this.validateSub = this.caseEdit.validate(caseEventData, this.currentPage.id)
                 .pipe(finalize(() => {
                 this.loadingService.unregister(loadingSpinnerToken);
             }))
@@ -9495,7 +9507,7 @@ class CaseEditPageComponent {
         if (this.eventTrigger.can_save_draft) {
             if (this.formValuesChanged) {
                 const dialogRef = this.dialog.open(SaveOrDiscardDialogComponent, this.dialogConfig);
-                dialogRef.afterClosed().subscribe(result => {
+                this.dialogRefAfterClosedSub = dialogRef.afterClosed().subscribe(result => {
                     if (result === 'Discard') {
                         this.discard();
                     }
@@ -9581,7 +9593,7 @@ class CaseEditPageComponent {
             const draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
             draftCaseEventData.event_token = this.eventTrigger.event_token;
             draftCaseEventData.ignore_warning = this.caseEdit.ignoreWarning;
-            this.caseEdit.saveDraft(draftCaseEventData).subscribe((draft) => this.eventTrigger.case_id = DRAFT_PREFIX + draft.id, error => this.handleError(error));
+            this.saveDraftSub = this.caseEdit.saveDraft(draftCaseEventData).subscribe((draft) => this.eventTrigger.case_id = DRAFT_PREFIX + draft.id, error => this.handleError(error));
         }
     }
     getCaseFields() {
@@ -9644,7 +9656,7 @@ class CaseEditPageComponent {
         this.caseEditDataService.setCaseEventTriggerName(this.eventTrigger.name);
         this.caseEditDataService.setCaseTitle(this.getCaseTitle());
         this.caseEditDataService.setCaseEditForm(this.editForm);
-        this.caseEditDataService.caseFormValidationErrors$.subscribe({
+        this.caseFormValidationErrorsSub = this.caseEditDataService.caseFormValidationErrors$.subscribe({
             next: (validationErrors) => this.validationErrors = validationErrors
         });
     }
@@ -26099,7 +26111,7 @@ class CaseResolver {
             }
             else {
                 return this.caseNotifier.fetchAndRefresh(cid)
-                    .pipe(catchError(error => this.checkAuthorizationError(error)))
+                    .pipe(catchError(error => this.checkAuthorizationError(error, cid)))
                     .toPromise();
             }
         }
@@ -26111,20 +26123,24 @@ class CaseResolver {
             this.caseNotifier.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.caseNotifier.announceCase(this.caseNotifier.cachedCaseView);
             return this.caseNotifier.cachedCaseView;
-        }), catchError(error => this.checkAuthorizationError(error))).toPromise();
+        }), catchError(error => this.checkAuthorizationError(error, cid))).toPromise();
     }
-    checkAuthorizationError(error) {
+    checkAuthorizationError(error, caseReference) {
         // TODO Should be logged to remote logging infrastructure
         if (error.status === 400) {
             this.router.navigate(['/search/noresults']);
             return of(null);
         }
-        console.error(error);
         if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
             this.router.navigate(['/list/case']);
             return of(null);
         }
-        if (error.status !== 401 && error.status !== 403) {
+        // Error 403, navigate to restricted case access page
+        if (error.status === 403) {
+            this.router.navigate([`/cases/restricted-case-access/${caseReference}`]);
+            return of(null);
+        }
+        if (error.status !== 401) {
             this.router.navigate(['/error']);
         }
         this.goToDefaultPage();