@defra/forms-engine-plugin 4.23.0 → 5.0.0-alpha.1

package/.server/server/plugins/postcode-lookup/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../src/server/plugins/postcode-lookup/types.js"],"sourcesContent":["/**\n * @typedef {{\n *   ordnanceSurveyApiKey: string\n * }} PostcodeLookupConfiguration\n */\n\n/**\n * @typedef {{\n *   name: string\n *   step?: string\n * }} PostcodeLookupDispatchArgs\n */\n\n/**\n * @typedef {{\n *   sourceUrl: string,\n *   formName: string\n *   componentName: string\n *   componentTitle: string,\n *   componentHint?: string\n *   step?: string\n * }} PostcodeLookupDispatchData\n */\n\n/**\n * @typedef {{\n *   initial: PostcodeLookupDispatchData\n *   details: PostcodeLookupDetailsData\n * }} PostcodeLookupSessionData\n */\n\n//\n// Model types\n//\n\n/**\n * The postcode lookup details form view model data\n * @typedef {object} PostcodeLookupDetailsData\n * @property {string} postcodeQuery - postcode query\n * @property {string} buildingNameQuery - Building name or number query\n */\n\n//\n// Route types\n//\n\n/**\n * Postcode lookup query params\n * @typedef {object} PostcodeLookupQuery\n * @property {string} [step] - step\n */\n\n/**\n * @typedef {object} PostcodeLookupDetailsPayloadProperties\n * @property {string} step - step\n */\n\n/**\n * @typedef {PostcodeLookupDetailsData & PostcodeLookupDetailsPayloadProperties} PostcodeLookupDetailsPayload\n */\n\n/**\n * @typedef {object} PostcodeLookupSelectPayload\n * @property {string} step - step\n * @property {string} uprn - postcode\n */\n\n/**\n * Postcode lookup get request\n * @typedef {object} PostcodeLookupGetRequestRefs\n * @property {PostcodeLookupQuery} Query - Request query\n */\n\n/**\n * Postcode lookup post request\n * @typedef {object} PostcodeLookupPostRequestRefs\n * @property {PostcodeLookupDetailsPayload | PostcodeLookupSelectPayload} Payload - Request payload\n */\n\n/**\n * @typedef {PostcodeLookupGetRequestRefs | PostcodeLookupPostRequestRefs} PostcodeLookupRequestRefs\n * @typedef {Request<PostcodeLookupGetRequestRefs>} PostcodeLookupGetRequest\n * @typedef {Request<PostcodeLookupPostRequestRefs>} PostcodeLookupPostRequest\n * @typedef {PostcodeLookupGetRequest | PostcodeLookupPostRequest} PostcodeLookupRequest\n */\n\n/**\n * @typedef {object} PostcodeLookupManualPayload\n * @property {string} addressLine1 - The address line 1\n * @property {string} addressLine2 - The address line 2\n * @property {string} town - The address town or city\n * @property {string} county - The address county\n * @property {string} postcode - The address postcode\n */\n\n//\n// Service types\n//\n\n/**\n * @typedef {object} Address\n * @property {string} uprn - The unique property reference\n * @property {string} address - The full address\n * @property {string} addressLine1 - Address line 1\n * @property {string} addressLine2 - Address line 2\n * @property {string} town - Address town\n * @property {string} county - Address county\n * @property {string} postcode - Address postcode\n * @property {string} formatted - The full formatted address\n */\n\n/**\n * OS places address response\n * @typedef {object} DeliveryPointAddress\n * @property {string} UPRN - Unique property reference number\n * @property {string} UDPRN - Unique delivery point Reference Number\n * @property {string} ADDRESS - Address\n * @property {string} ORGANISATION_NAME - Organisation name\n * @property {string} SUB_BUILDING_NAME - Sub building name\n * @property {string} BUILDING_NAME - Building name\n * @property {string} BUILDING_NUMBER - Building number\n * @property {string} THOROUGHFARE_NAME - Throughfare name\n * @property {string} DEPENDENT_LOCALITY - Dependent locality\n * @property {string} POST_TOWN - Post town\n * @property {string} POSTCODE - Postcode\n */\n\n/**\n * OS places DPA response\n * @typedef {object} DeliveryPointAddressItem\n * @property {DeliveryPointAddress} DPA - Delivery point address\n */\n\n/**\n * OS places DPA response\n * @typedef {object} DeliveryPointAddressResult\n * @property {DeliveryPointAddressItem[]} [results] - Delivery point address results\n */\n\n/**\n * @import { Request } from '@hapi/hapi'\n * @import { FormPayload } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../src/server/plugins/postcode-lookup/types.js"],"sourcesContent":["/**\n * @typedef {{\n *   ordnanceSurveyApiKey: string\n * }} PostcodeLookupConfiguration\n */\n\n/**\n * @typedef {{\n *   name: string\n *   step?: string\n * }} PostcodeLookupDispatchArgs\n */\n\n/**\n * @typedef {{\n *   sourceUrl: string,\n *   formName: string\n *   componentName: string\n *   componentTitle: string,\n *   componentHint?: string\n *   step?: string\n *   language?: string\n * }} PostcodeLookupDispatchData\n */\n\n/**\n * @typedef {{\n *   initial: PostcodeLookupDispatchData\n *   details: PostcodeLookupDetailsData\n * }} PostcodeLookupSessionData\n */\n\n//\n// Model types\n//\n\n/**\n * The postcode lookup details form view model data\n * @typedef {object} PostcodeLookupDetailsData\n * @property {string} postcodeQuery - postcode query\n * @property {string} buildingNameQuery - Building name or number query\n */\n\n//\n// Route types\n//\n\n/**\n * Postcode lookup query params\n * @typedef {object} PostcodeLookupQuery\n * @property {string} [step] - step\n */\n\n/**\n * @typedef {object} PostcodeLookupDetailsPayloadProperties\n * @property {string} step - step\n */\n\n/**\n * @typedef {PostcodeLookupDetailsData & PostcodeLookupDetailsPayloadProperties} PostcodeLookupDetailsPayload\n */\n\n/**\n * @typedef {object} PostcodeLookupSelectPayload\n * @property {string} step - step\n * @property {string} uprn - postcode\n */\n\n/**\n * Postcode lookup get request\n * @typedef {object} PostcodeLookupGetRequestRefs\n * @property {PostcodeLookupQuery} Query - Request query\n */\n\n/**\n * Postcode lookup post request\n * @typedef {object} PostcodeLookupPostRequestRefs\n * @property {PostcodeLookupDetailsPayload | PostcodeLookupSelectPayload} Payload - Request payload\n */\n\n/**\n * @typedef {PostcodeLookupGetRequestRefs | PostcodeLookupPostRequestRefs} PostcodeLookupRequestRefs\n * @typedef {Request<PostcodeLookupGetRequestRefs>} PostcodeLookupGetRequest\n * @typedef {Request<PostcodeLookupPostRequestRefs>} PostcodeLookupPostRequest\n * @typedef {PostcodeLookupGetRequest | PostcodeLookupPostRequest} PostcodeLookupRequest\n */\n\n/**\n * @typedef {object} PostcodeLookupManualPayload\n * @property {string} addressLine1 - The address line 1\n * @property {string} addressLine2 - The address line 2\n * @property {string} town - The address town or city\n * @property {string} county - The address county\n * @property {string} postcode - The address postcode\n */\n\n//\n// Service types\n//\n\n/**\n * @typedef {object} Address\n * @property {string} uprn - The unique property reference\n * @property {string} address - The full address\n * @property {string} addressLine1 - Address line 1\n * @property {string} addressLine2 - Address line 2\n * @property {string} town - Address town\n * @property {string} county - Address county\n * @property {string} postcode - Address postcode\n * @property {string} formatted - The full formatted address\n */\n\n/**\n * OS places address response\n * @typedef {object} DeliveryPointAddress\n * @property {string} UPRN - Unique property reference number\n * @property {string} UDPRN - Unique delivery point Reference Number\n * @property {string} ADDRESS - Address\n * @property {string} ORGANISATION_NAME - Organisation name\n * @property {string} SUB_BUILDING_NAME - Sub building name\n * @property {string} BUILDING_NAME - Building name\n * @property {string} BUILDING_NUMBER - Building number\n * @property {string} THOROUGHFARE_NAME - Throughfare name\n * @property {string} DEPENDENT_LOCALITY - Dependent locality\n * @property {string} POST_TOWN - Post town\n * @property {string} POSTCODE - Postcode\n */\n\n/**\n * OS places DPA response\n * @typedef {object} DeliveryPointAddressItem\n * @property {DeliveryPointAddress} DPA - Delivery point address\n */\n\n/**\n * OS places DPA response\n * @typedef {object} DeliveryPointAddressResult\n * @property {DeliveryPointAddressItem[]} [results] - Delivery point address results\n */\n\n/**\n * @import { Request } from '@hapi/hapi'\n * @import { FormPayload } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA","ignoreList":[]}

