@hmcts/ccd-case-ui-toolkit 6.13.11-welsh-release-v5-yes-no → 6.13.11-welsh-form-validation-errors-v2

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

@@ -3124,7 +3124,8 @@
     })();
 
     var FirstErrorPipe = /** @class */ (function () {
-        function FirstErrorPipe() {
+        function FirstErrorPipe(rpxTranslationPipe) {
+            this.rpxTranslationPipe = rpxTranslationPipe;
         }
         FirstErrorPipe.prototype.transform = function (value, args) {
             if (!value) {
@@ -3137,34 +3138,40 @@
             if (!keys.length) {
                 return '';
             }
+            var fieldLabel = this.rpxTranslationPipe.transform(args);
+            var errorMessage;
             if (keys[0] === 'required') {
-                return args + " is required";
+                errorMessage = '%FIELDLABEL% is required';
             }
             else if (keys[0] === 'pattern') {
-                return "The data entered is not valid for " + args;
+                errorMessage = 'The data entered is not valid for %FIELDLABEL%';
             }
             else if (keys[0] === 'minlength') {
-                return args + " is below the minimum length";
+                errorMessage = '%FIELDLABEL% is below the minimum length';
             }
             else if (keys[0] === 'maxlength') {
-                return args + " exceeds the maximum length";
+                errorMessage = '%FIELDLABEL% exceeds the maximum length';
             }
             else if (value.hasOwnProperty('matDatetimePickerParse')) {
-                return 'The date entered is not valid. Please provide a valid date';
+                errorMessage = 'The date entered is not valid. Please provide a valid date';
             }
-            return value[keys[0]];
+            else {
+                errorMessage = value[keys[0]];
+            }
+            return this.rpxTranslationPipe.transform(errorMessage, { FIELDLABEL: fieldLabel });
         };
         return FirstErrorPipe;
     }());
-    FirstErrorPipe.ɵfac = function FirstErrorPipe_Factory(t) { return new (t || FirstErrorPipe)(); };
-    FirstErrorPipe.ɵpipe = i0__namespace.ɵɵdefinePipe({ name: "ccdFirstError", type: FirstErrorPipe, pure: true });
+    FirstErrorPipe.ɵfac = function FirstErrorPipe_Factory(t) { return new (t || FirstErrorPipe)(i0__namespace.ɵɵdirectiveInject(i1__namespace.RpxTranslatePipe)); };
+    FirstErrorPipe.ɵpipe = i0__namespace.ɵɵdefinePipe({ name: "ccdFirstError", type: FirstErrorPipe, pure: false });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(FirstErrorPipe, [{
                 type: i0.Pipe,
                 args: [{
-                        name: 'ccdFirstError'
+                        name: 'ccdFirstError',
+                        pure: false
                     }]
-            }], null, null);
+            }], function () { return [{ type: i1__namespace.RpxTranslatePipe }]; }, null);
     })();
 
     var IsCompoundPipe = /** @class */ (function () {
@@ -3328,9 +3335,11 @@
     PaletteUtilsModule.ɵfac = function PaletteUtilsModule_Factory(t) { return new (t || PaletteUtilsModule)(); };
     PaletteUtilsModule.ɵmod = i0__namespace.ɵɵdefineNgModule({ type: PaletteUtilsModule });
     PaletteUtilsModule.ɵinj = i0__namespace.ɵɵdefineInjector({ providers: [
-            IsCompoundPipe
+            IsCompoundPipe,
+            i1.RpxTranslatePipe
         ], imports: [[
-                i2.CommonModule
+                i2.CommonModule,
+                i1.RpxTranslationModule.forChild()
             ]] });
     (function () {
         (typeof ngJitMode === "undefined" || ngJitMode) && i0__namespace.ɵɵsetNgModuleScope(PaletteUtilsModule, { declarations: [DatePipe,
@@ -3340,7 +3349,7 @@
                 IsMandatoryPipe,
                 IsReadOnlyPipe,
                 IsReadOnlyAndNotCollectionPipe,
-                DashPipe], imports: [i2.CommonModule], exports: [DatePipe,
+                DashPipe], imports: [i2.CommonModule, i1__namespace.RpxTranslationModule], exports: [DatePipe,
                 FieldLabelPipe,
                 FirstErrorPipe,
                 IsCompoundPipe,
@@ -3354,7 +3363,8 @@
                 type: i0.NgModule,
                 args: [{
                         imports: [
-                            i2.CommonModule
+                            i2.CommonModule,
+                            i1.RpxTranslationModule.forChild()
                         ],
                         declarations: [
                             DatePipe,
@@ -3377,7 +3387,8 @@
                             DashPipe
                         ],
                         providers: [
-                            IsCompoundPipe
+                            IsCompoundPipe,
+                            i1.RpxTranslatePipe
                         ]
                     }]
             }], null, null);
@@ -10296,6 +10307,7 @@
             i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_div_7_div_4_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r17_1); var validationError_r15 = ctx.$implicit; var ctx_r16 = i0__namespace.ɵɵnextContext(2); return ctx_r16.navigateToErrorElement(validationError_r15.id); });
             i0__namespace.ɵɵtext(4);
             i0__namespace.ɵɵpipe(5, "rpxTranslate");
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -10303,8 +10315,9 @@
         }
         if (rf & 2) {
             var validationError_r15 = ctx.$implicit;
+            var ctx_r14 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 1, validationError_r15.message));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(5, 1, validationError_r15.message, ctx_r14.getRpxTranslatePipeArgs(i0__namespace.ɵɵpipeBind1(6, 5, validationError_r15.label)), null), " ");
         }
     }
     function CaseEditPageComponent_div_7_Template(rf, ctx) {
@@ -10314,7 +10327,7 @@
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_div_7_div_4_Template, 6, 3, "div", 17);
+            i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_div_7_div_4_Template, 7, 7, "div", 17);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -10610,19 +10623,19 @@
                         }
                     }
                     if (fieldElement.hasError('required')) {
-                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: label + " is required" });
+                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: "%FIELDLABEL% is required", label: label });
                         fieldElement.markAsDirty();
                     }
                     else if (fieldElement.hasError('pattern')) {
-                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: label + " is not valid" });
+                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: "%FIELDLABEL% is not valid", label: label });
                         fieldElement.markAsDirty();
                     }
                     else if (fieldElement.hasError('minlength')) {
-                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: label + " is below the minimum length" });
+                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: "%FIELDLABEL% is below the minimum length", label: label });
                         fieldElement.markAsDirty();
                     }
                     else if (fieldElement.hasError('maxlength')) {
-                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: label + " exceeds the maximum length" });
+                        _this.caseEditDataService.addFormValidationError({ id: id_1, message: "%FIELDLABEL% exceeds the maximum length", label: label });
                         fieldElement.markAsDirty();
                     }
                     else if (fieldElement.invalid) {
@@ -10919,6 +10932,9 @@
                 next: function (validationErrors) { return _this.validationErrors = validationErrors; }
             });
         };
