@hmcts/ccd-case-ui-toolkit 6.19.5-secure-doc-case-creation.1 → 6.19.5-yes-no-bug-fix-v3

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;
             }));
         };
@@ -14657,7 +14649,6 @@
         };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             this.secureModeOn = this.appConfig.getDocumentSecureMode();
-            console.info('writeDocumentField.ngInit: secure mode = ' + this.secureModeOn);
             if (this.secureModeOn) {
                 this.subscribeToCaseDetails();
             }
@@ -14786,7 +14777,6 @@
                     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({
@@ -14797,7 +14787,6 @@
                             _this.caseTypeId = jurisdiction.currentCaseType.id;
                         }
                     }
-                    console.info("selectedJurisdiction.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
                 }
             });
         };
@@ -16425,12 +16414,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
@@ -16476,6 +16477,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)); };
@@ -21018,27 +21023,31 @@
         ReadYesNoFieldComponent.prototype.ngOnInit = function () {
             _super.prototype.ngOnInit.call(this);
             this.formattedValue = this.yesNoService.format(this.caseField.value);
+            if (!this.caseField.label) {
+                this.caseField.label = this.formattedValue;
+            }
         };
         return ReadYesNoFieldComponent;
     }(AbstractFieldReadComponent));
     ReadYesNoFieldComponent.ɵfac = function ReadYesNoFieldComponent_Factory(t) { return new (t || ReadYesNoFieldComponent)(i0__namespace.ɵɵdirectiveInject(YesNoService)); };
-    ReadYesNoFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadYesNoFieldComponent, selectors: [["ccd-read-yes-no-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 2, vars: 1, consts: [[1, "text-16"]], template: function ReadYesNoFieldComponent_Template(rf, ctx) {
+    ReadYesNoFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadYesNoFieldComponent, selectors: [["ccd-read-yes-no-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 5, consts: [[1, "text-16"]], template: function ReadYesNoFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "span", 0);
                 i0__namespace.ɵɵtext(1);
+                i0__namespace.ɵɵpipe(2, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate(ctx.formattedValue);
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind3(2, 1, ctx.caseField.label, null, ctx.formattedValue));
             }
-        }, encapsulation: 2 });
+        }, pipes: [i1__namespace.RpxTranslatePipe], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ReadYesNoFieldComponent, [{
                 type: i0.Component,
                 args: [{
                         selector: 'ccd-read-yes-no-field',
-                        template: "<span class=\"text-16\">{{formattedValue}}</span>"
+                        template: "<span class=\"text-16\">{{caseField.label | rpxTranslate : null : formattedValue}}</span>"
                     }]
             }], function () { return [{ type: YesNoService }]; }, null);
     })();
@@ -21091,20 +21100,21 @@
             i0__namespace.ɵɵelement(1, "input", 11);
             i0__namespace.ɵɵelementStart(2, "label", 12);
             i0__namespace.ɵɵtext(3);
+            i0__namespace.ɵɵpipe(4, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var value_r4 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$w, ctx_r3.yesNoControl.value === value_r4));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(12, _c0$w, ctx_r3.yesNoControl.value === value_r4));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("id", ctx_r3.createElementId(value_r4))("name", ctx_r3.id())("formControl", ctx_r3.yesNoControl)("value", value_r4);
             i0__namespace.ɵɵattribute("name", ctx_r3.id());
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r3.createElementId(value_r4));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(value_r4);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind3(4, 8, ctx_r3.caseField.label, null, value_r4));
         }
     }
     var _c1$a = function (a0) { return { "form-group-error": a0 }; };
@@ -21132,7 +21142,7 @@
                 i0__namespace.ɵɵtemplate(4, WriteYesNoFieldComponent_span_4_Template, 3, 3, "span", 3);
                 i0__namespace.ɵɵtemplate(5, WriteYesNoFieldComponent_span_5_Template, 4, 6, "span", 4);
                 i0__namespace.ɵɵelementStart(6, "div", 5);
-                i0__namespace.ɵɵtemplate(7, WriteYesNoFieldComponent_div_7_Template, 4, 10, "div", 6);
+                i0__namespace.ɵɵtemplate(7, WriteYesNoFieldComponent_div_7_Template, 5, 14, "div", 6);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -29820,6 +29830,7 @@
             });
         };
         WorkbasketFiltersComponent.prototype.apply = function (init) {
+            var _this = this;
             // Save filters as query parameters for current route
             var queryParams = {};
             if (this.selected.jurisdiction) {
@@ -29851,9 +29862,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();