package/.server/server/plugins/postcode-lookup/views/postcode-lookup-details.html

@@ -13,7 +13,7 @@
     <div class="govuk-grid-column-two-thirds">
       {% if errors %}
         {{ govukErrorSummary({
-          titleText: "There is a problem",
+          titleText: t('errors.title'),
           errorList: errors
         }) }}
       {% endif %}
@@ -38,7 +38,7 @@
 
             {% if hasAddresses %}
               <p class="govuk-body">
-                {{addressCount}} address{{ "es" if hasMultipleAddresses }} found for {{ detailsHtml | safe }}. <a href="{{ searchAgainLink.href }}" class="govuk-link govuk-link--no-visited-state">{{ searchAgainLink.text }}</a>
+                {{ addressesFoundText }} {{ detailsHtml | safe }}. <a href="{{ searchAgainLink.href }}" class="govuk-link govuk-link--no-visited-state">{{ searchAgainLink.text }}</a>
               </p>
             {% endif %}
 
@@ -53,7 +53,7 @@
               }) }}
             {% else %}
               <!-- No addresses found - show try again -->
-              <p class="govuk-body">We could not find an address that matches {{ detailsHtml | safe }}.</p>
+              <p class="govuk-body">{{ noAddressFoundText }} {{ detailsHtml | safe }}.</p>
             {% endif %}
           {% case "manual" %}
             <!-- Postcode lookup manual entry -->

package/.server/server/types.d.ts

@@ -3,7 +3,7 @@ import { type Server } from '@hapi/hapi';
 import { type FormModel } from '../server/plugins/engine/models/index.js';
 import { type DetailItem } from '../server/plugins/engine/models/types.js';
 import { type PageController } from '../server/plugins/engine/pageControllers/PageController.js';
-import { type FormContext, type OnRequestCallback, type PluginOptions, type PreparePageEventRequestOptions } from '../server/plugins/engine/types.js';
+import { type FormContext, type GetLanguageHandler, type OnRequestCallback, type PluginOptions, type PreparePageEventRequestOptions } from '../server/plugins/engine/types.js';
 import { type PaymentService } from '../server/plugins/payment/service.js';
 import { type FormRequestPayload, type FormStatus } from '../server/routes/types.js';
 import { type CacheService } from '../server/services/cacheService.js';
