@hmcts/ccd-case-ui-toolkit 7.3.85-exui-5069 → 7.3.86-exui-2837

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -4166,6 +4166,7 @@ class WorkbasketInputModel {
     label;
     order;
     field;
+    dataType;
     metadata;
     display_context_parameter;
 }
@@ -4215,6 +4216,16 @@ class FieldsUtils {
         }
         return obj;
     }
+    static buildFieldId(fieldId, elementPath, dataType) {
+        if (!fieldId || !elementPath) {
+            return fieldId;
+        }
+        const normalizedType = typeof dataType === 'string' ? dataType.toLowerCase() : '';
+        if (normalizedType === 'collection') {
+            return `${fieldId}.value.${elementPath}`;
+        }
+        return `${fieldId}.${elementPath}`;
+    }
     static toValuesMap(caseFields) {
         const valueMap = {};
         caseFields.forEach(field => {
@@ -13989,67 +14000,57 @@ class WriteComplexFieldComponent extends AbstractFieldWriteComponent {
 const _c0$Z = ["writeComplexFieldComponent"];
 const _c1$o = a0 => ({ "form-group-error": a0 });
 const _c2$3 = a0 => ({ "govuk-input--error": a0 });
-function WriteAddressFieldComponent_div_1_span_4_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "span", 9);
-    i0.ɵɵelement(1, "ccd-markdown", 10);
-    i0.ɵɵpipe(2, "rpxTranslate");
-    i0.ɵɵelementEnd();
-} if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(2);
-    i0.ɵɵadvance();
-    i0.ɵɵproperty("content", i0.ɵɵpipeBind1(2, 1, ctx_r0.caseField.hint_text));
-} }
-function WriteAddressFieldComponent_div_1_div_5_span_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "span", 17);
+function WriteAddressFieldComponent_div_1_div_4_span_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "span", 14);
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(3);
+    const ctx_r1 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r0.errorMessage));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r1.errorMessage));
 } }
-function WriteAddressFieldComponent_div_1_div_5_Template(rf, ctx) { if (rf & 1) {
-    const _r2 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "div", 11)(1, "label", 12)(2, "span", 13);
+function WriteAddressFieldComponent_div_1_div_4_Template(rf, ctx) { if (rf & 1) {
+    const _r1 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div", 8)(1, "label", 9)(2, "span", 10);
     i0.ɵɵtext(3);
     i0.ɵɵpipe(4, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_5_span_5_Template, 3, 3, "span", 14);
-    i0.ɵɵelement(6, "input", 15);
-    i0.ɵɵelementStart(7, "button", 16);
-    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_div_5_Template_button_click_7_listener() { i0.ɵɵrestoreView(_r2); const ctx_r0 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r0.findAddress()); });
+    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_4_span_5_Template, 3, 3, "span", 11);
+    i0.ɵɵelement(6, "input", 12);
+    i0.ɵɵelementStart(7, "button", 13);
+    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_div_4_Template_button_click_7_listener() { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r1.findAddress()); });
     i0.ɵɵtext(8);
     i0.ɵɵpipe(9, "rpxTranslate");
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("id", ctx_r0.createElementId("postcodeLookup"))("ngClass", i0.ɵɵpureFunction1(14, _c1$o, ctx_r0.missingPostcode));
+    const ctx_r1 = i0.ɵɵnextContext(2);
+    i0.ɵɵproperty("id", ctx_r1.createElementId("postcodeLookup"))("ngClass", i0.ɵɵpureFunction1(14, _c1$o, ctx_r1.missingPostcode));
     i0.ɵɵadvance();
-    i0.ɵɵproperty("for", ctx_r0.createElementId("postcodeInput"));
+    i0.ɵɵproperty("for", ctx_r1.createElementId("postcodeInput"));
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 10, "Enter a UK postcode"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r0.missingPostcode);
+    i0.ɵɵproperty("ngIf", ctx_r1.missingPostcode);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(16, _c2$3, ctx_r0.missingPostcode))("id", ctx_r0.createElementId("postcodeInput"))("formControl", ctx_r0.postcode);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(16, _c2$3, ctx_r1.missingPostcode))("id", ctx_r1.createElementId("postcodeInput"))("formControl", ctx_r1.postcode);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("disabled", ctx_r0.loadingAddresses);
+    i0.ɵɵproperty("disabled", ctx_r1.loadingAddresses);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(9, 12, ctx_r0.loadingAddresses ? "Finding addresses..." : "Find address"), " ");
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(9, 12, ctx_r1.loadingAddresses ? "Finding addresses..." : "Find address"), " ");
 } }
