@hmcts/ccd-case-ui-toolkit 6.19.4-sscs-joh-fixes → 6.19.4

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

@@ -14635,18 +14635,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 +14657,10 @@
         };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             this.secureModeOn = this.appConfig.getDocumentSecureMode();
+            console.info('writeDocumentField.ngInit: secure mode = ' + this.secureModeOn);
+            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 +14673,6 @@
             else {
                 this.createDocumentForm(document);
             }
-            if (this.appConfig.getDocumentSecureMode()) {
-                this.subscribeToCaseDetails();
-            }
         };
         WriteDocumentFieldComponent.prototype.ngOnDestroy = function () {
             if (this.fileUploadSubscription) {
@@ -14679,8 +14681,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 +14737,9 @@
         WriteDocumentFieldComponent.prototype.triggerReplace = function () {
             if (this.confirmReplaceResult === 'Replace') {
                 this.openFileDialog();
+                return true;
             }
+            return false;
         };
         WriteDocumentFieldComponent.prototype.getUploadedFileName = function () {
             if (this.uploadedDocument) {
@@ -14767,11 +14774,30 @@
                 _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;
+                    console.info("caseNotifier.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
+                }
+            });
+            this.jurisdictionSubs = this.jurisdictionService.selectedJurisdictionBS.subscribe({
+                next: function (jurisdiction) {
+                    if (jurisdiction) {
+                        _this.jurisdictionId = jurisdiction.id;
+                        if (jurisdiction.currentCaseType) {
+                            _this.caseTypeId = jurisdiction.currentCaseType.id;
+                        }
+                    }
+                    console.info("selectedJurisdiction.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
                 }
             });
         };
@@ -14835,13 +14861,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 +14910,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 +14988,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: [{
@@ -16404,24 +16425,12 @@
             }
         };
         WriteJudicialUserFieldComponent.prototype.setJurisdictionAndCaseType = function () {
-            var _this = this;
             var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
             if (caseInfoStr) {
                 var caseInfo = JSON.parse(caseInfoStr);
                 this.jurisdiction = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.jurisdiction;
                 this.caseType = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.caseType;
             }
-            else {
-                // If there is no case info, attempt to get the current jurisdiction and case type via the JurisdictionService
-                this.jurisdictionSubscription = this.jurisdictionService.selectedJurisdictionBS.subscribe(function (jurisdiction) {
-                    if (jurisdiction) {
-                        _this.jurisdiction = jurisdiction.id;
-                        if (jurisdiction.currentCaseType) {
-                            _this.caseType = jurisdiction.currentCaseType.id;
-                        }
-                    }
-                });
-            }
         };
         WriteJudicialUserFieldComponent.prototype.displayJudicialUser = function (judicialUser) {
             return judicialUser
@@ -16467,10 +16476,6 @@
                 this.judicialUserControl.setValidators(i2$1.Validators.required);
             }
         };
-        WriteJudicialUserFieldComponent.prototype.ngOnDestroy = function () {
-            var _a;
-            (_a = this.jurisdictionSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
-        };
         return WriteJudicialUserFieldComponent;
     }(WriteComplexFieldComponent));
     WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0__namespace.ɵɵdirectiveInject(JurisdictionService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService), i0__namespace.ɵɵdirectiveInject(IsCompoundPipe), i0__namespace.ɵɵdirectiveInject(FormValidatorsService)); };
@@ -29815,7 +29820,6 @@
             });
         };
         WorkbasketFiltersComponent.prototype.apply = function (init) {
-            var _this = this;
             // Save filters as query parameters for current route
             var queryParams = {};
             if (this.selected.jurisdiction) {
@@ -29847,20 +29851,9 @@
             if (init) {
                 this.windowService.setLocalStorage(SAVED_QUERY_PARAM_LOC_STORAGE, JSON.stringify(queryParams));
                 if (Object.keys(this.formGroup.controls).length > 0) {
-                    // Find all "special case" JudicialUser FormControl keys and remove the corresponding values from the
-                    // FormGroup value because these values are not intended to be stored and subsequently passed as query string
-                    // parameters when calling searchCases API endpoint
-                    var judicialUserControlValuesToRemove = Object.keys(this.formGroup.controls).filter(function (key) { return key.endsWith('_judicialUserControl'); });
-                    judicialUserControlValuesToRemove.forEach(function (controlKey) { return delete _this.formGroup.value[controlKey]; });
                     this.windowService.setLocalStorage(FORM_GROUP_VAL_LOC_STORAGE, JSON.stringify(this.formGroup.value));
                 }
             }
-            // Announce selected jurisdiction via JurisdictionService
-            if (this.selected.jurisdiction) {
-                // Set the selected case type as the current case type of the selected jurisdiction
-                this.selected.jurisdiction.currentCaseType = this.selected.caseType;
-                this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
-            }
             // Apply filters
             this.onApply.emit({ selected: this.selected, queryParams: queryParams });
             this.setFocusToTop();