@@ -38,6 +38,7 @@ export interface RouteConfig {
     cacheServiceCreator?: (server: Server) => CacheService;
     ordnanceSurveyApiKey?: string;
     ordnanceSurveyApiSecret?: string;
+    getLanguage?: GetLanguageHandler;
 }
 export interface OutputService {
     submit: (context: FormContext, request: FormRequestPayload, model: FormModel, emailAddress: string, items: DetailItem[], submitResponse: SubmitResponsePayload, formMetadata?: FormMetadata) => Promise<void>;

package/.server/server/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/server/types.ts"],"sourcesContent":["import {\n  type FormDefinition,\n  type FormMetadata,\n  type SubmitPayload,\n  type SubmitResponsePayload\n} from '@defra/forms-model'\nimport { type Server } from '@hapi/hapi'\n\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type DetailItem } from '~/src/server/plugins/engine/models/types.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport {\n  type FormContext,\n  type OnRequestCallback,\n  type PluginOptions,\n  type PreparePageEventRequestOptions\n} from '~/src/server/plugins/engine/types.js'\nimport { type PaymentService } from '~/src/server/plugins/payment/service.js'\nimport {\n  type FormRequestPayload,\n  type FormStatus\n} from '~/src/server/routes/types.js'\nimport { type CacheService } from '~/src/server/services/cacheService.js'\n\nexport interface FormsService {\n  getFormMetadata: (slug: string) => Promise<FormMetadata>\n  getFormMetadataById: (id: string) => Promise<FormMetadata>\n  getFormDefinition: (\n    id: string,\n    state: FormStatus\n  ) => Promise<FormDefinition | undefined>\n  getFormSecret: (formId: string, secretName: string) => Promise<string>\n}\n\nexport interface FormSubmissionService {\n  persistFiles: (\n    files: { fileId: string; initiatedRetrievalKey: string }[],\n    persistedRetrievalKey: string\n  ) => Promise<object>\n  submit: (data: SubmitPayload) => Promise<SubmitResponsePayload | undefined>\n}\n\nexport interface Services {\n  formsService: FormsService\n  formSubmissionService: FormSubmissionService\n  outputService: OutputService\n  paymentService?: PaymentService\n}\n\nexport interface RouteConfig {\n  formFileName?: string\n  formFilePath?: string\n  enforceCsrf?: boolean\n  services?: Services\n  controllers?: Record<string, typeof PageController>\n  preparePageEventRequestOptions?: PreparePageEventRequestOptions\n  onRequest?: OnRequestCallback\n  saveAndExit?: PluginOptions['saveAndExit']\n  cacheServiceCreator?: (server: Server) => CacheService\n  ordnanceSurveyApiKey?: string\n  ordnanceSurveyApiSecret?: string\n}\n\nexport interface OutputService {\n  submit: (\n    context: FormContext,\n    request: FormRequestPayload,\n    model: FormModel,\n    emailAddress: string,\n    items: DetailItem[],\n    submitResponse: SubmitResponsePayload,\n    formMetadata?: FormMetadata\n  ) => Promise<void>\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/server/types.ts"],"sourcesContent":["import {\n  type FormDefinition,\n  type FormMetadata,\n  type SubmitPayload,\n  type SubmitResponsePayload\n} from '@defra/forms-model'\nimport { type Server } from '@hapi/hapi'\n\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type DetailItem } from '~/src/server/plugins/engine/models/types.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport {\n  type FormContext,\n  type GetLanguageHandler,\n  type OnRequestCallback,\n  type PluginOptions,\n  type PreparePageEventRequestOptions\n} from '~/src/server/plugins/engine/types.js'\nimport { type PaymentService } from '~/src/server/plugins/payment/service.js'\nimport {\n  type FormRequestPayload,\n  type FormStatus\n} from '~/src/server/routes/types.js'\nimport { type CacheService } from '~/src/server/services/cacheService.js'\n\nexport interface FormsService {\n  getFormMetadata: (slug: string) => Promise<FormMetadata>\n  getFormMetadataById: (id: string) => Promise<FormMetadata>\n  getFormDefinition: (\n    id: string,\n    state: FormStatus\n  ) => Promise<FormDefinition | undefined>\n  getFormSecret: (formId: string, secretName: string) => Promise<string>\n}\n\nexport interface FormSubmissionService {\n  persistFiles: (\n    files: { fileId: string; initiatedRetrievalKey: string }[],\n    persistedRetrievalKey: string\n  ) => Promise<object>\n  submit: (data: SubmitPayload) => Promise<SubmitResponsePayload | undefined>\n}\n\nexport interface Services {\n  formsService: FormsService\n  formSubmissionService: FormSubmissionService\n  outputService: OutputService\n  paymentService?: PaymentService\n}\n\nexport interface RouteConfig {\n  formFileName?: string\n  formFilePath?: string\n  enforceCsrf?: boolean\n  services?: Services\n  controllers?: Record<string, typeof PageController>\n  preparePageEventRequestOptions?: PreparePageEventRequestOptions\n  onRequest?: OnRequestCallback\n  saveAndExit?: PluginOptions['saveAndExit']\n  cacheServiceCreator?: (server: Server) => CacheService\n  ordnanceSurveyApiKey?: string\n  ordnanceSurveyApiSecret?: string\n  getLanguage?: GetLanguageHandler\n}\n\nexport interface OutputService {\n  submit: (\n    context: FormContext,\n    request: FormRequestPayload,\n    model: FormModel,\n    emailAddress: string,\n    items: DetailItem[],\n    submitResponse: SubmitResponsePayload,\n    formMetadata?: FormMetadata\n  ) => Promise<void>\n}\n"],"mappings":"","ignoreList":[]}

package/.server/server/utils/utils.d.ts