-function WriteAddressFieldComponent_div_1_div_6_span_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "span", 17);
+function WriteAddressFieldComponent_div_1_div_5_span_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "span", 14);
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(3);
+    const ctx_r1 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r0.errorMessage));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, ctx_r1.errorMessage));
 } }
-function WriteAddressFieldComponent_div_1_div_6_option_7_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "option", 22);
+function WriteAddressFieldComponent_div_1_div_5_option_7_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "option", 19);
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -14058,19 +14059,19 @@ function WriteAddressFieldComponent_div_1_div_6_option_7_Template(rf, ctx) { if
     i0.ɵɵadvance();
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 2, "No address found"), " ");
 } }
-function WriteAddressFieldComponent_div_1_div_6_option_8_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "option", 22);
+function WriteAddressFieldComponent_div_1_div_5_option_8_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "option", 19);
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(3);
+    const ctx_r1 = i0.ɵɵnextContext(3);
     i0.ɵɵproperty("ngValue", undefined);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate2(" ", ctx_r0.addressOptions.length, " ", i0.ɵɵpipeBind1(2, 3, ctx_r0.addressOptions.length === 1 ? "address found" : "addresses found"), " ");
+    i0.ɵɵtextInterpolate2(" ", ctx_r1.addressOptions.length, " ", i0.ɵɵpipeBind1(2, 3, ctx_r1.addressOptions.length === 1 ? "address found" : "addresses found"), " ");
 } }
-function WriteAddressFieldComponent_div_1_div_6_option_9_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "option", 22);
+function WriteAddressFieldComponent_div_1_div_5_option_9_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "option", 19);
     i0.ɵɵtext(1);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
@@ -14079,39 +14080,39 @@ function WriteAddressFieldComponent_div_1_div_6_option_9_Template(rf, ctx) { if
     i0.ɵɵadvance();
     i0.ɵɵtextInterpolate1(" ", addressOption_r4.description, " ");
 } }
-function WriteAddressFieldComponent_div_1_div_6_Template(rf, ctx) { if (rf & 1) {
+function WriteAddressFieldComponent_div_1_div_5_Template(rf, ctx) { if (rf & 1) {
     const _r3 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "div", 18)(1, "label", 12)(2, "span", 13);
+    i0.ɵɵelementStart(0, "div", 15)(1, "label", 9)(2, "span", 10);
     i0.ɵɵtext(3);
     i0.ɵɵpipe(4, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_6_span_5_Template, 3, 3, "span", 14);
-    i0.ɵɵelementStart(6, "select", 19);
-    i0.ɵɵlistener("change", function WriteAddressFieldComponent_div_1_div_6_Template_select_change_6_listener() { i0.ɵɵrestoreView(_r3); const ctx_r0 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r0.addressSelected()); });
-    i0.ɵɵtemplate(7, WriteAddressFieldComponent_div_1_div_6_option_7_Template, 3, 4, "option", 20)(8, WriteAddressFieldComponent_div_1_div_6_option_8_Template, 3, 5, "option", 20)(9, WriteAddressFieldComponent_div_1_div_6_option_9_Template, 2, 2, "option", 21);
+    i0.ɵɵtemplate(5, WriteAddressFieldComponent_div_1_div_5_span_5_Template, 3, 3, "span", 11);
+    i0.ɵɵelementStart(6, "select", 16);
+    i0.ɵɵlistener("change", function WriteAddressFieldComponent_div_1_div_5_Template_select_change_6_listener() { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r1.addressSelected()); });
+    i0.ɵɵtemplate(7, WriteAddressFieldComponent_div_1_div_5_option_7_Template, 3, 4, "option", 17)(8, WriteAddressFieldComponent_div_1_div_5_option_8_Template, 3, 5, "option", 17)(9, WriteAddressFieldComponent_div_1_div_5_option_9_Template, 2, 2, "option", 18);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c1$o, ctx_r0.noAddressSelected));
+    const ctx_r1 = i0.ɵɵnextContext(2);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c1$o, ctx_r1.noAddressSelected));
     i0.ɵɵadvance();