+        CaseEditPageComponent.prototype.getRpxTranslatePipeArgs = function (fieldLabel) {
+            return fieldLabel ? ({ FIELDLABEL: fieldLabel }) : null;
+        };
         return CaseEditPageComponent;
     }());
     CaseEditPageComponent.RESUMED_FORM_DISCARD = 'RESUMED_FORM_DISCARD';
@@ -10972,7 +10988,7 @@
                 args: [{
                         selector: 'ccd-case-edit-page',
                         templateUrl: 'case-edit-page.html',
-                        styleUrls: ['./case-edit-page.scss']
+                        styleUrls: ['./case-edit-page.scss'],
                     }]
             }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }]; }, null);
     })();
@@ -12543,14 +12559,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.caseReferenceControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.caseReferenceControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c1$l = function (a0) { return { "form-group-error": a0 }; };
@@ -12632,7 +12647,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteCaseLinkFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteCaseLinkFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteCaseLinkFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteCaseLinkFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelement(5, "input", 5);
                 i0__namespace.ɵɵelementEnd();
             }
@@ -12862,21 +12877,20 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 10);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r4 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r4.formArray.errors, ctx_r4.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r4.formArray.errors, ctx_r4.caseField.label), " ");
         }
     }
     function WriteCollectionFieldComponent_h2_9_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "h2", 2);
             i0__namespace.ɵɵtemplate(1, WriteCollectionFieldComponent_h2_9_span_1_Template, 3, 3, "span", 7);
