@hmcts/ccd-case-ui-toolkit 6.19.5-restricted-case-access → 6.19.5-view-case-link

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

@@ -6528,7 +6528,6 @@ class JurisdictionService {
         return this.httpService.get('/aggregated/caseworkers/:uid/jurisdictions?access=read');
     }
     announceSelectedJurisdiction(jurisdiction) {
-        console.info('Announcing selected jurisdiction = ' + (jurisdiction === null || jurisdiction === void 0 ? void 0 : jurisdiction.id));
         this.selectedJurisdictionSource.next(jurisdiction);
         this.selectedJurisdictionBS.next(jurisdiction);
     }
@@ -8026,22 +8025,15 @@ class CaseNotifier {
         this.cachedCaseView = null;
     }
     announceCase(c) {
-        console.info('announceCase started.');
         this.caseViewSource.next(c);
-        console.info('announceCase finished.');
     }
     fetchAndRefresh(cid) {
-        console.info('fetchAndRefresh started.');
         return this.casesService
             .getCaseViewV2(cid)
             .pipe(map(caseView => {
-            console.info('mapping caseView started.');
-            // this.casesService.syncWait(10);
-            // throw new Error('******************************************************');
             this.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.setBasicFields(this.cachedCaseView.tabs);
             this.announceCase(this.cachedCaseView);
-            console.info('mapping caseView finished. Returning it.');
             return this.cachedCaseView;
         }));
     }
@@ -12734,17 +12726,18 @@ function WriteDocumentFieldComponent_ccd_read_document_field_10_Template(rf, ctx
 } }
 const _c1$k = function (a0) { return { "form-group-error bottom-30": a0 }; };
 class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
-    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService) {
+    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
         super();
         this.appConfig = appConfig;
         this.caseNotifier = caseNotifier;
         this.documentManagement = documentManagement;
         this.dialog = dialog;
         this.fileUploadStateService = fileUploadStateService;
+        this.jurisdictionService = jurisdictionService;
         this.valid = true;
     }
     clickout(event) {
-        // Capturing the event of of the associated  ElementRef <input type="file" #fileInpu
+        // Capturing the event of the associated  ElementRef <input type="file" #fileInpu
         if (this.fileInput.nativeElement.contains(event.target)) {
             this.clickInsideTheDocument = true;
         }
@@ -12754,6 +12747,9 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     }
     ngOnInit() {
         this.secureModeOn = this.appConfig.getDocumentSecureMode();
+        if (this.secureModeOn) {
+            this.subscribeToCaseDetails();
+        }
         this.dialogConfig = initDialog();
         // EUI-3403. The field was not being registered when there was no value and the field
         // itself was not mandatory, which meant that show_conditions would not be evaluated.
@@ -12766,9 +12762,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         else {
             this.createDocumentForm(document);
         }
-        if (this.appConfig.getDocumentSecureMode()) {
-            this.subscribeToCaseDetails();
-        }
     }
     ngOnDestroy() {
         if (this.fileUploadSubscription) {
@@ -12777,8 +12770,11 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         if (this.dialogSubscription) {
             this.dialogSubscription.unsubscribe();
         }
-        if (this.caseEventSubscription) {
-            this.caseEventSubscription.unsubscribe();
+        if (this.caseNotifierSubscription) {
+            this.caseNotifierSubscription.unsubscribe();
+        }
+        if (this.jurisdictionSubs) {
+            this.jurisdictionSubs.unsubscribe();
         }
     }
     isUploadInProgress() {
@@ -12829,7 +12825,9 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     triggerReplace() {
         if (this.confirmReplaceResult === 'Replace') {
             this.openFileDialog();
+            return true;
         }
+        return false;
     }
     getUploadedFileName() {
         if (this.uploadedDocument) {
@@ -12863,10 +12861,27 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             this.triggerReplace();
         });
     }
+    // Depending on the context, we can get the case type and jurisdiction from different sources
+    // If we are running an event, the caseNotifier will have the current case
+    // If we are creating a case, the case doesn't exist yet, so the caseNotifier can't help
+    // Instead we can use the eventTrigger to get the case type, and the jurisdiction service to
+    // get the currently selected jurisdiction
     subscribeToCaseDetails() {
-        this.caseEventSubscription = this.caseNotifier.caseView.subscribe({
+        this.caseNotifierSubscription = this.caseNotifier.caseView.subscribe({
             next: (caseDetails) => {
-                this.caseDetails = caseDetails;
+                var _a, _b;
+                this.caseTypeId = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_id;
+                this.jurisdictionId = (_b = (_a = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_type) === null || _a === void 0 ? void 0 : _a.jurisdiction) === null || _b === void 0 ? void 0 : _b.id;
+            }
+        });
+        this.jurisdictionSubs = this.jurisdictionService.selectedJurisdictionBS.subscribe({
+            next: (jurisdiction) => {
+                if (jurisdiction) {
+                    this.jurisdictionId = jurisdiction.id;
+                    if (jurisdiction.currentCaseType) {
+                        this.caseTypeId = jurisdiction.currentCaseType.id;
+                    }
+                }
             }
         });
     }
@@ -12930,13 +12945,8 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         documentUpload.append('files', selectedFile, selectedFile.name);
         documentUpload.append('classification', 'PUBLIC');
         if (this.appConfig.getDocumentSecureMode()) {
-            const caseTypeId = this.caseDetails &&
-                this.caseDetails.case_type &&
-                this.caseDetails.case_type.id ? this.caseDetails.case_type.id : null;
-            const caseTypeJurisdictionId = this.caseDetails &&
-                this.caseDetails.case_type &&
-                this.caseDetails.case_type.jurisdiction &&
-                this.caseDetails.case_type.jurisdiction.id ? this.caseDetails.case_type.jurisdiction.id : null;
+            const caseTypeId = this.caseTypeId ? this.caseTypeId : null;
+            const caseTypeJurisdictionId = this.jurisdictionId ? this.jurisdictionId : null;
             documentUpload.append('caseTypeId', caseTypeId);
             documentUpload.append('jurisdictionId', caseTypeJurisdictionId);
         }
@@ -12983,7 +12993,7 @@ WriteDocumentFieldComponent.DOCUMENT_HASH = 'document_hash';
 WriteDocumentFieldComponent.UPLOAD_ERROR_FILE_REQUIRED = 'File required';
 WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE = 'Document upload facility is not available at the moment';
 WriteDocumentFieldComponent.UPLOAD_WAITING_FILE_STATUS = 'Uploading...';
-WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(FileUploadStateService)); };
+WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService)); };
 WriteDocumentFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) { if (rf & 1) {
         i0.ɵɵviewQuery(_c0$N, 1);
     } if (rf & 2) {
@@ -13052,7 +13062,7 @@ WriteDocumentFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteDocument
                 selector: 'ccd-write-document-field',
                 templateUrl: './write-document-field.html'
             }]
