@hmcts/ccd-case-ui-toolkit 6.19.3-RetryCaseRetrievals.1 → 6.19.5-secure-doc-case-creation.1

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

@@ -7699,14 +7699,18 @@
     var JurisdictionService = /** @class */ (function () {
         function JurisdictionService(httpService) {
             this.httpService = httpService;
+            // We retain the Subject observable because subscribing code couldn't happen a null value
             this.selectedJurisdictionSource = new rxjs.Subject();
+            this.selectedJurisdictionBS = new rxjs.BehaviorSubject(null);
             this.selectedJurisdiction = this.selectedJurisdictionSource.asObservable();
         }
         JurisdictionService.prototype.getJurisdictions = function () {
             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);
         };
         JurisdictionService.prototype.searchJudicialUsers = function (searchTerm, serviceId) {
             return this.httpService.post('api/prd/judicial/getJudicialUsersSearch', { searchString: searchTerm, serviceCode: serviceId });
@@ -14631,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;
             }
@@ -14652,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.
@@ -14664,9 +14673,6 @@
             else {
                 this.createDocumentForm(document);
             }
-            if (this.appConfig.getDocumentSecureMode()) {
-                this.subscribeToCaseDetails();
-            }
         };
         WriteDocumentFieldComponent.prototype.ngOnDestroy = function () {
             if (this.fileUploadSubscription) {
@@ -14675,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 () {
@@ -14728,7 +14737,9 @@
         WriteDocumentFieldComponent.prototype.triggerReplace = function () {
             if (this.confirmReplaceResult === 'Replace') {
                 this.openFileDialog();
+                return true;
             }
+            return false;
         };
         WriteDocumentFieldComponent.prototype.getUploadedFileName = function () {
             if (this.uploadedDocument) {
@@ -14763,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);
                 }
             });
         };
@@ -14831,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);
             }
@@ -14885,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);
@@ -14963,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: [{
@@ -26880,13 +26905,13 @@
             CaseFlagRefdataService,
             YesNoService,
             CollectionCreateCheckerService,
+            JurisdictionService,
             PaletteService,
             FormValidatorsService,
             FileUploadStateService,
             FileUploadProgressGuard,
             WindowService,
             CommonDataService,
-            JurisdictionService,
             LinkedCasesService,
             { provide: i6.MAT_DATE_LOCALE, useValue: 'en-GB' }
         ], imports: [[
@@ -27236,17 +27261,16 @@
                             CaseFlagRefdataService,
                             YesNoService,
                             CollectionCreateCheckerService,
+                            JurisdictionService,
                             PaletteService,
                             FormValidatorsService,
                             FileUploadStateService,
                             FileUploadProgressGuard,
                             WindowService,
                             CommonDataService,
-                            JurisdictionService,
                             LinkedCasesService,
                             { provide: i6.MAT_DATE_LOCALE, useValue: 'en-GB' }
-                        ],
-                        entryComponents: [CaseFileViewFolderSelectorComponent]
+                        ]
                     }]
             }], null, null);
     })();
@@ -28592,13 +28616,13 @@
                 i2$1.FormsModule,
                 i2$1.ReactiveFormsModule,
                 CaseEditDataModule,
-                PaletteModule,
                 LabelSubstitutorModule,
                 ConditionalShowModule,
                 ErrorsModule,
                 i6$2.PortalModule,
                 LoadingSpinnerModule,
                 BannersModule,