-    i0.ɵɵproperty("for", ctx_r0.createElementId("addressList"));
+    i0.ɵɵproperty("for", ctx_r1.createElementId("addressList"));
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 9, "Select an address"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r0.noAddressSelected);
+    i0.ɵɵproperty("ngIf", ctx_r1.noAddressSelected);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("id", ctx_r0.createElementId("addressList"))("formControl", ctx_r0.addressList);
+    i0.ɵɵproperty("id", ctx_r1.createElementId("addressList"))("formControl", ctx_r1.addressList);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", ctx_r0.addressOptions.length === 0);
+    i0.ɵɵproperty("ngIf", ctx_r1.addressOptions.length === 0);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", ctx_r0.addressOptions.length > 0);
+    i0.ɵɵproperty("ngIf", ctx_r1.addressOptions.length > 0);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngForOf", ctx_r0.addressOptions);
+    i0.ɵɵproperty("ngForOf", ctx_r1.addressOptions);
 } }
-function WriteAddressFieldComponent_div_1_a_7_Template(rf, ctx) { if (rf & 1) {
+function WriteAddressFieldComponent_div_1_a_6_Template(rf, ctx) { if (rf & 1) {
     const _r5 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "a", 23);
-    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_a_7_Template_a_click_0_listener($event) { i0.ɵɵrestoreView(_r5); const ctx_r0 = i0.ɵɵnextContext(2); ctx_r0.blankAddress(); return i0.ɵɵresetView($event.preventDefault()); });
+    i0.ɵɵelementStart(0, "a", 20);
+    i0.ɵɵlistener("click", function WriteAddressFieldComponent_div_1_a_6_Template_a_click_0_listener($event) { i0.ɵɵrestoreView(_r5); const ctx_r1 = i0.ɵɵnextContext(2); ctx_r1.blankAddress(); return i0.ɵɵresetView($event.preventDefault()); });
     i0.ɵɵtext(1);
     i0.ɵɵpipe(2, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -14124,20 +14125,18 @@ function WriteAddressFieldComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "ccdFieldLabel");
     i0.ɵɵelementEnd();
-    i0.ɵɵtemplate(4, WriteAddressFieldComponent_div_1_span_4_Template, 3, 3, "span", 5)(5, WriteAddressFieldComponent_div_1_div_5_Template, 10, 18, "div", 6)(6, WriteAddressFieldComponent_div_1_div_6_Template, 10, 13, "div", 7)(7, WriteAddressFieldComponent_div_1_a_7_Template, 3, 3, "a", 8);
+    i0.ɵɵtemplate(4, WriteAddressFieldComponent_div_1_div_4_Template, 10, 18, "div", 5)(5, WriteAddressFieldComponent_div_1_div_5_Template, 10, 13, "div", 6)(6, WriteAddressFieldComponent_div_1_a_6_Template, 3, 3, "a", 7);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵadvance(2);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 5, ctx_r0.caseField));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, ctx_r1.caseField));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r0.caseField.hint_text);
-    i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", !ctx_r0.isExpanded);
+    i0.ɵɵproperty("ngIf", !ctx_r1.isExpanded);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", ctx_r0.addressOptions);
+    i0.ɵɵproperty("ngIf", ctx_r1.addressOptions);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", !ctx_r0.shouldShowDetailFields());
+    i0.ɵɵproperty("ngIf", !ctx_r1.shouldShowDetailFields());
 } }
 class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
     isCompoundPipe;
