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

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

@@ -1,4 +1,9 @@
-import { ComponentType, type UkAddressFieldComponent } from '@defra/forms-model'
+import {
+  ComponentType,
+  FormStatus,
+  type FormMetadata,
+  type UkAddressFieldComponent
+} from '@defra/forms-model'
 import { type ObjectSchema } from 'joi'
 import lowerFirst from 'lodash/lowerFirst.js'
 
@@ -9,6 +14,8 @@ import {
 } from './FormComponent.js'
 import { TextField } from './TextField.js'
 import { type RenderContext } from './types.js'
+import { getCachedPluginTranslator } from '../i18n/form.js'
+import { getAvailableLanguages } from '../i18n/languages.js'
 import { type Translator } from '../i18n/types.js'
 import {
   type FormRequestPayload,
@@ -207,7 +214,7 @@ export class UkAddressField extends FormComponent {
 
         /**
          * For screen readers, only hide legend visually. This can be overridden
-         * by single component {@link QuestionPageController | `showTitle` handling}
+         * by single component (see QuestionPageController and showTitle handling)
          */
         classes: options.hideTitle
           ? 'govuk-visually-hidden'
@@ -290,7 +297,6 @@ export class UkAddressField extends FormComponent {
     )
   }
 
-  // eslint-disable-next-line @typescript-eslint/require-await
   static async dispatcher(
     request: FormRequestPayload,
     h: FormResponseToolkit,
@@ -299,14 +305,31 @@ export class UkAddressField extends FormComponent {
     const { controller, component } = args
     const language = resolveLanguage(request)
 
+    const availableLanguages = getAvailableLanguages(controller.model.def)
+    const languages = availableLanguages.length
+      ? { languages: availableLanguages }
+      : {}
+
+    const translator = await getCachedPluginTranslator(
+      request,
+      { id: controller.model.formId } as unknown as FormMetadata,
+      args.isLive ? FormStatus.Live : FormStatus.Draft,
+      language
+    )
+    const { tComponent, tForm } = translator
+
     return dispatch(request, h, {
-      formName: controller.model.name,
+      formName: tForm('title'),
+      formId: controller.model.formId,
+      formStatus: args.isLive ? FormStatus.Live : FormStatus.Draft,
+      componentId: component.id ?? 'unknown',
       componentName: component.name,
-      componentHint: component.hint,
-      componentTitle: component.title || controller.title,
+      componentHint: tComponent(component, 'hint'),
+      componentTitle: tComponent(component, 'title') || controller.title,
       step: args.actionArgs.step,
       sourceUrl: args.sourceUrl,
-      language
+      language,
+      ...languages
     })
   }
 }

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

@@ -4,7 +4,6 @@ import {
   yesNoListName,
   type YesNoFieldComponent
 } from '@defra/forms-model'
-import { type LanguageMessages } from 'joi'
 
 import { SelectionControlField } from './SelectionControlField.js'
 import { addClassOptionIfNone } from './helpers/index.js'
@@ -12,7 +11,6 @@ import { buildValidationMessages } from '../i18n/buildValidationMessages.js'
 import { type Translator } from '../i18n/types.js'
 import { messageTemplate } from '../pageControllers/validationOptions.js'
 import { type ErrorMessageTemplateList } from '../types.js'
-import { convertToLanguageMessages } from '../../../utils/type-utils.js'
 
 /**
  * @description
@@ -45,21 +43,31 @@ export class YesNoField extends SelectionControlField {
       formSchema = formSchema.optional()
     }
 
-    formSchema = formSchema.messages(
-      convertToLanguageMessages({
+    if (options.customValidationMessage) {
+      const message = options.customValidationMessage
+
+      formSchema = formSchema.messages({
+        'any.required': message
+      })
+    } else if (options.customValidationMessages) {
+      formSchema = formSchema.messages(options.customValidationMessages)
+    } else {
+      formSchema = formSchema.messages({
         'any.required': messageTemplate.selectYesNoRequired
       })
-    )
+    }
 
     this.formSchema = formSchema
     this.options = options
   }
 
-  getValidationMessagesOverride(translator: Translator): LanguageMessages {
+  getValidationMessagesOverride(translator: Translator) {
     const { selectYesNoRequired } = buildValidationMessages(translator.t)
-    return convertToLanguageMessages({
-      'any.required': selectYesNoRequired
-    })
+    return {
+      [this.name]: {
+        'any.required': selectYesNoRequired
+      }
+    }
   }
 
   /**

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

@@ -347,8 +347,7 @@ export function getAnswerMarkdown(
     field instanceof Components.EastingNorthingField ||
     field instanceof Components.LatLongField
   ) {
-    const contextValue = field.getContextValueFromState(state)
-    answerEscaped = contextValue ? `${contextValue}\n` : ''
+    answerEscaped = answer ? `${answer}\n` : ''
   } else if (field instanceof Components.GeospatialField) {
     const features = field.getFormValueFromState(state)
     const value = field.getDisplayStringFromFormValue(features, translator)

package/src/server/plugins/engine/components/helpers/geospatial.ts

@@ -5,8 +5,13 @@ import {
 } from '@defra/forms-model'
 import Bourne from '@hapi/bourne'
 import { booleanWithin } from '@turf/boolean-within'
+import { point } from '@turf/helpers'
+// @ts-expect-error - no types
+import OsGridRef from 'geodesy/osgridref.js'
 import JoiBase, { type CustomValidator } from 'joi'
 
+import { type EastingNorthingField } from '../EastingNorthingField.js'
+import { type EastingNorthingState } from '../types.js'
 import {
   type Coordinates,
   type Feature,
@@ -171,3 +176,51 @@ export function getGeospatialSchema(
     def
   )
 }
+
+export function getEastingNorthingCountryValidator(
+  field: EastingNorthingField,
+  country: GeospatialFieldOptionsCountry
+) {
+  const validateCountryBounds: CustomValidator = (value, helpers) => {
+    const countryFeature = countries.features.find(
+      (feature) => feature.id === country
+    )
+
+    if (!countryFeature) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return value
+    }
+
+    const eastingNorthing = field.getFormValueFromState(
+      value as EastingNorthingState
+    )
+
+    if (!eastingNorthing) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return value
+    }
+
+    const gridRef = new OsGridRef(
+      eastingNorthing.easting,
+      eastingNorthing.northing
+    )
+    const latLong = gridRef.toLatLon()
+    const coord = point([latLong.longitude, latLong.latitude])
+    const within = booleanWithin(coord, countryFeature)
+
+    if (!within) {
+      return helpers.error(
+        'any.custom',
+        {
+          country: countriesDesc[country as GeospatialFieldOptionsCountryEnum]
+        },
+        { path: [field.name] }
+      )
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return value
+  }
+
+  return validateCountryBounds
+}

package/src/server/plugins/engine/components/helpers/index.ts

@@ -2,6 +2,8 @@ import { type ComponentDef } from '@defra/forms-model'
 import joi, { type JoiExpression, type ReferenceOptions } from 'joi'
 import lowerFirst from 'lodash/lowerFirst.js'
 
+import { type Translator } from '../../i18n/types.js'
+
 /**
  * Prevent Markdown formatting
  * @see {@link https://pandoc.org/chunkedhtml-demo/8.11-backslash-escapes.html}
@@ -66,3 +68,20 @@ export const lowerFirstExpressionOptions = {
  */
 export const createLowerFirstExpression = (template: string): JoiExpression =>
   joi.expression(template, lowerFirstExpressionOptions) as JoiExpression
+
+/**
+ * Translate a component label, in precedence order of errorDescription, then shortDesciption, then title
+ * @param {ComponentDef} component
+ * @param {Translator} translator
+ */
+export function getTranslatedLabel(
+  component: ComponentDef,
+  translator: Translator
+) {
+  const { tComponent } = translator
+  const translatedLabel =
+    tComponent(component, 'errorDescription') ||
+    tComponent(component, 'shortDescription') ||
+    tComponent(component, 'title')
+  return translatedLabel
+}

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

@@ -124,6 +124,7 @@ export interface ViewModel extends Record<string, unknown> {
   upload?: {
     count: number
     summaryList: SummaryList
+    uploadingLabel?: string
   }
 }
 

package/src/server/plugins/engine/helpers.ts

@@ -8,13 +8,14 @@ import {
 } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 import { type ResponseToolkit, type Server } from '@hapi/hapi'
-import { format, parseISO } from 'date-fns'
+import { format, parseISO, type Locale } from 'date-fns'
+import { cy, enGB } from 'date-fns/locale'
 import { StatusCodes } from 'http-status-codes'
 import { type Schema, type ValidationErrorItem } from 'joi'
 import { Liquid } from 'liquidjs'
 
 import { logger } from '../../common/helpers/logging/logger.js'
-import { FORM_VERSION_METADATA_KEY } from '../../constants.js'
+import { CY, EN_GB, FORM_VERSION_METADATA_KEY } from '../../constants.js'
 import {
   getAnswer,
   type Field
@@ -300,19 +301,24 @@ export function checkEmailAddressForLiveFormSubmission(
 
 /**
  * Parses the errors from {@link Schema.validate} so they can be rendered by govuk-frontend templates
+ * @param language - the target language for translations
  * @param [details] - provided by {@link Schema.validate}
  */
 export function getErrors(
+  language: string | undefined,
   details?: ValidationErrorItem[]
 ): FormSubmissionError[] | undefined {
   if (!details?.length) {
     return
   }
 
-  return details.map(getError)
+  return details.map((detail) => getError(language, detail))
 }
 
-export function getError(detail: ValidationErrorItem): FormSubmissionError {
+export function getError(
+  language: string | undefined,
+  detail: ValidationErrorItem
+): FormSubmissionError {
   const { context, message, path } = detail
 
   const name = context?.key ?? ''
@@ -320,7 +326,10 @@ export function getError(detail: ValidationErrorItem): FormSubmissionError {
 
   const text = message.replace(
     /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,
-    (text) => format(parseISO(text), 'd MMMM yyyy')
+    (text) =>
+      format(parseISO(text), 'd MMMM yyyy', {
+        locale: toLanguageLocale(language)
+      })
   )
 
   return {
@@ -410,3 +419,41 @@ export function getFormVersion(
     | FormVersionMetadata
     | undefined
 }
+
+const payLanguageCodes = {
+  [EN_GB]: 'en',
+  [CY]: 'cy'
+} as Record<string, string>
+
+const languageLocales = {
+  [EN_GB]: enGB,
+  [CY]: cy
+} as Record<string, Locale>
+
+const defaultLanguageCode = 'en'
+const defaultLanguageLocale = enGB
+
+/**
+ * Converts a BCP 47 language tag to the ISO 639-1 code GOV.UK Pay accepts.
+ * Defaults to English if the language is not supported.
+ * @param { string | undefined } language - BCP 47 language code
+ * @returns {string} language code required by GOV.UK Pay
+ */
+export function toPayLanguageCode(language: string | undefined): string {
+  return payLanguageCodes[language ?? 'unknown'] ?? defaultLanguageCode
+}
+
+/**
+ * Converts a BCP 47 language tag to the date-fns Locale (for date formatting).
+ * Defaults to English if the language is not supported.
+ * @param { string | undefined } language - BCP 47 language code
+ * @returns {Locale} language locale
+ */
+export function toLanguageLocale(language: string | undefined): Locale {
+  return languageLocales[language ?? 'unknown'] ?? defaultLanguageLocale
+}
+
+/**
+ * @import { FormsService } from '../../types.js'
+ * @import { Locale } from 'date-fns/locale'
+ */

package/src/server/plugins/engine/i18n/buildValidationMessages.ts

@@ -56,13 +56,16 @@ export function buildValidationMessages(t: (key: string) => string) {
     dateMin: t('components.dateField.validation.dateMin'),
     dateMax: t('components.dateField.validation.dateMax'),
 
-    unicode: 'validation.unicode',
-    arrayMin: 'validation.array.min',
-    arrayMax: 'validation.array.max',
-    arrayLength: 'validation.array.length',
-    featuresMin: 'validation.features.min',
-    featuresMax: 'validation.features.max',
-    featuresLength: 'validation.features.length'
+    unicode: t('validation.unicode'),
+    arrayMin: t('validation.arrayMin'),
+    arrayMax: t('validation.arrayMax'),
+    arrayLength: t('validation.arrayLength'),
+    featuresMin: t('validation.featuresMin'),
+    featuresMax: t('validation.featuresMax'),
+    featuresLength: t('validation.featuresLength'),
+    filesMin: t('validation.filesMin'),
+    filesMax: t('validation.filesMax'),
+    filesLength: t('validation.filesLength')
   }
 }
 

package/src/server/plugins/engine/i18n/createFormTranslator.ts

@@ -1,26 +1,40 @@
-import { type FormDefinition } from '@defra/forms-model'
+import {
+  yesNoListNoItemId,
+  yesNoListYesItemId,
+  type FormDefinition,
+  type FormMetadata
+} from '@defra/forms-model'
 import { type i18n } from 'i18next'
 
+import { CY } from '../../../constants.js'
 import { createTranslator } from './createTranslator.js'
 import { extractBaseTranslations } from './extractBaseTranslations.js'
 import { createFormI18nInstance } from './index.js'
-import {
-  type FormDefinitionTranslations,
-  type Translator
-} from './types.js'
+import { type FormDefinitionTranslations } from './types.js'
 
 export function createFormTranslator(
-  def: FormDefinition,
+  metadata: FormMetadata,
+  definition: FormDefinition | undefined,
   language: string
-): Translator {
-  const baseTranslations = extractBaseTranslations(def)
+) {
+  const baseTranslations = extractBaseTranslations(definition)
   const i18nInstance = createFormI18nInstance(baseTranslations)
-  loadFormTranslations(def, i18nInstance)
+  loadFormTranslations(definition, i18nInstance)
+  extractMetadataBaseTranslations(metadata, i18nInstance)
+
+  const translator = createTranslator(i18nInstance, language)
 
-  return createTranslator(i18nInstance, language)
+  return translator
 }
 
-export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
+export function loadFormTranslations(
+  def: FormDefinition | undefined,
+  i18nInstance: i18n
+) {
+  if (!def) {
+    return
+  }
+
   const formTranslations = def.metadata?.translations as
     | FormDefinitionTranslations
     | undefined
@@ -28,6 +42,43 @@ export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
   if (formTranslations) {
     for (const [lng, resources] of Object.entries(formTranslations)) {
       i18nInstance.addResourceBundle(lng, 'form', resources, true, true)
+
+      // Temporary workaround - until we develop a better solution
+      if (lng === CY) {
+        i18nInstance.addResource(
+          lng,
+          'form',
+          `listItems.${yesNoListYesItemId}.text`,
+          'Ie'
+        )
+        i18nInstance.addResource(
+          lng,
+          'form',
+          `listItems.${yesNoListNoItemId}.text`,
+          'Nage'
+        )
+      }
+    }
+  }
+}
+
+export function extractMetadataBaseTranslations(
+  metadata: FormMetadata | undefined,
+  i18nInstance: i18n
+) {
+  if (metadata) {
+    const translations = {
+      'form.title': metadata.title,
+      'form.contact.email.address': metadata.contact?.email?.address ?? '',
+      'form.contact.email.responseTime':
+        metadata.contact?.email?.responseTime ?? '',
+      'form.contact.online.url': metadata.contact?.online?.url ?? '',
+      'form.contact.online.text': metadata.contact?.online?.text ?? '',
+      'form.contact.phone': metadata.contact?.phone ?? '',
+      'form.submissionGuidance': metadata.submissionGuidance ?? '',
+      'form.privacyNoticeText': metadata.privacyNoticeText ?? '',
+      'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''
     }
+    i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true)
   }
 }

package/src/server/plugins/engine/i18n/extractBaseTranslations.ts

@@ -7,13 +7,19 @@ import { type FormDefinitionTranslations } from './types.js'
 
 type BaseTranslations = FormDefinitionTranslations[string]
 
-export function extractBaseTranslations(def: FormDefinition): BaseTranslations {
+export function extractBaseTranslations(
+  def: FormDefinition | undefined
+): BaseTranslations {
   const pages: BaseTranslations['pages'] = {}
   const components: BaseTranslations['components'] = {}
   const sections: BaseTranslations['sections'] = {}
   const listItems: BaseTranslations['listItems'] = {}
   const form: BaseTranslations['form'] = {}
 
+  if (!def) {
+    return { pages, components, sections, listItems, form }
+  }
+
   for (const page of def.pages) {
     if (page.id && page.title) {
       pages[page.id] = { title: page.title }

package/src/server/plugins/engine/i18n/form.ts

@@ -0,0 +1,54 @@
+import { type FormMetadata, type FormStatus } from '@defra/forms-model'
+import Boom from '@hapi/boom'
+import { LRUCache } from 'lru-cache'
+
+import { getPluginOptions } from '../helpers.js'
+import { createFormTranslator } from './createFormTranslator.js'
+import { type Translator } from './types.js'
+import { type AnyFormRequest } from '../types.js'
+
+const cache = new LRUCache({
+  max: 100,
+  ttl: 1000 * 60 * 15 // 15 minutes
+})
+
+/**
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
+ * This is an async call so we can read the form definition inside this call.
+ * See docs/features/multi-language.md for the language and translation flow overview.
+ * @param {AnyFormRequest} request
+ * @param {FormMetadata} metadata - the metadata of the form
+ * @param {FormStatus} status - the form status to use when retrieving the definition
+ * @param {string} language - the language to use for the translator
+ */
+export async function getCachedPluginTranslator(
+  request: AnyFormRequest,
+  metadata: FormMetadata,
+  status: FormStatus,
+  language: string
+) {
+  const key = `${metadata.id}-${status}-${language}-plugin-meta`
+
+  if (cache.has(key)) {
+    return cache.get(key) as unknown as Translator
+  }
+
+  const { services } = getPluginOptions(request.server)
+
+  const definition = await services?.formsService.getFormDefinition(
+    metadata.id,
+    status
+  )
+
+  if (!definition) {
+    throw Boom.notFound(
+      `FormDefinition not found for form ${metadata.id} and status ${status}`
+    )
+  }
+
+  const translator = createFormTranslator(metadata, definition, language)
+
+  cache.set(key, translator)
+
+  return translator
+}

package/src/server/plugins/engine/i18n/languages.ts

@@ -0,0 +1,19 @@
+import { type FormDefinition } from '@defra/forms-model'
+
+/**
+ * Return a list of available languages.
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
+ * @param {FormDefinition} def
+ */
+export function getAvailableLanguages(
+  def: FormDefinition
+): { name: string; code: string }[] {
+  // @ts-expect-error - dynamic property
+  if (def.metadata?.translations?.cy) {
+    return [
+      { name: 'English', code: 'en-GB' },
+      { name: 'Cymraeg', code: 'cy' }
+    ]
+  }
+  return []
+}