+                PaletteModule,
                 i1.RpxTranslationModule.forChild()
             ]] });
     (function () {
@@ -28617,13 +28641,13 @@
                 i2$1.FormsModule,
                 i2$1.ReactiveFormsModule,
                 CaseEditDataModule,
-                PaletteModule,
                 LabelSubstitutorModule,
                 ConditionalShowModule,
                 ErrorsModule,
                 i6$2.PortalModule,
                 LoadingSpinnerModule,
-                BannersModule, i1__namespace.RpxTranslationModule], exports: [CaseEditConfirmComponent,
+                BannersModule,
+                PaletteModule, i1__namespace.RpxTranslationModule], exports: [CaseEditConfirmComponent,
                 CaseEditComponent,
                 CaseEditPageComponent,
                 CaseEditFormComponent,
@@ -28642,13 +28666,13 @@
                             i2$1.FormsModule,
                             i2$1.ReactiveFormsModule,
                             CaseEditDataModule,
-                            PaletteModule,
                             LabelSubstitutorModule,
                             ConditionalShowModule,
                             ErrorsModule,
                             i6$2.PortalModule,
                             LoadingSpinnerModule,
                             BannersModule,
+                            PaletteModule,
                             i1.RpxTranslationModule.forChild()
                         ],
                         declarations: [
@@ -35412,10 +35436,11 @@
         }
     }
     var CreateCaseFiltersComponent = /** @class */ (function () {
-        function CreateCaseFiltersComponent(orderService, definitionsService, sessionStorageService) {
+        function CreateCaseFiltersComponent(orderService, definitionsService, sessionStorageService, jurisdictionService) {
             this.orderService = orderService;
             this.definitionsService = definitionsService;
             this.sessionStorageService = sessionStorageService;
+            this.jurisdictionService = jurisdictionService;
             this.selectionSubmitted = new i0.EventEmitter();
             this.selectionChanged = new i0.EventEmitter();
             this.formGroup = new i2$1.FormGroup({});
@@ -35469,6 +35494,8 @@
                 !this.isDisabled;
         };
         CreateCaseFiltersComponent.prototype.apply = function () {
+            this.selected.jurisdiction.currentCaseType = this.selected.caseType;
+            this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
             this.selectionSubmitted.emit({
                 jurisdictionId: this.selected.jurisdiction.id,
                 caseTypeId: this.selected.caseType.id,
@@ -35552,7 +35579,7 @@
         };
         return CreateCaseFiltersComponent;
     }());
-    CreateCaseFiltersComponent.ɵfac = function CreateCaseFiltersComponent_Factory(t) { return new (t || CreateCaseFiltersComponent)(i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(DefinitionsService), i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
+    CreateCaseFiltersComponent.ɵfac = function CreateCaseFiltersComponent_Factory(t) { return new (t || CreateCaseFiltersComponent)(i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(DefinitionsService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(JurisdictionService)); };
     CreateCaseFiltersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CreateCaseFiltersComponent, selectors: [["ccd-create-case-filters"]], inputs: { isDisabled: "isDisabled", startButtonText: "startButtonText" }, outputs: { selectionSubmitted: "selectionSubmitted", selectionChanged: "selectionChanged" }, decls: 31, vars: 28, consts: [[3, "ngSubmit"], [1, "form-group"], ["for", "cc-jurisdiction", 1, "form-label"], ["id", "cc-jurisdiction", "name", "jurisdiction", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["value", ""], [3, "value", 4, "ngFor", "ngForOf"], ["for", "cc-case-type", 1, "form-label"], ["id", "cc-case-type", "name", "case-type", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["for", "cc-event", 1, "form-label"], ["id", "cc-event", "name", "event", 1, "form-control", "ccd-dropdown", 3, "formControl", "change"], ["type", "submit", 1, "button", 3, "disabled"], [3, "value"]], template: function CreateCaseFiltersComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "form", 0);
@@ -35643,7 +35670,7 @@
                         selector: 'ccd-create-case-filters',
                         templateUrl: './create-case-filters.component.html'
                     }]
-            }], function () { return [{ type: OrderService }, { type: DefinitionsService }, { type: SessionStorageService }]; }, { isDisabled: [{
+            }], function () { return [{ type: OrderService }, { type: DefinitionsService }, { type: SessionStorageService }, { type: JurisdictionService }]; }, { isDisabled: [{
                     type: i0.Input
                 }], startButtonText: [{
                     type: i0.Input