@@ -14271,9 +14270,9 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.writeComplexFieldComponent = _t.first);
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.focusElementDirectives = _t);
-        } }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 4, vars: 9, consts: [["writeComplexFieldComponent", ""], [1, "form-group", 3, "id"], [4, "ngIf"], [3, "hidden", "caseField", "renderLabel", "parent", "formGroup", "ignoreMandatory", "idPrefix"], [1, "heading-h2"], ["class", "form-hint", 4, "ngIf"], ["class", "form-group bottom-30 postcodeLookup", 3, "id", "ngClass", 4, "ngIf"], ["class", "form-group", "id", "selectAddress", 3, "ngClass", 4, "ngIf"], ["class", "manual-link bottom-30", "href", "#", 3, "click", 4, "ngIf"], [1, "form-hint"], [3, "content"], [1, "form-group", "bottom-30", "postcodeLookup", 3, "id", "ngClass"], [3, "for"], [1, "form-label"], ["class", "error-message", 4, "ngIf"], ["type", "text", "name", "postcode", 1, "form-control", "postcodeinput", "inline-block", 3, "ngClass", "id", "formControl"], ["type", "button", 1, "button", "button-30", 3, "click", "disabled"], [1, "error-message"], ["id", "selectAddress", 1, "form-group", 3, "ngClass"], ["name", "address", "focusElement", "", 1, "form-control", "ccd-dropdown", "addressList", 3, "change", "id", "formControl"], [3, "ngValue", 4, "ngIf"], [3, "ngValue", 4, "ngFor", "ngForOf"], [3, "ngValue"], ["href", "#", 1, "manual-link", "bottom-30", 3, "click"]], template: function WriteAddressFieldComponent_Template(rf, ctx) { if (rf & 1) {
+        } }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 4, vars: 9, consts: [["writeComplexFieldComponent", ""], [1, "form-group", 3, "id"], [4, "ngIf"], [3, "hidden", "caseField", "renderLabel", "parent", "formGroup", "ignoreMandatory", "idPrefix"], [1, "heading-h2"], ["class", "form-group bottom-30 postcodeLookup", 3, "id", "ngClass", 4, "ngIf"], ["class", "form-group", "id", "selectAddress", 3, "ngClass", 4, "ngIf"], ["class", "manual-link bottom-30", "href", "#", 3, "click", 4, "ngIf"], [1, "form-group", "bottom-30", "postcodeLookup", 3, "id", "ngClass"], [3, "for"], [1, "form-label"], ["class", "error-message", 4, "ngIf"], ["type", "text", "name", "postcode", 1, "form-control", "postcodeinput", "inline-block", 3, "ngClass", "id", "formControl"], ["type", "button", 1, "button", "button-30", 3, "click", "disabled"], [1, "error-message"], ["id", "selectAddress", 1, "form-group", 3, "ngClass"], ["name", "address", "focusElement", "", 1, "form-control", "ccd-dropdown", "addressList", 3, "change", "id", "formControl"], [3, "ngValue", 4, "ngIf"], [3, "ngValue", 4, "ngFor", "ngForOf"], [3, "ngValue"], ["href", "#", 1, "manual-link", "bottom-30", 3, "click"]], template: function WriteAddressFieldComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 1);
-            i0.ɵɵtemplate(1, WriteAddressFieldComponent_div_1_Template, 8, 7, "div", 2);
+            i0.ɵɵtemplate(1, WriteAddressFieldComponent_div_1_Template, 7, 6, "div", 2);
             i0.ɵɵelement(2, "ccd-write-complex-type-field", 3, 0);
             i0.ɵɵelementEnd();
         } if (rf & 2) {
@@ -14286,7 +14285,7 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteAddressFieldComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-write-address-field', standalone: false, template: "<div class=\"form-group\" [id]=\"id()\">\n  <div *ngIf=\"!isComplexWithHiddenFields()\">\n    <h2 class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n    <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">\n      <ccd-markdown [content]=\"caseField.hint_text | rpxTranslate\"></ccd-markdown>\n    </span>\n\n    <div class=\"form-group bottom-30 postcodeLookup\" [id]=\"createElementId('postcodeLookup')\" [ngClass]=\"{'form-group-error': missingPostcode}\" *ngIf=\"!isExpanded\">\n      <label [for]=\"createElementId('postcodeInput')\">\n        <span class=\"form-label\">{{'Enter a UK postcode' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"missingPostcode\">{{errorMessage | rpxTranslate}}</span>\n      <input type=\"text\" [ngClass]=\"{'govuk-input--error': missingPostcode}\"\n      [id]=\"createElementId('postcodeInput')\" name=\"postcode\" class=\"form-control postcodeinput inline-block\" [formControl]=\"postcode\">\n      <button type=\"button\" class=\"button button-30\" (click)=\"findAddress()\" [disabled]=\"loadingAddresses\">\n        {{(loadingAddresses ? 'Finding addresses...' : 'Find address') | rpxTranslate}}\n      </button>\n    </div>\n\n    <div class=\"form-group\" *ngIf=\"addressOptions\" id=\"selectAddress\" [ngClass]=\"{'form-group-error': noAddressSelected}\">\n      <label [for]=\"createElementId('addressList')\">\n        <span class=\"form-label\">{{'Select an address' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"noAddressSelected\">{{errorMessage | rpxTranslate}}</span>\n      <select class=\"form-control ccd-dropdown addressList\" [id]=\"createElementId('addressList')\" name=\"address\" [formControl]=\"addressList\" (change)=\"addressSelected()\" focusElement>\n        <option *ngIf=\"addressOptions.length === 0\" [ngValue]=\"undefined\">\n          {{'No address found' | rpxTranslate}}\n        </option>\n        <option *ngIf=\"addressOptions.length > 0\" [ngValue]=\"undefined\">\n          {{addressOptions.length}} {{(addressOptions.length === 1 ? 'address found' : 'addresses found') | rpxTranslate}}\n        </option>\n        <option *ngFor=\"let addressOption of addressOptions\" [ngValue]=\"addressOption.value\">\n          {{addressOption.description}}\n        </option>\n      </select>\n    </div>\n\n    <a class=\"manual-link bottom-30\" *ngIf=\"!shouldShowDetailFields()\" (click)=\"blankAddress(); $event.preventDefault()\" href=\"#\">\n      {{\"I can't enter a UK postcode\" | rpxTranslate}}\n    </a>\n  </div>\n\n  <ccd-write-complex-type-field\n    [hidden]=\"!shouldShowDetailFields()\"\n    [caseField]=\"caseField\"\n    [renderLabel]=\"false\"\n    [parent]=\"parent\"\n    [formGroup]=\"formGroup\"\n    [ignoreMandatory]=\"true\"\n    [idPrefix]=\"buildIdPrefix('detail')\"\n    #writeComplexFieldComponent>\n  </ccd-write-complex-type-field>\n</div>\n", styles: [".manual-link{cursor:pointer;display:block;text-decoration:underline}\n"] }]
+        args: [{ selector: 'ccd-write-address-field', standalone: false, template: "<div class=\"form-group\" [id]=\"id()\">\n  <div *ngIf=\"!isComplexWithHiddenFields()\">\n    <h2 class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n\n    <div class=\"form-group bottom-30 postcodeLookup\" [id]=\"createElementId('postcodeLookup')\" [ngClass]=\"{'form-group-error': missingPostcode}\" *ngIf=\"!isExpanded\">\n      <label [for]=\"createElementId('postcodeInput')\">\n        <span class=\"form-label\">{{'Enter a UK postcode' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"missingPostcode\">{{errorMessage | rpxTranslate}}</span>\n      <input type=\"text\" [ngClass]=\"{'govuk-input--error': missingPostcode}\"\n      [id]=\"createElementId('postcodeInput')\" name=\"postcode\" class=\"form-control postcodeinput inline-block\" [formControl]=\"postcode\">\n      <button type=\"button\" class=\"button button-30\" (click)=\"findAddress()\" [disabled]=\"loadingAddresses\">\n        {{(loadingAddresses ? 'Finding addresses...' : 'Find address') | rpxTranslate}}\n      </button>\n    </div>\n\n    <div class=\"form-group\" *ngIf=\"addressOptions\" id=\"selectAddress\" [ngClass]=\"{'form-group-error': noAddressSelected}\">\n      <label [for]=\"createElementId('addressList')\">\n        <span class=\"form-label\">{{'Select an address' | rpxTranslate}}</span>\n      </label>\n      <span class=\"error-message\" *ngIf=\"noAddressSelected\">{{errorMessage | rpxTranslate}}</span>\n      <select class=\"form-control ccd-dropdown addressList\" [id]=\"createElementId('addressList')\" name=\"address\" [formControl]=\"addressList\" (change)=\"addressSelected()\" focusElement>\n        <option *ngIf=\"addressOptions.length === 0\" [ngValue]=\"undefined\">\n          {{'No address found' | rpxTranslate}}\n        </option>\n        <option *ngIf=\"addressOptions.length > 0\" [ngValue]=\"undefined\">\n          {{addressOptions.length}} {{(addressOptions.length === 1 ? 'address found' : 'addresses found') | rpxTranslate}}\n        </option>\n        <option *ngFor=\"let addressOption of addressOptions\" [ngValue]=\"addressOption.value\">\n          {{addressOption.description}}\n        </option>\n      </select>\n    </div>\n\n    <a class=\"manual-link bottom-30\" *ngIf=\"!shouldShowDetailFields()\" (click)=\"blankAddress(); $event.preventDefault()\" href=\"#\">\n      {{\"I can't enter a UK postcode\" | rpxTranslate}}\n    </a>\n  </div>\n\n  <ccd-write-complex-type-field\n    [hidden]=\"!shouldShowDetailFields()\"\n    [caseField]=\"caseField\"\n    [renderLabel]=\"false\"\n    [parent]=\"parent\"\n    [formGroup]=\"formGroup\"\n    [ignoreMandatory]=\"true\"\n    [idPrefix]=\"buildIdPrefix('detail')\"\n    #writeComplexFieldComponent>\n  </ccd-write-complex-type-field>\n</div>\n", styles: [".manual-link{cursor:pointer;display:block;text-decoration:underline}\n"] }]
     }], () => [{ type: AddressesService }, { type: IsCompoundPipe }], { writeComplexFieldComponent: [{
             type: ViewChild,
             args: ['writeComplexFieldComponent', { static: false }]
@@ -33584,7 +33583,7 @@ i0.ɵɵsetComponentScope(ReadLinkedCasesFieldComponent, function () { return [i4
     // Components for linked cases
     LinkedCasesToTableComponent,
     LinkedCasesFromTableComponent]; }, []);
-i0.ɵɵsetComponentScope(WriteAddressFieldComponent, function () { return [i4.NgClass, i4.NgForOf, i4.NgIf, i3.NgSelectOption, i3.ɵNgSelectMultipleOption, i3.DefaultValueAccessor, i3.SelectControlValueAccessor, i3.NgControlStatus, i3.NgControlStatusGroup, i3.FormControlDirective, i3.FormGroupDirective, MarkdownComponent, WriteComplexFieldComponent]; }, function () { return [FieldLabelPipe, i1.RpxTranslatePipe]; });
+i0.ɵɵsetComponentScope(WriteAddressFieldComponent, function () { return [i4.NgClass, i4.NgForOf, i4.NgIf, i3.NgSelectOption, i3.ɵNgSelectMultipleOption, i3.DefaultValueAccessor, i3.SelectControlValueAccessor, i3.NgControlStatus, i3.NgControlStatusGroup, i3.FormControlDirective, i3.FormGroupDirective, WriteComplexFieldComponent]; }, function () { return [FieldLabelPipe, i1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(WriteComplexFieldComponent, function () { return [i4.NgForOf, i4.NgIf, i4.NgSwitch, i4.NgSwitchCase, i3.NgControlStatusGroup, i3.FormGroupDirective, LabelSubstitutorDirective, FieldReadComponent,
     FieldWriteComponent]; }, function () { return [FieldLabelPipe, IsReadOnlyPipe]; });
 i0.ɵɵsetComponentScope(WriteDocumentFieldComponent, function () { return [i4.NgClass, i4.NgIf, i1$4.MarkdownComponent, ReadDocumentFieldComponent]; }, function () { return [FieldLabelPipe, i1.RpxTranslatePipe]; });
@@ -35720,9 +35719,7 @@ class WorkbasketFiltersComponent {
                         .sort(this.orderService.sortAsc);
                     const formValue = this.windowService.getLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
                     workbasketInputs.forEach(item => {
-                        if (item.field.elementPath) {
-                            item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                        }
+                        item.field.id = FieldsUtils.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                         item.field.label = item.label;
                         if (formValue) {
                             const searchFormValueObject = JSON.parse(formValue);
@@ -41276,12 +41273,14 @@ class SearchInput {
     field;
     metadata;
     display_context_parameter;
-    constructor(label, order, field, metadata, display_context_parameter) {
+    dataType;
+    constructor(label, order, field, metadata, display_context_parameter, dataType) {
         this.label = label;
         this.order = order;
         this.field = field;
         this.metadata = metadata;
         this.display_context_parameter = display_context_parameter;
+        this.dataType = dataType;
     }
 }
 
@@ -41480,9 +41479,7 @@ class SearchFiltersComponent {
                 formValueObject = JSON.parse(formValue);
             }
             searchInputs.forEach(item => {
-                if (item.field.elementPath) {
-                    item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                }
+                item.field.id = FieldsUtils.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                 item.field.label = item.label;
                 if (formValueObject) {
                     item.field.value = formValueObject[item.field.id];