@hmcts/ccd-case-ui-toolkit 6.19.5-restricted-case-access → 6.19.5-yes-no-bug-fix-v2

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -7708,7 +7708,6 @@
             return this.httpService.get('/aggregated/caseworkers/:uid/jurisdictions?access=read');
         };
         JurisdictionService.prototype.announceSelectedJurisdiction = function (jurisdiction) {
-            console.info('Announcing selected jurisdiction = ' + (jurisdiction === null || jurisdiction === void 0 ? void 0 : jurisdiction.id));
             this.selectedJurisdictionSource.next(jurisdiction);
             this.selectedJurisdictionBS.next(jurisdiction);
         };
@@ -9374,23 +9373,16 @@
             this.cachedCaseView = null;
         };
         CaseNotifier.prototype.announceCase = function (c) {
-            console.info('announceCase started.');
             this.caseViewSource.next(c);
-            console.info('announceCase finished.');
         };
         CaseNotifier.prototype.fetchAndRefresh = function (cid) {
             var _this = this;
-            console.info('fetchAndRefresh started.');
             return this.casesService
                 .getCaseViewV2(cid)
                 .pipe(operators.map(function (caseView) {
-                console.info('mapping caseView started.');
-                // this.casesService.syncWait(10);
-                // throw new Error('******************************************************');
                 _this.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.setBasicFields(_this.cachedCaseView.tabs);
                 _this.announceCase(_this.cachedCaseView);
-                console.info('mapping caseView finished. Returning it.');
                 return _this.cachedCaseView;
             }));
         };
@@ -14635,18 +14627,19 @@
     var _c1$k = function (a0) { return { "form-group-error bottom-30": a0 }; };
     var WriteDocumentFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDocumentFieldComponent, _super);
-        function WriteDocumentFieldComponent(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService) {
+        function WriteDocumentFieldComponent(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
             var _this = _super.call(this) || this;
             _this.appConfig = appConfig;
             _this.caseNotifier = caseNotifier;
             _this.documentManagement = documentManagement;
             _this.dialog = dialog;
             _this.fileUploadStateService = fileUploadStateService;
+            _this.jurisdictionService = jurisdictionService;
             _this.valid = true;
             return _this;
         }
         WriteDocumentFieldComponent.prototype.clickout = function (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;
             }
@@ -14656,6 +14649,9 @@
         };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             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.
@@ -14668,9 +14664,6 @@
             else {
                 this.createDocumentForm(document);
             }
-            if (this.appConfig.getDocumentSecureMode()) {
-                this.subscribeToCaseDetails();
-            }
         };
         WriteDocumentFieldComponent.prototype.ngOnDestroy = function () {
             if (this.fileUploadSubscription) {
@@ -14679,8 +14672,11 @@
             if (this.dialogSubscription) {
                 this.dialogSubscription.unsubscribe();
             }
-            if (this.caseEventSubscription) {
-                this.caseEventSubscription.unsubscribe();
+            if (this.caseNotifierSubscription) {
+                this.caseNotifierSubscription.unsubscribe();
+            }
+            if (this.jurisdictionSubs) {
+                this.jurisdictionSubs.unsubscribe();
             }
         };
         WriteDocumentFieldComponent.prototype.isUploadInProgress = function () {
@@ -14732,7 +14728,9 @@
         WriteDocumentFieldComponent.prototype.triggerReplace = function () {
             if (this.confirmReplaceResult === 'Replace') {
                 this.openFileDialog();
+                return true;
             }
+            return false;
         };
         WriteDocumentFieldComponent.prototype.getUploadedFileName = function () {
             if (this.uploadedDocument) {
@@ -14767,11 +14765,28 @@
                 _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
         WriteDocumentFieldComponent.prototype.subscribeToCaseDetails = function () {
             var _this = this;
-            this.caseEventSubscription = this.caseNotifier.caseView.subscribe({
+            this.caseNotifierSubscription = this.caseNotifier.caseView.subscribe({
                 next: function (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: function (jurisdiction) {
+                    if (jurisdiction) {
+                        _this.jurisdictionId = jurisdiction.id;
+                        if (jurisdiction.currentCaseType) {
+                            _this.caseTypeId = jurisdiction.currentCaseType.id;
+                        }
+                    }
                 }
             });
         };
@@ -14835,13 +14850,8 @@
             documentUpload.append('files', selectedFile, selectedFile.name);
             documentUpload.append('classification', 'PUBLIC');
             if (this.appConfig.getDocumentSecureMode()) {
-                var caseTypeId = this.caseDetails &&
-                    this.caseDetails.case_type &&
-                    this.caseDetails.case_type.id ? this.caseDetails.case_type.id : null;
-                var 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;
+                var caseTypeId = this.caseTypeId ? this.caseTypeId : null;
+                var caseTypeJurisdictionId = this.jurisdictionId ? this.jurisdictionId : null;
                 documentUpload.append('caseTypeId', caseTypeId);
                 documentUpload.append('jurisdictionId', caseTypeJurisdictionId);
             }
@@ -14889,7 +14899,7 @@
     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__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService)); };
+    WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService), i0__namespace.ɵɵdirectiveInject(JurisdictionService)); };
     WriteDocumentFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵviewQuery(_c0$N, 1);
@@ -14967,7 +14977,7 @@
                         selector: 'ccd-write-document-field',
                         templateUrl: './write-document-field.html'
                     }]
-            }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: FileUploadStateService }]; }, { fileInput: [{
+            }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
                     type: i0.ViewChild,
                     args: ['fileInput', { static: false }]
                 }], clickout: [{
@@ -31010,7 +31020,7 @@
                 else {
                     console.info('getAndCacheCaseView - Path B.');
                     return this.caseNotifier.fetchAndRefresh(cid)
-                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); }))
+                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); }))
                         .toPromise();
                 }
             }
@@ -31023,9 +31033,9 @@
                 _this.caseNotifier.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.caseNotifier.announceCase(_this.caseNotifier.cachedCaseView);
                 return _this.caseNotifier.cachedCaseView;
-            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); })).toPromise();
+            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); })).toPromise();
         };
-        CaseResolver.prototype.processErrorInCaseFetch = function (error, caseReference) {
+        CaseResolver.prototype.processErrorInCaseFetch = function (error) {
             console.error('!!! processErrorInCaseFetch !!!');
             console.error(error);
             // TODO Should be logged to remote logging infrastructure
@@ -31033,16 +31043,12 @@
                 this.router.navigate(['/search/noresults']);
                 return rxjs.of(null);
             }
+            console.error(error);
             if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
                 this.router.navigate(['/list/case']);
                 return rxjs.of(null);
             }
-            // Error 403, navigate to restricted case access page
-            if (error.status === 403) {
-                this.router.navigate(["/cases/restricted-case-access/" + caseReference]);
-                return rxjs.of(null);
-            }
-            if (error.status !== 401) {
+            if (error.status !== 401 && error.status !== 403) {
                 this.router.navigate(['/error']);
             }
             this.goToDefaultPage();