@hmcts/ccd-case-ui-toolkit 6.19.5-secure-doc-case-creation.1 → 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;
         }));
     }
@@ -12755,7 +12747,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     }
     ngOnInit() {
         this.secureModeOn = this.appConfig.getDocumentSecureMode();
-        console.info('writeDocumentField.ngInit: secure mode = ' + this.secureModeOn);
         if (this.secureModeOn) {
             this.subscribeToCaseDetails();
         }
@@ -12881,7 +12872,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
                 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({
@@ -12892,7 +12882,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
                         this.caseTypeId = jurisdiction.currentCaseType.id;
                     }
                 }
-                console.info(`selectedJurisdiction.next: caseType=${this.caseTypeId} juris=${this.jurisdictionId}`);
             }
         });
     }
@@ -14238,6 +14227,17 @@ class WriteJudicialUserFieldComponent extends WriteComplexFieldComponent {
             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((jurisdiction) => {
+                if (jurisdiction) {
+                    this.jurisdiction = jurisdiction.id;
+                    if (jurisdiction.currentCaseType) {
+                        this.caseType = jurisdiction.currentCaseType.id;
+                    }
+                }
+            });
+        }
     }
     displayJudicialUser(judicialUser) {
         return judicialUser
@@ -14283,6 +14283,10 @@ class WriteJudicialUserFieldComponent extends WriteComplexFieldComponent {
             this.judicialUserControl.setValidators(Validators.required);
         }
     }
+    ngOnDestroy() {
+        var _a;
+        (_a = this.jurisdictionSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+    }
 }
 WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(CaseFlagRefdataService), i0.ɵɵdirectiveInject(IsCompoundPipe), i0.ɵɵdirectiveInject(FormValidatorsService)); };
 WriteJudicialUserFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteJudicialUserFieldComponent, selectors: [["ccd-write-judicial-user-field"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 12, vars: 17, consts: [[1, "form-group", 3, "formGroup", "ngClass"], [3, "for"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [1, "form-control", "bottom-30", 3, "id", "formControl", "matAutocomplete", "blur"], ["autoActiveFirstOption", "", 3, "displayWith"], ["autoComplete", "matAutocomplete"], ["class", "select-option", 3, "ngClass", "value", "onSelectionChange", 4, "ngFor", "ngForOf"], ["class", "select-option", "disabled", "", 4, "ngIf"], [1, "form-label"], [1, "form-hint"], [1, "error-message"], [1, "select-option", 3, "ngClass", "value", "onSelectionChange"], ["disabled", "", 1, "select-option"]], template: function WriteJudicialUserFieldComponent_Template(rf, ctx) { if (rf & 1) {
@@ -26004,9 +26008,20 @@ class WorkbasketFiltersComponent {
         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
+                const judicialUserControlValuesToRemove = Object.keys(this.formGroup.controls).filter((key) => key.endsWith('_judicialUserControl'));
+                judicialUserControlValuesToRemove.forEach((controlKey) => 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 });
         this.setFocusToTop();
@@ -28244,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() {