-    }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatDialog }, { type: FileUploadStateService }]; }, { fileInput: [{
+    }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
         }], clickout: [{
@@ -27061,7 +27071,7 @@ class CaseResolver {
             else {
                 console.info('getAndCacheCaseView - Path B.');
                 return this.caseNotifier.fetchAndRefresh(cid)
-                    .pipe(catchError(error => this.processErrorInCaseFetch(error, cid)))
+                    .pipe(catchError(error => this.processErrorInCaseFetch(error)))
                     .toPromise();
             }
         }
@@ -27073,9 +27083,9 @@ class CaseResolver {
             this.caseNotifier.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.caseNotifier.announceCase(this.caseNotifier.cachedCaseView);
             return this.caseNotifier.cachedCaseView;
-        }), catchError(error => this.processErrorInCaseFetch(error, cid))).toPromise();
+        }), catchError(error => this.processErrorInCaseFetch(error))).toPromise();
     }
-    processErrorInCaseFetch(error, caseReference) {
+    processErrorInCaseFetch(error) {
         console.error('!!! processErrorInCaseFetch !!!');
         console.error(error);
         // TODO Should be logged to remote logging infrastructure
@@ -27083,16 +27093,12 @@ class CaseResolver {
             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);
         }
-        // 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) {
+        if (error.status !== 401 && error.status !== 403) {
             this.router.navigate(['/error']);
         }
         this.goToDefaultPage();
@@ -28253,6 +28259,7 @@ class CaseFullAccessViewComponent {
         const targetTabIndex = this.tabGroup._tabs.toArray().findIndex(tab => tab.textLabel === triggerOutputEventText);
         if (targetTabIndex > -1) {
             this.selectedTabIndex = targetTabIndex;
+            this.tabGroup.selectedIndex = targetTabIndex;
         }
     }
     hasActiveCaseFlags() {