-            i0__namespace.ɵɵtemplate(2, WriteCollectionFieldComponent_h2_9_span_2_Template, 4, 6, "span", 8);
+            i0__namespace.ɵɵtemplate(2, WriteCollectionFieldComponent_h2_9_span_2_Template, 3, 4, "span", 8);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -14698,7 +14712,7 @@
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.checkboxes.errors));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.checkboxes.errors), "");
         }
     }
     function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template(rf, ctx) {
@@ -14952,14 +14966,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 9);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r3 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r3.dynamicRadioListControl.errors)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r3.dynamicRadioListControl.errors), " ");
         }
     }
     var _c0$K = function (a0) { return { selected: a0 }; };
@@ -15024,7 +15037,7 @@
                 i0__namespace.ɵɵtemplate(4, WriteDynamicRadioListFieldComponent_span_4_Template, 4, 5, "span", 3);
                 i0__namespace.ɵɵtemplate(5, WriteDynamicRadioListFieldComponent_span_5_Template, 3, 3, "span", 4);
                 i0__namespace.ɵɵtemplate(6, WriteDynamicRadioListFieldComponent_span_6_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(7, WriteDynamicRadioListFieldComponent_span_7_Template, 4, 5, "span", 5);
+                i0__namespace.ɵɵtemplate(7, WriteDynamicRadioListFieldComponent_span_7_Template, 3, 3, "span", 5);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementContainerStart(8);
                 i0__namespace.ɵɵtemplate(9, WriteDynamicRadioListFieldComponent_div_9_Template, 5, 11, "div", 6);
@@ -15133,14 +15146,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.emailControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.emailControl.errors, ctx_r2.caseField.label), "");
         }
     }
     var _c0$J = function (a0) { return { "form-group-error": a0 }; };
@@ -15163,7 +15175,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteEmailFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteEmailFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteEmailFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteEmailFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelement(5, "input", 5);
                 i0__namespace.ɵɵelementEnd();
             }
@@ -15255,14 +15267,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 10);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.fixedListFormControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.fixedListFormControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     function WriteFixedListFieldComponent_option_8_Template(rf, ctx) {
@@ -15318,7 +15329,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteFixedListFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteFixedListFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteFixedListFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteFixedListFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementStart(5, "select", 5);
                 i0__namespace.ɵɵelementStart(6, "option", 6);
                 i0__namespace.ɵɵtext(7, "--Select a value--");
@@ -15440,14 +15451,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$H = function (a0) { return { selected: a0 }; };
@@ -15495,7 +15505,7 @@
                 i0__namespace.ɵɵtemplate(4, WriteFixedRadioListFieldComponent_span_4_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(5, WriteFixedRadioListFieldComponent_span_5_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(6, WriteFixedRadioListFieldComponent_span_6_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(6, WriteFixedRadioListFieldComponent_span_6_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementContainerStart(7);
                 i0__namespace.ɵɵtemplate(8, WriteFixedRadioListFieldComponent_div_8_Template, 5, 11, "div", 5);
@@ -18573,14 +18583,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 10);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label), "");
         }
     }
     var _c0$D = function (a0) { return { "form-group-error": a0 }; };
@@ -18602,7 +18611,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteMoneyGbpFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteMoneyGbpFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteMoneyGbpFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteMoneyGbpFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementStart(5, "div", 5);
                 i0__namespace.ɵɵelementStart(6, "span", 6);
                 i0__namespace.ɵɵtext(7, "\u00A3");