@@ -11,3 +11,8 @@ export function applyTraceHeaders(existingHeaders?: Record<string, string> | und
  * @returns
  */
 export function isValidUUID(str: string): boolean;
+/**
+ * @param {AnyFormRequest} request
+ */
+export function resolveLanguage(request: AnyFormRequest): string;
+import type { AnyFormRequest } from '../../server/plugins/engine/types.js';

package/.server/server/utils/utils.js

@@ -1,6 +1,7 @@
 import { getTraceId } from '@defra/hapi-tracing';
 import Joi from 'joi';
 import { config } from "../../config/index.js";
+import { getPluginOptions } from "../plugins/engine/helpers.js";
 
 /**
  * Returns a set of headers to use in an HTTP request, merging them with any existing headers in options.
@@ -30,4 +31,19 @@ export function isValidUUID(str) {
   } = Joi.string().uuid().validate(str);
   return error === undefined;
 }
+
+/**
+ * @param {AnyFormRequest} request
+ */
+export function resolveLanguage(request) {
+  const {
+    getLanguage
+  } = getPluginOptions(request.server);
+  return getLanguage?.(request.query, request.yar) ?? 'en-GB';
+}
+
+/**
+ * @import { FormMetadata } from '@defra/forms-model'
+ * @import { AnyFormRequest } from '../../server/plugins/engine/types.js'
+ */
 //# sourceMappingURL=utils.js.map

package/.server/server/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["getTraceId","Joi","config","applyTraceHeaders","existingHeaders","header","get","traceId","headers","undefined","Object","assign","isValidUUID","str","error","string","uuid","validate"],"sources":["../../../src/server/utils/utils.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\nimport Joi from 'joi'\n\nimport { config } from '~/src/config/index.js'\n\n/**\n * Returns a set of headers to use in an HTTP request, merging them with any existing headers in options.\n * @param {Record<string, string> | undefined} [existingHeaders] - Optional existing headers to merge with the tracing headers.\n * @param {string} [header] - The tracing header name to use.\n * @returns {Record<string, string> | undefined} The merged headers, or undefined if no tracing header is available.\n */\nexport function applyTraceHeaders(\n  existingHeaders,\n  header = config.get('tracing').header\n) {\n  if (!header) {\n    return existingHeaders\n  }\n\n  const traceId = getTraceId()\n\n  const headers = traceId ? { [header]: traceId } : undefined\n\n  return existingHeaders ? Object.assign(existingHeaders, headers) : headers\n}\n\n/**\n * Validates if a string conforms to the uuid structure\n * @param {string} str\n * @returns\n */\nexport function isValidUUID(str) {\n  const { error } = Joi.string().uuid().validate(str)\n  return error === undefined\n}\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,MAAM;;AAEf;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,eAAe,EACfC,MAAM,GAAGH,MAAM,CAACI,GAAG,CAAC,SAAS,CAAC,CAACD,MAAM,EACrC;EACA,IAAI,CAACA,MAAM,EAAE;IACX,OAAOD,eAAe;EACxB;EAEA,MAAMG,OAAO,GAAGP,UAAU,CAAC,CAAC;EAE5B,MAAMQ,OAAO,GAAGD,OAAO,GAAG;IAAE,CAACF,MAAM,GAAGE;EAAQ,CAAC,GAAGE,SAAS;EAE3D,OAAOL,eAAe,GAAGM,MAAM,CAACC,MAAM,CAACP,eAAe,EAAEI,OAAO,CAAC,GAAGA,OAAO;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,WAAWA,CAACC,GAAG,EAAE;EAC/B,MAAM;IAAEC;EAAM,CAAC,GAAGb,GAAG,CAACc,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAACJ,GAAG,CAAC;EACnD,OAAOC,KAAK,KAAKL,SAAS;AAC5B","ignoreList":[]}
+{"version":3,"file":"utils.js","names":["getTraceId","Joi","config","getPluginOptions","applyTraceHeaders","existingHeaders","header","get","traceId","headers","undefined","Object","assign","isValidUUID","str","error","string","uuid","validate","resolveLanguage","request","getLanguage","server","query","yar"],"sources":["../../../src/server/utils/utils.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\nimport Joi from 'joi'\n\nimport { config } from '~/src/config/index.js'\nimport { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'\n\n/**\n * Returns a set of headers to use in an HTTP request, merging them with any existing headers in options.\n * @param {Record<string, string> | undefined} [existingHeaders] - Optional existing headers to merge with the tracing headers.\n * @param {string} [header] - The tracing header name to use.\n * @returns {Record<string, string> | undefined} The merged headers, or undefined if no tracing header is available.\n */\nexport function applyTraceHeaders(\n  existingHeaders,\n  header = config.get('tracing').header\n) {\n  if (!header) {\n    return existingHeaders\n  }\n\n  const traceId = getTraceId()\n\n  const headers = traceId ? { [header]: traceId } : undefined\n\n  return existingHeaders ? Object.assign(existingHeaders, headers) : headers\n}\n\n/**\n * Validates if a string conforms to the uuid structure\n * @param {string} str\n * @returns\n */\nexport function isValidUUID(str) {\n  const { error } = Joi.string().uuid().validate(str)\n  return error === undefined\n}\n\n/**\n * @param {AnyFormRequest} request\n */\nexport function resolveLanguage(request) {\n  const { getLanguage } = getPluginOptions(request.server)\n  return getLanguage?.(request.query, request.yar) ?? 'en-GB'\n}\n\n/**\n * @import { FormMetadata } from '@defra/forms-model'\n * @import { AnyFormRequest } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,MAAM;AACf,SAASC,gBAAgB;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,eAAe,EACfC,MAAM,GAAGJ,MAAM,CAACK,GAAG,CAAC,SAAS,CAAC,CAACD,MAAM,EACrC;EACA,IAAI,CAACA,MAAM,EAAE;IACX,OAAOD,eAAe;EACxB;EAEA,MAAMG,OAAO,GAAGR,UAAU,CAAC,CAAC;EAE5B,MAAMS,OAAO,GAAGD,OAAO,GAAG;IAAE,CAACF,MAAM,GAAGE;EAAQ,CAAC,GAAGE,SAAS;EAE3D,OAAOL,eAAe,GAAGM,MAAM,CAACC,MAAM,CAACP,eAAe,EAAEI,OAAO,CAAC,GAAGA,OAAO;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,WAAWA,CAACC,GAAG,EAAE;EAC/B,MAAM;IAAEC;EAAM,CAAC,GAAGd,GAAG,CAACe,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAACJ,GAAG,CAAC;EACnD,OAAOC,KAAK,KAAKL,SAAS;AAC5B;;AAEA;AACA;AACA;AACA,OAAO,SAASS,eAAeA,CAACC,OAAO,EAAE;EACvC,MAAM;IAAEC;EAAY,CAAC,GAAGlB,gBAAgB,CAACiB,OAAO,CAACE,MAAM,CAAC;EACxD,OAAOD,WAAW,GAAGD,OAAO,CAACG,KAAK,EAAEH,OAAO,CAACI,GAAG,CAAC,IAAI,OAAO;AAC7D;;AAEA;AACA;AACA;AACA","ignoreList":[]}

package/.server/typings/hapi/index.d.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/hapi/index.d.ts"],"sourcesContent":["import { type Plugin } from '@hapi/hapi'\nimport { type ServerYar, type Yar } from '@hapi/yar'\nimport { type Logger } from 'pino'\n\nimport {\n  type COMPONENT_STATE_ERROR,\n  type EXTERNAL_STATE_APPENDAGE,\n  type EXTERNAL_STATE_PAYLOAD\n} from '~/src/server/constants.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport {\n  type AnyFormRequest,\n  type FormSubmissionError,\n  type PluginOptions\n} from '~/src/server/plugins/engine/types.ts'\nimport { type CacheService } from '~/src/server/services/index.js'\n\ndeclare module '@hapi/yar' {\n  interface YarFlashes {\n    [EXTERNAL_STATE_APPENDAGE]: object\n    [EXTERNAL_STATE_PAYLOAD]: object\n    [COMPONENT_STATE_ERROR]: string\n    [key: string]: { errors: FormSubmissionError[] }\n  }\n}\n\ndeclare module '@hapi/hapi' {\n  // Here we are decorating Hapi interface types with\n  // props from plugins which doesn't export @types\n  interface PluginProperties {\n    crumb: {\n      generate?: (request: AnyRequest) => string\n    }\n    'forms-engine-plugin': {\n      baseLayoutPath: string\n      cacheService: CacheService\n      viewContext?: (\n        request: AnyFormRequest | null\n      ) => Record<string, unknown> | Promise<Record<string, unknown>>\n      saveAndExit?: PluginOptions['saveAndExit']\n      baseUrl: string\n      services: PluginOptions['services']\n    }\n  }\n\n  interface Request {\n    logger: Logger\n    yar: Yar\n  }\n\n  interface RequestApplicationState {\n    model?: FormModel\n  }\n\n  interface Server {\n    logger: Logger\n    yar: ServerYar\n  }\n\n  interface ServerApplicationState {\n    model?: FormModel\n    models?: Map<string, { model: FormModel; updatedAt: Date }>\n  }\n}\n\ndeclare module 'blankie' {\n  declare const blankie: {\n    plugin: Plugin<Record<string, boolean | string | string[]>>\n  }\n\n  export = blankie\n}\n\ndeclare module 'blipp' {\n  declare const blipp: {\n    plugin: Plugin\n  }\n\n  export = blipp\n}\n\ndeclare module 'hapi-pulse' {\n  declare const hapiPulse: {\n    plugin: Plugin<{\n      timeout: number\n    }>\n  }\n\n  export = hapiPulse\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/hapi/index.d.ts"],"sourcesContent":["import { type Plugin } from '@hapi/hapi'\nimport { type ServerYar, type Yar } from '@hapi/yar'\nimport { type Logger } from 'pino'\n\nimport {\n  type COMPONENT_STATE_ERROR,\n  type EXTERNAL_STATE_APPENDAGE,\n  type EXTERNAL_STATE_PAYLOAD\n} from '~/src/server/constants.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport {\n  type AnyFormRequest,\n  type FormSubmissionError,\n  type PluginOptions\n} from '~/src/server/plugins/engine/types.ts'\nimport { type CacheService } from '~/src/server/services/index.js'\n\ndeclare module '@hapi/yar' {\n  interface YarFlashes {\n    [EXTERNAL_STATE_APPENDAGE]: object\n    [EXTERNAL_STATE_PAYLOAD]: object\n    [COMPONENT_STATE_ERROR]: string\n    [key: string]: { errors: FormSubmissionError[] }\n  }\n}\n\ndeclare module '@hapi/hapi' {\n  // Here we are decorating Hapi interface types with\n  // props from plugins which doesn't export @types\n  interface PluginProperties {\n    crumb: {\n      generate?: (request: AnyRequest) => string\n    }\n    'forms-engine-plugin': {\n      baseLayoutPath: string\n      cacheService: CacheService\n      viewContext?: (\n        request: AnyFormRequest | null\n      ) => Record<string, unknown> | Promise<Record<string, unknown>>\n      saveAndExit?: PluginOptions['saveAndExit']\n      getLanguage?: PluginOptions['getLanguage']\n      baseUrl: string\n      services: PluginOptions['services']\n    }\n  }\n\n  interface Request {\n    logger: Logger\n    yar: Yar\n  }\n\n  interface RequestApplicationState {\n    model?: FormModel\n  }\n\n  interface Server {\n    logger: Logger\n    yar: ServerYar\n  }\n\n  interface ServerApplicationState {\n    model?: FormModel\n    models?: Map<string, { model: FormModel; updatedAt: Date }>\n  }\n}\n\ndeclare module 'blankie' {\n  declare const blankie: {\n    plugin: Plugin<Record<string, boolean | string | string[]>>\n  }\n\n  export = blankie\n}\n\ndeclare module 'blipp' {\n  declare const blipp: {\n    plugin: Plugin\n  }\n\n  export = blipp\n}\n\ndeclare module 'hapi-pulse' {\n  declare const hapiPulse: {\n    plugin: Plugin<{\n      timeout: number\n    }>\n  }\n\n  export = hapiPulse\n}\n"],"mappings":"","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "4.23.0",
+  "version": "5.0.0-alpha.1",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -83,13 +83,13 @@
   },
   "engines": {
     "node": ">=22.11.0 <25.0.0",
-    "npm": ">=10.9.0 <11.6.4"
+    "npm": ">=10.9.0 <=11.17.0"
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.686",
+    "@defra/forms-model": "^3.0.687",
     "@defra/hapi-tracing": "^1.29.0",
-    "@defra/interactive-map": "^0.0.22-alpha",
+    "@defra/interactive-map": "^0.0.33-alpha",
     "@elastic/ecs-pino-format": "^1.5.0",
     "@hapi/boom": "^10.0.1",
     "@hapi/bourne": "^3.0.0",
@@ -126,6 +126,7 @@
     "highlight.js": "^11.11.1",
     "http-status-codes": "^2.3.0",
     "humanize-duration": "^3.33.1",
+    "i18next": "^26.0.5",
     "ioredis": "^5.8.2",
     "joi": "^17.13.3",
     "liquidjs": "^10.24.0",

package/src/client/javascripts/geospatial-map.js

@@ -1,8 +1,6 @@
 // @ts-expect-error - no types
 import createDatasetsPlugin from '@defra/interactive-map/plugins/datasets'
 // @ts-expect-error - no types
-import { maplibreLayerAdapter } from '@defra/interactive-map/plugins/datasets/adapters/maplibre'
-// @ts-expect-error - no types
 import createDrawPlugin from '@defra/interactive-map/plugins/draw-ml'
 import { bbox } from '@turf/bbox'
 
@@ -11,8 +9,10 @@ import {
   createMap,
   defaultConfig,
   getCentroidGridRef,
-  getCoordinateGridRef
+  getCoordinateGridRef,
+  getMapLayers
 } from './map.js'
+import sssiDataset from './sssi-dataset.js'
 import { formatDelimtedList } from './utils.js'
 
 const helpPanelConfig = {
@@ -173,12 +173,12 @@ export function processGeospatial(config, geospatial, index) {
   const drawPlugin = createDrawPlugin()
   const plugins = [drawPlugin]
   const country = geospatial.dataset.country
+  const mapLayers = getMapLayers(geospatial.dataset.maplayers)
 
   if (country) {
     // Add the country bounds as a dataset plugin to show the valid area on the map
     // and provide feedback to the user when they add features outside of the bounds.
-    const datasetsPlugin = createDatasetsPlugin({
-      layerAdapter: maplibreLayerAdapter,
+    const countriesDatasetPlugin = createDatasetsPlugin({
       datasets: [
         {
           id: 'invalid-area',
@@ -206,7 +206,11 @@ export function processGeospatial(config, geospatial, index) {
       ]
     })
 
-    plugins.push(datasetsPlugin)
+    plugins.push(countriesDatasetPlugin)
+  }
+
+  if (mapLayers.includes('sssi')) {
+    plugins.push(createDatasetsPlugin(sssiDataset))
   }
 
   const initConfig = {

package/src/client/javascripts/location-map.js

@@ -1,13 +1,18 @@
+// @ts-expect-error - no types
+import createDatasetsPlugin from '@defra/interactive-map/plugins/datasets'
+
 import {
   EVENTS,
   centerMap,
   createMap,
   defaultConfig,
   eastingNorthingToLatLong,
+  getMapLayers,
   latLongToEastingNorthing,
   latLongToOsGridRef,
   osGridRefToLatLong
 } from './map.js'
+import sssiDataset from './sssi-dataset.js'
 
 const LOCATION_FIELD_SELECTOR = 'input.govuk-input'
 
@@ -418,6 +423,12 @@ export function processLocation(config, location, index) {
 
   locationInputs.after(mapContainer)
 
+  const mapLayers = getMapLayers(location.dataset.maplayers)
+
+  if (mapLayers.includes('sssi')) {
+    initConfig.plugins = [createDatasetsPlugin(sssiDataset)]
+  }
+
   const { map, interactPlugin } = createMap(mapId, initConfig, config)
 
   map.on(

package/src/client/javascripts/map.js

@@ -357,6 +357,16 @@ export function centerMap(map, mapProvider, center) {
   })
 }
 
+/**
+ * Parse CSV string layers
+ * @param {string | undefined} layers
+ * @returns {string[]}
+ */
+export function getMapLayers(layers) {
+  const trimmed = layers?.trim()
+  return trimmed ? trimmed.split(',') : []
+}
+
 /**
  * @typedef {object} InteractiveMap - an instance of a InteractiveMap
  * @property {Function} on - register callback listeners to map events

package/src/client/javascripts/sssi-dataset.js

@@ -0,0 +1,106 @@
+const style = {
+  stroke: '#00897B',
+  fillPattern: 'diagonal-cross-hatch',
+  fillPatternForegroundColor: '#00897B',
+  fillPatternBackgroundColor: 'transparent'
+}
+const minZoom = 12
+
+const englandWFS =
+  'https://environment.data.gov.uk/geoservices/datasets/ba8dc201-66ef-4983-9d46-7378af21027e/ogc/features/v1/collections/Sites_of_Special_Scientific_Interest_England/items?f=json'
+const walesWFS =
+  'https://datamap.gov.wales/geoserver/wfs?service=WFS&version=2.0.0&request=GetFeature&typeNames=inspire-nrw:NRW_SSSI&outputFormat=application/json&srsName=EPSG:4326'
+const scotlandWFS =
+  'https://services1.arcgis.com/LM9GyVFsughzHdbO/ArcGIS/rest/services/Sites_of_Special_Scientific_Interest/FeatureServer/0/query?f=geojson&where=1%3D1&geometryType=esriGeometryEnvelope&inSR=4326&spatialRel=esriSpatialRelIntersects&returnGeometry=true&outFields=*'
+
+/**
+ * @type {TransformRequestArgs}
+ */
+export function sssiEnglandRequestTransformer(url, { bbox }) {
+  const uri = new URL(url)
+  uri.searchParams.set('bbox', bbox.join(','))
+
+  return {
+    url: uri.toString()
+  }
+}
+
+/**
+ * @type {TransformRequestArgs}
+ */
+export function sssiWalesRequestTransformer(url, { bbox }) {
+  const uri = new URL(url)
+  uri.searchParams.set('bbox', `${bbox.join(',')},EPSG:4326`)
+
+  return {
+    url: uri.toString()
+  }
+}
+
+/**
+ * @type {TransformRequestArgs}
+ */
+export function sssiScotlandRequestTransformer(url, { bbox }) {
+  const uri = new URL(url)
+  uri.searchParams.set('geometry', bbox.join(','))
+
+  return {
+    url: uri.toString()
+  }
+}
+
+export default {
+  datasets: [
+    {
+      id: 'sssi-england',
+      label: 'Sites of Special Scientific Interest',
+      dynamicGeoJSON: {
+        url: englandWFS,
+        idProperty: 'ref_code',
+        transformRequest: sssiEnglandRequestTransformer
+      },
+      minZoom,
+      style,
+      showInKey: true,
+      showInMenu: false
+    },
+    {
+      id: 'sssi-wales',
+      label: 'SSSI Wales',
+      dynamicGeoJSON: {
+        url: walesWFS,
+        idProperty: 'id',
+        transformRequest: sssiWalesRequestTransformer
+      },
+      minZoom,
+      style,
+      showInKey: false,
+      showInMenu: false
+    },
+    {
+      id: 'sssi-scotland',
+      label: 'SSSI Scotland',
+      dynamicGeoJSON: {
+        url: scotlandWFS,
+        idProperty: 'OBJECTID',
+        transformRequest: sssiScotlandRequestTransformer
+      },
+      minZoom,
+      style,
+      showInKey: false,
+      showInMenu: false
+    }
+  ]
+}
+
+/**
+ * @typedef {object} TransformRequestOptions
+ * @property {string[]} bbox - the bounding box coordinates
+ */
+
+/**
+ * Transforms the request URL with bounding box parameters
+ * @callback TransformRequestArgs
+ * @param {string} url - the request URL
+ * @param {TransformRequestOptions} options - the bounding box coordinates
+ */

package/src/client/stylesheets/shared.scss

@@ -5,11 +5,9 @@
 @use "location-fields";
 
 @use "@defra/interactive-map/css" as core;
-@use "@defra/interactive-map/plugins/interact/css" as interact;
 @use "@defra/interactive-map/plugins/map-styles/css" as mapStyles;
 @use "@defra/interactive-map/plugins/search/css" as search;
 @use "@defra/interactive-map/plugins/scale-bar/css" as scaleBar;
-@use "@defra/interactive-map/plugins/draw-ml/css" as drawMl;
 
 // Use default GDS Transport font for autocomplete
 .autocomplete__hint,

package/src/server/forms/register-as-a-unicorn-breeder.yaml

@@ -242,20 +242,6 @@ pages:
         content: 'Fill in this field'
         options:
           required: false
-    next:
-      - path: '/pay-for-your-licence'
-  - title: Pay for your licence
-    path: '/pay-for-your-licence'
-    section: section
-    components:
-      - name: licencePayment
-        title: Unicorn breeder licence fee
-        type: PaymentField
-        hint: You'll be redirected to GOV.UK Pay to complete your payment
-        options:
-          required: true
-          amount: 50
-          description: Unicorn breeder annual licence fee
     next:
       - path: '/summary'
 conditions:

package/src/server/forms/simple-form.yaml

@@ -3,6 +3,57 @@ name: Page events
 engine: V2
 schema: 2
 startPage: '/summary'
+metadata:
+  language: en-GB
+  translations:
+    cy:
+      components:
+        1fb8e182-c709-4792-8f83-e01d8b1fee1a:
+          title: Beth yw eich enw cyntaf?
+          shortDescription: Eich enw cyntaf
+        b68df7f1-d4f4-4c17-83c8-402f584906c9:
+          title: Beth yw eich enw olaf?
+          shortDescription: Eich enw olaf
+        987c1234-56d7-89e0-1234-56789abcdef0:
+          title: Llwytho copi o'ch pasbort
+          shortDescription: Llwytho pasbort
+        987c1234-56d7-89e0-1234-56789abcdef1:
+          title: Llwytho copi o'ch trwydded yrru
+          shortDescription: Llwytho trwydded yrru
+        00738799-3489-4ab2-a57b-542eecb31bfa:
+          title: Pryd yw pen-blwydd {{ applicantFirstName }} {{ applicantLastName }}?
+          shortDescription: Eich pen-blwydd
+        123e4567-e89b-12d3-a456-426614174000:
+          title: Beth yw eich cyfeiriad?
+          shortDescription: Eich cyfeiriad
+        aabbccdd-1122-3344-5566-778899001123:
+          title: Oes gennych chi drwydded yrru?
+          shortDescription: Trwydded yrru
+        aabbccdd-1122-3344-5566-778899001124:
+          title: Sut rydych chi fel arfer yn teithio?
+          shortDescription: Eich ffordd o deithio
+      listItems:
+        aabbccdd-1122-3344-5566-778899001126:
+          text: Car
+        aabbccdd-1122-3344-5566-778899001127:
+          text: Bws
+        aabbccdd-1122-3344-5566-778899001128:
+          text: Trên
+      pages:
+        622a35ec-3795-418a-81f3-a45746959045:
+          title: Eich enw
+        23456789-0abc-def1-2345-67890abcdef1:
+          title: Llwytho copi o'ch pasbort
+        23456789-0abc-def1-2345-67890abcdef2:
+          title: Llwytho copi o'ch trwydded yrru
+        da0fbdb4-a2de-4650-be16-9ba552af135f:
+          title: Dyddiad geni
+        449a45f6-4541-4a46-91bd-8b8931b07b50:
+          title: Crynodeb
+        123e4567-e89b-12d3-a456-426614174001:
+          title: Ble rydych chi'n byw?
+        aabbccdd-1122-3344-5566-778899001122:
+          title: Amdanoch chi
 pages:
   - title: Your name
     path: '/your-name'
@@ -36,6 +87,21 @@ pages:
         id: e18116e0-7c3e-416a-af42-6f229017c5b1
     next: []
     id: 622a35ec-3795-418a-81f3-a45746959045
+  - title: Where do you live?
+    path: '/where-you-live'
+    components:
+      - type: UkAddressField
+        title: What is your address?
+        name: applicantAddress
+        shortDescription: Your address
+        hint: ''
+        options:
+          required: true
+          usePostcodeLookup: true
+        schema: {}
+        id: 123e4567-e89b-12d3-a456-426614174000
+    next: []
+    id: 123e4567-e89b-12d3-a456-426614174001
   - title: Upload a copy of your passport
     controller: FileUploadPageController
     path: '/upload-passport'
@@ -46,7 +112,7 @@ pages:
         shortDescription: Upload passport
         hint: ''
         options:
-          required: true
+          required: false
         schema: {}
         id: 987c1234-56d7-89e0-1234-56789abcdef0
     id: 23456789-0abc-def1-2345-67890abcdef1
@@ -60,7 +126,7 @@ pages:
         shortDescription: Upload drivers licence
         hint: ''
         options:
-          required: true
+          required: false
         schema: {}
         id: 987c1234-56d7-89e0-1234-56789abcdef1
     id: 23456789-0abc-def1-2345-67890abcdef2
@@ -78,6 +144,29 @@ pages:
         id: '00738799-3489-4ab2-a57b-542eecb31bfa'
     next: []
     id: da0fbdb4-a2de-4650-be16-9ba552af135f
+  - title: About you
+    path: '/about-you'
+    components:
+      - type: YesNoField
+        title: Do you have a driving licence?
+        name: hasDrivingLicence
+        shortDescription: Driving licence
+        hint: ''
+        options: {}
+        schema: {}
+        id: aabbccdd-1122-3344-5566-778899001123
+      - type: RadiosField
+        title: How do you usually travel?
+        name: travelMethod
+        shortDescription: Your travel method
+        hint: ''
+        options:
+          required: true
+        schema: {}
+        list: aabbccdd-1122-3344-5566-778899001125
+        id: aabbccdd-1122-3344-5566-778899001124
+    next: []
+    id: aabbccdd-1122-3344-5566-778899001122
   - title: ''
     path: '/notification-demo'
     components:
@@ -103,4 +192,18 @@ pages:
     controller: SummaryPageController
 conditions: []
 sections: []
-lists: []
+lists:
+  - id: aabbccdd-1122-3344-5566-778899001125
+    name: travelMethods
+    title: Travel methods
+    type: string
+    items:
+      - id: aabbccdd-1122-3344-5566-778899001126
+        text: Car
+        value: car
+      - id: aabbccdd-1122-3344-5566-778899001127
+        text: Bus
+        value: bus
+      - id: aabbccdd-1122-3344-5566-778899001128
+        text: Train
+        value: train

package/src/server/plugins/engine/components/AutocompleteField.ts

@@ -1,11 +1,8 @@
 import { type AutocompleteFieldComponent } from '@defra/forms-model'
 
 import { SelectField } from './SelectField.js'
+import { type RenderContext } from './types.js'
 import { messageTemplate } from '../pageControllers/validationOptions.js'
-import {
-  type FormPayload,
-  type FormSubmissionError
-} from '../types.js'
 
 export class AutocompleteField extends SelectField {
   declare options: AutocompleteFieldComponent['options']
@@ -34,8 +31,8 @@ export class AutocompleteField extends SelectField {
     this.formSchema = formSchema
   }
 
-  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {
-    const viewModel = super.getViewModel(payload, errors)
+  getViewModel(context: RenderContext) {
+    const viewModel = super.getViewModel(context)
     let { formGroup } = viewModel
 
     formGroup ??= {}

package/src/server/plugins/engine/components/CheckboxesField.ts

@@ -3,6 +3,7 @@ import joi, { type ArraySchema } from 'joi'
 
 import { isFormValue } from './FormComponent.js'
 import { SelectionControlField } from './SelectionControlField.js'
+import { type Translator } from '../i18n/types.js'
 import { type FormModel } from '../models/FormModel.js'
 import { type QuestionPageController } from '../pageControllers/QuestionPageController.js'
 import { messageTemplate } from '../pageControllers/validationOptions.js'
@@ -41,9 +42,9 @@ export class CheckboxesField extends SelectionControlField {
       .label(this.label)
       .required()
       .messages({
-        'array.min': messageTemplate.arrayMin as string,
-        'array.max': messageTemplate.arrayMax as string,
-        'array.length': messageTemplate.arrayLength as string
+        'array.min': messageTemplate.arrayMin,
+        'array.max': messageTemplate.arrayMax,
+        'array.length': messageTemplate.arrayLength
       })
 
     if (options.required === false) {
@@ -86,7 +87,8 @@ export class CheckboxesField extends SelectionControlField {
   }
 
   getDisplayStringFromFormValue(
-    selected: (string | number | boolean)[] | undefined
+    selected: (string | number | boolean)[] | undefined,
+    translator: Translator
   ) {
     const { items } = this
 
@@ -94,10 +96,9 @@ export class CheckboxesField extends SelectionControlField {
       return ''
     }
 
-    // Map selected values to text
     return items
       .filter((item) => selected.includes(item.value))
-      .map((item) => item.text)
+      .map((item) => translator.tListItem(item, 'text') || item.text)
       .join(', ')
   }
 
@@ -118,12 +119,12 @@ export class CheckboxesField extends SelectionControlField {
     return values ?? []
   }
 
-  getDisplayStringFromState(state: FormSubmissionState) {
-    // Selected checkbox values
+  getDisplayStringFromState(
+    state: FormSubmissionState,
+    translator: Translator
+  ) {
     const selected = this.getFormValueFromState(state) ?? []
-
-    // Map selected values to text
-    return this.getDisplayStringFromFormValue(selected)
+    return this.getDisplayStringFromFormValue(selected, translator)
   }
 
   getContextValueFromState(state: FormSubmissionState) {