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

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 });
@@ -16400,12 +16404,24 @@
             }
         };
         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
@@ -16451,6 +16467,10 @@
                 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)); };
@@ -26880,13 +26900,13 @@
             CaseFlagRefdataService,
             YesNoService,
             CollectionCreateCheckerService,
+            JurisdictionService,
             PaletteService,
             FormValidatorsService,
             FileUploadStateService,
             FileUploadProgressGuard,
             WindowService,
             CommonDataService,
-            JurisdictionService,
             LinkedCasesService,
             { provide: i6.MAT_DATE_LOCALE, useValue: 'en-GB' }
         ], imports: [[
@@ -27236,17 +27256,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 +28611,13 @@
                 i2$1.FormsModule,
                 i2$1.ReactiveFormsModule,
                 CaseEditDataModule,
-                PaletteModule,
                 LabelSubstitutorModule,
                 ConditionalShowModule,
                 ErrorsModule,
                 i6$2.PortalModule,
                 LoadingSpinnerModule,
                 BannersModule,
+                PaletteModule,
                 i1.RpxTranslationModule.forChild()
             ]] });
     (function () {
@@ -28617,13 +28636,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 +28661,13 @@
                             i2$1.FormsModule,
                             i2$1.ReactiveFormsModule,
                             CaseEditDataModule,
-                            PaletteModule,
                             LabelSubstitutorModule,
                             ConditionalShowModule,
                             ErrorsModule,
                             i6$2.PortalModule,
                             LoadingSpinnerModule,
                             BannersModule,
+                            PaletteModule,
                             i1.RpxTranslationModule.forChild()
                         ],
                         declarations: [
@@ -29796,6 +29815,7 @@
             });
         };
         WorkbasketFiltersComponent.prototype.apply = function (init) {
+            var _this = this;
             // Save filters as query parameters for current route
             var queryParams = {};
             if (this.selected.jurisdiction) {
@@ -29827,9 +29847,20 @@
             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();
@@ -35412,10 +35443,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 +35501,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 +35586,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 +35677,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