@@ -18732,14 +18741,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 7);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.checkboxes.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.checkboxes.errors, ctx_r2.caseField.label), " ");
         }
     }
     function WriteMultiSelectListFieldComponent_ng_container_6_Template(rf, ctx) {
@@ -18826,7 +18834,7 @@
                 i0__namespace.ɵɵtemplate(3, WriteMultiSelectListFieldComponent_span_3_Template, 4, 5, "span", 1);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(4, WriteMultiSelectListFieldComponent_span_4_Template, 3, 3, "span", 2);
-                i0__namespace.ɵɵtemplate(5, WriteMultiSelectListFieldComponent_span_5_Template, 4, 6, "span", 3);
+                i0__namespace.ɵɵtemplate(5, WriteMultiSelectListFieldComponent_span_5_Template, 3, 4, "span", 3);
                 i0__namespace.ɵɵtemplate(6, WriteMultiSelectListFieldComponent_ng_container_6_Template, 6, 8, "ng-container", 4);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -18916,14 +18924,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.numberControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.numberControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$B = function (a0) { return { "form-group-error": a0 }; };
@@ -18946,7 +18953,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteNumberFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteNumberFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteNumberFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteNumberFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelement(5, "input", 5);
                 i0__namespace.ɵɵelementEnd();
             }
@@ -19794,14 +19801,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.phoneUkControl.errors, ctx_r2.caseField.label)), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.phoneUkControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$z = function (a0) { return { "form-group-error": a0 }; };
@@ -19824,7 +19830,7 @@
                 i0__namespace.ɵɵtemplate(2, WritePhoneUKFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WritePhoneUKFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WritePhoneUKFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WritePhoneUKFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelement(5, "input", 5);
                 i0__namespace.ɵɵelementEnd();
             }
@@ -19915,14 +19921,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.textareaControl.errors, ctx_r2.caseField.label)), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.textareaControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$y = function (a0) { return { "form-group-error": a0 }; };
@@ -19954,7 +19959,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteTextAreaFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteTextAreaFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteTextAreaFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteTextAreaFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementStart(5, "textarea", 5);
                 i0__namespace.ɵɵlistener("input", function WriteTextAreaFieldComponent_Template_textarea_input_5_listener($event) { return ctx.autoGrow($event); });
                 i0__namespace.ɵɵelementEnd();
@@ -20047,14 +20052,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 8);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.textControl.errors, ctx_r2.caseField.label)), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.textControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$x = function (a0) { return { "form-group-error": a0 }; };
@@ -20080,7 +20084,7 @@
                 i0__namespace.ɵɵtemplate(2, WriteTextFieldComponent_span_2_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(3, WriteTextFieldComponent_span_3_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵtemplate(4, WriteTextFieldComponent_span_4_Template, 4, 6, "span", 4);
+                i0__namespace.ɵɵtemplate(4, WriteTextFieldComponent_span_4_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementStart(5, "input", 5);
                 i0__namespace.ɵɵlistener("blur", function WriteTextFieldComponent_Template_input_blur_5_listener($event) { return ctx.onBlur($event); });
                 i0__namespace.ɵɵelementEnd();
@@ -20238,7 +20242,7 @@
         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: 3, vars: 5, 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: 3, consts: [[1, "text-16"]], template: function ReadYesNoFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "span", 0);
                 i0__namespace.ɵɵtext(1);
@@ -20247,7 +20251,7 @@
             }
             if (rf & 2) {
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind3(2, 1, ctx.caseField.label, null, ctx.formattedValue));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx.formattedValue));
             }
         }, pipes: [i1__namespace.RpxTranslatePipe], encapsulation: 2 });
     (function () {
@@ -20255,7 +20259,7 @@
                 type: i0.Component,
                 args: [{
                         selector: 'ccd-read-yes-no-field',
-                        template: "<span class=\"text-16\">{{caseField.label | rpxTranslate : null : formattedValue}}</span>"
+                        template: "<span class=\"text-16\">{{formattedValue | rpxTranslate}}</span>"
                     }]
             }], function () { return [{ type: YesNoService }]; }, null);
     })();
@@ -20271,7 +20275,7 @@
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r0.caseField)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r0.caseField)), " ");
         }
     }
     function WriteYesNoFieldComponent_span_4_Template(rf, ctx) {
@@ -20291,14 +20295,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 9);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.yesNoControl.errors, ctx_r2.caseField.label)), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.yesNoControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$w = function (a0) { return { selected: a0 }; };
@@ -20315,14 +20318,14 @@
         if (rf & 2) {
             var value_r4 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(12, _c0$w, ctx_r3.yesNoControl.value === value_r4));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _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(i0__namespace.ɵɵpipeBind3(4, 8, ctx_r3.caseField.label, null, value_r4));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 8, value_r4));
         }
     }
     var _c1$a = function (a0) { return { "form-group-error": a0 }; };
@@ -20337,9 +20340,6 @@
         WriteYesNoFieldComponent.prototype.ngOnInit = function () {
             this.yesNoControl = this.registerControl(new i2$1.FormControl(this.yesNoService.format(this.caseField.value)));
         };
-        WriteYesNoFieldComponent.prototype.toLowerCase = function (value) {
-            return value.toLowerCase();
-        };
         return WriteYesNoFieldComponent;
     }(AbstractFieldWriteComponent));
     WriteYesNoFieldComponent.ɵfac = function WriteYesNoFieldComponent_Factory(t) { return new (t || WriteYesNoFieldComponent)(i0__namespace.ɵɵdirectiveInject(YesNoService)); };
@@ -20351,9 +20351,9 @@
                 i0__namespace.ɵɵtemplate(3, WriteYesNoFieldComponent_span_3_Template, 4, 5, "span", 2);
                 i0__namespace.ɵɵelementEnd();
                 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.ɵɵtemplate(5, WriteYesNoFieldComponent_span_5_Template, 3, 4, "span", 4);
                 i0__namespace.ɵɵelementStart(6, "div", 5);
-                i0__namespace.ɵɵtemplate(7, WriteYesNoFieldComponent_div_7_Template, 5, 14, "div", 6);
+                i0__namespace.ɵɵtemplate(7, WriteYesNoFieldComponent_div_7_Template, 5, 12, "div", 6);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -24053,14 +24053,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 7);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.dateControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.dateControl.errors, ctx_r2.caseField.label), " ");
         }
     }
     var _c0$j = function (a0) { return { "form-group-error": a0 }; };
@@ -24086,7 +24085,7 @@
                 i0__namespace.ɵɵtemplate(3, WriteDateFieldComponent_span_3_Template, 4, 5, "span", 1);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(4, WriteDateFieldComponent_span_4_Template, 3, 3, "span", 2);
-                i0__namespace.ɵɵtemplate(5, WriteDateFieldComponent_span_5_Template, 4, 6, "span", 3);
+                i0__namespace.ɵɵtemplate(5, WriteDateFieldComponent_span_5_Template, 3, 4, "span", 3);
                 i0__namespace.ɵɵelement(6, "cut-date-input", 4);
                 i0__namespace.ɵɵpipe(7, "ccdIsMandatory");
                 i0__namespace.ɵɵelementEnd();
@@ -24160,14 +24159,13 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 12);
             i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵpipe(3, "ccdFirstError");
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.dateControl.errors, ctx_r2.caseField.label)));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.dateControl.errors, ctx_r2.caseField.label));
         }
     }
     function DatetimePickerComponent_span_6_Template(rf, ctx) {
@@ -24385,7 +24383,7 @@
                 i0__namespace.ɵɵelementStart(2, "legend");
                 i0__namespace.ɵɵtemplate(3, DatetimePickerComponent_span_3_Template, 4, 5, "span", 1);
                 i0__namespace.ɵɵtemplate(4, DatetimePickerComponent_span_4_Template, 3, 3, "span", 2);
-                i0__namespace.ɵɵtemplate(5, DatetimePickerComponent_span_5_Template, 4, 6, "span", 3);
+                i0__namespace.ɵɵtemplate(5, DatetimePickerComponent_span_5_Template, 3, 4, "span", 3);
                 i0__namespace.ɵɵtemplate(6, DatetimePickerComponent_span_6_Template, 3, 3, "span", 3);
                 i0__namespace.ɵɵtemplate(7, DatetimePickerComponent_span_7_Template, 3, 3, "span", 3);
                 i0__namespace.ɵɵelementEnd();